diff --git a/.github/ci-suites.json b/.github/ci-suites.json
index fbd721966a9..48b3bf98c08 100644
--- a/.github/ci-suites.json
+++ b/.github/ci-suites.json
@@ -24,10 +24,6 @@
       "group": "organization-search",
       "task": "ci:e2e-organization-search"
     },
-    {
-      "group": "org-redesign",
-      "task": "ci:e2e-org-redesign"
-    },
     {
       "group": "browser-extension-navigation",
       "task": "ci:e2e-browser-extension"
diff --git a/.github/scripts/ci-plan.gql b/.github/scripts/ci-plan.gql
index 5f44d548823..78dcbf3eaab 100644
--- a/.github/scripts/ci-plan.gql
+++ b/.github/scripts/ci-plan.gql
@@ -3,7 +3,7 @@ query($base: String!, $head: String!) {
   affectedTasks(base: $base, head: $head, tasks: [
     "test", "build", "type-check", "ci:integration", "ci:desktop-live",
     "ci:e2e-scim", "ci:e2e-cli", "ci:e2e-stop-after", "ci:e2e-desktop-inbox",
-    "ci:e2e-assistant-actions", "ci:e2e-organization-search", "ci:e2e-org-redesign",
+    "ci:e2e-assistant-actions", "ci:e2e-organization-search",
     "ci:e2e-docs-platform",
     "ci:e2e-browser-extension", "ci:e2e-project-files", "ci:e2e-mobile", "ci:e2e-seo"
   ]) {
diff --git a/.github/scripts/http-e2e.sh b/.github/scripts/http-e2e.sh
index f3e43d7cadb..8c5f185e7cd 100755
--- a/.github/scripts/http-e2e.sh
+++ b/.github/scripts/http-e2e.sh
@@ -3,7 +3,7 @@
 # CI groups, which reuse the production build from `e2e-build`.
 # The job extracts it into apps/sim/.next before running these suites.
 #
-# Usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|assistant-actions|organization-search|org-redesign|browser-extension|browser-extension-native|browser-extension-navigation|browser-extension-composer|browser-extension-access|project-files|mobile|seo>   (run from apps/sim)
+# Usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|assistant-actions|organization-search|browser-extension|browser-extension-native|browser-extension-navigation|browser-extension-composer|browser-extension-access|project-files|mobile|seo>   (run from apps/sim)
 #
 # The job provides DATABASE_URL, BETTER_AUTH_SECRET and ENCRYPTION_KEY; each group sets the rest of
 # its app's environment here. Reports and server logs land in $RUNNER_TEMP/e2e.
@@ -20,7 +20,7 @@
 # telemetry flush runs detached and still writes .next/dev).
 set -euo pipefail
 
-group=${1:?usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|assistant-actions|organization-search|org-redesign|browser-extension|browser-extension-native|browser-extension-navigation|browser-extension-composer|browser-extension-access|project-files|mobile|seo>}
+group=${1:?usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|assistant-actions|organization-search|browser-extension|browser-extension-native|browser-extension-navigation|browser-extension-composer|browser-extension-access|project-files|mobile|seo>}
 report_dir="$RUNNER_TEMP/e2e"
 ready_timeout_seconds=600
 mkdir -p "$report_dir"
@@ -32,7 +32,6 @@ status_log=''
 realtime_pid=''
 realtime_tag=''
 realtime_log=''
-agent_pid=''
 browsers_pid=''
 local_app_url=''
 # `dev` or `start`; a group sets it before start_app.
@@ -64,10 +63,6 @@ finish() {
       tail -n 100 "$realtime_log"
     fi
   fi
-  if [ -n "$agent_pid" ]; then
-    kill "$agent_pid" 2>/dev/null || true
-    wait "$agent_pid" 2>/dev/null || true
-  fi
   if [ -n "$browsers_pid" ]; then
     kill -- "-$browsers_pid" 2>/dev/null || true
     wait "$browsers_pid" 2>/dev/null || true
@@ -138,13 +133,6 @@ start_realtime() {
   wait_ready "$realtime_pid" "http://127.0.0.1:$port/health" "$name realtime server"
 }
 
-# stop_app: stops the app start_app started, so a group can start it again under other flags.
-stop_app() {
-  bash "$GITHUB_WORKSPACE/.github/scripts/stop-session.sh" "$server_pid" "$app_tag"
-  wait "$server_pid" 2>/dev/null || true
-  server_pid=''
-}
-
 # wait_ready <pid> <health-url> <label>
 wait_ready() {
   local pid=$1 url=$2 label=$3
@@ -280,59 +268,6 @@ case "$group" in
     esac
     ;;
 
-  # 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
-    export REDIS_URL=redis://127.0.0.1:6379
-    export E2E_APP_PUBLIC_URL=http://org-redesign.sim.ai:3029
-    export NEXT_PUBLIC_APP_URL="$E2E_APP_PUBLIC_URL"
-    export INTERNAL_API_BASE_URL=http://127.0.0.1:3029 TRUSTED_ORIGINS=http://127.0.0.1:3029
-    export NEXT_PUBLIC_SOCKET_URL=http://127.0.0.1:3030 SOCKET_SERVER_URL=http://127.0.0.1:3030
-    export BILLING_ENABLED=true NEXT_PUBLIC_BILLING_ENABLED=true
-    export ENTERPRISE_ENABLED=true NEXT_PUBLIC_ENTERPRISE_ENABLED=true
-    export ORGANIZATIONS_ENABLED=true NEXT_PUBLIC_ORGANIZATIONS_ENABLED=true
-    export SSO_ENABLED=true NEXT_PUBLIC_SSO_ENABLED=true
-    export KNOWLEDGE_MEMBER_ACCESS=true CREDENTIAL_GROUPS=true ACCESS_CONTROL_ENABLED=true
-    export NEXT_PUBLIC_ACCESS_CONTROL_ENABLED=true SIM_LINKS=true
-    export COPILOT_TOOL_PERMISSIONS_ENABLED=true
-    export INTERNAL_API_SECRET=org-redesign-ci-local-secret-at-least-32-characters
-    export COPILOT_API_KEY=org-redesign-ci-local-copilot-key MOTHERSHIP_SIM_TRANSPORT=direct
-    export SIM_AGENT_API_URL=http://127.0.0.1:3031
-    export GOOGLE_CLIENT_ID=org-redesign-google-client GOOGLE_CLIENT_SECRET=org-redesign-google-secret
-    export JIRA_CLIENT_ID=org-redesign-jira-client JIRA_CLIENT_SECRET=org-redesign-jira-secret
-    export CONFLUENCE_CLIENT_ID=org-redesign-confluence-client CONFLUENCE_CLIENT_SECRET=org-redesign-confluence-secret
-    export STRIPE_SECRET_KEY=sk_test_org_redesign STRIPE_WEBHOOK_SECRET=whsec_org_redesign
-    export DB_TX_TRIPWIRE=throw
-    export BROWSER_EXTENSION_IDS=abcdefghijklmnopabcdefghijklmnop
-    bun --no-env-file scripts/org-redesign-seed.ts
-    start_browser_install org-redesign --only-shell chromium
-    bun --no-env-file scripts/org-redesign-e2e/scripted-agent.ts 3031 \
-      > "$report_dir/org-redesign-agent.log" 2>&1 &
-    agent_pid=$!
-    wait_ready "$agent_pid" http://127.0.0.1:3031/health 'scripted agent'
-    start_app org-redesign 3029 'organization redesign' record-http-status
-    start_realtime org-redesign 3030
-    wait_for_browsers
-    run_status=0
-    ORG_REDESIGN_E2E_ORIGIN="$E2E_APP_PUBLIC_URL" \
-    ORG_REDESIGN_E2E_DATABASE_URL="$DATABASE_URL" \
-    ORG_REDESIGN_E2E_AUTH_SECRET="$BETTER_AUTH_SECRET" \
-    ORG_REDESIGN_E2E_REPORT_PATH="$report_dir/org-redesign-ui-report.json" \
-      bun --no-env-file scripts/test-org-redesign-e2e.ts || run_status=$?
-    stop_app
-    export PEOPLE=true
-    start_app org-redesign-people 3029 'organization redesign, People on'
-    ORG_REDESIGN_E2E_PHASE=people \
-    ORG_REDESIGN_E2E_ORIGIN="$E2E_APP_PUBLIC_URL" \
-    ORG_REDESIGN_E2E_DATABASE_URL="$DATABASE_URL" \
-    ORG_REDESIGN_E2E_AUTH_SECRET="$BETTER_AUTH_SECRET" \
-    ORG_REDESIGN_E2E_REPORT_PATH="$report_dir/org-redesign-people-ui-report.json" \
-      bun --no-env-file scripts/test-org-redesign-e2e.ts || run_status=$?
-    exit "$run_status"
-    ;;
-
   browser-extension|browser-extension-native|browser-extension-navigation|browser-extension-composer|browser-extension-access)
     extension_group=all
     case "$group" in
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 382396915fe..e0d1d77f3b8 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -207,7 +207,7 @@ jobs:
     needs: [changes, e2e-build]
     if: needs.changes.outputs.http == 'true'
     runs-on: ubuntu-24.04
-    timeout-minutes: ${{ matrix.group == 'org-redesign' && 45 || 20 }}
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.changes.outputs.http_matrix) }}
@@ -227,7 +227,7 @@ jobs:
           --health-retries 10
       # Desktop inbox, browser extension, and Project Files use Redis.
       redis:
-        image: ${{ (matrix.group == 'desktop-inbox' || matrix.group == 'assistant-actions' || matrix.group == 'organization-search' || matrix.group == 'org-redesign' || startsWith(matrix.group, 'browser-extension-') || matrix.group == 'project-files') && 'redis:8.2-alpine' || '' }}
+        image: ${{ (matrix.group == 'desktop-inbox' || matrix.group == 'assistant-actions' || matrix.group == 'organization-search' || startsWith(matrix.group, 'browser-extension-') || matrix.group == 'project-files') && 'redis:8.2-alpine' || '' }}
         ports:
           - 6379:6379
         options: >-
@@ -293,10 +293,6 @@ jobs:
         if: matrix.group == 'scim'
         run: printf '127.0.0.1 scim-e2e.sim.ai\n' | sudo tee -a /etc/hosts
 
-      - name: Map the hosted organization fixture to loopback
-        if: matrix.group == 'org-redesign'
-        run: printf '127.0.0.1 org-redesign.sim.ai\n' | sudo tee -a /etc/hosts
-
       # No step timeout: the job's bound covers a hang without cutting a slow but healthy suite
       # short of writing its report.
       - name: Run end-to-end suites
diff --git a/apps/sim/app/_shell/providers/get-query-client.ts b/apps/sim/app/_shell/providers/get-query-client.ts
index 7fe869b9212..fc986903949 100644
--- a/apps/sim/app/_shell/providers/get-query-client.ts
+++ b/apps/sim/app/_shell/providers/get-query-client.ts
@@ -1,7 +1,7 @@
 import { isServer, QueryClient } from '@tanstack/react-query'
 import { isDesktopApp } from '@/lib/desktop'
 
-export function makeQueryClient() {
+function makeQueryClient() {
   return new QueryClient({
     defaultOptions: {
       queries: {
diff --git a/apps/sim/app/api/organizations/[id]/home/calendar/route.ts b/apps/sim/app/api/organizations/[id]/home/calendar/route.ts
deleted file mode 100644
index fbc44c04cef..00000000000
--- a/apps/sim/app/api/organizations/[id]/home/calendar/route.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { getOrganizationHomeCalendarContract } from '@/lib/api/contracts/organization-home'
-import {
-  defineInternalJsonRoute,
-  internalRateLimits,
-  internalSessionAuth,
-} from '@/lib/api/server/routes'
-import {
-  organizationHomeOperations,
-  readOrganizationHomeCalendar,
-} from '@/lib/organizations/application/home-widgets'
-import { createCredentialGroupInternalErrorPolicy } from '@/app/api/workspaces/[id]/credential-groups/error-policy'
-
-export const GET = defineInternalJsonRoute({
-  contract: getOrganizationHomeCalendarContract,
-  auth: internalSessionAuth,
-  operation: organizationHomeOperations.readCalendar,
-  rateLimit: internalRateLimits.user({ bucketName: 'organization-home-calendar' }),
-  errorPolicy: createCredentialGroupInternalErrorPolicy(
-    'Failed to load calendar',
-    'Organization not found'
-  ),
-  mapInput: ({ params, query }) => ({ organizationId: params.id, ...query }),
-  useCase: readOrganizationHomeCalendar,
-  staticResponseHeaders: { 'Cache-Control': 'private, no-store' },
-})
diff --git a/apps/sim/app/api/organizations/[id]/home/email/route.ts b/apps/sim/app/api/organizations/[id]/home/email/route.ts
deleted file mode 100644
index 2286b859f74..00000000000
--- a/apps/sim/app/api/organizations/[id]/home/email/route.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { getOrganizationHomeEmailContract } from '@/lib/api/contracts/organization-home'
-import {
-  defineInternalJsonRoute,
-  internalRateLimits,
-  internalSessionAuth,
-} from '@/lib/api/server/routes'
-import {
-  organizationHomeOperations,
-  readOrganizationHomeEmail,
-} from '@/lib/organizations/application/home-widgets'
-import { createCredentialGroupInternalErrorPolicy } from '@/app/api/workspaces/[id]/credential-groups/error-policy'
-
-export const GET = defineInternalJsonRoute({
-  contract: getOrganizationHomeEmailContract,
-  auth: internalSessionAuth,
-  operation: organizationHomeOperations.readEmail,
-  rateLimit: internalRateLimits.user({ bucketName: 'organization-home-email' }),
-  errorPolicy: createCredentialGroupInternalErrorPolicy(
-    'Failed to load email',
-    'Organization not found'
-  ),
-  mapInput: ({ params }) => ({ organizationId: params.id }),
-  useCase: readOrganizationHomeEmail,
-  staticResponseHeaders: { 'Cache-Control': 'private, no-store' },
-})
diff --git a/apps/sim/app/api/organizations/[id]/search/history/sources/route.ts b/apps/sim/app/api/organizations/[id]/search/history/sources/route.ts
deleted file mode 100644
index 2cdf43717fd..00000000000
--- a/apps/sim/app/api/organizations/[id]/search/history/sources/route.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { removeSearchHistorySourceContract } from '@/lib/api/contracts/knowledge/search-history'
-import {
-  defineInternalJsonRoute,
-  internalOrchestrationErrorPolicy,
-  internalRateLimits,
-  internalSessionAuth,
-} from '@/lib/api/server/routes'
-import {
-  removeSearchHistorySource,
-  searchHistoryOperations,
-} from '@/lib/knowledge/application/search-history'
-
-export const DELETE = defineInternalJsonRoute({
-  contract: removeSearchHistorySourceContract,
-  auth: internalSessionAuth,
-  operation: searchHistoryOperations.removeSource,
-  rateLimit: internalRateLimits.user({ bucketName: 'search-history-write' }),
-  errorPolicy: internalOrchestrationErrorPolicy,
-  parseOptions: { maxBodyBytes: 24 * 1024 },
-  mapInput: ({ params, body }) => ({ organizationId: params.id, url: body.url }),
-  useCase: removeSearchHistorySource,
-  staticResponseHeaders: { 'Cache-Control': 'private, no-store' },
-})
diff --git a/apps/sim/app/api/organizations/[id]/sim-links/route.ts b/apps/sim/app/api/organizations/[id]/sim-links/route.ts
index 42b95c4d17a..a3a52a01780 100644
--- a/apps/sim/app/api/organizations/[id]/sim-links/route.ts
+++ b/apps/sim/app/api/organizations/[id]/sim-links/route.ts
@@ -5,7 +5,7 @@ import {
   internalRateLimits,
   internalSessionAuth,
 } from '@/lib/api/server/routes'
-import { presentSimLink, presentSimLinkPage } from '@/lib/api/server/sim-link-presenters'
+import { presentSimLink } from '@/lib/api/server/sim-link-presenters'
 import { createSimLink, listSimLinks } from '@/lib/sim-links/application/use-cases'
 
 const policy = {
@@ -21,7 +21,7 @@ export const GET = defineInternalJsonRoute({
   operation: listSimLinks.operation,
   useCase: listSimLinks,
   mapInput: ({ params, query }) => ({ organizationId: params.id, ...query }),
-  present: presentSimLinkPage,
+  present: ({ links, nextCursor }) => ({ links: links.map(presentSimLink), nextCursor }),
 })
 
 export const POST = defineInternalJsonRoute({
diff --git a/apps/sim/app/o/[organizationId]/_redesign/hydrated.tsx b/apps/sim/app/o/[organizationId]/_redesign/hydrated.tsx
deleted file mode 100644
index 24aaeb99f96..00000000000
--- a/apps/sim/app/o/[organizationId]/_redesign/hydrated.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { ReactNode } from 'react'
-import { type DehydratedState, HydrationBoundary } from '@tanstack/react-query'
-
-interface HydratedProps {
-  state: Promise<DehydratedState>
-  children: ReactNode
-}
-
-/**
- * Children painted from a page's server reads. Put it inside a `Suspense`: it holds only that
- * boundary, so the page's arrangement paints before the reads settle.
- */
-export async function Hydrated({ state, children }: HydratedProps) {
-  return <HydrationBoundary state={await state}>{children}</HydrationBoundary>
-}
diff --git a/apps/sim/app/o/[organizationId]/_redesign/redesign-host.tsx b/apps/sim/app/o/[organizationId]/_redesign/redesign-host.tsx
deleted file mode 100644
index ecac86ac933..00000000000
--- a/apps/sim/app/o/[organizationId]/_redesign/redesign-host.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-'use client'
-
-import '@/platform/design-system/styles/embedded.css'
-import type { ReactNode } from 'react'
-import { PlatformSurface } from '@/platform/design-system/components/surface/platform-surface'
-
-interface RedesignSurfaceProps {
-  children: ReactNode
-}
-
-/**
- * Mounts the design system. `system` follows the app's theme through `<html>`'s class, in CSS, so it
- * tracks every change and is right before hydration (`lib/postcss/platform-embed.cjs`).
- *
- * Never render a legacy component inside: the surface redefines tokens legacy utilities read. Compose
- * one beside a surface instead.
- */
-export function RedesignSurface({ children }: RedesignSurfaceProps) {
-  return <PlatformSurface theme='system'>{children}</PlatformSurface>
-}
-
-/** Fills the app's content slot, and the grid stretches the surface so its canvas reaches the end. */
-export function RedesignPageSurface({ children }: RedesignSurfaceProps) {
-  return (
-    <div className='grid h-full min-h-0 min-w-0 flex-1 grid-cols-[minmax(0,1fr)] overflow-y-auto'>
-      <RedesignSurface>{children}</RedesignSurface>
-    </div>
-  )
-}
diff --git a/apps/sim/app/o/[organizationId]/chat/[chatId]/page.tsx b/apps/sim/app/o/[organizationId]/chat/[chatId]/page.tsx
index c465952efd0..39708fa67f7 100644
--- a/apps/sim/app/o/[organizationId]/chat/[chatId]/page.tsx
+++ b/apps/sim/app/o/[organizationId]/chat/[chatId]/page.tsx
@@ -7,10 +7,7 @@ import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/pa
 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 {
-  canUseOrganizationChat,
-  getOrganizationBuildRedirect,
-} from '@/app/o/[organizationId]/home/home-redirect'
+import { getOrganizationHomeRedirect } from '@/app/o/[organizationId]/home/home-redirect'
 
 export const metadata: Metadata = { title: 'Chat' }
 
@@ -24,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 (!canUseOrganizationChat(context)) {
-    const unavailableRedirect = getOrganizationBuildRedirect(context, organizationId)
+  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, {
@@ -36,8 +33,8 @@ export default async function OrganizationChatPage({
     if (!context.searchAccess.memberScoped) redirect(WORKSPACE_SETTINGS_PATH)
     redirect(organizationRoutes(organizationId).searchChat(chatId))
   }
-  const buildRedirect = getOrganizationBuildRedirect(context, organizationId)
-  if (buildRedirect) redirect(buildRedirect)
+  const homeRedirect = getOrganizationHomeRedirect(context, organizationId)
+  if (homeRedirect) redirect(homeRedirect)
 
   return (
     <Suspense fallback={<OrganizationChatLoading />}>
diff --git a/apps/sim/app/o/[organizationId]/components/organization-conversation-landing.test.tsx b/apps/sim/app/o/[organizationId]/components/organization-conversation-landing.test.tsx
deleted file mode 100644
index 28a38980e0c..00000000000
--- a/apps/sim/app/o/[organizationId]/components/organization-conversation-landing.test.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * @vitest-environment jsdom
- *
- * 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'
-import { integrationMatcherMock } from '@sim/testing/mocks/integration-matcher.mock'
-import { kbConnectorsQueriesMock } from '@sim/testing/mocks/kb-connectors-queries.mock'
-import { nextNavigationMock, nextNavigationMockFns } from '@sim/testing/mocks/next-navigation.mock'
-import {
-  organizationProviderMock,
-  organizationProviderMockFns,
-} from '@sim/testing/mocks/organization-provider.mock'
-import {
-  createMutationResultMock,
-  createQueryResultMock,
-  reactQueryMock,
-  reactQueryMockFns,
-} from '@sim/testing/mocks/react-query.mock'
-import { NuqsTestingAdapter } from 'nuqs/adapters/testing'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => ({
-  chat: vi.fn(),
-  composer: vi.fn(),
-}))
-vi.mock('@/app/workspace/[workspaceId]/providers/feature-flags-provider', () => ({
-  useFeatureFlag: () => false,
-}))
-vi.mock('@/blocks/integration-matcher', () => integrationMatcherMock)
-vi.mock('next/navigation', () => nextNavigationMock)
-vi.mock('@tanstack/react-query', () => reactQueryMock)
-vi.mock('@/app/workspace/[workspaceId]/home/hooks/use-resource-panel', () => ({
-  useResourcePanelController: () => ({
-    onResourceEvent: undefined,
-    activeResourceState: [null, vi.fn()],
-    activeResourceParam: null,
-  }),
-  useChatResourcePanel: () => ({
-    isResourceCollapsed: true,
-    addResourceFromUser: vi.fn(),
-    prepareResourceViewForAgentTurn: vi.fn(),
-  }),
-}))
-vi.mock('@/app/workspace/[workspaceId]/home/components/chat-resource-panel', () => ({
-  ChatResourcePanel: ({ children }: { children: ReactNode }) => children,
-}))
-vi.mock('@/lib/auth/client', () => authClientMock)
-vi.mock('@/app/o/[organizationId]/providers/organization-provider', () => organizationProviderMock)
-vi.mock('@/app/workspace/[workspaceId]/home/hooks/use-chat', () => ({
-  getMothershipUseChatOptions: (options: object) => options,
-  useChat: mocks.chat,
-}))
-vi.mock('@/hooks/queries/mothership-chats', () => ({
-  useMarkMothershipChatRead: () => ({ mutate: vi.fn() }),
-}))
-vi.mock('@/app/o/[organizationId]/home/components/composer', () => ({ Composer: mocks.composer }))
-vi.mock('@/app/o/[organizationId]/home/components/get-started', () => ({
-  GetStarted: () => <div>Legacy get started</div>,
-}))
-vi.mock('@/app/workspace/[workspaceId]/home/components/suggested-actions', () => ({
-  SuggestedActions: () => <div>Suggested actions</div>,
-}))
-vi.mock('@/hooks/queries/kb/connectors', () => kbConnectorsQueriesMock)
-vi.mock('@/app/workspace/[workspaceId]/home/components/mothership-chat', () => ({
-  MothershipChat: () => <div>Conversation view</div>,
-}))
-
-import {
-  OrganizationConversation,
-  type OrganizationLandingSlot,
-} from '@/app/o/[organizationId]/components/organization-conversation'
-
-const landing = {
-  fallback: <div>Dashboard skeleton</div>,
-  render: ({ requestMode, composer }: OrganizationLandingSlot) => (
-    <div>
-      <div>Dashboard for {requestMode}</div>
-      {composer}
-    </div>
-  ),
-}
-
-let root: Root
-let container: HTMLDivElement
-
-async function render(element: ReactNode) {
-  await act(async () => {
-    root.render(<NuqsTestingAdapter hasMemory>{element}</NuqsTestingAdapter>)
-  })
-}
-
-beforeEach(() => {
-  vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
-  reactQueryMockFns.mockUseQuery.mockReturnValue(createQueryResultMock())
-  reactQueryMockFns.mockUseMutation.mockReturnValue(createMutationResultMock())
-  nextNavigationMockFns.mockUsePathname.mockReturnValue('/o/organization-a/home')
-  authClientMockFns.mockUseSession.mockReturnValue({ data: { user: { id: 'reader' } } })
-  organizationProviderMockFns.mockUseOrganizationContext.mockReturnValue({
-    organization: { id: 'organization-a', name: 'Acme' },
-    searchAccess: { memberScoped: true },
-    mothershipAvailable: true,
-    canBuild: false,
-    viewer: { isAdmin: false, canUseSearchMcp: true },
-  })
-  mocks.chat.mockReturnValue({ messages: [], resources: [], sendMessage: vi.fn() })
-  mocks.composer.mockReturnValue(<div>Question composer</div>)
-  container = document.createElement('div')
-  document.body.appendChild(container)
-  root = createRoot(container)
-})
-
-afterEach(async () => {
-  await act(async () => root.unmount())
-  container.remove()
-})
-
-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 })
-    await render(<OrganizationConversation requestMode='assistant' landing={landing} />)
-    expect(container.textContent).toBe('Dashboard skeleton')
-  })
-
-  it('shows no dashboard while a restored chat entry hands itself back to the router', async () => {
-    nextNavigationMockFns.mockUsePathname.mockReturnValue('/o/organization-a/search/chat/chat-1')
-    await render(<OrganizationConversation requestMode='assistant' landing={landing} />)
-    expect(container.textContent).toBe('')
-  })
-})
diff --git a/apps/sim/app/o/[organizationId]/components/organization-conversation.tsx b/apps/sim/app/o/[organizationId]/components/organization-conversation.tsx
index 22a1d36b7b3..38778bf511e 100644
--- a/apps/sim/app/o/[organizationId]/components/organization-conversation.tsx
+++ b/apps/sim/app/o/[organizationId]/components/organization-conversation.tsx
@@ -78,12 +78,6 @@ export interface OrganizationSummaryRequest {
   assistantSearch: WorkspaceSearchFilters
 }
 
-/** What a surface's own landing arranges in place of the default one. */
-export interface OrganizationLandingSlot {
-  requestMode: ChatRequestMode
-  composer: ReactNode
-}
-
 const serializeSearchConversation = createSerializer({
   ...organizationSearchParsers,
   ...searchFilterParsers,
@@ -98,15 +92,6 @@ interface OrganizationConversationProps {
   chatId?: string
   requestMode: ChatRequestMode
   header?: ReactNode
-  /** Names this surface's new-chat draft, for a surface that must not share another's. */
-  draftId?: string
-  /** Replaces the landing, and the blank frame before it, until the first turn takes over. */
-  landing?: {
-    /** Shown over the conversation once the first turn has replaced the landing. */
-    chatHeader?: ReactNode
-    fallback: ReactNode
-    render: (slot: OrganizationLandingSlot) => ReactNode
-  }
   panelOptions?: {
     header: ReactNode
     attachments?: ReactNode
@@ -132,9 +117,8 @@ export function OrganizationConversation(props: OrganizationConversationProps) {
     (props.requestMode === 'assistant' ? !searchAccess.memberScoped : !canBuild)
   )
     return null
-  if (isRestoredChatEntry) return <HomeFallback header={props.header} />
-  if (!isClient || !session?.user?.id)
-    return props.landing?.fallback ?? <HomeFallback header={props.header} />
+  if (isRestoredChatEntry || !isClient || !session?.user?.id)
+    return <HomeFallback header={props.header} />
   return (
     <OrganizationConversationContent
       key={`${session.user.id}:${organization.id}:${props.chatId ?? 'new'}:${props.panelOptions ? 'panel' : props.requestMode}`}
@@ -147,12 +131,10 @@ function OrganizationConversationContent({
   userName,
   chatId,
   requestMode: destinationMode,
-  header: frameHeader,
+  header,
   active = true,
   summaryRequest,
   onSummaryConsumed,
-  draftId,
-  landing,
   panelOptions,
 }: OrganizationConversationProps) {
   const { organization, canBuild } = useOrganizationContext()
@@ -189,8 +171,7 @@ function OrganizationConversationContent({
       ? { projectsDesktopTabs: false, onChatIdResolved: panelOptions.onChatIdResolved }
       : {}),
   })
-  const newDraftId =
-    draftId ?? (!compact && destinationMode === 'assistant' ? 'search-assistant' : 'home')
+  const newDraftId = !compact && destinationMode === 'assistant' ? 'search-assistant' : 'home'
   const draftPrefix = panelOptions ? `${panelOptions.draftNamespace}:` : ''
   const initialDraftKey = `${draftPrefix}${userId}:organization:${organization.id}:${chatId ?? newDraftId}`
   const draftKey = `${draftPrefix}${userId}:organization:${organization.id}:${chat.resolvedChatId ?? chatId ?? newDraftId}`
@@ -233,7 +214,6 @@ function OrganizationConversationContent({
     store.migrateDraft(initialDraftKey, draftKey)
   }, [initialDraftKey, draftKey, legacyDraftKey])
   const hasChat = Boolean(chatId || chat.messages.length)
-  const header = frameHeader ?? (hasChat ? landing?.chatHeader : undefined)
   const assistantSearchLevel = 'fast'
   const panel = useChatResourcePanel(chat, controller, userId)
   const addResource = panel.addResourceFromUser
@@ -512,16 +492,6 @@ function OrganizationConversationContent({
     />
   )
 
-  const shortcuts =
-    requestMode !== 'assistant' ? (
-      <SuggestedActions
-        organizationId={organization.id}
-        onSelectPrompt={(prompt) => setDraft(mentionifyIntegrations(prompt))}
-      />
-    ) : (
-      <GetStarted />
-    )
-
   const content = (
     <div
       className={cn(
@@ -579,8 +549,6 @@ function OrganizationConversationContent({
           </div>
           <ComposerScrollArea className='px-3 pb-3'>{composer}</ComposerScrollArea>
         </>
-      ) : landing ? (
-        landing.render({ requestMode, composer })
       ) : (
         <OrganizationLanding
           heading={
@@ -592,7 +560,16 @@ function OrganizationConversationContent({
           }
         >
           {composer}
-          <div className='relative md:absolute md:inset-x-0 md:top-full'>{shortcuts}</div>
+          <div className='relative md:absolute md:inset-x-0 md:top-full'>
+            {requestMode !== 'assistant' ? (
+              <SuggestedActions
+                organizationId={organization.id}
+                onSelectPrompt={(prompt) => setDraft(mentionifyIntegrations(prompt))}
+              />
+            ) : (
+              <GetStarted />
+            )}
+          </div>
         </OrganizationLanding>
       )}
     </div>
diff --git a/apps/sim/app/o/[organizationId]/components/organization-page/constants.ts b/apps/sim/app/o/[organizationId]/components/organization-page/constants.ts
new file mode 100644
index 00000000000..7a75d97ce48
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-page/constants.ts
@@ -0,0 +1,5 @@
+/**
+ * The home surface's reading column, so every organization page shares its width. Kept out of
+ * the client component module so server-rendered loading views receive the class string itself.
+ */
+export const PAGE_COLUMN_CLASS = 'mx-auto w-full max-w-chat px-6'
diff --git a/apps/sim/app/o/[organizationId]/components/organization-page/index.ts b/apps/sim/app/o/[organizationId]/components/organization-page/index.ts
new file mode 100644
index 00000000000..eac6781b000
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-page/index.ts
@@ -0,0 +1,3 @@
+export { PAGE_COLUMN_CLASS } from '@/app/o/[organizationId]/components/organization-page/constants'
+export { OrganizationPage } from '@/app/o/[organizationId]/components/organization-page/organization-page'
+export { useOrganizationPageFilters } from '@/app/o/[organizationId]/components/organization-page/use-organization-page-filters'
diff --git a/apps/sim/app/o/[organizationId]/components/organization-page/organization-page.tsx b/apps/sim/app/o/[organizationId]/components/organization-page/organization-page.tsx
new file mode 100644
index 00000000000..0cd6a8e495d
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-page/organization-page.tsx
@@ -0,0 +1,185 @@
+'use client'
+
+import { type ReactNode, useRef, useState } from 'react'
+import {
+  Button,
+  Chip,
+  ChipInput,
+  cn,
+  scrollFadeAttributes,
+  scrollFadeClass,
+  scrollFadeXClass,
+  useScrollEdges,
+} from '@sim/emcn'
+import { Search, X } from '@sim/emcn/icons'
+import { HEADER_ACTION_CLUSTER, PAGE_HEADER_BAR } from '@/components/page-header-bar'
+import { PAGE_COLUMN_CLASS } from '@/app/o/[organizationId]/components/organization-page/constants'
+import { useOrganizationPageFilters } from '@/app/o/[organizationId]/components/organization-page/use-organization-page-filters'
+import {
+  SIDEBAR_DIVIDER_PAD_ABOVE_CLASS,
+  SIDEBAR_DIVIDER_PAD_BELOW_CLASS,
+} from '@/app/workspace/[workspaceId]/w/components/sidebar/constants'
+
+interface OrganizationPageTab {
+  id: string
+  label: string
+}
+
+interface OrganizationPageProps {
+  title: string
+  description?: string
+  /** Header tabs; the first is the default. Omit for a page with one view. */
+  tabs?: readonly OrganizationPageTab[]
+  /** The page's primary action, a chip. Omit for a page without one. */
+  action?: ReactNode
+  /** Keep the search field visible on pages whose main content is a searchable list. */
+  searchMode?: 'collapsible' | 'expanded'
+  searchPlaceholder?: string
+  children?: ReactNode
+}
+
+/**
+ * The shell every organization page renders into: the top bar the workspace pages
+ * wear, then a fixed page header — title, description, tabs, search, and the
+ * optional action — over a scroll region that fades at both edges the way the
+ * sidebar does. Pages supply their content and logic; nothing else.
+ *
+ * The shell paints at once and never waits on data: a page renders each piece —
+ * a tab, a list, a count — the moment it is known and nothing before, with no
+ * skeleton standing in for it. Pass `tabs` only once they are known; the row
+ * simply gains them.
+ */
+export function OrganizationPage({
+  title,
+  description,
+  tabs,
+  action,
+  searchMode = 'collapsible',
+  searchPlaceholder = 'Search',
+  children,
+}: OrganizationPageProps) {
+  const scrollContainerRef = useRef<HTMLDivElement>(null)
+  const scrollContentRef = useRef<HTMLDivElement>(null)
+  const scrollEdges = useScrollEdges(scrollContainerRef, { contentRef: scrollContentRef })
+  const tabsRef = useRef<HTMLDivElement>(null)
+  const tabEdges = useScrollEdges(tabsRef, { axis: 'x' })
+
+  const { tab, search, setTab, setSearch } = useOrganizationPageFilters()
+  const defaultTab = tabs?.[0]?.id
+  const activeTab = tab ?? defaultTab
+
+  /**
+   * The field stays open while it holds text, across tab switches and reloads,
+   * since the text lives in the URL; this only remembers an empty field the
+   * viewer opened and has not dismissed.
+   */
+  const [searchOpened, setSearchOpened] = useState(false)
+  const searchOpen = searchMode === 'expanded' || searchOpened || search.length > 0
+
+  const closeSearch = () => {
+    setSearch('')
+    setSearchOpened(false)
+  }
+
+  return (
+    <div className='flex h-full flex-col bg-[var(--bg)]'>
+      {/* Reserved even while empty so the page header sits where the workspace's does. */}
+      <div className={PAGE_HEADER_BAR}>
+        <div className={HEADER_ACTION_CLUSTER} />
+      </div>
+
+      <div
+        className={cn(PAGE_COLUMN_CLASS, SIDEBAR_DIVIDER_PAD_ABOVE_CLASS, 'flex shrink-0 flex-col')}
+      >
+        <div className='flex flex-col gap-1 pt-8'>
+          <h1 className='text-[var(--text-primary)] text-lg'>{title}</h1>
+          {description && <p className='text-[var(--text-muted)] text-small'>{description}</p>}
+        </div>
+        <div className='mt-4 flex items-center justify-between gap-2'>
+          {/* The row yields to the controls beside it and scrolls sideways under a fade
+              once it can no longer fit; the scrollbar itself never shows. */}
+          <div
+            ref={tabsRef}
+            className={cn(
+              scrollFadeXClass,
+              'flex min-w-0 flex-1 items-center gap-[1px] overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden',
+              searchMode === 'expanded' && !tabs?.length && 'hidden'
+            )}
+            {...scrollFadeAttributes(tabEdges)}
+          >
+            {tabs?.map((item) => {
+              const active = item.id === activeTab
+              return (
+                <Chip
+                  key={item.id}
+                  shape='round'
+                  active={active}
+                  aria-pressed={active}
+                  onClick={() => setTab(item.id === defaultTab ? null : item.id)}
+                  className='min-w-[44px] shrink-0 text-center'
+                >
+                  {item.label}
+                </Chip>
+              )
+            })}
+          </div>
+          <div
+            className={cn(
+              'flex items-center gap-1.5',
+              searchMode === 'expanded' ? 'min-w-0 flex-1' : 'shrink-0'
+            )}
+          >
+            {searchOpen ? (
+              <ChipInput
+                autoFocus={searchMode === 'collapsible'}
+                icon={Search}
+                value={search}
+                placeholder={searchPlaceholder}
+                aria-label='Search'
+                spellCheck={false}
+                autoComplete='off'
+                className={searchMode === 'expanded' ? 'w-full' : 'w-[240px]'}
+                onChange={(event) => setSearch(event.target.value)}
+                onKeyDown={(event) => {
+                  if (event.key === 'Escape') closeSearch()
+                }}
+                endAdornment={
+                  (searchMode === 'collapsible' || search.length > 0) && (
+                    <Button
+                      type='button'
+                      variant='quiet'
+                      size='icon'
+                      className='-mr-1 shrink-0'
+                      aria-label={searchMode === 'expanded' ? 'Clear search' : 'Close search'}
+                      onClick={closeSearch}
+                    >
+                      <X className='size-[14px]' />
+                    </Button>
+                  )
+                }
+              />
+            ) : (
+              <Chip leftIcon={Search} aria-label='Search' onClick={() => setSearchOpened(true)} />
+            )}
+            {action}
+          </div>
+        </div>
+      </div>
+
+      <div
+        ref={scrollContainerRef}
+        className={cn(
+          SIDEBAR_DIVIDER_PAD_BELOW_CLASS,
+          SIDEBAR_DIVIDER_PAD_ABOVE_CLASS,
+          scrollFadeClass,
+          'min-h-0 flex-1 overflow-y-auto [scrollbar-gutter:stable_both-edges]'
+        )}
+        {...scrollFadeAttributes(scrollEdges)}
+      >
+        <div ref={scrollContentRef} className={PAGE_COLUMN_CLASS}>
+          {children}
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/components/organization-page/search-params.ts b/apps/sim/app/o/[organizationId]/components/organization-page/search-params.ts
new file mode 100644
index 00000000000..2be9ae79290
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-page/search-params.ts
@@ -0,0 +1,22 @@
+import { parseAsString } from 'nuqs/server'
+
+/**
+ * Co-located, typed URL query-param definitions for an organization page's
+ * header. Both are view state the page's content filters by, so a link carries
+ * them and a tab switch keeps them.
+ *
+ * - `tab` is the active header tab. Absent, the page shows its first tab, so the
+ *   key only appears once the viewer leaves it.
+ * - `q` is the search field's text, written raw (consumers trim on read) and
+ *   debounced on the way to the URL by `useDebouncedSearchSetter`.
+ */
+export const organizationPageParsers = {
+  tab: parseAsString,
+  q: parseAsString.withDefault(''),
+} as const
+
+/** Tabs and search are filter-like view changes, not navigation: replace, and clear at the default. */
+export const organizationPageUrlKeys = {
+  history: 'replace',
+  clearOnDefault: true,
+} as const
diff --git a/apps/sim/app/o/[organizationId]/components/organization-page/use-organization-page-filters.ts b/apps/sim/app/o/[organizationId]/components/organization-page/use-organization-page-filters.ts
new file mode 100644
index 00000000000..371ae5527af
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-page/use-organization-page-filters.ts
@@ -0,0 +1,21 @@
+import { useCallback } from 'react'
+import { useQueryStates } from 'nuqs'
+import {
+  organizationPageParsers,
+  organizationPageUrlKeys,
+} from '@/app/o/[organizationId]/components/organization-page/search-params'
+import { useDebouncedSearchSetter } from '@/hooks/use-debounced-search-setter'
+
+/**
+ * The header filters of the organization page the caller sits on. The shell
+ * drives them; a page's content reads `tab` and `search` to filter its list, so
+ * the same criteria apply whichever tab is showing.
+ */
+export function useOrganizationPageFilters() {
+  const [{ tab, q }, setFilters] = useQueryStates(organizationPageParsers, organizationPageUrlKeys)
+
+  const setTab = useCallback((next: string | null) => setFilters({ tab: next }), [setFilters])
+  const setSearch = useDebouncedSearchSetter((value, options) => setFilters({ q: value }, options))
+
+  return { tab, search: q, setTab, setSearch }
+}
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/chats-section.tsx b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/chats-section.tsx
new file mode 100644
index 00000000000..d3077103b59
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/chats-section.tsx
@@ -0,0 +1,235 @@
+'use client'
+
+import {
+  chipVariants,
+  cn,
+  DropdownMenuItem,
+  OverflowText,
+  RowActions,
+  rowActionsGroupClass,
+} from '@sim/emcn'
+import { MoreHorizontal, Pin, Task } from '@sim/emcn/icons'
+import type { OrganizationChat } from '@/app/o/[organizationId]/components/organization-sidebar/hooks'
+import { useOrganizationChatActions } from '@/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-chat-actions'
+import {
+  ChatNavigationLink,
+  CollapsedChatFlyoutItem,
+  CollapsedSidebarMenu,
+  SidebarSection,
+} from '@/app/workspace/[workspaceId]/w/components/sidebar/components'
+import { SidebarRenameRow } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-rename-row'
+import { SidebarRowAction } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-row-actions'
+import { ContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu'
+import { DeleteModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal'
+import {
+  SIDEBAR_ITEM_GAP_CLASS,
+  SIDEBAR_SECTION_GAP_CLASS,
+} from '@/app/workspace/[workspaceId]/w/components/sidebar/constants'
+
+interface ChatRowProps {
+  chat: OrganizationChat
+  isCurrentRoute: boolean
+  isSelected: boolean
+  isMenuOpen: boolean
+  onSelectChat: (chatId: string, shiftKey: boolean) => void
+  onContextMenu: (e: React.MouseEvent, chatId: string) => void
+  onMorePointerDown: () => void
+  onMoreClick: (e: React.MouseEvent<HTMLButtonElement>, chatId: string) => void
+}
+
+function ChatRow({
+  chat,
+  isCurrentRoute,
+  isSelected,
+  isMenuOpen,
+  onSelectChat,
+  onContextMenu,
+  onMorePointerDown,
+  onMoreClick,
+}: ChatRowProps) {
+  /**
+   * The trailing slot fits one glyph, and the dot wins over the pin: it reports
+   * transient state (a run in progress, or an unread reply elsewhere), while pinning
+   * is persistent and already conveyed by the row sorting to the top of the list.
+   */
+  const showStatusDot = Boolean(chat.isActive) || (!isCurrentRoute && Boolean(chat.isUnread))
+
+  return (
+    <ChatNavigationLink
+      href={chat.href}
+      chatId={chat.id}
+      isCurrentRoute={isCurrentRoute}
+      className={cn(
+        chipVariants({ active: isCurrentRoute || isSelected || isMenuOpen, fullWidth: true }),
+        rowActionsGroupClass
+      )}
+      onContextMenu={(e) => onContextMenu(e, chat.id)}
+      onSelectChat={onSelectChat}
+    >
+      <OverflowText label={chat.name} className='flex-1 text-[var(--text-body)]' />
+      <RowActions
+        open={isMenuOpen}
+        indicator={
+          showStatusDot ? (
+            <span
+              aria-hidden='true'
+              className='size-[6px] rounded-full'
+              style={{ backgroundColor: chat.isActive ? '#EAB308' : 'var(--brand-accent)' }}
+            />
+          ) : chat.isPinned ? (
+            <Pin aria-hidden='true' className='size-[12px] text-[var(--text-icon)]' />
+          ) : undefined
+        }
+      >
+        <SidebarRowAction
+          aria-label='Chat options'
+          onPointerDown={onMorePointerDown}
+          onClick={(e) => {
+            e.preventDefault()
+            e.stopPropagation()
+            onMoreClick(e, chat.id)
+          }}
+        >
+          <MoreHorizontal className='size-[14px] text-[var(--text-icon)]' />
+        </SidebarRowAction>
+      </RowActions>
+    </ChatNavigationLink>
+  )
+}
+
+interface ChatsSectionProps {
+  organizationId: string
+  chats: OrganizationChat[]
+  isLoading: boolean
+  isCollapsed: boolean
+  pathname: string | null
+}
+
+export function ChatsSection({
+  organizationId,
+  chats,
+  isLoading,
+  isCollapsed,
+  pathname,
+}: ChatsSectionProps) {
+  const actions = useOrganizationChatActions({ organizationId, chats })
+  const { menu, hover, rename, selectedChat, selectedChats, menuOpenChatId } = actions
+  const saveRename = () => {
+    void rename.saveRename()
+  }
+
+  return (
+    <>
+      <SidebarSection
+        title='Chats'
+        railCollapsed={isCollapsed}
+        className={cn(SIDEBAR_SECTION_GAP_CLASS, 'chats-section shrink-0')}
+      >
+        {isCollapsed ? (
+          <div className='px-2'>
+            <CollapsedSidebarMenu
+              icon={<Task className='size-[16px] shrink-0 text-[var(--text-icon)]' />}
+              hover={hover}
+              ariaLabel='Chats'
+              isEditing={rename.editingId !== null}
+            >
+              {isLoading ? null : chats.length === 0 ? (
+                <DropdownMenuItem disabled>No chats yet</DropdownMenuItem>
+              ) : (
+                chats.map((chat) => (
+                  <CollapsedChatFlyoutItem
+                    key={chat.id}
+                    chat={chat}
+                    isCurrentRoute={pathname === chat.href}
+                    isSelected={selectedChats.size > 1 && selectedChats.has(chat.id)}
+                    onSelectChat={actions.handleChatClick}
+                    isMenuOpen={menuOpenChatId === chat.id}
+                    isEditing={rename.editingId === chat.id}
+                    editValue={rename.value}
+                    inputRef={rename.inputRef}
+                    isRenaming={rename.isSaving}
+                    onEditValueChange={rename.setValue}
+                    onEditKeyDown={rename.handleKeyDown}
+                    onEditBlur={saveRename}
+                    onContextMenu={actions.onContextMenu}
+                    onMorePointerDown={actions.onMorePointerDown}
+                    onMoreClick={actions.onMoreClick}
+                  />
+                ))
+              )}
+            </CollapsedSidebarMenu>
+          </div>
+        ) : (
+          <div className={cn(SIDEBAR_ITEM_GAP_CLASS, 'flex flex-col px-2')}>
+            {!isLoading && (
+              <>
+                {chats.length === 0 && (
+                  <div className='flex h-[30px] items-center px-2 text-[var(--text-muted)] text-small'>
+                    No chats yet
+                  </div>
+                )}
+                {chats.map((chat) =>
+                  rename.editingId === chat.id ? (
+                    <SidebarRenameRow
+                      key={chat.id}
+                      ref={rename.inputRef}
+                      aria-label={`Rename chat ${chat.name}`}
+                      value={rename.value}
+                      onChange={(event) => rename.setValue(event.target.value)}
+                      onKeyDown={rename.handleKeyDown}
+                      onBlur={saveRename}
+                      disabled={rename.isSaving}
+                    />
+                  ) : (
+                    <ChatRow
+                      key={chat.id}
+                      chat={chat}
+                      isCurrentRoute={pathname === chat.href}
+                      isSelected={selectedChats.size > 1 && selectedChats.has(chat.id)}
+                      isMenuOpen={menuOpenChatId === chat.id}
+                      onSelectChat={actions.handleChatClick}
+                      onContextMenu={actions.onContextMenu}
+                      onMorePointerDown={actions.onMorePointerDown}
+                      onMoreClick={actions.onMoreClick}
+                    />
+                  )
+                )}
+              </>
+            )}
+          </div>
+        )}
+      </SidebarSection>
+      <ContextMenu
+        isOpen={menu.isOpen}
+        position={menu.position}
+        menuRef={menu.menuRef}
+        onClose={menu.closeMenu}
+        onOpenInNewTab={actions.openInNewTab}
+        onCopyLink={selectedChat ? actions.copyLink : undefined}
+        onRename={actions.startRename}
+        renameInputRef={rename.inputRef}
+        onTogglePin={actions.togglePin}
+        onMarkAsRead={actions.markRead}
+        onMarkAsUnread={actions.markUnread}
+        showOpenInNewTab={Boolean(selectedChat)}
+        showRename={Boolean(selectedChat)}
+        showPin={Boolean(selectedChat)}
+        isPinned={Boolean(selectedChat?.isPinned)}
+        showMarkAsRead={Boolean(selectedChat?.isUnread)}
+        showMarkAsUnread={Boolean(selectedChat) && !selectedChat?.isUnread}
+        onDelete={actions.startDelete}
+        showDelete={actions.selectedCount > 0}
+        selectedCount={actions.selectedCount}
+        showDuplicate={false}
+      />
+      <DeleteModal
+        isOpen={actions.chatsToDelete.length > 0}
+        onClose={actions.cancelDelete}
+        onConfirm={actions.confirmDelete}
+        isDeleting={actions.isDeleting}
+        itemType='task'
+        itemName={actions.chatsToDelete.map((chat) => chat.name)}
+      />
+    </>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/index.ts b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/index.ts
new file mode 100644
index 00000000000..a2ee28fffc9
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/index.ts
@@ -0,0 +1 @@
+export { ChatsSection } from './chats-section'
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/index.ts b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/index.ts
new file mode 100644
index 00000000000..c7f48483337
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/index.ts
@@ -0,0 +1,4 @@
+export { ChatsSection } from './chats-section'
+export { OrganizationFooter } from './organization-footer'
+export { OrganizationHeader } from './organization-header'
+export { WorkspacesSection } from './workspaces-section'
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-footer/index.ts b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-footer/index.ts
new file mode 100644
index 00000000000..95078897371
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-footer/index.ts
@@ -0,0 +1 @@
+export { OrganizationFooter } from './organization-footer'
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-footer/organization-footer.tsx b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-footer/organization-footer.tsx
new file mode 100644
index 00000000000..125ab4202af
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-footer/organization-footer.tsx
@@ -0,0 +1,28 @@
+'use client'
+
+import type { ComponentProps } from 'react'
+import { useRouter } from 'next/navigation'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import { SidebarFooter } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-footer/sidebar-footer'
+
+interface OrganizationFooterProps
+  extends Omit<
+    ComponentProps<typeof SidebarFooter>,
+    'accountSettingsHref' | 'onOpenAccountSettings' | 'navigationLinks'
+  > {}
+
+export function OrganizationFooter(props: OrganizationFooterProps) {
+  const { organization } = useOrganizationContext()
+  const router = useRouter()
+  const accountSettingsHref = organizationRoutes(organization.id).settingsSection('general')
+
+  return (
+    <SidebarFooter
+      {...props}
+      accountSettingsHref={accountSettingsHref}
+      onOpenAccountSettings={() => router.push(accountSettingsHref)}
+      navigationLinks={[]}
+    />
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-header/index.ts b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-header/index.ts
new file mode 100644
index 00000000000..7040e44e82d
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-header/index.ts
@@ -0,0 +1 @@
+export { OrganizationHeader } from './organization-header'
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-header/organization-header.tsx b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-header/organization-header.tsx
new file mode 100644
index 00000000000..f834c893055
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/organization-header/organization-header.tsx
@@ -0,0 +1,278 @@
+'use client'
+
+import { useRef, useState } from 'react'
+import {
+  Chip,
+  ChipChevronDown,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  OverflowText,
+  Tooltip,
+  toast,
+} from '@sim/emcn'
+import { PanelLeft, Send, Settings } from '@sim/emcn/icons'
+import { getErrorMessage } from '@sim/utils/errors'
+import { useRouter } from 'next/navigation'
+import { IdentityTile } from '@/components/identity-tile/identity-tile'
+import { getOrganizationSettingsHref } from '@/components/settings/navigation'
+import { SettingsGuardedLink } from '@/components/settings/settings-guarded-link'
+import type { OrganizationSurfaceContext } from '@/lib/organizations/surface'
+import { LOGO_ACCEPT_ATTRIBUTE } from '@/lib/uploads/client/logo-file'
+import { InviteModal } from '@/app/workspace/[workspaceId]/components/invite-modal'
+import { SidebarRenameRow } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-rename-row'
+import { SIDEBAR_RAIL_CHIP_CLASS } from '@/app/workspace/[workspaceId]/w/components/sidebar/constants'
+import { holdRowFocus } from '@/app/workspace/[workspaceId]/w/components/sidebar/utils'
+import { useRenameOrganization } from '@/hooks/queries/organization'
+import { useUploadOrganizationLogo } from '@/hooks/queries/organization-logo'
+
+function getOrganizationInitial(name: string): string {
+  return (name.trim()[0] || 'O').toUpperCase()
+}
+
+interface OrganizationHeaderProps {
+  organization: OrganizationSurfaceContext['organization']
+  /** Organization admins may change its logo and name. */
+  canEditIdentity: boolean
+  canInviteMembers: boolean
+  isCollapsed: boolean
+  /** Expands the rail; the collapsed header is itself the expand control. */
+  onExpandSidebar: () => void
+}
+
+/**
+ * The top-left organization chip. Expanded, it names the organization and opens
+ * its card — the mark at tile size, the name, how many people belong, and the way
+ * into its settings; collapsed, it becomes the rail's expand control, swapping
+ * the mark for a panel glyph on hover exactly as the workspace header does. The
+ * mark is the organization's uploaded logo or its initial on the neutral tile.
+ * Admins change the logo and rename the organization from the card.
+ */
+export function OrganizationHeader({
+  organization,
+  canEditIdentity,
+  canInviteMembers,
+  isCollapsed,
+  onExpandSidebar,
+}: OrganizationHeaderProps) {
+  const fileInputRef = useRef<HTMLInputElement>(null)
+  const nameInputRef = useRef<HTMLInputElement>(null)
+  const router = useRouter()
+  const { mutate: uploadLogo, isPending: isUploadingLogo } = useUploadOrganizationLogo(
+    organization.id
+  )
+  const renameOrganization = useRenameOrganization()
+  const [isInviteModalOpen, setIsInviteModalOpen] = useState(false)
+  const [isMenuOpen, setIsMenuOpen] = useState(false)
+  const [draftName, setDraftName] = useState<string | null>(null)
+  /**
+   * The name just saved, shown until the refreshed server prop replaces the one
+   * it was saved over; without it the old name flashes back in between.
+   */
+  const [savedName, setSavedName] = useState<{ name: string; replaces: string } | null>(null)
+  if (savedName && savedName.replaces !== organization.name) setSavedName(null)
+  const organizationName = savedName?.name ?? organization.name
+  const initial = getOrganizationInitial(organizationName)
+
+  if (isCollapsed) {
+    return (
+      <div className='min-w-0 flex-1'>
+        <Chip
+          aria-label='Expand sidebar'
+          onClick={onExpandSidebar}
+          fullWidth
+          className={SIDEBAR_RAIL_CHIP_CLASS}
+          leftAdornment={
+            <div className='relative flex size-[16px] shrink-0 items-center justify-center'>
+              <IdentityTile
+                initial={initial}
+                logoUrl={organization.logo}
+                className='group-hover:invisible'
+              />
+              <PanelLeft
+                aria-hidden
+                className='pointer-events-none invisible absolute inset-0 m-auto size-[16px] rotate-180 text-[var(--text-icon)] group-hover:visible'
+              />
+            </div>
+          }
+        />
+      </div>
+    )
+  }
+
+  const { memberCount } = organization
+  const stopRenaming = () => {
+    setDraftName(null)
+    renameOrganization.reset()
+  }
+
+  const submitRename = () => {
+    if (draftName === null || renameOrganization.isPending) return
+    const name = draftName.trim()
+    if (!name || name === organizationName) {
+      stopRenaming()
+      return
+    }
+    renameOrganization.mutate(
+      { orgId: organization.id, name },
+      {
+        onSuccess: () => {
+          setSavedName({ name, replaces: organization.name })
+          stopRenaming()
+        },
+        onError: () => requestAnimationFrame(() => nameInputRef.current?.focus()),
+      }
+    )
+  }
+
+  const logo = (
+    <IdentityTile size='lg' initial={initial} logoUrl={organization.logo} alt={organizationName} />
+  )
+
+  return (
+    <div className='min-w-0 flex-1'>
+      {canEditIdentity && (
+        <input
+          ref={fileInputRef}
+          type='file'
+          accept={LOGO_ACCEPT_ATTRIBUTE}
+          className='hidden'
+          aria-label='Organization logo'
+          disabled={isUploadingLogo}
+          onChange={(event) => {
+            const file = event.target.files?.[0]
+            event.target.value = ''
+            if (!file || isUploadingLogo) return
+            uploadLogo(file, {
+              onSuccess: () => router.refresh(),
+              onError: (error) => toast.error(error.message),
+            })
+          }}
+        />
+      )}
+      <DropdownMenu
+        open={isMenuOpen}
+        onOpenChange={(open) => {
+          // The input's blur saves the draft; closing now would unmount it and hide a failure.
+          if (!open && draftName !== null) return
+          setIsMenuOpen(open)
+        }}
+      >
+        <DropdownMenuTrigger asChild>
+          <Chip
+            aria-label='Organization menu'
+            className='min-w-0 max-w-full'
+            leftAdornment={<IdentityTile initial={initial} logoUrl={organization.logo} />}
+            rightAdornment={<ChipChevronDown />}
+          >
+            {organizationName}
+          </Chip>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          align='start'
+          side='bottom'
+          sideOffset={8}
+          className='w-64 max-w-[calc(100vw-24px)]'
+          onPointerMoveCapture={draftName !== null ? holdRowFocus : undefined}
+          onPointerOutCapture={draftName !== null ? holdRowFocus : undefined}
+        >
+          <div className='flex items-center gap-2 px-2 py-1.5'>
+            {canEditIdentity ? (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <DropdownMenuItem
+                    aria-label='Change organization logo'
+                    aria-busy={isUploadingLogo}
+                    textValue='Change organization logo'
+                    className='h-auto shrink-0 p-0 hover-hover:opacity-70 focus-visible:opacity-70'
+                    disabled={isUploadingLogo}
+                    onSelect={(event) => {
+                      event.preventDefault()
+                      fileInputRef.current?.click()
+                    }}
+                  >
+                    {logo}
+                  </DropdownMenuItem>
+                </Tooltip.Trigger>
+                <Tooltip.Content>{isUploadingLogo ? 'Uploading' : 'Change logo'}</Tooltip.Content>
+              </Tooltip.Root>
+            ) : (
+              logo
+            )}
+            <div className='flex min-w-0 flex-1 flex-col'>
+              {draftName !== null ? (
+                <SidebarRenameRow
+                  ref={nameInputRef}
+                  aria-label='Organization name'
+                  aria-invalid={renameOrganization.isError || undefined}
+                  autoFocus
+                  value={draftName}
+                  disabled={renameOrganization.isPending}
+                  onFocus={(event) => event.currentTarget.select()}
+                  onChange={(event) => {
+                    setDraftName(event.target.value)
+                    if (renameOrganization.isError) renameOrganization.reset()
+                  }}
+                  onKeyDown={(event) => {
+                    if (event.key === 'Enter') {
+                      event.preventDefault()
+                      submitRename()
+                    } else if (event.key === 'Escape') {
+                      event.preventDefault()
+                      stopRenaming()
+                    }
+                  }}
+                  onBlur={submitRename}
+                />
+              ) : canEditIdentity ? (
+                <DropdownMenuItem
+                  aria-label='Rename organization'
+                  textValue='Rename organization'
+                  className='h-auto min-w-0 p-0 hover-hover:opacity-70 focus-visible:opacity-70'
+                  onSelect={(event) => {
+                    event.preventDefault()
+                    setDraftName(organizationName)
+                  }}
+                >
+                  <OverflowText label={organizationName} />
+                </DropdownMenuItem>
+              ) : (
+                <OverflowText label={organizationName} />
+              )}
+              {renameOrganization.isError && (
+                <span role='alert' className='text-[var(--text-error)] text-caption'>
+                  {getErrorMessage(renameOrganization.error, 'Failed to rename organization')}
+                </span>
+              )}
+              <span className='text-[var(--text-muted)] text-caption'>
+                {memberCount} {memberCount === 1 ? 'member' : 'members'}
+              </span>
+            </div>
+          </div>
+          <DropdownMenuItem asChild>
+            <SettingsGuardedLink href={getOrganizationSettingsHref(organization.id, 'members')}>
+              <Settings className='size-[14px]' />
+              Settings
+            </SettingsGuardedLink>
+          </DropdownMenuItem>
+          {canInviteMembers && (
+            <DropdownMenuItem onSelect={() => setIsInviteModalOpen(true)}>
+              <Send className='size-[14px]' />
+              Invite people
+            </DropdownMenuItem>
+          )}
+        </DropdownMenuContent>
+      </DropdownMenu>
+      {isInviteModalOpen && (
+        <InviteModal
+          open={isInviteModalOpen}
+          onOpenChange={setIsInviteModalOpen}
+          organizationId={organization.id}
+          isOrganizationAdmin={canEditIdentity}
+          canInvite={canInviteMembers}
+        />
+      )}
+    </div>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/index.ts b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/index.ts
new file mode 100644
index 00000000000..48d480cdd44
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/index.ts
@@ -0,0 +1 @@
+export { WorkspacesSection } from './workspaces-section'
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/workspace-list.tsx b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/workspace-list.tsx
new file mode 100644
index 00000000000..f371d69d4a8
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/workspace-list.tsx
@@ -0,0 +1,249 @@
+'use client'
+
+import { useEffect, useState } from 'react'
+import {
+  chipVariants,
+  cn,
+  DropdownMenuItem,
+  DropdownMenuItemAction,
+  OverflowText,
+  RowActions,
+  rowActionsGroupClass,
+  toast,
+} from '@sim/emcn'
+import { MoreHorizontal, Pin } from '@sim/emcn/icons'
+import { getErrorMessage } from '@sim/utils/errors'
+import { IdentityTile } from '@/components/identity-tile/identity-tile'
+import { SettingsGuardedLink } from '@/components/settings/settings-guarded-link'
+import { WorkspaceContextMenu } from '@/components/workspaces/workspace-context-menu'
+import { getWorkspaceInitial } from '@/lib/workspaces/initials'
+import { useOrganizationWorkspaces } from '@/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-workspaces'
+import { SidebarRenameRow } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-rename-row'
+import { SidebarRowAction } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-row-actions'
+import { useFlyoutInlineRename } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-flyout-inline-rename'
+import type { useHoverMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-hover-menu'
+import { useToggleWorkspacePin, useUpdateWorkspace } from '@/hooks/queries/workspace'
+import { useContextMenu } from '@/hooks/use-context-menu'
+
+const PAGE_SIZE = 5
+
+interface WorkspaceListProps {
+  organizationId: string
+  pathname?: string | null
+  /** The rail flyout uses the same actions and ordering as the expanded list. */
+  flyout?: ReturnType<typeof useHoverMenu>
+}
+
+export function WorkspaceList({ organizationId, pathname, flyout }: WorkspaceListProps) {
+  const { workspaces, pinnedWorkspaceIds, isLoading } = useOrganizationWorkspaces(organizationId)
+  const { mutate: togglePin } = useToggleWorkspacePin()
+  const { mutateAsync: updateWorkspace } = useUpdateWorkspace()
+  const menu = useContextMenu()
+  const [selectedId, setSelectedId] = useState<string | null>(null)
+  const [visibleCount, setVisibleCount] = useState(PAGE_SIZE)
+  const selectedWorkspace = workspaces.find((workspace) => workspace.id === selectedId)
+  const rename = useFlyoutInlineRename({
+    itemType: 'workspace',
+    onSave: async (workspaceId, name) => {
+      try {
+        await updateWorkspace({ workspaceId, name })
+      } catch (error) {
+        toast.error(getErrorMessage(error, 'Failed to rename workspace'))
+        throw error
+      }
+    },
+  })
+  const lockFlyout = flyout?.setLocked
+  const isInteracting = menu.isOpen || rename.editingId !== null
+
+  useEffect(() => {
+    if (!lockFlyout || !isInteracting) return
+    lockFlyout(true)
+    return () => lockFlyout(false)
+  }, [lockFlyout, isInteracting])
+
+  const visibleWorkspaces = flyout ? workspaces : workspaces.slice(0, visibleCount)
+  const hasMore = workspaces.length > visibleCount
+
+  const openMenu = (event: React.MouseEvent, workspaceId: string) => {
+    setSelectedId(workspaceId)
+    flyout?.setLocked(true)
+    menu.preventDismiss()
+    menu.handleContextMenu(event)
+  }
+
+  return (
+    <>
+      {!isLoading && workspaces.length === 0 && (
+        <div className='px-2 py-1 text-[var(--text-muted)] text-small'>No workspaces yet</div>
+      )}
+      {visibleWorkspaces.map((workspace) => {
+        const href = `/workspace/${workspace.id}`
+        const isActive = pathname === href || Boolean(pathname?.startsWith(`${href}/`))
+        const isMenuOpen = menu.isOpen && selectedId === workspace.id
+        const isPinned = pinnedWorkspaceIds.has(workspace.id)
+        const label = (
+          <>
+            <IdentityTile
+              initial={getWorkspaceInitial(workspace.name)}
+              logoUrl={workspace.logoUrl}
+            />
+            <OverflowText
+              label={workspace.name}
+              className='flex-1 text-[var(--text-body)]'
+              focusTarget='nearest-interactive'
+            />
+          </>
+        )
+        const onMoreClick = (event: React.MouseEvent<HTMLButtonElement>) => {
+          event.preventDefault()
+          event.stopPropagation()
+          if (isMenuOpen) {
+            menu.closeMenu()
+            return
+          }
+          setSelectedId(workspace.id)
+          flyout?.setLocked(true)
+          const rect = event.currentTarget.getBoundingClientRect()
+          menu.openMenuAt({ x: rect.right, y: rect.top })
+        }
+
+        if (rename.editingId === workspace.id) {
+          return (
+            <SidebarRenameRow
+              key={workspace.id}
+              ref={rename.inputRef}
+              leadingAdornment={
+                <IdentityTile
+                  initial={getWorkspaceInitial(workspace.name)}
+                  logoUrl={workspace.logoUrl}
+                />
+              }
+              aria-label={`Rename workspace ${workspace.name}`}
+              value={rename.value}
+              onChange={(event) => rename.setValue(event.target.value)}
+              onKeyDown={rename.handleKeyDown}
+              onBlur={() => void rename.saveRename()}
+              disabled={rename.isSaving}
+            />
+          )
+        }
+
+        if (flyout) {
+          return (
+            <DropdownMenuItem
+              key={workspace.id}
+              asChild
+              active={isActive || isMenuOpen}
+              actionOpen={isMenuOpen}
+              onPointerMove={(event) => {
+                if (menu.isOpen || rename.editingId) event.preventDefault()
+              }}
+              actionIndicator={
+                isPinned ? (
+                  <Pin
+                    aria-hidden={false}
+                    className='size-[12px] text-[var(--text-icon)]'
+                    aria-label='Pinned'
+                    role='img'
+                  />
+                ) : undefined
+              }
+              action={
+                <DropdownMenuItemAction
+                  aria-label={`Options for ${workspace.name}`}
+                  onPointerDown={() => menu.preventDismiss()}
+                  onClick={onMoreClick}
+                >
+                  <MoreHorizontal />
+                </DropdownMenuItemAction>
+              }
+            >
+              <SettingsGuardedLink
+                href={href}
+                onContextMenu={(event) => openMenu(event, workspace.id)}
+              >
+                {label}
+              </SettingsGuardedLink>
+            </DropdownMenuItem>
+          )
+        }
+
+        return (
+          <SettingsGuardedLink
+            key={workspace.id}
+            href={href}
+            className={cn(
+              chipVariants({ active: isActive || isMenuOpen, fullWidth: true }),
+              rowActionsGroupClass
+            )}
+            onContextMenu={(event) => openMenu(event, workspace.id)}
+          >
+            {label}
+            <RowActions
+              open={isMenuOpen}
+              indicator={
+                isPinned ? (
+                  <Pin
+                    role='img'
+                    aria-label='Pinned'
+                    aria-hidden={false}
+                    className='size-[12px] text-[var(--text-icon)]'
+                  />
+                ) : undefined
+              }
+            >
+              <SidebarRowAction
+                aria-label={`Options for ${workspace.name}`}
+                onPointerDown={() => menu.preventDismiss()}
+                onClick={onMoreClick}
+              >
+                <MoreHorizontal className='size-[14px] text-[var(--text-icon)]' />
+              </SidebarRowAction>
+            </RowActions>
+          </SettingsGuardedLink>
+        )
+      })}
+      {!flyout && workspaces.length > PAGE_SIZE && (
+        <button
+          type='button'
+          onClick={() => setVisibleCount((count) => (hasMore ? count + PAGE_SIZE : PAGE_SIZE))}
+          className={cn(chipVariants({ fullWidth: true }), 'text-[var(--text-muted)] text-small')}
+        >
+          {hasMore ? 'See more' : 'See less'}
+        </button>
+      )}
+      <WorkspaceContextMenu
+        workspace={selectedWorkspace}
+        workspaceCount={workspaces.length}
+        isOpen={menu.isOpen}
+        position={menu.position}
+        menuRef={menu.menuRef}
+        onClose={menu.closeMenu}
+        renameInputRef={rename.inputRef}
+        showDelete={false}
+        showDuplicate={false}
+        showOpenInNewTab
+        onOpenInNewTab={() => {
+          if (selectedWorkspace)
+            window.open(`/workspace/${selectedWorkspace.id}`, '_blank', 'noopener,noreferrer')
+        }}
+        onRename={() => {
+          if (selectedWorkspace?.permissions === 'admin') rename.startRename(selectedWorkspace)
+        }}
+        isPinned={Boolean(selectedId && pinnedWorkspaceIds.has(selectedId))}
+        onTogglePin={() => {
+          if (selectedWorkspace) {
+            togglePin(
+              {
+                workspaceId: selectedWorkspace.id,
+                pinned: !pinnedWorkspaceIds.has(selectedWorkspace.id),
+              },
+              { onError: (error) => toast.error(error.message) }
+            )
+          }
+        }}
+      />
+    </>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/workspaces-section.tsx b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/workspaces-section.tsx
new file mode 100644
index 00000000000..8c11625e2a2
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/workspaces-section.tsx
@@ -0,0 +1,104 @@
+'use client'
+
+import { useState } from 'react'
+import { Button, cn, Tooltip } from '@sim/emcn'
+import { Plus, Workspaces } from '@sim/emcn/icons'
+import { useRouter } from 'next/navigation'
+import { WorkspaceList } from '@/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/workspace-list'
+import {
+  CollapsedSidebarMenu,
+  SidebarSection,
+} from '@/app/workspace/[workspaceId]/w/components/sidebar/components'
+import { CreateWorkspaceModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/create-workspace-modal/create-workspace-modal'
+import { SIDEBAR_ITEM_GAP_CLASS } from '@/app/workspace/[workspaceId]/w/components/sidebar/constants'
+import { useHoverMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-hover-menu'
+import { useCreateWorkspace, useWorkspaceCreationPolicy } from '@/hooks/queries/workspace'
+import { useSettingsDirtyStore } from '@/stores/settings/dirty/store'
+
+interface WorkspacesSectionProps {
+  organizationId: string
+  isCollapsed: boolean
+  pathname: string | null
+}
+
+export function WorkspacesSection({
+  organizationId,
+  isCollapsed,
+  pathname,
+}: WorkspacesSectionProps) {
+  const router = useRouter()
+  const hover = useHoverMenu()
+  const [isCreateOpen, setIsCreateOpen] = useState(false)
+  const { data: creationPolicy } = useWorkspaceCreationPolicy()
+  const { mutateAsync: createWorkspace, isPending: isCreating } = useCreateWorkspace()
+  const canCreate = creationPolicy?.canCreate && creationPolicy.organizationId === organizationId
+  const createDisabledReason = creationPolicy?.reason ?? 'Workspace creation is unavailable.'
+
+  const openCreate = () => {
+    if (!canCreate || isCreating) return
+    useSettingsDirtyStore.getState().requestLeave(() => {
+      hover.close()
+      setIsCreateOpen(true)
+    })
+  }
+
+  return (
+    <>
+      <SidebarSection
+        title='Workspaces'
+        railCollapsed={isCollapsed}
+        className='shrink-0'
+        action={
+          !isCollapsed && (
+            <Tooltip.Root>
+              <Tooltip.Trigger asChild>
+                <Button
+                  variant='quiet'
+                  size='icon'
+                  aria-label='New workspace'
+                  disabled={!canCreate || isCreating}
+                  onClick={openCreate}
+                >
+                  <Plus className='size-[16px]' />
+                </Button>
+              </Tooltip.Trigger>
+              <Tooltip.Content>
+                {canCreate ? 'New workspace' : createDisabledReason}
+              </Tooltip.Content>
+            </Tooltip.Root>
+          )
+        }
+      >
+        {isCollapsed ? (
+          <div className='px-2'>
+            <CollapsedSidebarMenu
+              icon={<Workspaces className='size-[16px] shrink-0 text-[var(--text-icon)]' />}
+              hover={hover}
+              ariaLabel='Workspaces'
+              primaryAction={
+                canCreate ? { label: 'New workspace', onSelect: openCreate } : undefined
+              }
+            >
+              <WorkspaceList organizationId={organizationId} pathname={pathname} flyout={hover} />
+            </CollapsedSidebarMenu>
+          </div>
+        ) : (
+          <div className={cn(SIDEBAR_ITEM_GAP_CLASS, 'flex flex-col px-2')}>
+            <WorkspaceList organizationId={organizationId} pathname={pathname} />
+          </div>
+        )}
+      </SidebarSection>
+      <CreateWorkspaceModal
+        open={isCreateOpen}
+        onOpenChange={setIsCreateOpen}
+        isCreating={isCreating}
+        onConfirm={async (name) => {
+          if (!canCreate) throw new Error(createDisabledReason)
+          const workspace = await createWorkspace({ name })
+          setIsCreateOpen(false)
+          router.push(`/workspace/${workspace.id}`)
+        }}
+      />
+    </>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/index.ts b/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/index.ts
new file mode 100644
index 00000000000..5824b847fde
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/index.ts
@@ -0,0 +1,2 @@
+export type { OrganizationChat } from './use-organization-chats'
+export { useOrganizationChats } from './use-organization-chats'
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-chat-actions.ts b/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-chat-actions.ts
new file mode 100644
index 00000000000..5470dfd65b9
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-chat-actions.ts
@@ -0,0 +1,225 @@
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { toast } from '@sim/emcn'
+import { getErrorMessage } from '@sim/utils/errors'
+import { useRouter } from 'next/navigation'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import type { OrganizationChat } from '@/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-chats'
+import { useChatSelection } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-chat-selection'
+import { useFlyoutInlineRename } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-flyout-inline-rename'
+import { useHoverMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-hover-menu'
+import {
+  MothershipChatDeleteError,
+  useDeleteMothershipChat,
+  useDeleteMothershipChats,
+  useMarkMothershipChatRead,
+  useMarkMothershipChatUnread,
+  useRenameMothershipChat,
+  useSetMothershipChatPinned,
+} from '@/hooks/queries/mothership-chats'
+import { useContextMenu } from '@/hooks/use-context-menu'
+import { useFolderStore } from '@/stores/folders/store'
+
+interface UseOrganizationChatActionsProps {
+  organizationId: string
+  chats: OrganizationChat[]
+}
+
+export function useOrganizationChatActions({
+  organizationId,
+  chats,
+}: UseOrganizationChatActionsProps) {
+  const router = useRouter()
+  const owner = { organizationId }
+  const deleteChat = useDeleteMothershipChat(owner)
+  const deleteChats = useDeleteMothershipChats(owner)
+  const isDeleting = deleteChat.isPending || deleteChats.isPending
+  const { mutateAsync: renameChat } = useRenameMothershipChat(owner)
+  const { mutate: pinChat } = useSetMothershipChatPinned(owner)
+  const { mutate: readChat } = useMarkMothershipChatRead(owner)
+  const { mutate: unreadChat } = useMarkMothershipChatUnread(owner)
+  const menu = useContextMenu()
+  const hover = useHoverMenu()
+  const chatIds = useMemo(() => chats.map((chat) => chat.id), [chats])
+  const { selectedChats, handleChatClick } = useChatSelection({ chatIds })
+  const [menuSelection, setMenuSelection] = useState<{
+    chatId: string
+    chatIds: string[]
+  } | null>(null)
+  const [chatIdsToDelete, setChatIdsToDelete] = useState<string[]>([])
+  const deleteTargetIds = new Set(chatIdsToDelete)
+  const chatsToDelete = chats.filter((chat) => deleteTargetIds.has(chat.id))
+  const selectedChat =
+    menuSelection?.chatIds.length === 1
+      ? chats.find((chat) => chat.id === menuSelection.chatId)
+      : undefined
+  const rename = useFlyoutInlineRename({
+    itemType: 'chat',
+    onSave: async (chatId, title) => {
+      try {
+        await renameChat({ chatId, title })
+      } catch (error) {
+        toast.error(getErrorMessage(error, 'Failed to rename chat'))
+        throw error
+      }
+    },
+  })
+
+  /** Keep the parent flyout open while its nested menu or rename field owns focus. */
+  useEffect(() => {
+    hover.setLocked(menu.isOpen || rename.editingId !== null)
+  }, [menu.isOpen, rename.editingId, hover.setLocked])
+
+  const captureSelection = useCallback(
+    (chatId: string) => {
+      const { selectedChats, selectChatOnly } = useFolderStore.getState()
+      if (selectedChats.has(chatId)) {
+        setMenuSelection({ chatId, chatIds: chatIds.filter((id) => selectedChats.has(id)) })
+      } else {
+        selectChatOnly(chatId)
+        setMenuSelection({ chatId, chatIds: [chatId] })
+      }
+    },
+    [chatIds]
+  )
+
+  const onContextMenu = useCallback(
+    (event: React.MouseEvent, chatId: string) => {
+      captureSelection(chatId)
+      hover.setLocked(true)
+      menu.preventDismiss()
+      menu.handleContextMenu(event)
+    },
+    [captureSelection, hover.setLocked, menu.preventDismiss, menu.handleContextMenu]
+  )
+
+  const onMorePointerDown = useCallback(() => {
+    if (menu.isOpen) menu.preventDismiss()
+  }, [menu.isOpen, menu.preventDismiss])
+
+  const onMoreClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>, chatId: string) => {
+      if (menu.isOpen && menuSelection?.chatId === chatId) {
+        menu.closeMenu()
+        return
+      }
+      const rect = event.currentTarget.getBoundingClientRect()
+      captureSelection(chatId)
+      hover.setLocked(true)
+      menu.openMenuAt({ x: rect.right, y: rect.top })
+    },
+    [menu.isOpen, menu.closeMenu, menu.openMenuAt, hover.setLocked, menuSelection, captureSelection]
+  )
+
+  const chatId = selectedChat?.id
+  const chatName = selectedChat?.name
+  const chatHref = selectedChat?.href
+  const chatPinned = selectedChat?.isPinned
+
+  const startDelete = useCallback(() => {
+    setChatIdsToDelete(menuSelection?.chatIds ?? [])
+  }, [menuSelection])
+
+  const cancelDelete = useCallback(() => {
+    if (!isDeleting) setChatIdsToDelete([])
+  }, [isDeleting])
+
+  const confirmDelete = useCallback(() => {
+    if (chatsToDelete.length === 0 || isDeleting) return
+    const redirectIfDeleted = (ids: string[]) => {
+      const current = chats.find(
+        (chat) => ids.includes(chat.id) && window.location.pathname === chat.href
+      )
+      if (current) {
+        const routes = organizationRoutes(organizationId)
+        router.push(current.href.startsWith(`${routes.search}/`) ? routes.search : routes.home)
+      }
+    }
+    const options = {
+      onSuccess: () => {
+        setChatIdsToDelete([])
+        useFolderStore.getState().clearChatSelection()
+        redirectIfDeleted(chatIdsToDelete)
+      },
+      onError: (error: Error) => {
+        if (error instanceof MothershipChatDeleteError) {
+          const deletedIds = new Set(error.deletedChatIds)
+          setChatIdsToDelete((ids) => ids.filter((id) => !deletedIds.has(id)))
+          redirectIfDeleted(error.deletedChatIds)
+        }
+        toast.error(error.message)
+      },
+    }
+    if (chatsToDelete.length === 1) {
+      deleteChat.mutate(chatsToDelete[0].id, options)
+    } else {
+      deleteChats.mutate(
+        chatsToDelete.map((chat) => chat.id),
+        options
+      )
+    }
+  }, [
+    chatIdsToDelete,
+    chats,
+    chatsToDelete,
+    deleteChat.mutate,
+    deleteChats.mutate,
+    isDeleting,
+    organizationId,
+    router,
+  ])
+
+  const startRename = useCallback(() => {
+    if (chatId && chatName !== undefined) rename.startRename({ id: chatId, name: chatName })
+  }, [chatId, chatName, rename.startRename])
+
+  const togglePin = useCallback(() => {
+    if (!chatId) return
+    pinChat({ chatId, pinned: !chatPinned }, { onError: (error) => toast.error(error.message) })
+  }, [chatId, chatPinned, pinChat])
+
+  const markRead = useCallback(() => {
+    if (chatId) readChat(chatId, { onError: (error) => toast.error(error.message) })
+  }, [chatId, readChat])
+
+  const markUnread = useCallback(() => {
+    if (chatId) unreadChat(chatId, { onError: (error) => toast.error(error.message) })
+  }, [chatId, unreadChat])
+
+  const openInNewTab = useCallback(() => {
+    if (chatHref) window.open(chatHref, '_blank', 'noopener,noreferrer')
+  }, [chatHref])
+
+  const copyLink = useCallback(async () => {
+    if (!chatHref) return
+    try {
+      await navigator.clipboard.writeText(new URL(chatHref, window.location.origin).href)
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Failed to copy link'))
+    }
+  }, [chatHref])
+
+  return {
+    menu,
+    hover,
+    rename,
+    selectedChat,
+    selectedChats,
+    handleChatClick,
+    menuOpenChatId: menu.isOpen ? menuSelection?.chatId : null,
+    selectedCount: menuSelection?.chatIds.length ?? 0,
+    onContextMenu,
+    onMorePointerDown,
+    onMoreClick,
+    startRename,
+    chatsToDelete,
+    isDeleting,
+    startDelete,
+    cancelDelete,
+    confirmDelete,
+    togglePin,
+    markRead,
+    markUnread,
+    openInNewTab,
+    copyLink,
+  }
+}
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-chats.ts b/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-chats.ts
new file mode 100644
index 00000000000..1230c52530f
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-chats.ts
@@ -0,0 +1,30 @@
+import { organizationRoutes } from '@/lib/navigation/paths'
+import { useOrganizationMothershipChats } from '@/hooks/queries/mothership-chats'
+
+export interface OrganizationChat {
+  id: string
+  name: string
+  href: string
+  /** A run is in progress. */
+  isActive?: boolean
+  /** Has a reply the viewer has not opened. */
+  isUnread?: boolean
+  isPinned?: boolean
+}
+
+/** Lists only the current member's private organization conversations. */
+export function useOrganizationChats(organizationId: string) {
+  const query = useOrganizationMothershipChats(organizationId)
+  const chats: OrganizationChat[] = (query.data ?? []).map((chat) => ({
+    id: chat.id,
+    name: chat.name,
+    href:
+      chat.mode === 'assistant'
+        ? organizationRoutes(organizationId).searchChat(chat.id)
+        : organizationRoutes(organizationId).chat(chat.id),
+    isActive: chat.isActive,
+    isUnread: chat.isUnread,
+    isPinned: chat.isPinned,
+  }))
+  return { chats, isLoading: query.isPending }
+}
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-workspaces.ts b/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-workspaces.ts
new file mode 100644
index 00000000000..4e6c15b5b53
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-workspaces.ts
@@ -0,0 +1,22 @@
+import {
+  EMPTY_PINNED_WORKSPACE_IDS,
+  useOrderedWorkspacesQuery,
+  usePinnedWorkspaceIds,
+} from '@/hooks/queries/workspace'
+
+/**
+ * The organization's workspaces the viewer belongs to, for the sidebar's
+ * Workspaces section. Read from the viewer's workspace list — the same query and
+ * order the workspace switcher uses — narrowed to those the organization owns.
+ */
+export function useOrganizationWorkspaces(organizationId: string) {
+  const { data = [], isLoading } = useOrderedWorkspacesQuery()
+  const { data: pinnedWorkspaceIds = EMPTY_PINNED_WORKSPACE_IDS } = usePinnedWorkspaceIds()
+  const workspaces = data.filter((workspace) => workspace.organizationId === organizationId)
+
+  return {
+    workspaces,
+    pinnedWorkspaceIds,
+    isLoading,
+  }
+}
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/index.ts b/apps/sim/app/o/[organizationId]/components/organization-sidebar/index.ts
new file mode 100644
index 00000000000..9963f275118
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/index.ts
@@ -0,0 +1 @@
+export { OrganizationSidebar } from './organization-sidebar'
diff --git a/apps/sim/platform/app/(shell)/_components/destinations.ts b/apps/sim/app/o/[organizationId]/components/organization-sidebar/navigation.ts
similarity index 50%
rename from apps/sim/platform/app/(shell)/_components/destinations.ts
rename to apps/sim/app/o/[organizationId]/components/organization-sidebar/navigation.ts
index 9b0008d4ee4..56826273d6f 100644
--- a/apps/sim/platform/app/(shell)/_components/destinations.ts
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/navigation.ts
@@ -1,29 +1,32 @@
+import { ChartColumn, Home, Integration, Link, Search, Users } from '@sim/emcn/icons'
 import { organizationRoutes } from '@/lib/navigation/paths'
-import type { ShellDestination } from '@/platform/app/(shell)/_components/model'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
+import type { SidebarNavItemData } from '@/app/workspace/[workspaceId]/w/components/sidebar/components'
 
 type OrganizationNavRoute = 'home' | 'search' | 'people' | 'integrations' | 'simLinks' | 'benchmark'
 
 interface OrganizationNavEntry {
   id: string
   label: string
-  icon: IconName
+  icon: SidebarNavItemData['icon']
   route: OrganizationNavRoute
 }
 
-/** The pinned block at the top of the organization sidebar, in display order. */
+/**
+ * The pinned block at the top of the organization sidebar, in display order.
+ * Hrefs are resolved per organization by {@link buildOrganizationNavItems}.
+ */
 const ORGANIZATION_NAV_ENTRIES: readonly OrganizationNavEntry[] = [
-  { id: 'home', label: 'Home', icon: 'I104', route: 'home' },
-  { id: 'search', label: 'Search', icon: 'I089', route: 'search' },
-  { id: 'people', label: 'People', icon: 'I129', route: 'people' },
-  { id: 'integrations', label: 'Integrations', icon: 'I070', route: 'integrations' },
-  { id: 'sim-links', label: 'Links', icon: 'I041', route: 'simLinks' },
-  { id: 'benchmark', label: 'Benchmark', icon: 'I046', route: 'benchmark' },
+  { id: 'home', label: 'Home', icon: Home, route: 'home' },
+  { id: 'search', label: 'Search', icon: Search, route: 'search' },
+  { id: 'people', label: 'People', icon: Users, route: 'people' },
+  { id: 'integrations', label: 'Integrations', icon: Integration, route: 'integrations' },
+  { id: 'sim-links', label: 'Links', icon: Link, route: 'simLinks' },
+  { id: 'benchmark', label: 'Benchmark', icon: ChartColumn, route: 'benchmark' },
 ]
 
 interface OrganizationNavAvailability {
   searchAvailable: boolean
-  homeAvailable: boolean
+  mothershipAvailable: boolean
   benchmarkEnabled?: boolean
   simLinksEnabled?: boolean
   peopleEnabled?: boolean
@@ -33,15 +36,15 @@ export function buildOrganizationNavItems(
   organizationId: string,
   {
     searchAvailable,
-    homeAvailable,
+    mothershipAvailable,
     benchmarkEnabled = false,
     simLinksEnabled = false,
     peopleEnabled = false,
   }: OrganizationNavAvailability
-): ShellDestination[] {
+): SidebarNavItemData[] {
   const routes = organizationRoutes(organizationId)
   const available: Record<OrganizationNavRoute, boolean> = {
-    home: homeAvailable,
+    home: mothershipAvailable,
     search: searchAvailable,
     people: peopleEnabled,
     integrations: searchAvailable,
@@ -49,6 +52,9 @@ export function buildOrganizationNavItems(
     benchmark: benchmarkEnabled,
   }
   return ORGANIZATION_NAV_ENTRIES.filter(({ route }) => available[route]).map(
-    ({ route, id, label, icon }) => ({ id, label, icon, value: routes[route] })
+    ({ route, ...entry }) => ({
+      ...entry,
+      href: routes[route],
+    })
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/organization-sidebar.tsx b/apps/sim/app/o/[organizationId]/components/organization-sidebar/organization-sidebar.tsx
new file mode 100644
index 00000000000..5d7d19dc225
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/organization-sidebar.tsx
@@ -0,0 +1,344 @@
+'use client'
+
+import { type ComponentProps, memo, useRef, useState } from 'react'
+import { Chip, cn, scrollFadeAttributes, scrollFadeClass, useScrollEdges } from '@sim/emcn'
+import { PanelLeft } from '@sim/emcn/icons'
+import { createLogger } from '@sim/logger'
+import { usePathname } from 'next/navigation'
+import { usePostHog } from 'posthog-js/react'
+import { isMacPlatform } from '@/lib/core/utils/platform'
+import { DOCS_URL, SLACK_COMMUNITY_URL } from '@/lib/help-links'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import { captureEvent } from '@/lib/posthog/client'
+import {
+  ChatsSection,
+  OrganizationFooter,
+  OrganizationHeader,
+  WorkspacesSection,
+} from '@/app/o/[organizationId]/components/organization-sidebar/components'
+import { useOrganizationChats } from '@/app/o/[organizationId]/components/organization-sidebar/hooks'
+import { buildOrganizationNavItems } from '@/app/o/[organizationId]/components/organization-sidebar/navigation'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import { OrganizationSettingsSidebar } from '@/app/o/[organizationId]/settings/organization-settings-sidebar'
+import { useSidebarChrome } from '@/app/workspace/[workspaceId]/components/workspace-chrome'
+import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
+import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands'
+import {
+  HelpModal,
+  isNavItemActive,
+  NavItemContextMenu,
+  SidebarNavChip,
+  SidebarTooltip,
+} from '@/app/workspace/[workspaceId]/w/components/sidebar/components'
+import {
+  SIDEBAR_DIVIDER_PAD_ABOVE_CLASS,
+  SIDEBAR_DIVIDER_PAD_BELOW_CLASS,
+  SIDEBAR_ITEM_GAP_CLASS,
+  SIDEBAR_SECTION_GAP_CLASS,
+} from '@/app/workspace/[workspaceId]/w/components/sidebar/constants'
+import { useSidebarResize } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks'
+import { isSidebarBackgroundClick } from '@/app/workspace/[workspaceId]/w/components/sidebar/utils'
+import { useContextMenu } from '@/hooks/use-context-menu'
+import { useFolderStore } from '@/stores/folders/store'
+
+const logger = createLogger('OrganizationSidebar')
+
+/**
+ * Opts a control out of the desktop shell's window-drag region. The header row is
+ * draggable chrome, so anything clickable inside it has to say so or the click is
+ * swallowed by the drag handler.
+ */
+const DRAG_EXEMPT_CLASS = '[-webkit-app-region:no-drag]'
+
+interface OrganizationChatsProps
+  extends Omit<ComponentProps<typeof ChatsSection>, 'chats' | 'isLoading'> {
+  organizationId: string
+}
+
+interface OrganizationSidebarProps {
+  benchmarkEnabled?: boolean
+  simLinksEnabled?: boolean
+  peopleEnabled?: boolean
+}
+
+function OrganizationChats({ organizationId, ...props }: OrganizationChatsProps) {
+  const { chats, isLoading } = useOrganizationChats(organizationId)
+  return (
+    <ChatsSection {...props} organizationId={organizationId} chats={chats} isLoading={isLoading} />
+  )
+}
+
+/**
+ * The organization surface's rail: the same chrome as the workspace sidebar —
+ * header row, pinned nav block, a divided scroll region of sections, and the
+ * pinned footer — hosted by the same `WorkspaceChrome`, so collapse, resize, and
+ * the desktop hover-peek all behave identically. Collapse and peek state come from
+ * the chrome through {@link useSidebarChrome}.
+ */
+export const OrganizationSidebar = memo(function OrganizationSidebar({
+  benchmarkEnabled = false,
+  simLinksEnabled = false,
+  peopleEnabled = false,
+}: OrganizationSidebarProps) {
+  const { isCollapsed: railCollapsed, isPeeking, onToggle: toggleCollapsed } = useSidebarChrome()
+  /** The peek card always renders the expanded layout, whatever the rail's state. */
+  const isCollapsed = railCollapsed && !isPeeking
+
+  const scrollContainerRef = useRef<HTMLDivElement>(null)
+  const scrollContentRef = useRef<HTMLDivElement>(null)
+
+  const pathname = usePathname()
+  const posthog = usePostHog()
+  const { organization, viewer, searchAccess, mothershipAvailable, canBuild } =
+    useOrganizationContext()
+  const { handlePointerDown } = useSidebarResize()
+  const showCollapsedTooltips = isCollapsed
+  const scrollEdges = useScrollEdges(scrollContainerRef, {
+    contentRef: scrollContentRef,
+    enabled: !isCollapsed,
+  })
+
+  const isMac = isMacPlatform()
+  const canUseHome = mothershipAvailable && canBuild
+  const navItems = buildOrganizationNavItems(organization.id, {
+    searchAvailable: searchAccess.memberScoped,
+    mothershipAvailable: canUseHome,
+    benchmarkEnabled,
+    simLinksEnabled,
+    peopleEnabled,
+  })
+  const settingsPath = organizationRoutes(organization.id).settings
+  const isSettings = pathname === settingsPath || pathname?.startsWith(`${settingsPath}/`)
+
+  const [isHelpModalOpen, setIsHelpModalOpen] = useState(false)
+  const [menuHref, setMenuHref] = useState<string | null>(null)
+  const {
+    isOpen: isHrefMenuOpen,
+    position: hrefMenuPosition,
+    menuRef: hrefMenuRef,
+    handleContextMenu: openHrefMenu,
+    closeMenu: closeHrefMenu,
+  } = useContextMenu()
+
+  const handleHrefContextMenu = (e: React.MouseEvent, href: string) => {
+    setMenuHref(href)
+    openHrefMenu(e)
+  }
+
+  const handleHrefMenuClose = () => {
+    closeHrefMenu()
+    setMenuHref(null)
+  }
+
+  const handleOpenInNewTab = () => {
+    if (menuHref) window.open(menuHref, '_blank', 'noopener,noreferrer')
+  }
+
+  const handleCopyLink = async () => {
+    if (!menuHref) return
+    try {
+      await navigator.clipboard.writeText(`${window.location.origin}${menuHref}`)
+    } catch (error) {
+      logger.error('Failed to copy link to clipboard', { error })
+    }
+  }
+
+  const handleOpenDocs = () => {
+    window.open(DOCS_URL, '_blank', 'noopener,noreferrer')
+    captureEvent(posthog, 'docs_opened', { source: 'help_menu' })
+  }
+
+  const handleOpenSlackCommunity = () => {
+    window.open(SLACK_COMMUNITY_URL, '_blank', 'noopener,noreferrer')
+    captureEvent(posthog, 'slack_community_opened', { source: 'help_menu' })
+  }
+
+  const handleEdgeKeyDown = (e: React.KeyboardEvent) => {
+    if (isCollapsed && (e.key === 'Enter' || e.key === ' ')) {
+      e.preventDefault()
+      toggleCollapsed()
+    }
+  }
+
+  const handleSidebarClick = (event: React.MouseEvent<HTMLElement>) => {
+    if (!isSidebarBackgroundClick(event)) return
+    useFolderStore.getState().clearChatSelection()
+  }
+
+  useRegisterGlobalCommands(() =>
+    createCommands([
+      {
+        id: 'toggle-sidebar',
+        handler: () => {
+          toggleCollapsed()
+        },
+      },
+    ])
+  )
+
+  return (
+    <div className='relative h-full'>
+      <aside
+        className='group/rail sidebar-container relative h-full overflow-hidden bg-[var(--surface-1)] [&_.group.cursor-pointer]:duration-0'
+        data-collapsed={isCollapsed || undefined}
+        aria-label='Organization sidebar'
+        onClick={handleSidebarClick}
+      >
+        <div className='flex h-full flex-col'>
+          {/* The peek card already sits below the lane; reserving it again doubles the offset. */}
+          {!isPeeking && (
+            <div
+              aria-hidden
+              className='desktop-window-drag-region desktop-workspace-window-drag-region h-[var(--desktop-title-bar-height)]'
+            />
+          )}
+          <div
+            className={cn(
+              'relative flex shrink-0 items-center px-2 pt-2',
+              !isPeeking &&
+                '[[data-sim-desktop-title-bar=inset]_&]:pt-[var(--desktop-title-bar-height)]'
+            )}
+          >
+            <OrganizationHeader
+              organization={organization}
+              canEditIdentity={viewer.isAdmin}
+              canInviteMembers={viewer.canInviteMembers}
+              isCollapsed={isCollapsed}
+              onExpandSidebar={toggleCollapsed}
+            />
+            <div
+              inert={isCollapsed}
+              className={cn(
+                'flex h-[30px] items-center gap-[1px] overflow-hidden max-md:hidden',
+                isCollapsed
+                  ? 'w-0 opacity-0'
+                  : 'w-[32px] [[data-sim-desktop-title-bar=inset]_&]:w-0'
+              )}
+            >
+              <SidebarTooltip
+                label='Collapse sidebar'
+                enabled={!isCollapsed}
+                side='bottom'
+                shortcut={isMac ? '⌘B' : 'Ctrl+B'}
+              >
+                <Chip
+                  leftIcon={PanelLeft}
+                  aria-label='Collapse sidebar'
+                  onClick={toggleCollapsed}
+                  tabIndex={isCollapsed ? -1 : undefined}
+                  className={cn(
+                    DRAG_EXEMPT_CLASS,
+                    'max-md:hidden [[data-sim-desktop-title-bar=inset]_&]:hidden'
+                  )}
+                />
+              </SidebarTooltip>
+            </div>
+          </div>
+
+          {isSettings ? (
+            <OrganizationSettingsSidebar
+              isCollapsed={isCollapsed}
+              showCollapsedTooltips={showCollapsedTooltips}
+            />
+          ) : (
+            <>
+              {/* The divider is the pinned block's bottom rule, not the scroll region's top one:
+              the region's edge fade masks its own first pixels, which would erase a rule
+              drawn there exactly when it should show. Same construction as the footer. */}
+              <div
+                className={cn(
+                  SIDEBAR_SECTION_GAP_CLASS,
+                  SIDEBAR_ITEM_GAP_CLASS,
+                  SIDEBAR_DIVIDER_PAD_ABOVE_CLASS,
+                  'flex shrink-0 flex-col border-b px-2 transition-colors duration-150',
+                  !scrollEdges.top && 'border-transparent'
+                )}
+              >
+                {navItems.map((item) => {
+                  const active = isNavItemActive(item, pathname)
+                  return (
+                    <SidebarTooltip
+                      key={item.id}
+                      label={item.label}
+                      enabled={showCollapsedTooltips}
+                    >
+                      <SidebarNavChip
+                        item={item}
+                        active={active}
+                        onContextMenu={(e) => handleHrefContextMenu(e, item.href as string)}
+                      />
+                    </SidebarTooltip>
+                  )
+                })}
+              </div>
+
+              <div
+                ref={scrollContainerRef}
+                className={cn(
+                  SIDEBAR_DIVIDER_PAD_BELOW_CLASS,
+                  SIDEBAR_DIVIDER_PAD_ABOVE_CLASS,
+                  scrollFadeClass,
+                  'flex min-h-0 flex-1 flex-col overflow-y-auto overflow-x-hidden'
+                )}
+                {...scrollFadeAttributes(scrollEdges)}
+              >
+                <div ref={scrollContentRef} className='flex flex-col'>
+                  <WorkspacesSection
+                    organizationId={organization.id}
+                    isCollapsed={isCollapsed}
+                    pathname={pathname}
+                  />
+                  {mothershipAvailable && (canBuild || searchAccess.memberScoped) && (
+                    <OrganizationChats
+                      key={organization.id}
+                      organizationId={organization.id}
+                      isCollapsed={isCollapsed}
+                      pathname={pathname}
+                    />
+                  )}
+                </div>
+              </div>
+            </>
+          )}
+          <OrganizationFooter
+            showDivider={scrollEdges.bottom}
+            isCollapsed={isCollapsed}
+            showCollapsedTooltips={showCollapsedTooltips}
+            onOpenDocs={handleOpenDocs}
+            onJoinSlack={handleOpenSlackCommunity}
+            onContactSupport={() => setIsHelpModalOpen(true)}
+          />
+
+          <NavItemContextMenu
+            isOpen={isHrefMenuOpen}
+            position={hrefMenuPosition}
+            menuRef={hrefMenuRef}
+            onClose={handleHrefMenuClose}
+            onOpenInNewTab={handleOpenInNewTab}
+            onCopyLink={handleCopyLink}
+          />
+        </div>
+      </aside>
+
+      <HelpModal open={isHelpModalOpen} onOpenChange={setIsHelpModalOpen} />
+
+      {/* Not on the peek card: the resize hook writes an inline `--sidebar-width` that
+          out-specifies the `[data-peek]` rule, stranding the card at a stale width. */}
+      {!isPeeking && (
+        <div
+          className={cn(
+            'absolute top-0 right-0 bottom-0 z-20 hidden w-[8px] translate-x-1/2 md:block',
+            isCollapsed ? 'cursor-e-resize' : 'cursor-ew-resize'
+          )}
+          onPointerDown={isCollapsed ? undefined : handlePointerDown}
+          onClick={isCollapsed ? toggleCollapsed : undefined}
+          onKeyDown={handleEdgeKeyDown}
+          role={isCollapsed ? 'button' : 'separator'}
+          tabIndex={0}
+          aria-orientation={isCollapsed ? undefined : 'vertical'}
+          aria-label={isCollapsed ? 'Expand sidebar' : 'Resize sidebar'}
+        />
+      )}
+    </div>
+  )
+})
diff --git a/apps/sim/app/o/[organizationId]/components/search-landing-history.tsx b/apps/sim/app/o/[organizationId]/components/search-landing-history.tsx
new file mode 100644
index 00000000000..384ecc97b22
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/components/search-landing-history.tsx
@@ -0,0 +1,116 @@
+'use client'
+
+import { type ReactNode, useState } from 'react'
+import { Chip, cn, toast } from '@sim/emcn'
+import { Clock } from '@sim/emcn/icons'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { SourceCard } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-card'
+import { useClearSearchHistory, useSearchHistory } from '@/hooks/queries/search-history'
+
+interface SearchLandingHistoryProps {
+  organizationId: string
+  userId: string
+  onSearch: (query: string) => void
+  children: ReactNode
+}
+
+/** Private shortcuts under the composer; ordinary buttons retain native Tab/Enter navigation. */
+export function SearchLandingHistory({
+  organizationId,
+  userId,
+  onSearch,
+  children,
+}: SearchLandingHistoryProps) {
+  const history = useSearchHistory(organizationId, userId)
+  const clear = useClearSearchHistory(organizationId, userId)
+  const [selection, setSelection] = useState<'sources' | 'queries' | null>(null)
+  const data = history.isError ? undefined : history.data
+  const sources = data?.sources.slice(0, 5) ?? []
+  const queries = data?.queries.slice(0, 5) ?? []
+  const selected = selection ?? (sources.length > 0 ? 'sources' : 'queries')
+  return (
+    <div className={cn('relative w-full min-w-0', inter.className)}>
+      {children}
+      <div className='relative md:absolute md:inset-x-0 md:top-full'>
+        {(sources.length > 0 || queries.length > 0) && (
+          <section aria-label='Recent activity' className='mt-6 px-2'>
+            <div className='mb-2 flex flex-wrap items-center justify-between gap-2'>
+              <div role='group' aria-label='History type' className='flex items-center gap-1'>
+                <Chip
+                  active={selected === 'sources'}
+                  aria-pressed={selected === 'sources'}
+                  onClick={() => setSelection('sources')}
+                >
+                  Recently viewed
+                </Chip>
+                <Chip
+                  active={selected === 'queries'}
+                  aria-pressed={selected === 'queries'}
+                  onClick={() => setSelection('queries')}
+                >
+                  Recent searches
+                </Chip>
+              </div>
+              <Chip
+                disabled={clear.isPending}
+                onClick={() =>
+                  clear.mutate(undefined, { onError: (error) => toast.error(error.message) })
+                }
+              >
+                Clear history
+              </Chip>
+            </div>
+            <div className='grid grid-cols-1'>
+              <div
+                className={cn(
+                  'col-start-1 row-start-1 min-w-0',
+                  selected !== 'sources' && 'invisible'
+                )}
+                inert={selected !== 'sources'}
+                aria-hidden={selected !== 'sources'}
+              >
+                {sources.length > 0 ? (
+                  sources.map((source) => <SourceCard key={source.url} source={source} dense />)
+                ) : (
+                  <p className='px-2 py-2 text-[var(--text-tertiary)] text-small'>
+                    Sources you open will appear here.
+                  </p>
+                )}
+              </div>
+              <div
+                className={cn(
+                  'col-start-1 row-start-1 min-w-0',
+                  selected !== 'queries' && 'invisible'
+                )}
+                inert={selected !== 'queries'}
+                aria-hidden={selected !== 'queries'}
+              >
+                {queries.length > 0 ? (
+                  queries.map(({ query }) => (
+                    <div key={query} className='py-1'>
+                      <Chip fullWidth leftIcon={Clock} onClick={() => onSearch(query)}>
+                        {query}
+                      </Chip>
+                    </div>
+                  ))
+                ) : (
+                  <p className='px-2 py-2 text-[var(--text-tertiary)] text-small'>
+                    Your recent searches will appear here.
+                  </p>
+                )}
+              </div>
+            </div>
+          </section>
+        )}
+        {history.isError && (
+          <div className='mt-6 flex items-center gap-2 px-4 text-[var(--text-tertiary)] text-small'>
+            Recent activity couldn’t load.
+            <Chip onClick={() => void history.refetch()} disabled={history.isFetching}>
+              Try again
+            </Chip>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/home/components/get-started/get-started.tsx b/apps/sim/app/o/[organizationId]/home/components/get-started/get-started.tsx
index f7b84ab00fc..42f8f800cac 100644
--- a/apps/sim/app/o/[organizationId]/home/components/get-started/get-started.tsx
+++ b/apps/sim/app/o/[organizationId]/home/components/get-started/get-started.tsx
@@ -1,11 +1,33 @@
 'use client'
 
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import { cn } from '@sim/emcn'
 import { ArrowRight } from '@sim/emcn/icons'
 import { HomeSection } from '@/components/home/home-section'
 import { SettingsGuardedLink } from '@/components/settings/settings-guarded-link'
-import { useGetStartedSteps } from '@/app/o/[organizationId]/home/components/get-started/use-get-started-steps'
+import { OAUTH_SEARCH_READ_SCOPE, oauthScopeSatisfies } from '@/lib/auth/oauth-provider'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import {
+  liveSearchProviderForCredential,
+  supportsLiveSearchMode,
+} from '@/lib/sim-search/live/provider-catalog'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import { useAuthorizedApps } from '@/hooks/queries/oauth-provider'
+import { useOrganizationAccounts } from '@/hooks/queries/organization-accounts'
+import { useSearchIntegrations } from '@/hooks/queries/search-integrations'
+
+type StepId = 'connect-integration' | 'connect-sim-search'
+
+interface GetStartedStep {
+  id: StepId
+  label: string
+}
+
+/** The onboarding steps, in the order a new organization works through them. */
+const STEPS: readonly GetStartedStep[] = [
+  { id: 'connect-integration', label: 'Connect an integration' },
+  { id: 'connect-sim-search', label: 'Connect Sim Search MCP' },
+]
 
 const ROW_CLASS =
   'flex items-center gap-2 border-[var(--border)] px-2 py-2 text-left transition-colors hover-hover:bg-[var(--surface-5)]'
@@ -52,7 +74,88 @@ function StepMark({ complete }: { complete: boolean }) {
  * and reads as done from the organization's real state: a configured integration and an OAuth app authorized to use Search.
  */
 export function GetStarted() {
-  const steps = useGetStartedSteps()
+  const { organization, viewer, connectedAccountsAvailable } = useOrganizationContext()
+  const routes = organizationRoutes(organization.id)
+  const canConnectIntegrations = viewer.canConnectSearchIntegrations && connectedAccountsAvailable
+  const { data: accounts } = useOrganizationAccounts(
+    canConnectIntegrations ? organization.id : undefined
+  )
+  const { data: integrations } = useSearchIntegrations(organization.id, {
+    enabled: canConnectIntegrations,
+  })
+  const {
+    data: authorizedApps,
+    fetchNextPage,
+    hasNextPage,
+    isFetching,
+    isError,
+  } = useAuthorizedApps('', { enabled: viewer.canUseSearchMcp })
+  const hasSearchAuthorization =
+    authorizedApps?.pages.some((page) =>
+      page.apps.some((app) => oauthScopeSatisfies(app.scopes, OAUTH_SEARCH_READ_SCOPE))
+    ) ?? false
+  const approvedProviders = new Set(
+    integrations
+      ?.filter((integration) => integration.approved && integration.available !== false)
+      .map((integration) => integration.connectorType)
+  )
+  const readyOptions = new Set(
+    accounts?.credentialGroup?.options
+      .filter((option) => {
+        const provider = liveSearchProviderForCredential(option.provider)
+        return (
+          option.status === 'active' &&
+          option.configurationStatus === 'ready' &&
+          provider &&
+          supportsLiveSearchMode(provider, 'member') &&
+          approvedProviders.has(provider)
+        )
+      })
+      .map((option) => option.id)
+  )
+  const readyMcpServers = new Set(
+    accounts?.credentialGroup?.mcpServers
+      .filter((server) => {
+        const provider = liveSearchProviderForCredential(`mcp:${server.managedConnectorId}`)
+        return (
+          server.enabled &&
+          provider &&
+          approvedProviders.has(provider) &&
+          accounts.availableMcpConnectors.some((id) => id === server.managedConnectorId)
+        )
+      })
+      .map((server) => server.id)
+  )
+  const hasSearchConnection =
+    accounts?.credentialGroup?.status === 'active' &&
+    (accounts.viewerAccounts?.some(
+      (account) => account.status === 'active' && readyOptions.has(account.optionId)
+    ) ||
+      accounts.viewerMcpAccounts?.some(
+        (account) => account.status === 'active' && readyMcpServers.has(account.mcpServerId)
+      ))
+
+  const hrefs: Record<StepId, string> = {
+    'connect-integration': viewer.isAdmin
+      ? routes.settingsSection('integrations')
+      : routes.integrations,
+    'connect-sim-search': routes.settingsSection('search-mcp'),
+  }
+  const completed: Record<StepId, boolean> = {
+    'connect-integration': Boolean(
+      hasSearchConnection ||
+        integrations?.some(
+          (integration) =>
+            integration.approved &&
+            integration.available !== false &&
+            integration.configuredServiceSource
+        )
+    ),
+    'connect-sim-search': hasSearchAuthorization,
+  }
+  const steps = STEPS.filter((step) =>
+    step.id === 'connect-sim-search' ? viewer.canUseSearchMcp : canConnectIntegrations
+  )
 
   const [expanded, setExpanded] = useState(true)
   /**
@@ -63,6 +166,25 @@ export function GetStarted() {
    */
   const [animationsEnabled, setAnimationsEnabled] = useState(false)
 
+  useEffect(() => {
+    if (
+      viewer.canUseSearchMcp &&
+      !hasSearchAuthorization &&
+      hasNextPage &&
+      !isFetching &&
+      !isError
+    ) {
+      void fetchNextPage()
+    }
+  }, [
+    viewer.canUseSearchMcp,
+    hasSearchAuthorization,
+    hasNextPage,
+    isFetching,
+    isError,
+    fetchNextPage,
+  ])
+
   const handleToggleExpanded = () => {
     setAnimationsEnabled(true)
     setExpanded((prev) => !prev)
@@ -77,9 +199,14 @@ export function GetStarted() {
       animationsEnabled={animationsEnabled}
       onToggle={handleToggleExpanded}
     >
-      {steps.map(({ id, title, href, complete }, i) => {
+      {steps.map((step, i) => {
+        const complete = completed[step.id]
         return (
-          <SettingsGuardedLink key={id} href={href} className={cn(ROW_CLASS, i > 0 && 'border-t')}>
+          <SettingsGuardedLink
+            key={step.id}
+            href={hrefs[step.id]}
+            className={cn(ROW_CLASS, i > 0 && 'border-t')}
+          >
             <StepMark complete={complete} />
             <span
               className={cn(
@@ -87,7 +214,7 @@ export function GetStarted() {
                 complete ? 'text-[var(--brand-blue)]' : 'text-[var(--text-body)]'
               )}
             >
-              {title}
+              {step.label}
             </span>
             <ArrowRight className='size-[16px] shrink-0 text-[var(--text-icon)]' />
           </SettingsGuardedLink>
diff --git a/apps/sim/app/o/[organizationId]/home/components/get-started/use-get-started-steps.ts b/apps/sim/app/o/[organizationId]/home/components/get-started/use-get-started-steps.ts
deleted file mode 100644
index 08c0c2a734d..00000000000
--- a/apps/sim/app/o/[organizationId]/home/components/get-started/use-get-started-steps.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { hasSearchIntegrationReady } from '@/lib/credential-groups/search-readiness'
-import { organizationRoutes } from '@/lib/navigation/paths'
-import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import { useHasSearchAuthorization } from '@/hooks/queries/oauth-provider'
-import { useOrganizationAccounts } from '@/hooks/queries/organization-accounts'
-import { useSearchIntegrations } from '@/hooks/queries/search-integrations'
-
-/**
- * The onboarding steps this viewer has, in the order a new organization works through them, each
- * done or not from the organization's real state: a configured integration and an OAuth app
- * authorized to use Search. A surface that does not show them passes `enabled: false` to read nothing.
- */
-export function useGetStartedSteps(enabled = true) {
-  const { organization, viewer, connectedAccountsAvailable } = useOrganizationContext()
-  const routes = organizationRoutes(organization.id)
-  const canConnectIntegrations =
-    enabled && viewer.canConnectSearchIntegrations && connectedAccountsAvailable
-  const canUseSearchMcp = enabled && viewer.canUseSearchMcp
-  const { data: accounts } = useOrganizationAccounts(
-    canConnectIntegrations ? organization.id : undefined
-  )
-  const { data: integrations } = useSearchIntegrations(organization.id, {
-    enabled: canConnectIntegrations,
-  })
-  const hasSearchAuthorization = useHasSearchAuthorization(canUseSearchMcp)
-  return [
-    ...(canConnectIntegrations
-      ? [
-          {
-            id: 'connect-integration',
-            title: 'Connect an integration',
-            detail: 'Choose what Sim can search for you',
-            href: viewer.isAdmin ? routes.settingsSection('integrations') : routes.integrations,
-            complete: hasSearchIntegrationReady(accounts, integrations),
-          },
-        ]
-      : []),
-    ...(canUseSearchMcp
-      ? [
-          {
-            id: 'connect-sim-search',
-            title: 'Connect Sim Search MCP',
-            detail: 'Use your company’s knowledge from your other AI tools',
-            href: routes.settingsSection('search-mcp'),
-            complete: hasSearchAuthorization,
-          },
-        ]
-      : []),
-  ]
-}
diff --git a/apps/sim/app/o/[organizationId]/home/home-redirect.ts b/apps/sim/app/o/[organizationId]/home/home-redirect.ts
index 20c8c1f1476..597717276df 100644
--- a/apps/sim/app/o/[organizationId]/home/home-redirect.ts
+++ b/apps/sim/app/o/[organizationId]/home/home-redirect.ts
@@ -1,23 +1,8 @@
 import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
 import type { OrganizationSurfaceContext } from '@/lib/organizations/surface'
 
-type OrganizationRedirectContext = Pick<
-  OrganizationSurfaceContext,
-  'mothershipAvailable' | 'canBuild' | 'searchAccess'
->
-
-/** Whether the viewer can hold a conversation here: an agent to build, or an Assistant to search. */
-export function canUseOrganizationChat({
-  mothershipAvailable,
-  canBuild,
-  searchAccess,
-}: OrganizationRedirectContext): boolean {
-  return mothershipAvailable && (canBuild || searchAccess.memberScoped)
-}
-
-/** Where an agent conversation sends a viewer who cannot build. */
-export function getOrganizationBuildRedirect(
-  context: OrganizationRedirectContext,
+export function getOrganizationHomeRedirect(
+  context: Pick<OrganizationSurfaceContext, 'mothershipAvailable' | 'canBuild' | 'searchAccess'>,
   organizationId: string
 ): string | null {
   if (context.mothershipAvailable && context.canBuild) return null
@@ -25,12 +10,3 @@ export function getOrganizationBuildRedirect(
     ? organizationRoutes(organizationId).search
     : WORKSPACE_SETTINGS_PATH
 }
-
-/** Home serves whoever can hold a conversation here; the sidebar offers it by the same rule. */
-export function getOrganizationHomeRedirect(
-  context: OrganizationRedirectContext,
-  organizationId: string
-): string | null {
-  if (canUseOrganizationChat(context)) return null
-  return getOrganizationBuildRedirect(context, organizationId)
-}
diff --git a/apps/sim/app/o/[organizationId]/home/loading.tsx b/apps/sim/app/o/[organizationId]/home/loading.tsx
deleted file mode 100644
index b5de305a773..00000000000
--- a/apps/sim/app/o/[organizationId]/home/loading.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { HomeDashboardSkeleton } from '@/platform/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' />
-}
diff --git a/apps/sim/app/o/[organizationId]/home/page.test.tsx b/apps/sim/app/o/[organizationId]/home/page.test.tsx
index 9fac7e7b5d1..963f9a76697 100644
--- a/apps/sim/app/o/[organizationId]/home/page.test.tsx
+++ b/apps/sim/app/o/[organizationId]/home/page.test.tsx
@@ -8,22 +8,16 @@ import { nextNavigationMock } from '@sim/testing/mocks/next-navigation.mock'
 import { renderToStaticMarkup } from 'react-dom/server'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const mocks = vi.hoisted(() => ({ context: vi.fn(), prefetchHome: vi.fn() }))
+const mocks = vi.hoisted(() => ({ context: vi.fn() }))
 
 vi.mock('next/navigation', () => nextNavigationMock)
 vi.mock('@/lib/organizations/surface', () => ({ getOrganizationSurfaceContext: mocks.context }))
 vi.mock('@/lib/mothership/chat/lifecycle', () => mothershipChatLifecycleMock)
-vi.mock('@/platform/lib/data/prefetch', () => ({}))
-vi.mock('@/platform/lib/data/prefetch-member-inventory', () => ({
-  prefetchHome: mocks.prefetchHome,
+vi.mock('@/app/o/[organizationId]/integrations/integrations', () => ({
+  OrganizationIntegrations: () => <div>Integrations</div>,
 }))
-vi.mock('@/platform/app/(shell)/home/_components/home-dashboard/home-dashboard-skeleton', () => ({
-  HomeDashboardSkeleton: ({ requestMode }: { requestMode: string }) => (
-    <div>Home for {requestMode}</div>
-  ),
-}))
-vi.mock('@/platform/app/(shell)/search/_components/search-surface/search-surface', () => ({
-  OrganizationSearchSurface: () => <div>Standalone Search</div>,
+vi.mock('@/app/o/[organizationId]/search/search', () => ({
+  OrganizationSearch: () => <div>Standalone Search</div>,
 }))
 vi.mock('@/app/o/[organizationId]/components/organization-conversation', () => ({
   OrganizationConversation: ({ requestMode }: { requestMode?: string }) => (
@@ -39,7 +33,6 @@ import OrganizationSearchPage from '@/app/o/[organizationId]/search/page'
 const mockChat = mothershipChatLifecycleMockFns.mockGetAccessibleCopilotChatAuth
 
 const params = Promise.resolve({ organizationId: 'org-1', chatId: 'chat-1' })
-const searchParams = Promise.resolve({})
 const session = { user: { id: 'viewer', name: 'Taylor' }, session: { id: 'session-1' } }
 
 describe('organization Search page gates', () => {
@@ -55,7 +48,7 @@ describe('organization Search page gates', () => {
 
   it.each([
     ['Home', () => OrganizationHomePage({ params })],
-    ['Search', () => OrganizationSearchPage({ params, searchParams })],
+    ['Search', () => OrganizationSearchPage({ params })],
     ['chat', () => OrganizationChatPage({ params })],
     ['organization entry', () => OrganizationPage({ params })],
   ] as const)('denies %s to nonmembers before loading content', async (_name, open) => {
@@ -87,47 +80,7 @@ describe('organization Search page gates', () => {
     expect(mockChat).not.toHaveBeenCalled()
   })
 
-  const searchOnlyMember = {
-    mothershipAvailable: true,
-    canBuild: false,
-    searchAccess: { memberScoped: true },
-  }
-
-  it('gives a search-only member Home with the Assistant, at both of its addresses', async () => {
-    mocks.context.mockResolvedValue(searchOnlyMember)
-    expect(renderToStaticMarkup(await OrganizationHomePage({ params }))).toContain(
-      'Home for assistant'
-    )
-    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 })
-    await expect(OrganizationHomePage({ params })).rejects.toThrow('NEXT_REDIRECT:/o/org-1/search')
-    await expect(OrganizationPage({ params })).rejects.toThrow('NEXT_REDIRECT:/o/org-1/search')
-  })
-
-  it('keeps a search-only member out of an agent chat that Home does not entitle them to', async () => {
-    mocks.context.mockResolvedValue(searchOnlyMember)
-    await expect(OrganizationChatPage({ params })).rejects.toThrow('NEXT_REDIRECT:/o/org-1/search')
-  })
-
-  it('sends a viewer with no conversation here away from chat URLs, before loading the chat', async () => {
+  it('routes chat URLs exactly where Home routes the same viewer, before loading the chat', async () => {
     mocks.context.mockResolvedValue({
       mothershipAvailable: true,
       canBuild: false,
diff --git a/apps/sim/app/o/[organizationId]/home/page.tsx b/apps/sim/app/o/[organizationId]/home/page.tsx
index 6ca6f465586..ba9bde38fec 100644
--- a/apps/sim/app/o/[organizationId]/home/page.tsx
+++ b/apps/sim/app/o/[organizationId]/home/page.tsx
@@ -3,11 +3,9 @@ import type { Metadata } from 'next'
 import { notFound, redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
-import { Hydrated } from '@/app/o/[organizationId]/_redesign/hydrated'
+import { OrganizationConversation } from '@/app/o/[organizationId]/components/organization-conversation'
 import { getOrganizationHomeRedirect } from '@/app/o/[organizationId]/home/home-redirect'
-import { HomeConversation } from '@/platform/app/(shell)/home/_components/home-conversation/home-conversation'
-import { HomeDashboardSkeleton } from '@/platform/app/(shell)/home/_components/home-dashboard/home-dashboard-skeleton'
-import { prefetchHome } from '@/platform/lib/data/prefetch-member-inventory'
+import { HomeFallback } from '@/app/workspace/[workspaceId]/home/home-fallback'
 
 export const metadata: Metadata = {
   title: 'Home',
@@ -26,18 +24,9 @@ export default async function OrganizationHomePage({
   const homeRedirect = getOrganizationHomeRedirect(context, organizationId)
   if (homeRedirect) redirect(homeRedirect)
 
-  const requestMode = context.canBuild ? 'agent' : 'assistant'
   return (
-    <Suspense fallback={<HomeDashboardSkeleton requestMode={requestMode} />}>
-      <Hydrated
-        state={prefetchHome(context, {
-          kind: 'session',
-          userId: session.user.id,
-          sessionId: session.session.id,
-        })}
-      >
-        <HomeConversation requestMode={requestMode} />
-      </Hydrated>
+    <Suspense fallback={<HomeFallback />}>
+      <OrganizationConversation requestMode='agent' userName={session.user.name} />
     </Suspense>
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/integrations/[provider]/page.tsx b/apps/sim/app/o/[organizationId]/integrations/[provider]/page.tsx
deleted file mode 100644
index a796bea4a4c..00000000000
--- a/apps/sim/app/o/[organizationId]/integrations/[provider]/page.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { Metadata } from 'next'
-import { requireIntegrationsViewer } from '@/app/o/[organizationId]/integrations/access'
-import { HydratedIntegrations } from '@/app/o/[organizationId]/integrations/hydrated-integrations'
-import { integrationPath } from '@/platform/lib/integrations/model'
-
-export const metadata: Metadata = {
-  title: 'Integrations',
-  referrer: 'no-referrer',
-}
-
-interface IntegrationProviderPageProps {
-  params: Promise<{ organizationId: string; provider: string }>
-}
-
-export default async function IntegrationProviderPage({ params }: IntegrationProviderPageProps) {
-  const { organizationId, provider } = await params
-  const viewer = await requireIntegrationsViewer(
-    organizationId,
-    integrationPath(organizationId, provider)
-  )
-  return <HydratedIntegrations {...viewer} section={provider} />
-}
diff --git a/apps/sim/app/o/[organizationId]/integrations/access.ts b/apps/sim/app/o/[organizationId]/integrations/access.ts
deleted file mode 100644
index 489bf864ee0..00000000000
--- a/apps/sim/app/o/[organizationId]/integrations/access.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { SessionPrincipal } from '@sim/auth/principal'
-import { notFound, redirect } from 'next/navigation'
-import { getSession } from '@/lib/auth'
-import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
-import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
-
-/**
- * The gate the integrations index and provider pages share. `callbackUrl` is the page to come back to after
- * sign-in, carrying whatever connection or Slack context the visit arrived with.
- */
-export async function requireIntegrationsViewer(organizationId: string, callbackUrl: string) {
-  const session = await getSession()
-  if (!session?.user) redirect(buildAuthCrossLink('/login', { callbackUrl, isInviteFlow: false }))
-  const surface = await getOrganizationSurfaceContext(organizationId, session.user.id)
-  if (!surface?.searchAccess.memberScoped) notFound()
-  const principal: SessionPrincipal = {
-    kind: 'session',
-    userId: session.user.id,
-    sessionId: session.session.id,
-  }
-  return { principal, surface }
-}
diff --git a/apps/sim/app/o/[organizationId]/integrations/account-connection-actions.tsx b/apps/sim/app/o/[organizationId]/integrations/account-connection-actions.tsx
new file mode 100644
index 00000000000..cea608ed198
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/integrations/account-connection-actions.tsx
@@ -0,0 +1,100 @@
+'use client'
+
+import { useState } from 'react'
+import { ChipConfirmModal, ChipModalError } from '@sim/emcn'
+import { type SettingsAction, SettingsActionChips } from '@/components/settings/settings-header'
+import type { ViewerSearchSourceAccount } from '@/lib/api/contracts/knowledge/connectors'
+import { useDisconnectPersonalOrganizationAccount } from '@/hooks/queries/organization-accounts'
+import { useRemovePersonalSearchCredential } from '@/hooks/queries/personal-search-integrations'
+
+interface AccountConnectionActionsProps {
+  organizationId: string
+  integrationName: string
+  account?: ViewerSearchSourceAccount
+  /** A saved credential (Jama, Flow) is removed through Search, not the managed-account route. */
+  saved?: boolean
+  onConnect?: () => void
+  connectLabel: 'Connect' | 'Add account'
+  onReconnect: () => void
+  canReconnect: boolean
+  canConnect: boolean
+  connectionPending: boolean
+}
+
+/** Header actions act on the selected account; adding a connection uses its available slot. */
+export function AccountConnectionActions({
+  organizationId,
+  integrationName,
+  account,
+  saved = false,
+  onConnect,
+  connectLabel,
+  onReconnect,
+  canReconnect,
+  canConnect,
+  connectionPending,
+}: AccountConnectionActionsProps) {
+  const disconnectManaged = useDisconnectPersonalOrganizationAccount()
+  const removeSaved = useRemovePersonalSearchCredential()
+  const disconnect = saved ? removeSaved : disconnectManaged
+  const [confirming, setConfirming] = useState(false)
+  const pending = connectionPending || disconnect.isPending
+  const actions: SettingsAction[] = []
+  if (account) {
+    actions.push({
+      id: 'reconnect',
+      text: 'Reconnect',
+      disabled: pending || !canReconnect,
+      onSelect: onReconnect,
+    })
+  }
+  if (onConnect) {
+    actions.push({
+      id: 'connect',
+      text: connectLabel,
+      variant: 'primary',
+      disabled: pending || !canConnect,
+      onSelect: onConnect,
+    })
+  }
+  if (account) {
+    actions.push({
+      id: 'delete',
+      text: 'Disconnect',
+      disabled: pending,
+      onSelect: () => {
+        disconnect.reset()
+        setConfirming(true)
+      },
+    })
+  }
+  return (
+    <>
+      <SettingsActionChips actions={actions} />
+      {account && (
+        <ChipConfirmModal
+          open={confirming}
+          onOpenChange={(open) => {
+            if (!disconnect.isPending) setConfirming(open)
+          }}
+          title={`Disconnect ${integrationName}`}
+          text={`Disconnect ${account.displayName} from all ${integrationName} connections in this organization. Workflows using this account will also lose access. You can reconnect later.`}
+          confirm={{
+            label: 'Disconnect',
+            pendingLabel: 'Disconnecting',
+            pending: disconnect.isPending,
+            disabled: disconnect.isPending,
+            onClick: () => {
+              const body = { credentialId: account.credentialId, organizationId }
+              const onSuccess = () => setConfirming(false)
+              if (saved) removeSaved.mutate(body, { onSuccess })
+              else disconnectManaged.mutate(body, { onSuccess })
+            },
+          }}
+        >
+          <ChipModalError>{disconnect.error?.message}</ChipModalError>
+        </ChipConfirmModal>
+      )}
+    </>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/integrations/accounts/[credentialId]/page.tsx b/apps/sim/app/o/[organizationId]/integrations/accounts/[credentialId]/page.tsx
index fcd3402b66d..42158de4d9d 100644
--- a/apps/sim/app/o/[organizationId]/integrations/accounts/[credentialId]/page.tsx
+++ b/apps/sim/app/o/[organizationId]/integrations/accounts/[credentialId]/page.tsx
@@ -1,10 +1,7 @@
 import { Suspense } from 'react'
 import type { Metadata } from 'next'
-import { organizationRoutes } from '@/lib/navigation/paths'
 import Loading from '@/app/o/[organizationId]/integrations/accounts/[credentialId]/loading'
-import { IntegrationsHost } from '@/app/o/[organizationId]/integrations/integrations-host'
-import { IntegrationsPage } from '@/platform/app/(shell)/integrations/_components/integrations-page/integrations-page'
-import { ToolPermissionsPanel } from '@/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions-panel'
+import { AccountToolPermissions } from '@/app/o/[organizationId]/integrations/accounts/[credentialId]/tool-permissions'
 
 export const metadata: Metadata = { title: 'Tool permissions', referrer: 'no-referrer' }
 
@@ -15,20 +12,9 @@ interface AccountToolPermissionsPageProps {
 export default async function AccountToolPermissionsPage({
   params,
 }: AccountToolPermissionsPageProps) {
-  const { organizationId, credentialId } = await params
   return (
     <Suspense fallback={<Loading />}>
-      <IntegrationsHost>
-        <IntegrationsPage
-          back={{ href: organizationRoutes(organizationId).integrations, label: 'Integrations' }}
-        >
-          <ToolPermissionsPanel
-            organizationId={organizationId}
-            credentialId={credentialId}
-            showHeading
-          />
-        </IntegrationsPage>
-      </IntegrationsHost>
+      <AccountToolPermissions {...(await params)} />
     </Suspense>
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/integrations/accounts/[credentialId]/tool-permissions.tsx b/apps/sim/app/o/[organizationId]/integrations/accounts/[credentialId]/tool-permissions.tsx
new file mode 100644
index 00000000000..1dd4337492e
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/integrations/accounts/[credentialId]/tool-permissions.tsx
@@ -0,0 +1,237 @@
+'use client'
+
+import { ChipInput, ChipLink, ChipSelect, ChipSwitch, Info, toast } from '@sim/emcn'
+import { ArrowLeft, Search } from '@sim/emcn/icons'
+import { useQueryStates } from 'nuqs'
+import type {
+  AssistantToolPermissionsResponse,
+  UpdateAssistantToolPermissionsBody,
+} from '@/lib/api/contracts/assistant-actions'
+import { resolveCredentialDisplay } from '@/lib/integrations/credential-display'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import { integrationViewParsers } from '@/app/o/[organizationId]/integrations/search-params'
+import {
+  CredentialDetailHeading,
+  CredentialDetailLayout,
+} from '@/app/workspace/[workspaceId]/components/credential-detail'
+import { IntegrationTile } from '@/app/workspace/[workspaceId]/integrations/components/integrations-showcase'
+import {
+  SettingsEmptyState,
+  SettingsQueryErrorState,
+} from '@/app/workspace/[workspaceId]/settings/components/settings-empty-state'
+import { SettingsSection } from '@/app/workspace/[workspaceId]/settings/components/settings-section/settings-section'
+import {
+  useAssistantToolPermissions,
+  useUpdateAssistantToolPermissions,
+} from '@/hooks/queries/assistant-actions'
+import { useDebouncedSearchSetter } from '@/hooks/use-debounced-search-setter'
+
+const POLICY_OPTIONS = [
+  { value: 'allow', label: 'Allow' },
+  { value: 'ask', label: 'Ask' },
+  { value: 'block', label: 'Block' },
+] as const
+const TOOL_GROUPS = [
+  { effect: 'read', label: 'Read-only tools' },
+  { effect: 'write', label: 'Write tools' },
+] as const
+
+interface AccountToolPermissionsProps {
+  organizationId: string
+  credentialId: string
+}
+
+export function AccountToolPermissions({
+  organizationId,
+  credentialId,
+}: AccountToolPermissionsProps) {
+  return (
+    <CredentialDetailLayout
+      back={
+        <ChipLink href={organizationRoutes(organizationId).integrations} leftIcon={ArrowLeft}>
+          Integrations
+        </ChipLink>
+      }
+    >
+      <AccountToolPermissionsContent
+        organizationId={organizationId}
+        credentialId={credentialId}
+        showHeading
+      />
+    </CredentialDetailLayout>
+  )
+}
+
+interface AccountToolPermissionsContentProps extends AccountToolPermissionsProps {
+  showHeading?: boolean
+}
+
+export function AccountToolPermissionsContent({
+  organizationId,
+  credentialId,
+  showHeading = false,
+}: AccountToolPermissionsContentProps) {
+  const query = useAssistantToolPermissions(organizationId, credentialId)
+  const update = useUpdateAssistantToolPermissions(organizationId, credentialId)
+  const [{ tools: search }, setParams] = useQueryStates(integrationViewParsers)
+  const setSearch = useDebouncedSearchSetter((value, options) =>
+    setParams({ tools: value }, options)
+  )
+  const data = query.data
+  const display = data
+    ? resolveCredentialDisplay({ ...data.account, type: 'managed_oauth' })
+    : undefined
+  const save = (change: UpdateAssistantToolPermissionsBody['change']) => {
+    if (!data || update.isPending) return
+    update.mutate(
+      { revision: data.revision, change },
+      { onError: (error) => toast.error(error.message) }
+    )
+  }
+
+  return (
+    <>
+      {query.error ? (
+        <SettingsQueryErrorState
+          error={query.error}
+          fallback='Could not load tool permissions'
+          isRetrying={query.isFetching}
+          onRetry={() => void query.refetch()}
+          variant='inline'
+        />
+      ) : !data ? (
+        <SettingsEmptyState variant='inline'>Loading tool permissions</SettingsEmptyState>
+      ) : (
+        <div className='flex flex-col gap-7'>
+          {(showHeading || !data.canAutoApprove || !data.account.active) && (
+            <div className='flex flex-col gap-3'>
+              {showHeading && (
+                <CredentialDetailHeading
+                  title={display?.detailTitle ?? data.account.providerId}
+                  subtitle={data.account.displayName}
+                  leading={
+                    display?.icon ? (
+                      <IntegrationTile blockType={display.blockType} icon={display.icon} />
+                    ) : undefined
+                  }
+                />
+              )}
+              {!data.canAutoApprove && (
+                <p className='text-[var(--text-muted)] text-small'>
+                  Your organization requires approval before tools run.
+                </p>
+              )}
+              {!data.account.active && (
+                <p className='text-[var(--text-muted)] text-small'>
+                  This account is disconnected or paused. Reconnect it before allowing tools
+                  automatically.
+                </p>
+              )}
+            </div>
+          )}
+          {data.tools.length > 0 && (
+            <ChipInput
+              icon={Search}
+              value={search}
+              onChange={(event) => setSearch(event.target.value)}
+              placeholder='Search tools'
+              aria-label='Search tools'
+            />
+          )}
+          {TOOL_GROUPS.map((group) => (
+            <ToolPermissionGroup
+              key={group.effect}
+              {...group}
+              data={data}
+              search={search}
+              pending={update.isPending}
+              onChange={save}
+            />
+          ))}
+          {data.tools.length === 0 && (
+            <SettingsEmptyState variant='inline'>
+              No Assistant tools are available for this account
+            </SettingsEmptyState>
+          )}
+        </div>
+      )}
+    </>
+  )
+}
+
+interface ToolPermissionGroupProps {
+  effect: 'read' | 'write'
+  label: string
+  data: AssistantToolPermissionsResponse
+  search: string
+  pending: boolean
+  onChange: (change: UpdateAssistantToolPermissionsBody['change']) => void
+}
+
+function ToolPermissionGroup({
+  effect,
+  label,
+  data,
+  search,
+  pending,
+  onChange,
+}: ToolPermissionGroupProps) {
+  const tools = data.tools.filter((tool) => tool.effect === effect)
+  const query = search.trim().toLowerCase()
+  const visible = tools.filter((tool) =>
+    `${tool.name} ${tool.description}`.toLowerCase().includes(query)
+  )
+  if (tools.length === 0) return null
+  const groupValue = tools.every((tool) => tool.policy === tools[0].policy)
+    ? tools[0].policy
+    : undefined
+  const options = POLICY_OPTIONS.map((option) => ({
+    ...option,
+    disabled: option.value === 'allow' && (!data.canAutoApprove || !data.account.active),
+  }))
+  return (
+    <SettingsSection
+      label={`${label} (${tools.length})`}
+      action={
+        <ChipSelect
+          options={options}
+          value={groupValue}
+          placeholder='Mixed'
+          disabled={pending}
+          aria-label={`${label} permission`}
+          onChange={(value) => {
+            const option = POLICY_OPTIONS.find((entry) => entry.value === value)
+            if (option) onChange({ kind: 'group', effect, policy: option.value })
+          }}
+        />
+      }
+    >
+      {visible.map((tool) => (
+        <div
+          key={tool.toolId}
+          className='flex flex-col items-start gap-3 py-3 sm:flex-row sm:items-center sm:justify-between'
+        >
+          <div className='flex min-w-0 flex-1 items-center gap-2'>
+            <span className='text-[var(--text-body)] text-small'>{tool.name}</span>
+            {tool.description && (
+              <Info side='top' className='shrink-0'>
+                {tool.description}
+              </Info>
+            )}
+          </div>
+          <ChipSwitch
+            className='max-w-full shrink-0'
+            options={options}
+            value={tool.policy}
+            disabled={pending}
+            aria-label={`${tool.name} permission`}
+            onChange={(policy) => onChange({ kind: 'tool', toolId: tool.toolId, policy })}
+          />
+        </div>
+      ))}
+      {!visible.length && (
+        <SettingsEmptyState variant='inline'>No matching tools</SettingsEmptyState>
+      )}
+    </SettingsSection>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/integrations/hydrated-integrations.tsx b/apps/sim/app/o/[organizationId]/integrations/hydrated-integrations.tsx
deleted file mode 100644
index 227497f368f..00000000000
--- a/apps/sim/app/o/[organizationId]/integrations/hydrated-integrations.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-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 { IntegrationsHost } from '@/app/o/[organizationId]/integrations/integrations-host'
-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 Omit<IntegrationsRouteProps, 'organizationId'> {
-  surface: OrganizationSurfaceContext
-  principal: SessionPrincipal
-}
-
-export function HydratedIntegrations({ surface, principal, ...route }: HydratedIntegrationsProps) {
-  return (
-    <IntegrationsHost>
-      <Suspense fallback={<IntegrationsRouteFallback detail={Boolean(route.section)} />}>
-        <Hydrated state={prefetchIntegrations(surface, principal)}>
-          <IntegrationsRoute organizationId={surface.organization.id} {...route} />
-        </Hydrated>
-      </Suspense>
-    </IntegrationsHost>
-  )
-}
diff --git a/apps/sim/app/o/[organizationId]/integrations/integration-detail.tsx b/apps/sim/app/o/[organizationId]/integrations/integration-detail.tsx
new file mode 100644
index 00000000000..184d2423fa7
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/integrations/integration-detail.tsx
@@ -0,0 +1,161 @@
+'use client'
+
+import { type ReactNode, useState } from 'react'
+import { toast } from '@sim/emcn'
+import type { MemberIntegration } from '@/lib/credential-groups/member-integrations'
+import { liveSearchSavedMemberProvider } from '@/lib/sim-search/live/source-catalog'
+import { AccountConnectionActions } from '@/app/o/[organizationId]/integrations/account-connection-actions'
+import { AccountToolPermissionsContent } from '@/app/o/[organizationId]/integrations/accounts/[credentialId]/tool-permissions'
+import {
+  CredentialDetailHeading,
+  CredentialDetailLayout,
+} from '@/app/workspace/[workspaceId]/components/credential-detail'
+import { IntegrationTile } from '@/app/workspace/[workspaceId]/integrations/components/integrations-showcase'
+import { SavedSearchCredentialModal } from '@/app/workspace/[workspaceId]/integrations/components/saved-search-credential-modal'
+import { SettingsEmptyState } from '@/app/workspace/[workspaceId]/settings/components/settings-empty-state'
+import { SettingsField } from '@/app/workspace/[workspaceId]/settings/components/settings-field'
+import {
+  RESOURCE_LIST_STACK,
+  SettingsResourceRow,
+} from '@/app/workspace/[workspaceId]/settings/components/settings-resource-row'
+import { SettingsSection } from '@/app/workspace/[workspaceId]/settings/components/settings-section/settings-section'
+import {
+  useConnectOrganizationAccount,
+  useReconnectPersonalOrganizationAccount,
+} from '@/hooks/queries/organization-accounts'
+
+interface IntegrationDetailProps {
+  organizationId: string
+  integration: MemberIntegration
+  accountId: string | null
+  accountHref: (accountId: string) => string
+  back: ReactNode
+  children?: ReactNode
+}
+
+function savedProviderIdFor(provider: string) {
+  const providerId = liveSearchSavedMemberProvider(provider)
+  return providerId === 'jama-service-account' || providerId === 'flow-service-account'
+    ? providerId
+    : null
+}
+
+/** The selected account owns every permission and connection action in this view. */
+export function IntegrationDetail({
+  organizationId,
+  integration,
+  accountId,
+  accountHref,
+  back,
+  children,
+}: IntegrationDetailProps) {
+  const connect = useConnectOrganizationAccount()
+  const reconnect = useReconnectPersonalOrganizationAccount()
+  const onError = (error: Error) => toast.error(error.message)
+  const selected = accountId
+    ? integration.accounts.find((account) => account.credentialId === accountId)
+    : integration.accounts.length === 1
+      ? integration.accounts[0]
+      : undefined
+  const target = integration.connectionTarget
+  const savedProvider = savedProviderIdFor(integration.provider)
+  const [savedConnection, setSavedConnection] = useState<{
+    providerId: 'jama-service-account' | 'flow-service-account'
+    credentialId?: string
+    displayName?: string
+  } | null>(null)
+  return (
+    <CredentialDetailLayout
+      back={back}
+      actions={
+        !integration.managed && (
+          <AccountConnectionActions
+            key={selected?.credentialId ?? integration.id}
+            organizationId={organizationId}
+            integrationName={integration.name}
+            account={selected}
+            saved={Boolean(savedProvider)}
+            connectLabel={integration.accounts.length ? 'Add account' : 'Connect'}
+            onConnect={
+              !target
+                ? undefined
+                : 'savedProviderId' in target
+                  ? () => savedProvider && setSavedConnection({ providerId: savedProvider })
+                  : () => connect.mutate({ organizationId, ...target }, { onError })
+            }
+            onReconnect={() => {
+              if (!selected) return
+              if (savedProvider)
+                setSavedConnection({
+                  providerId: savedProvider,
+                  credentialId: selected.credentialId,
+                  displayName: selected.displayName,
+                })
+              else reconnect.mutate(selected.credentialId, { onError })
+            }}
+            connectionPending={connect.isPending || reconnect.isPending}
+            canConnect={integration.ready}
+            canReconnect={Boolean(
+              selected && integration.reconnectAccountIds.includes(selected.credentialId)
+            )}
+          />
+        )
+      }
+    >
+      {children}
+      <CredentialDetailHeading
+        title={integration.name}
+        subtitle={integration.description}
+        leading={<IntegrationTile blockType={integration.provider} icon={integration.icon} />}
+      />
+      {integration.managed ? (
+        <SettingsEmptyState variant='inline'>Organization managed</SettingsEmptyState>
+      ) : (
+        <SettingsSection label={selected ? 'Account' : 'Accounts'}>
+          {accountId && !selected ? (
+            <SettingsEmptyState variant='inline'>
+              This account is no longer connected.
+            </SettingsEmptyState>
+          ) : selected ? (
+            <SettingsField
+              label={selected.status === 'needs_reauth' ? 'Reconnect needed' : 'Connected'}
+              breakAll
+            >
+              {selected.displayName}
+            </SettingsField>
+          ) : integration.accounts.length ? (
+            <div className={RESOURCE_LIST_STACK}>
+              {integration.accounts.map((account) => (
+                <SettingsResourceRow
+                  key={account.credentialId}
+                  title={account.displayName}
+                  description={account.status === 'needs_reauth' ? 'Reconnect needed' : 'Connected'}
+                  href={accountHref(account.credentialId)}
+                  clickLabel={`Open ${account.displayName} account`}
+                  navigable
+                />
+              ))}
+            </div>
+          ) : (
+            <SettingsEmptyState variant='inline'>No account connected</SettingsEmptyState>
+          )}
+        </SettingsSection>
+      )}
+      {selected && integration.permissionAccountIds.includes(selected.credentialId) && (
+        <AccountToolPermissionsContent
+          key={selected.credentialId}
+          organizationId={organizationId}
+          credentialId={selected.credentialId}
+        />
+      )}
+      {savedConnection && (
+        <SavedSearchCredentialModal
+          organizationId={organizationId}
+          connection={savedConnection}
+          onClose={() => setSavedConnection(null)}
+          onCreated={() => setSavedConnection(null)}
+        />
+      )}
+    </CredentialDetailLayout>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/integrations/integrations-host.tsx b/apps/sim/app/o/[organizationId]/integrations/integrations-host.tsx
deleted file mode 100644
index 76e4bdd3c75..00000000000
--- a/apps/sim/app/o/[organizationId]/integrations/integrations-host.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { ReactNode } from 'react'
-import { RedesignSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
-
-interface IntegrationsHostProps {
-  children: ReactNode
-}
-
-/** A scrolling page filled by the design system's surface. */
-export function IntegrationsHost({ children }: IntegrationsHostProps) {
-  return (
-    <div className='h-full overflow-y-auto [&>[data-platform-ui]]:min-h-full'>
-      <RedesignSurface>{children}</RedesignSurface>
-    </div>
-  )
-}
diff --git a/apps/sim/app/o/[organizationId]/integrations/integrations.tsx b/apps/sim/app/o/[organizationId]/integrations/integrations.tsx
new file mode 100644
index 00000000000..b85c2901409
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/integrations/integrations.tsx
@@ -0,0 +1,49 @@
+'use client'
+
+import type { SearchConnectionTarget } from '@/lib/knowledge/search/connection-target'
+import { SEARCH_DEBOUNCE_MS } from '@/lib/url-state'
+import { useOrganizationPageFilters } from '@/app/o/[organizationId]/components/organization-page'
+import { LiveMemberIntegrations } from '@/app/o/[organizationId]/integrations/live-member-integrations'
+import { SlackSearchActions } from '@/app/o/[organizationId]/integrations/slack-search-actions'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import { SearchIntegrationConnection } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/search-integration-connection'
+import { useDebounce } from '@/hooks/use-debounce'
+import { useDesktopOAuthConnectListener, useOAuthReturnRouter } from '@/hooks/use-oauth-return'
+
+interface OrganizationIntegrationsProps {
+  connectionRequest?: { target: SearchConnectionTarget; userId: string }
+  slackOnboarding?: { token: string; userId: string }
+}
+
+export function OrganizationIntegrations({
+  slackOnboarding,
+  connectionRequest,
+}: OrganizationIntegrationsProps = {}) {
+  useOAuthReturnRouter()
+  useDesktopOAuthConnectListener()
+  const { organization } = useOrganizationContext()
+  const { search } = useOrganizationPageFilters()
+  const sourceSearch = useDebounce(search.trim(), SEARCH_DEBOUNCE_MS)
+
+  return (
+    <LiveMemberIntegrations
+      organizationId={organization.id}
+      search={sourceSearch}
+      navigationSearch={search}
+      action={
+        slackOnboarding && (
+          <SlackSearchActions organizationId={organization.id} {...slackOnboarding} />
+        )
+      }
+      intro={
+        connectionRequest && (
+          <SearchIntegrationConnection
+            organizationId={organization.id}
+            {...connectionRequest}
+            controlId='integrations-link'
+          />
+        )
+      }
+    />
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/integrations/live-member-integrations.tsx b/apps/sim/app/o/[organizationId]/integrations/live-member-integrations.tsx
new file mode 100644
index 00000000000..6080b869c08
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/integrations/live-member-integrations.tsx
@@ -0,0 +1,207 @@
+'use client'
+
+import type { ReactNode } from 'react'
+import { ChipLink } from '@sim/emcn'
+import { ArrowLeft } from '@sim/emcn/icons'
+import { useQueryStates } from 'nuqs'
+import { memberIntegrationEntries } from '@/lib/credential-groups/member-integrations'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import { OrganizationPage } from '@/app/o/[organizationId]/components/organization-page'
+import { IntegrationDetail } from '@/app/o/[organizationId]/integrations/integration-detail'
+import {
+  integrationViewParsers,
+  serializeIntegrationView,
+} from '@/app/o/[organizationId]/integrations/search-params'
+import { memberIntegrationStatus } from '@/app/o/[organizationId]/integrations/utils'
+import {
+  GenericSecretSourceIcon,
+  GenericSecretSourceRow,
+} from '@/app/o/[organizationId]/settings/components/integrations/generic-secret-source'
+import { CredentialDetailLayout } from '@/app/workspace/[workspaceId]/components/credential-detail'
+import { IntegrationTile } from '@/app/workspace/[workspaceId]/integrations/components/integrations-showcase'
+import {
+  SettingsEmptyState,
+  SettingsQueryErrorState,
+} from '@/app/workspace/[workspaceId]/settings/components/settings-empty-state'
+import {
+  RESOURCE_LIST_STACK,
+  SettingsResourceRow,
+} from '@/app/workspace/[workspaceId]/settings/components/settings-resource-row'
+import { useOrganizationAccounts } from '@/hooks/queries/organization-accounts'
+import { useOrganizationSecretSource } from '@/hooks/queries/organization-secrets'
+import { useSearchIntegrations } from '@/hooks/queries/search-integrations'
+
+interface LiveMemberIntegrationsProps {
+  organizationId: string
+  search: string
+  navigationSearch: string
+  intro?: ReactNode
+  action?: ReactNode
+}
+
+/** Member integrations share one inventory and the platform's list/detail layout. */
+export function LiveMemberIntegrations({
+  organizationId,
+  search,
+  navigationSearch,
+  intro,
+  action,
+}: LiveMemberIntegrationsProps) {
+  const [{ integration, account }] = useQueryStates(integrationViewParsers)
+  const inventory = useOrganizationAccounts(organizationId)
+  const policies = useSearchIntegrations(organizationId)
+  const secrets = useOrganizationSecretSource(organizationId)
+  const routes = organizationRoutes(organizationId)
+  const href = (selected: string | null, selectedAccount: string | null = null) =>
+    serializeIntegrationView(routes.integrations, {
+      q: navigationSearch,
+      integration: selected,
+      account: selectedAccount,
+    })
+  const entries = inventory.data
+    ? memberIntegrationEntries(inventory.data, policies.isSuccess ? policies.data : undefined)
+    : []
+  const selected = entries.find((entry) => entry.id === integration)
+  const status = inventory.error ? (
+    <SettingsQueryErrorState
+      error={inventory.error}
+      fallback='Could not load your connections'
+      isRetrying={inventory.isFetching}
+      onRetry={() => void inventory.refetch()}
+      variant='inline'
+    />
+  ) : !inventory.data ? (
+    <SettingsEmptyState variant='inline'>Loading your connections</SettingsEmptyState>
+  ) : null
+  const errors = (
+    <>
+      {policies.error && (
+        <SettingsQueryErrorState
+          error={policies.error}
+          fallback='Could not load Search connections'
+          isRetrying={policies.isFetching}
+          onRetry={() => void policies.refetch()}
+          variant='inline'
+        />
+      )}
+      {secrets.error && (
+        <SettingsQueryErrorState
+          error={secrets.error}
+          fallback='Could not load secret connections'
+          isRetrying={secrets.isFetching}
+          onRetry={() => void secrets.refetch()}
+          variant='inline'
+        />
+      )}
+    </>
+  )
+  if (integration) {
+    const back = (
+      <ChipLink href={href(account ? integration : null)} leftIcon={ArrowLeft}>
+        {account ? (selected?.name ?? 'Integration') : 'Integrations'}
+      </ChipLink>
+    )
+    if (selected && !status) {
+      return (
+        <IntegrationDetail
+          key={selected.id}
+          organizationId={organizationId}
+          integration={selected}
+          accountId={account}
+          accountHref={(credentialId) => href(selected.id, credentialId)}
+          back={back}
+        >
+          {errors}
+        </IntegrationDetail>
+      )
+    }
+    return (
+      <CredentialDetailLayout back={back}>
+        {status ?? (
+          <>
+            {errors}
+            {integration === 'secrets' ? (
+              secrets.data?.source ? (
+                <GenericSecretSourceRow
+                  organizationId={organizationId}
+                  source={secrets.data.source}
+                />
+              ) : (
+                <SettingsEmptyState variant='inline'>
+                  {secrets.isPending
+                    ? 'Loading connection'
+                    : 'This integration is no longer available.'}
+                </SettingsEmptyState>
+              )
+            ) : (
+              <SettingsEmptyState variant='inline'>
+                {policies.isPending
+                  ? 'Loading connection'
+                  : 'This integration is no longer available.'}
+              </SettingsEmptyState>
+            )}
+          </>
+        )}
+      </CredentialDetailLayout>
+    )
+  }
+  const query = search.trim().toLowerCase()
+  const visible = entries.filter((entry) =>
+    [entry.provider, entry.name, ...entry.accounts.map((item) => item.displayName)]
+      .join(' ')
+      .toLowerCase()
+      .includes(query)
+  )
+  const showSecrets = secrets.data?.source && 'generic secrets'.includes(query)
+  return (
+    <OrganizationPage
+      title='Integrations'
+      searchMode='expanded'
+      searchPlaceholder='Search integrations'
+      action={action}
+    >
+      {intro}
+      {status ?? (
+        <div className={RESOURCE_LIST_STACK}>
+          {errors}
+          {showSecrets && (
+            <SettingsResourceRow
+              iconVariant='custom'
+              icon={<GenericSecretSourceIcon />}
+              title='Generic Secrets'
+              description={
+                secrets.data?.source?.mode === 'organization'
+                  ? 'Organization managed'
+                  : 'Personal secrets'
+              }
+              href={
+                secrets.data?.source?.mode === 'member'
+                  ? serializeIntegrationView(routes.memberSecrets, { q: navigationSearch })
+                  : href('secrets')
+              }
+              clickLabel='Open Generic Secrets integration'
+              navigable
+            />
+          )}
+          {visible.map((entry) => (
+            <SettingsResourceRow
+              key={entry.id}
+              iconVariant='custom'
+              icon={<IntegrationTile blockType={entry.provider} icon={entry.icon} />}
+              title={entry.name}
+              description={memberIntegrationStatus(entry)}
+              href={href(entry.id)}
+              clickLabel={`Open ${entry.name} integration`}
+              navigable
+            />
+          ))}
+          {!visible.length && !showSecrets && policies.isSuccess && secrets.isSuccess && (
+            <SettingsEmptyState variant='inline'>
+              {query ? 'No matching integrations' : 'No integrations available'}
+            </SettingsEmptyState>
+          )}
+        </div>
+      )}
+    </OrganizationPage>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/integrations/page.test.tsx b/apps/sim/app/o/[organizationId]/integrations/page.test.tsx
index 9a7ca52479c..5728acdeee4 100644
--- a/apps/sim/app/o/[organizationId]/integrations/page.test.tsx
+++ b/apps/sim/app/o/[organizationId]/integrations/page.test.tsx
@@ -4,8 +4,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const mocks = vi.hoisted(() => ({ context: vi.fn() }))
 vi.mock('@/lib/organizations/surface', () => ({ getOrganizationSurfaceContext: mocks.context }))
-vi.mock('@/app/o/[organizationId]/integrations/hydrated-integrations', () => ({
-  HydratedIntegrations: () => null,
+vi.mock('@/app/o/[organizationId]/integrations/integrations', () => ({
+  OrganizationIntegrations: () => null,
 }))
 vi.mock('next/navigation', () => nextNavigationMock)
 
@@ -20,10 +20,7 @@ const props = {
 }
 
 beforeEach(() => {
-  authMockFns.mockGetSession.mockResolvedValue({
-    user: { id: 'viewer' },
-    session: { id: 'session' },
-  })
+  authMockFns.mockGetSession.mockResolvedValue({ user: { id: 'viewer' } })
   mocks.context.mockResolvedValue({ searchAccess: { memberScoped: true } })
 })
 
diff --git a/apps/sim/app/o/[organizationId]/integrations/page.tsx b/apps/sim/app/o/[organizationId]/integrations/page.tsx
index 1209918db7f..d4afd11876f 100644
--- a/apps/sim/app/o/[organizationId]/integrations/page.tsx
+++ b/apps/sim/app/o/[organizationId]/integrations/page.tsx
@@ -1,25 +1,18 @@
 import type { Metadata } from 'next'
 import { notFound, redirect } from 'next/navigation'
 import { slackSearchOnboardingInputSchema } from '@/lib/api/contracts/knowledge/slack'
+import { getSession } from '@/lib/auth'
 import {
   searchConnectionPath,
   searchConnectionTargetSchema,
 } from '@/lib/knowledge/search/connection-target'
 import { organizationRoutes } from '@/lib/navigation/paths'
+import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
 import { SEARCH_CONNECTORS } from '@/lib/sim-search/connectors'
 import { slackSearchIntegrationsPath } from '@/lib/slack-search/onboarding'
-import { requireIntegrationsViewer } from '@/app/o/[organizationId]/integrations/access'
-import { HydratedIntegrations } from '@/app/o/[organizationId]/integrations/hydrated-integrations'
-import {
-  loadIntegrationConnectionParams,
-  loadIntegrationView,
-  serializeIntegrationView,
-} from '@/app/o/[organizationId]/integrations/search-params'
-import {
-  GENERIC_SECRETS_SEGMENT,
-  integrationPath,
-  integrationSegment,
-} from '@/platform/lib/integrations/model'
+import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
+import { OrganizationIntegrations } from '@/app/o/[organizationId]/integrations/integrations'
+import { loadIntegrationConnectionParams } from '@/app/o/[organizationId]/integrations/search-params'
 
 export const metadata: Metadata = {
   title: 'Integrations',
@@ -37,10 +30,6 @@ interface OrganizationIntegrationsPageProps {
     connectorType?: string | string[]
     connectorId?: string | string[]
     credentialId?: string | string[]
-    integration?: string | string[]
-    account?: string | string[]
-    tools?: string | string[]
-    q?: string | string[]
   }>
 }
 
@@ -78,34 +67,26 @@ export default async function OrganizationIntegrationsPage({
     slack === undefined ? undefined : slackSearchOnboardingInputSchema.safeParse({ token: slack })
   if (context && !context.success) notFound()
   const slackToken = context?.data?.token
-  const viewer = await requireIntegrationsViewer(
-    organizationId,
-    connectionTarget
-      ? searchConnectionPath(organizationId, connectionTarget)
-      : slackToken
-        ? slackSearchIntegrationsPath(organizationId, slackToken)
-        : organizationRoutes(organizationId).integrations
-  )
-  const { userId } = viewer.principal
-  const view = await loadIntegrationView(query)
-  if (view.integration) {
-    const segment =
-      view.integration === 'secrets'
-        ? GENERIC_SECRETS_SEGMENT
-        : integrationSegment(view.integration)
+  const session = await getSession()
+  if (!session?.user)
     redirect(
-      serializeIntegrationView(integrationPath(organizationId, segment), {
-        q: view.q,
-        account: view.account,
-        tools: view.tools,
+      buildAuthCrossLink('/login', {
+        callbackUrl: connectionTarget
+          ? searchConnectionPath(organizationId, connectionTarget)
+          : slackToken
+            ? slackSearchIntegrationsPath(organizationId, slackToken)
+            : organizationRoutes(organizationId).integrations,
+        isInviteFlow: false,
       })
     )
-  }
+  const organizationContext = await getOrganizationSurfaceContext(organizationId, session.user.id)
+  if (!organizationContext?.searchAccess.memberScoped) notFound()
   return (
-    <HydratedIntegrations
-      {...viewer}
-      connectionRequest={connectionTarget ? { target: connectionTarget, userId } : undefined}
-      slackOnboarding={slackToken ? { token: slackToken, userId } : undefined}
+    <OrganizationIntegrations
+      connectionRequest={
+        connectionTarget ? { target: connectionTarget, userId: session.user.id } : undefined
+      }
+      slackOnboarding={slackToken ? { token: slackToken, userId: session.user.id } : undefined}
     />
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/integrations/search-params.ts b/apps/sim/app/o/[organizationId]/integrations/search-params.ts
index 48d7c602dfc..20bbc419dec 100644
--- a/apps/sim/app/o/[organizationId]/integrations/search-params.ts
+++ b/apps/sim/app/o/[organizationId]/integrations/search-params.ts
@@ -1,14 +1,5 @@
 import { createLoader, createSerializer, parseAsString } from 'nuqs/server'
-
-/** 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
+import { organizationPageParsers } from '@/app/o/[organizationId]/components/organization-page/search-params'
 
 export const integrationViewParsers = {
   integration: parseAsString,
@@ -17,13 +8,7 @@ export const integrationViewParsers = {
 } as const
 
 export const serializeIntegrationView = createSerializer({
-  ...integrationSearchParsers,
-  ...integrationViewParsers,
-})
-
-/** Reads a link from before providers had their own route, so it can be sent there. */
-export const loadIntegrationView = createLoader({
-  ...integrationSearchParsers,
+  ...organizationPageParsers,
   ...integrationViewParsers,
 })
 
diff --git a/apps/sim/app/o/[organizationId]/integrations/secrets/page.tsx b/apps/sim/app/o/[organizationId]/integrations/secrets/page.tsx
index 2b7750c3461..083ca5c6423 100644
--- a/apps/sim/app/o/[organizationId]/integrations/secrets/page.tsx
+++ b/apps/sim/app/o/[organizationId]/integrations/secrets/page.tsx
@@ -2,10 +2,8 @@ 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 {
-  integrationSearchParsers,
-  serializeIntegrationView,
-} from '@/app/o/[organizationId]/integrations/search-params'
+import { organizationPageParsers } from '@/app/o/[organizationId]/components/organization-page/search-params'
+import { serializeIntegrationView } from '@/app/o/[organizationId]/integrations/search-params'
 
 export const metadata: Metadata = { title: 'Generic Secrets' }
 
@@ -14,7 +12,7 @@ interface MemberSecretsPageProps {
   searchParams: Promise<SearchParams>
 }
 
-const loadSearch = createLoader(integrationSearchParsers)
+const loadSearch = createLoader(organizationPageParsers)
 
 export default async function Page({ params, searchParams }: MemberSecretsPageProps) {
   const { organizationId } = await params
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/slack-search-actions/slack-search-actions.tsx b/apps/sim/app/o/[organizationId]/integrations/slack-search-actions.tsx
similarity index 53%
rename from apps/sim/platform/app/(shell)/integrations/_components/slack-search-actions/slack-search-actions.tsx
rename to apps/sim/app/o/[organizationId]/integrations/slack-search-actions.tsx
index 03a0e9e50ae..aec4a98815c 100644
--- a/apps/sim/platform/app/(shell)/integrations/_components/slack-search-actions/slack-search-actions.tsx
+++ b/apps/sim/app/o/[organizationId]/integrations/slack-search-actions.tsx
@@ -1,13 +1,11 @@
 'use client'
 
-import Link from 'next/link'
+import { Chip, ChipLink } from '@sim/emcn'
 import { slackSearchOnboardingPath } from '@/lib/slack-search/onboarding'
 import {
   useRetrySlackSearchOnboarding,
   useSlackSearchOnboarding,
 } from '@/hooks/queries/slack-search-onboarding'
-import styles from '@/platform/app/(shell)/integrations/_components/integrations-page/integrations-page.module.css'
-import { Button, InlineNotice } from '@/platform/design-system/components'
 
 interface SlackSearchActionsProps {
   organizationId: string
@@ -19,42 +17,45 @@ interface SlackSearchActionsProps {
 export function SlackSearchActions({ organizationId, token, userId }: SlackSearchActionsProps) {
   const status = useSlackSearchOnboarding(token, userId)
   const retry = useRetrySlackSearchOnboarding(userId)
-  const data = status.data
-  if (!data)
-    return status.error ? <InlineNotice intent='danger' message={status.error.message} /> : null
-  if (!('organizationId' in data) || data.organizationId !== organizationId)
+  if (status.isPending) return null
+  if (status.isError)
     return (
-      <div className={styles.handoff}>
-        <Button render={<Link href={slackSearchOnboardingPath(token)} />}>
-          Finish Slack setup
-        </Button>
-      </div>
+      <p role='alert' className='text-[var(--text-error)] text-caption'>
+        {status.error.message}
+      </p>
     )
+  const data = status.data
+  if (!('organizationId' in data) || data.organizationId !== organizationId)
+    return <ChipLink href={slackSearchOnboardingPath(token)}>Finish Slack setup</ChipLink>
   const retried = data.status === 'retried' || retry.isSuccess
   return (
-    <div className={styles.handoff}>
+    <div className='flex flex-wrap items-center gap-1.5'>
       {!retried &&
         (data.status === 'ready' ? (
-          <Button
+          <Chip
             variant='primary'
             disabled={retry.isPending}
             onClick={() => retry.mutate({ token })}
           >
             {retry.isPending ? 'Queuing' : 'Retry question in Slack'}
-          </Button>
+          </Chip>
         ) : (
-          <Button disabled={status.isFetching} onClick={() => void status.refetch()}>
+          <Chip disabled={status.isFetching} onClick={() => void status.refetch()}>
             {status.isFetching ? 'Checking' : 'Check connection'}
-          </Button>
+          </Chip>
         ))}
-      <Button
-        variant={retried ? 'primary' : 'secondary'}
-        render={<Link href={data.slackUrl} referrerPolicy='no-referrer' />}
+      <ChipLink
+        variant={retried ? 'primary' : undefined}
+        href={data.slackUrl}
+        referrerPolicy='no-referrer'
       >
         Return to Slack
-      </Button>
-      {retry.isError && <InlineNotice intent='danger' message={retry.error.message} />}
-      {status.isRefetchError && <InlineNotice intent='danger' message={status.error.message} />}
+      </ChipLink>
+      {retry.isError && (
+        <p role='alert' className='text-[var(--text-error)] text-caption'>
+          {retry.error.message}
+        </p>
+      )}
     </div>
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/integrations/utils.ts b/apps/sim/app/o/[organizationId]/integrations/utils.ts
new file mode 100644
index 00000000000..1a5e3cdbe27
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/integrations/utils.ts
@@ -0,0 +1,17 @@
+import type { MemberIntegration } from '@/lib/credential-groups/member-integrations'
+
+export function memberIntegrationStatus(entry: MemberIntegration) {
+  if (entry.managed) return 'Organization managed'
+  if (!entry.ready) return entry.description ?? 'Checking availability'
+  if (
+    entry.accounts.some(
+      (account) =>
+        account.status === 'needs_reauth' &&
+        entry.reconnectAccountIds.includes(account.credentialId)
+    )
+  )
+    return 'Reconnect needed'
+  if (entry.accounts.length)
+    return entry.accounts.length === 1 ? '1 account' : `${entry.accounts.length} accounts`
+  return 'Not connected'
+}
diff --git a/apps/sim/app/o/[organizationId]/layout.test.tsx b/apps/sim/app/o/[organizationId]/layout.test.tsx
index eb2239e4e40..1598aedf5b6 100644
--- a/apps/sim/app/o/[organizationId]/layout.test.tsx
+++ b/apps/sim/app/o/[organizationId]/layout.test.tsx
@@ -55,8 +55,8 @@ vi.mock('@/lib/organizations/surface', () => ({
   getOrganizationSurfaceContext: mockGetOrganizationSurfaceContext,
 }))
 
-vi.mock('@/platform/app/(shell)/_components/sidebar/sidebar', () => ({
-  Sidebar: () => null,
+vi.mock('@/app/o/[organizationId]/components/organization-sidebar', () => ({
+  OrganizationSidebar: () => null,
 }))
 
 vi.mock('@/app/workspace/[workspaceId]/components/workspace-chrome', () => ({
diff --git a/apps/sim/app/o/[organizationId]/layout.tsx b/apps/sim/app/o/[organizationId]/layout.tsx
index 5e9f794a273..ddaa31bf583 100644
--- a/apps/sim/app/o/[organizationId]/layout.tsx
+++ b/apps/sim/app/o/[organizationId]/layout.tsx
@@ -20,6 +20,7 @@ import { isWorkflowTestsEnabled } from '@/lib/workflow-tests/feature-flag'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
 import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
 import { OrganizationAccessDenied } from '@/app/o/[organizationId]/components/organization-access-denied'
+import { OrganizationSidebar } from '@/app/o/[organizationId]/components/organization-sidebar'
 import { SimLinkOrganizationProvider } from '@/app/o/[organizationId]/links/sim-link-organization-provider'
 import { prefetchOrganizationSidebar } from '@/app/o/[organizationId]/prefetch'
 import { OrganizationProvider } from '@/app/o/[organizationId]/providers/organization-provider'
@@ -31,7 +32,6 @@ import {
 } from '@/app/workspace/[workspaceId]/components/workspace-chrome'
 import { FeatureFlagsProvider } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import { GlobalCommandsProvider } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
-import { Sidebar } from '@/platform/app/(shell)/_components/sidebar/sidebar'
 
 const logger = createLogger('OrganizationLayout')
 
@@ -139,7 +139,7 @@ export default async function OrganizationLayout({
                 <SettingsNavigationProvider>
                   <WorkspaceChrome
                     sidebar={
-                      <Sidebar
+                      <OrganizationSidebar
                         benchmarkEnabled={benchmarkEnabled}
                         simLinksEnabled={simLinksEnabled}
                         peopleEnabled={peopleEnabled}
diff --git a/apps/sim/app/o/[organizationId]/links/columns.ts b/apps/sim/app/o/[organizationId]/links/columns.ts
new file mode 100644
index 00000000000..f522b1d3a5d
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/links/columns.ts
@@ -0,0 +1,17 @@
+import { Globe, Plus } from '@sim/emcn/icons'
+import type { ResourceColumn } from '@/app/workspace/[workspaceId]/components/resource/resource'
+
+/** Shared by the page and its loading chrome so the skeleton matches the table. */
+export const SIM_LINK_COLUMNS = [
+  { id: 'name', header: 'Name' },
+  { id: 'destination', header: 'Destination', widthMultiplier: 2 },
+  { id: 'description', header: 'Description', widthMultiplier: 1.4 },
+  { id: 'owner', header: 'Created by' },
+  { id: 'access', header: 'Access' },
+  { id: 'updated', header: 'Updated' },
+] as const satisfies readonly ResourceColumn[]
+
+export const SIM_LINKS_SEARCH_PLACEHOLDER = 'Search links...'
+
+export const INSTALL_EXTENSION_ACTION = { text: 'Install Sim for Chrome', icon: Globe } as const
+export const NEW_SIM_LINK_ACTION = { text: 'New link', icon: Plus, variant: 'primary' } as const
diff --git a/apps/sim/app/o/[organizationId]/links/loading.tsx b/apps/sim/app/o/[organizationId]/links/loading.tsx
index 2aa2aba9ade..f955ff8dd99 100644
--- a/apps/sim/app/o/[organizationId]/links/loading.tsx
+++ b/apps/sim/app/o/[organizationId]/links/loading.tsx
@@ -1,15 +1,27 @@
-import { RedesignPageSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
+'use client'
+
+import { Link } from '@sim/emcn/icons'
+import { useDeploymentShape } from '@/lib/core/config/deployment-shape'
 import {
-  LinkRowsSkeleton,
-  LinksFrame,
-} from '@/platform/app/(shell)/links/_components/links-page/links-frame'
+  INSTALL_EXTENSION_ACTION,
+  NEW_SIM_LINK_ACTION,
+  SIM_LINK_COLUMNS,
+  SIM_LINKS_SEARCH_PLACEHOLDER,
+} from '@/app/o/[organizationId]/links/columns'
+import { ResourceChromeFallback } from '@/app/workspace/[workspaceId]/components/resource/components/resource-chrome-fallback'
 
 export default function SimLinksLoading() {
+  const { hosted } = useDeploymentShape()
   return (
-    <RedesignPageSurface>
-      <LinksFrame loading>
-        <LinkRowsSkeleton />
-      </LinksFrame>
-    </RedesignPageSurface>
+    <div inert aria-busy className='contents'>
+      <ResourceChromeFallback
+        icon={Link}
+        title='Links'
+        columns={SIM_LINK_COLUMNS}
+        actions={hosted ? [INSTALL_EXTENSION_ACTION, NEW_SIM_LINK_ACTION] : [NEW_SIM_LINK_ACTION]}
+        searchPlaceholder={SIM_LINKS_SEARCH_PLACEHOLDER}
+        hasSort
+      />
+    </div>
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/links/page.tsx b/apps/sim/app/o/[organizationId]/links/page.tsx
index b788502566e..21e80786b66 100644
--- a/apps/sim/app/o/[organizationId]/links/page.tsx
+++ b/apps/sim/app/o/[organizationId]/links/page.tsx
@@ -1,24 +1,19 @@
-import { HydrationBoundary } from '@tanstack/react-query'
 import type { Metadata } from 'next'
 import { notFound, redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
 import { organizationRoutes } from '@/lib/navigation/paths'
 import { isSimLinksEnabled } from '@/lib/sim-links/feature-flag'
 import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
-import { RedesignPageSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
-import { loadSimLinksListView } from '@/app/o/[organizationId]/links/search-params'
-import { LinksPage } from '@/platform/app/(shell)/links/_components/links-page/links-page'
-import { prefetchSimLinks } from '@/platform/lib/data/prefetch'
+import { SimLinks } from '@/app/o/[organizationId]/links/sim-links'
 
 export const metadata: Metadata = { title: 'Links' }
 
 interface SimLinksPageProps {
   params: Promise<{ organizationId: string }>
-  searchParams: Promise<Record<string, string | string[] | undefined>>
 }
 
-export default async function SimLinksPage({ params, searchParams }: SimLinksPageProps) {
-  const [{ organizationId }, query] = await Promise.all([params, searchParams])
+export default async function SimLinksPage({ params }: SimLinksPageProps) {
+  const { organizationId } = await params
   const session = await getSession()
   if (!session?.user)
     redirect(
@@ -28,16 +23,5 @@ export default async function SimLinksPage({ params, searchParams }: SimLinksPag
       })
     )
   if (!(await isSimLinksEnabled(organizationId))) notFound()
-  const state = await prefetchSimLinks(
-    organizationId,
-    { kind: 'session', userId: session.user.id, sessionId: session.session.id },
-    loadSimLinksListView(query)
-  )
-  return (
-    <RedesignPageSurface>
-      <HydrationBoundary state={state}>
-        <LinksPage organizationId={organizationId} />
-      </HydrationBoundary>
-    </RedesignPageSurface>
-  )
+  return <SimLinks organizationId={organizationId} />
 }
diff --git a/apps/sim/app/o/[organizationId]/links/search-params.ts b/apps/sim/app/o/[organizationId]/links/search-params.ts
index 5025d0b48b1..1fb8368f3e0 100644
--- a/apps/sim/app/o/[organizationId]/links/search-params.ts
+++ b/apps/sim/app/o/[organizationId]/links/search-params.ts
@@ -1,10 +1,9 @@
 import { truncateAtCodePoint } from '@sim/utils/string'
-import { createLoader, createParser, createSerializer, parseAsString } from 'nuqs/server'
+import { createParser, createSerializer, parseAsString } from 'nuqs/server'
 import { SIM_LINK_SEARCH_MAX_LENGTH, SIM_LINK_SORTS } from '@/lib/sim-links/validation'
 import { createSortParams } from '@/lib/url-state'
 
-export const boundedSearch = (value: string) =>
-  truncateAtCodePoint(value, SIM_LINK_SEARCH_MAX_LENGTH, '')
+const boundedSearch = (value: string) => truncateAtCodePoint(value, SIM_LINK_SEARCH_MAX_LENGTH, '')
 
 /**
  * `create` opens the new-link editor, prefilled with its value as the name. `search` filters by
@@ -24,9 +23,3 @@ export const simLinksSortParams = createSortParams(SIM_LINK_SORTS, {
 })
 
 export const simLinksUrlKeys = { history: 'replace', clearOnDefault: true } as const
-
-/** The list a visit asks for, so a server prefetch reads the entry the page's hook will. */
-export const loadSimLinksListView = createLoader({
-  search: simLinksParsers.search,
-  ...simLinksSortParams.parsers,
-})
diff --git a/apps/sim/app/o/[organizationId]/links/sim-link-context-menu.tsx b/apps/sim/app/o/[organizationId]/links/sim-link-context-menu.tsx
new file mode 100644
index 00000000000..98e08ece0c4
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/links/sim-link-context-menu.tsx
@@ -0,0 +1,76 @@
+'use client'
+
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@sim/emcn'
+import { ArrowUpRight, Duplicate, Pencil, Trash } from '@sim/emcn/icons'
+
+interface SimLinkContextMenuProps {
+  isOpen: boolean
+  position: { x: number; y: number }
+  onClose: () => void
+  onOpen: () => void
+  onCopyLink: () => void
+  /** Present only when the viewer may edit the link. */
+  onEdit?: () => void
+  /** Present only when the viewer may delete the link. */
+  onDelete?: () => void
+}
+
+/** Row actions for one Sim link, anchored where the row was right-clicked. */
+export function SimLinkContextMenu({
+  isOpen,
+  position,
+  onClose,
+  onOpen,
+  onCopyLink,
+  onEdit,
+  onDelete,
+}: SimLinkContextMenuProps) {
+  return (
+    <DropdownMenu open={isOpen} onOpenChange={(open) => !open && onClose()} modal={false}>
+      <DropdownMenuTrigger asChild>
+        <div
+          className='pointer-events-none fixed size-px'
+          style={{ left: `${position.x}px`, top: `${position.y}px` }}
+          tabIndex={-1}
+          aria-hidden
+        />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        align='start'
+        side='bottom'
+        sideOffset={4}
+        onCloseAutoFocus={(e) => e.preventDefault()}
+      >
+        <DropdownMenuItem onSelect={onOpen}>
+          <ArrowUpRight />
+          Open
+        </DropdownMenuItem>
+        <DropdownMenuItem onSelect={onCopyLink}>
+          <Duplicate />
+          Copy link
+        </DropdownMenuItem>
+        {onEdit && (
+          <DropdownMenuItem onSelect={onEdit}>
+            <Pencil />
+            Edit
+          </DropdownMenuItem>
+        )}
+        {onDelete && (
+          <>
+            <DropdownMenuSeparator />
+            <DropdownMenuItem onSelect={onDelete}>
+              <Trash />
+              Delete
+            </DropdownMenuItem>
+          </>
+        )}
+      </DropdownMenuContent>
+    </DropdownMenu>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/links/sim-link-icon.tsx b/apps/sim/app/o/[organizationId]/links/sim-link-icon.tsx
new file mode 100644
index 00000000000..f28f247f9ce
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/links/sim-link-icon.tsx
@@ -0,0 +1,14 @@
+import { Globe } from '@sim/emcn/icons'
+import { Favicon } from '@/components/favicon'
+import { simLinkOrigin } from '@/lib/sim-links/validation'
+
+interface SimLinkIconProps {
+  /** The link's destination; a variable link's `{*}` never changes its host. */
+  url: string
+}
+
+/** The destination site's favicon, or a globe when neither it nor a parent domain has one. */
+export function SimLinkIcon({ url }: SimLinkIconProps) {
+  const origin = simLinkOrigin(url)
+  return <Favicon host={origin ? new URL(origin).hostname : null} fallback={<Globe />} />
+}
diff --git a/apps/sim/app/o/[organizationId]/links/sim-link-shortcut.tsx b/apps/sim/app/o/[organizationId]/links/sim-link-shortcut.tsx
index 522ea8c413d..e47e9588ec4 100644
--- a/apps/sim/app/o/[organizationId]/links/sim-link-shortcut.tsx
+++ b/apps/sim/app/o/[organizationId]/links/sim-link-shortcut.tsx
@@ -40,8 +40,8 @@ function useNestedSimLinkCreator(url: string, title: string): SimLinkCreator {
 }
 
 /** The first link that already opens `url`, and a copy of its address. */
-export function useExistingSimLink(organizationId: string, url: string, enabled = true) {
-  const { data, isPending, isError } = useSimLinksForUrl(organizationId, url, enabled)
+function useExistingSimLink(organizationId: string, url: string) {
+  const { data, isPending, isError } = useSimLinksForUrl(organizationId, url)
   const { copied, copy } = useCopyToClipboard({ resetMs: 1500 })
   const existing = data?.at(0)
   const copyExisting = async () => {
diff --git a/apps/sim/app/o/[organizationId]/links/sim-links.tsx b/apps/sim/app/o/[organizationId]/links/sim-links.tsx
new file mode 100644
index 00000000000..d966744ebb8
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/links/sim-links.tsx
@@ -0,0 +1,264 @@
+'use client'
+
+import { type MouseEvent, useCallback, useMemo, useState } from 'react'
+import { Avatar, ChipConfirmModal, ChipModalError, toast, writeTextToClipboard } from '@sim/emcn'
+import { Link } from '@sim/emcn/icons'
+import { createLogger } from '@sim/logger'
+import { useQueryStates } from 'nuqs'
+import type { SimLink } from '@/lib/api/contracts/sim-links'
+import { useDeploymentShape } from '@/lib/core/config/deployment-shape'
+import { simLinkPath, simLinkUrl } from '@/lib/navigation/paths'
+import { SIM_LINK_SEARCH_MAX_LENGTH, toSimLinkName } from '@/lib/sim-links/validation'
+import { SEARCH_DEBOUNCE_MS } from '@/lib/url-state'
+import {
+  INSTALL_EXTENSION_ACTION,
+  NEW_SIM_LINK_ACTION,
+  SIM_LINK_COLUMNS,
+  SIM_LINKS_SEARCH_PLACEHOLDER,
+} from '@/app/o/[organizationId]/links/columns'
+import {
+  simLinksParsers,
+  simLinksSortParams,
+  simLinksUrlKeys,
+} from '@/app/o/[organizationId]/links/search-params'
+import { SimLinkContextMenu } from '@/app/o/[organizationId]/links/sim-link-context-menu'
+import { SimLinkIcon } from '@/app/o/[organizationId]/links/sim-link-icon'
+import { SimLinkModal } from '@/app/o/[organizationId]/links/sim-link-modal'
+import {
+  ResourceLoadError,
+  ResourceNoResults,
+  SimLinksEmptyState,
+} from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state'
+import type {
+  SearchConfig,
+  SortConfig,
+} from '@/app/workspace/[workspaceId]/components/resource/components/resource-options'
+import { timeCell } from '@/app/workspace/[workspaceId]/components/resource/components/time-cell'
+import {
+  Resource,
+  type ResourceRow,
+} from '@/app/workspace/[workspaceId]/components/resource/resource'
+import { useDeleteSimLink, useSimLinks } from '@/hooks/queries/sim-links'
+import { useContextMenu } from '@/hooks/use-context-menu'
+import { useDebouncedSearchSetter } from '@/hooks/use-debounced-search-setter'
+import { useSearchFilterValue } from '@/hooks/use-search-filter-value'
+import { useUrlSort } from '@/hooks/use-url-sort'
+
+const logger = createLogger('SimLinks')
+
+const SIM_FOR_CHROME_URL =
+  'https://chromewebstore.google.com/detail/sim/oanlcahddodnjpdoopcpjlcageejjpmg'
+
+const SORT_OPTIONS = [
+  { id: 'name', label: 'Name' },
+  { id: 'popular', label: 'Opens' },
+] as const
+
+/** How the link is shared beyond the default: open to everyone and editable by any member. */
+function accessLabel(link: SimLink): string | null {
+  const limits = [link.unlisted && 'Unlisted', link.restrictEdit && 'Restricted'].filter(Boolean)
+  return limits.length ? limits.join(', ') : null
+}
+
+function openLink(name: string) {
+  window.open(simLinkPath(name), '_blank', 'noopener,noreferrer')
+}
+
+async function copyLink(name: string) {
+  try {
+    await writeTextToClipboard(simLinkUrl(window.location.origin, name))
+    toast.success('Link copied')
+  } catch (error) {
+    logger.error('Failed to copy Sim link', { error })
+    toast.error('Unable to copy link')
+  }
+}
+
+interface SimLinksProps {
+  organizationId: string
+}
+
+/** Every Sim link the viewer may browse, in the shared resource table. */
+export function SimLinks({ organizationId }: SimLinksProps) {
+  const { hosted } = useDeploymentShape()
+  const [{ search, create }, setView] = useQueryStates(simLinksParsers, simLinksUrlKeys)
+  const setSearch = useDebouncedSearchSetter((value, options) =>
+    setView({ search: value }, options)
+  )
+  const debouncedSearch = useSearchFilterValue(search, SEARCH_DEBOUNCE_MS)
+  const { sort, dir, activeSort, onSort, onClear } = useUrlSort(simLinksSortParams, simLinksUrlKeys)
+  const query = debouncedSearch.trim()
+  const links = useSimLinks(organizationId, query, sort, dir)
+  const remove = useDeleteSimLink(organizationId)
+  const contextMenu = useContextMenu()
+  const [menuLinkId, setMenuLinkId] = useState<string | null>(null)
+  const [editing, setEditing] = useState<SimLink | null>(null)
+  const [deleting, setDeleting] = useState<SimLink | null>(null)
+
+  const loaded = useMemo(() => links.data?.pages.flatMap((page) => page.links) ?? [], [links.data])
+  const linksById = useMemo(() => new Map(loaded.map((link) => [link.id, link])), [loaded])
+  const menuLink = menuLinkId ? linksById.get(menuLinkId) : undefined
+  // A row can leave the results while its menu is open; forgetting it keeps the menu from
+  // reappearing at the old position when the row comes back.
+  if (menuLinkId && !menuLink) setMenuLinkId(null)
+
+  const rows: ResourceRow[] = useMemo(
+    () =>
+      loaded.map((link) => ({
+        id: link.id,
+        cells: {
+          name: { icon: <SimLinkIcon url={link.url} />, label: link.name },
+          destination: { label: link.url },
+          description: { label: link.description },
+          owner: link.createdBy
+            ? {
+                icon: (
+                  <Avatar
+                    size='xs'
+                    name={link.createdBy.name}
+                    src={link.createdBy.image}
+                    aria-hidden
+                  />
+                ),
+                label: link.createdBy.name,
+              }
+            : { label: null },
+          access: { label: accessLabel(link) },
+          updated: timeCell(link.updatedAt),
+        },
+      })),
+    [loaded]
+  )
+
+  const searchConfig: SearchConfig = {
+    value: search,
+    maxLength: SIM_LINK_SEARCH_MAX_LENGTH,
+    onChange: setSearch,
+    onClearAll: () => setSearch(''),
+    placeholder: SIM_LINKS_SEARCH_PLACEHOLDER,
+  }
+  const sortConfig: SortConfig = { options: SORT_OPTIONS, active: activeSort, onSort, onClear }
+  const startCreate = () => void setView({ create: '' })
+  const { fetchNextPage } = links
+  const { handleContextMenu } = contextMenu
+  // Rows are memoized, so stable handlers keep a keystroke from re-rendering every row.
+  const openRow = useCallback(
+    (id: string) => {
+      const link = linksById.get(id)
+      if (link) openLink(link.name)
+    },
+    [linksById]
+  )
+  const openRowMenu = useCallback(
+    (event: MouseEvent, id: string) => {
+      if (!linksById.has(id)) return
+      setMenuLinkId(id)
+      handleContextMenu(event)
+    },
+    [linksById, handleContextMenu]
+  )
+  const loadMore = useCallback(() => void fetchNextPage(), [fetchNextPage])
+
+  const showEmptyState = Boolean(links.data || links.isLoadingError)
+
+  return (
+    <Resource>
+      <Resource.Header
+        icon={Link}
+        title='Links'
+        actions={[
+          ...(hosted
+            ? [
+                {
+                  ...INSTALL_EXTENSION_ACTION,
+                  onSelect: () => window.open(SIM_FOR_CHROME_URL, '_blank', 'noopener,noreferrer'),
+                },
+              ]
+            : []),
+          { ...NEW_SIM_LINK_ACTION, id: 'create', onSelect: startCreate },
+        ]}
+      />
+      <Resource.Options search={searchConfig} sort={sortConfig} />
+      <Resource.Table
+        columns={SIM_LINK_COLUMNS}
+        rows={rows}
+        virtualized
+        onRowClick={openRow}
+        onRowContextMenu={openRowMenu}
+        onLoadMore={loadMore}
+        hasMore={links.hasNextPage}
+        isLoadingMore={links.isFetchingNextPage}
+        isFetching={links.isFetching}
+        loadMoreFailed={links.isFetchNextPageError}
+        emptyState={
+          showEmptyState &&
+          (links.isLoadingError ? (
+            <ResourceLoadError message={links.error.message} onRetry={() => void links.refetch()} />
+          ) : query ? (
+            <ResourceNoResults
+              search={query}
+              filterCount={0}
+              searchScope='Searched every link you can see.'
+              onClear={() => setSearch('')}
+            />
+          ) : (
+            <SimLinksEmptyState onCreate={startCreate} />
+          ))
+        }
+      />
+      {menuLink && (
+        <SimLinkContextMenu
+          isOpen={contextMenu.isOpen}
+          position={contextMenu.position}
+          onClose={contextMenu.closeMenu}
+          onOpen={() => openLink(menuLink.name)}
+          onCopyLink={() => void copyLink(menuLink.name)}
+          onEdit={menuLink.canEdit ? () => setEditing(menuLink) : undefined}
+          onDelete={
+            menuLink.canEdit
+              ? () => {
+                  remove.reset()
+                  setDeleting(menuLink)
+                }
+              : undefined
+          }
+        />
+      )}
+      {create !== null && (
+        <SimLinkModal
+          key={create}
+          organizationId={organizationId}
+          initialName={toSimLinkName(create)}
+          onClose={() => void setView({ create: null })}
+        />
+      )}
+      {editing && (
+        <SimLinkModal
+          key={editing.id}
+          organizationId={organizationId}
+          link={editing}
+          onClose={() => setEditing(null)}
+        />
+      )}
+      <ChipConfirmModal
+        open={Boolean(deleting)}
+        onOpenChange={(open) => {
+          if (!open && !remove.isPending) setDeleting(null)
+        }}
+        title='Delete link'
+        text={`${deleting?.name ?? 'This link'} will stop working for everyone in your organization.`}
+        confirm={{
+          label: 'Delete',
+          pendingLabel: 'Deleting',
+          pending: remove.isPending,
+          disabled: remove.isPending,
+          onClick: () => {
+            if (deleting) remove.mutate(deleting.id, { onSuccess: () => setDeleting(null) })
+          },
+        }}
+      >
+        <ChipModalError>{remove.error?.message}</ChipModalError>
+      </ChipConfirmModal>
+    </Resource>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/page.tsx b/apps/sim/app/o/[organizationId]/page.tsx
index 40bf04cb1de..82b486cc5cf 100644
--- a/apps/sim/app/o/[organizationId]/page.tsx
+++ b/apps/sim/app/o/[organizationId]/page.tsx
@@ -5,7 +5,6 @@ import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
 import { canBrowsePeople } from '@/lib/people/feature-flag'
 import { isSimLinksEnabled } from '@/lib/sim-links/feature-flag'
 import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
-import { getOrganizationHomeRedirect } from '@/app/o/[organizationId]/home/home-redirect'
 
 export default async function OrganizationPage({
   params,
@@ -20,7 +19,7 @@ export default async function OrganizationPage({
   }
   const context = await getOrganizationSurfaceContext(organizationId, session.user.id)
   if (!context) notFound()
-  if (!getOrganizationHomeRedirect(context, organizationId)) redirect(routes.home)
+  if (context.mothershipAvailable && context.canBuild) redirect(routes.home)
   if (context.searchAccess.memberScoped) redirect(routes.search)
   if (await canBrowsePeople(organizationId, context.viewer.role)) redirect(routes.people)
   redirect((await isSimLinksEnabled(organizationId)) ? routes.simLinks : WORKSPACE_SETTINGS_PATH)
diff --git a/apps/sim/app/o/[organizationId]/people/[memberId]/loading.tsx b/apps/sim/app/o/[organizationId]/people/[memberId]/loading.tsx
index e3a7a006921..4d1e787708c 100644
--- a/apps/sim/app/o/[organizationId]/people/[memberId]/loading.tsx
+++ b/apps/sim/app/o/[organizationId]/people/[memberId]/loading.tsx
@@ -1,10 +1,5 @@
-import { RedesignPageSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
-import { PersonSkeleton } from '@/platform/app/(shell)/people/_components/person/person-skeleton'
+import { ApplicationLoading } from '@/app/_shell/application-loading'
 
-export default function PersonLoading() {
-  return (
-    <RedesignPageSurface>
-      <PersonSkeleton />
-    </RedesignPageSurface>
-  )
+export default function Loading() {
+  return <ApplicationLoading />
 }
diff --git a/apps/sim/app/o/[organizationId]/people/[memberId]/page.tsx b/apps/sim/app/o/[organizationId]/people/[memberId]/page.tsx
index cc7373cd2aa..5c3144801f6 100644
--- a/apps/sim/app/o/[organizationId]/people/[memberId]/page.tsx
+++ b/apps/sim/app/o/[organizationId]/people/[memberId]/page.tsx
@@ -3,12 +3,10 @@ import type { Metadata } from 'next'
 import { notFound, redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
 import { organizationRoutes } from '@/lib/navigation/paths'
-import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
-import { canBrowsePeople } from '@/lib/people/feature-flag'
+import { isPeopleEnabled } from '@/lib/people/feature-flag'
 import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
-import { RedesignPageSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
-import { PersonProfile } from '@/platform/app/(shell)/people/_components/person/person'
-import { PersonSkeleton } from '@/platform/app/(shell)/people/_components/person/person-skeleton'
+import PageLoading from '@/app/o/[organizationId]/people/[memberId]/loading'
+import { Person } from '@/app/o/[organizationId]/people/[memberId]/person'
 
 export const metadata: Metadata = { title: 'People' }
 
@@ -26,13 +24,10 @@ export default async function PersonPage({ params }: PersonPageProps) {
         isInviteFlow: false,
       })
     )
-  const context = await getOrganizationSurfaceContext(organizationId, session.user.id)
-  if (!context || !(await canBrowsePeople(organizationId, context.viewer.role))) notFound()
+  if (!(await isPeopleEnabled(organizationId))) notFound()
   return (
-    <RedesignPageSurface>
-      <Suspense fallback={<PersonSkeleton />}>
-        <PersonProfile organizationId={organizationId} memberId={memberId} />
-      </Suspense>
-    </RedesignPageSurface>
+    <Suspense fallback={<PageLoading />}>
+      <Person organizationId={organizationId} memberId={memberId} />
+    </Suspense>
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/people/[memberId]/person-modal.tsx b/apps/sim/app/o/[organizationId]/people/[memberId]/person-modal.tsx
new file mode 100644
index 00000000000..8783105b517
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/[memberId]/person-modal.tsx
@@ -0,0 +1,148 @@
+'use client'
+
+import { useState } from 'react'
+import {
+  Chip,
+  ChipCombobox,
+  ChipDatePicker,
+  ChipModal,
+  ChipModalBody,
+  ChipModalError,
+  ChipModalField,
+  ChipModalFooter,
+  ChipModalHeader,
+} from '@sim/emcn'
+import type { Person, PersonBody } from '@/lib/api/contracts/people'
+import { memberProfileFieldsSchema, PROFILE_TEXT_MAX_LENGTH } from '@/lib/people/validation'
+import { usePeoplePicker } from '@/app/o/[organizationId]/people/use-people-picker'
+import { useUpdatePerson } from '@/hooks/queries/people'
+
+type TextField = 'title' | 'department' | 'location'
+
+/** The picker's value for no manager; membership ids are never this. */
+const NO_MANAGER = 'no-manager'
+
+const TEXT_FIELDS: readonly { field: TextField; title: string; placeholder: string }[] = [
+  { field: 'title', title: 'Title', placeholder: 'Staff Engineer' },
+  { field: 'department', title: 'Department', placeholder: 'Engineering' },
+  { field: 'location', title: 'Location', placeholder: 'San Francisco' },
+]
+
+interface PersonModalProps {
+  organizationId: string
+  person: Person
+  onClose: () => void
+}
+
+/** Edits one person's profile; managers are chosen from the organization's people. */
+export function PersonModal({ organizationId, person, onClose }: PersonModalProps) {
+  const update = useUpdatePerson(organizationId)
+  const [draft, setDraft] = useState<PersonBody>({
+    title: person.title,
+    department: person.department,
+    location: person.location,
+    startDate: person.startDate,
+    managerMemberId: person.managerMemberId,
+  })
+  const [errors, setErrors] = useState<Partial<Record<keyof PersonBody, string>>>({})
+  /**
+   * The chosen manager's name, kept with the choice: the search results may no longer include them.
+   * Only a stored manager who is suspended has an id and no name.
+   */
+  const [managerName, setManagerName] = useState(person.manager?.name ?? null)
+  const { people, pickerProps } = usePeoplePicker(organizationId, 'members', person.memberId)
+  const managerLabel = draft.managerMemberId ? (managerName ?? 'Suspended member') : 'No manager'
+
+  const change = <K extends keyof PersonBody>(field: K, value: PersonBody[K]) => {
+    setDraft((current) => ({ ...current, [field]: value }))
+    setErrors((current) => ({ ...current, [field]: undefined }))
+    if (update.isError) update.reset()
+  }
+
+  const save = () => {
+    const parsed = memberProfileFieldsSchema.safeParse(draft)
+    if (!parsed.success) {
+      setErrors(
+        Object.fromEntries(
+          parsed.error.issues.map((issue) => [String(issue.path[0]), issue.message])
+        )
+      )
+      return
+    }
+    update.mutate({ memberId: person.memberId, body: parsed.data }, { onSuccess: onClose })
+  }
+
+  const title = `Edit ${person.name}`
+  return (
+    <ChipModal
+      open
+      onOpenChange={(open) => !open && onClose()}
+      dismissDisabled={update.isPending}
+      srTitle={title}
+    >
+      <ChipModalHeader onClose={onClose}>{title}</ChipModalHeader>
+      <ChipModalBody>
+        {TEXT_FIELDS.map(({ field, title: label, placeholder }) => (
+          <ChipModalField
+            key={field}
+            type='input'
+            disabled={update.isPending}
+            title={label}
+            placeholder={placeholder}
+            maxLength={PROFILE_TEXT_MAX_LENGTH}
+            value={draft[field] ?? ''}
+            onChange={(value) => change(field, value || null)}
+            error={errors[field]}
+          />
+        ))}
+        <ChipModalField type='custom' title='Start date' error={errors.startDate}>
+          {() => (
+            <div className='flex items-center gap-2'>
+              <ChipDatePicker
+                value={draft.startDate ?? undefined}
+                onChange={(value) => change('startDate', value)}
+                placeholder='Not recorded'
+                disabled={update.isPending}
+                fullWidth
+              />
+              {draft.startDate && (
+                <Chip disabled={update.isPending} onClick={() => change('startDate', null)}>
+                  Clear
+                </Chip>
+              )}
+            </div>
+          )}
+        </ChipModalField>
+        <ChipModalField type='custom' title='Manager' error={errors.managerMemberId}>
+          {() => (
+            <ChipCombobox
+              {...pickerProps}
+              aria-label='Manager'
+              options={[{ value: NO_MANAGER, label: 'No manager' }, ...pickerProps.options]}
+              value={draft.managerMemberId ?? NO_MANAGER}
+              onChange={(value) => {
+                const manager = people.find((candidate) => candidate.memberId === value)
+                setManagerName(manager?.name ?? null)
+                change('managerMemberId', manager?.memberId ?? null)
+              }}
+              overlayContent={managerLabel}
+              searchPlaceholder='Search people...'
+              emptyMessage='No one matches'
+              disabled={update.isPending}
+              className='w-full'
+            />
+          )}
+        </ChipModalField>
+        <ChipModalError>{update.error?.message}</ChipModalError>
+      </ChipModalBody>
+      <ChipModalFooter
+        onCancel={onClose}
+        primaryAction={{
+          label: update.isPending ? 'Saving' : 'Save',
+          disabled: update.isPending,
+          onClick: save,
+        }}
+      />
+    </ChipModal>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/people/[memberId]/person.tsx b/apps/sim/app/o/[organizationId]/people/[memberId]/person.tsx
new file mode 100644
index 00000000000..c4f9f04103e
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/[memberId]/person.tsx
@@ -0,0 +1,233 @@
+'use client'
+
+import { useState } from 'react'
+import { Avatar, Chip, ChipLink } from '@sim/emcn'
+import { ArrowLeft, Workflow } from '@sim/emcn/icons'
+import Link from 'next/link'
+import { useQueryStates } from 'nuqs'
+import { isApiClientError } from '@/lib/api/client/errors'
+import type { PersonSummary } from '@/lib/api/contracts/people'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import { PersonModal } from '@/app/o/[organizationId]/people/[memberId]/person-modal'
+import { peopleParsers, serializePeopleView } from '@/app/o/[organizationId]/people/search-params'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import {
+  CredentialDetailHeading,
+  CredentialDetailLayout,
+  DetailSection,
+} from '@/app/workspace/[workspaceId]/components/credential-detail'
+import {
+  SettingsEmptyState,
+  SettingsQueryErrorState,
+} from '@/app/workspace/[workspaceId]/settings/components/settings-empty-state'
+import { SettingsField } from '@/app/workspace/[workspaceId]/settings/components/settings-field'
+import {
+  RESOURCE_LIST_STACK,
+  SettingsResourceRow,
+} from '@/app/workspace/[workspaceId]/settings/components/settings-resource-row'
+import { usePerson } from '@/hooks/queries/people'
+
+const SOURCE_NAMES = {
+  scim: 'SCIM provisioning',
+  okta: 'Okta',
+  entra: 'Microsoft Entra ID',
+} as const
+const NOT_RECORDED = <p className='text-[var(--text-muted)] text-sm'>Not recorded</p>
+
+const START_DATE_FORMAT = new Intl.DateTimeFormat(undefined, {
+  dateStyle: 'medium',
+  timeZone: 'UTC',
+})
+
+/** `2024-01-31` as a calendar date, with how long ago it was: "Jan 31, 2024 · 2 yrs". */
+function describeStartDate(startDate: string): string {
+  const start = new Date(`${startDate}T00:00:00Z`)
+  const now = new Date()
+  const months =
+    (now.getUTCFullYear() - start.getUTCFullYear()) * 12 +
+    now.getUTCMonth() -
+    start.getUTCMonth() -
+    (now.getUTCDate() < start.getUTCDate() ? 1 : 0)
+  const tenure =
+    months < 0
+      ? 'starts soon'
+      : months < 1
+        ? 'new'
+        : months < 12
+          ? `${months} mo`
+          : `${Math.floor(months / 12)} yr${months >= 24 ? 's' : ''}`
+  return `${START_DATE_FORMAT.format(start)} · ${tenure}`
+}
+
+interface PersonRowsProps {
+  organizationId: string
+  originQuery: string
+  people: readonly PersonSummary[]
+  empty: string
+}
+
+function PersonRows({ organizationId, originQuery, people, empty }: PersonRowsProps) {
+  if (!people.length) return <SettingsEmptyState variant='inline'>{empty}</SettingsEmptyState>
+  const routes = organizationRoutes(organizationId)
+  return (
+    <div className={RESOURCE_LIST_STACK}>
+      {people.map((person) => (
+        <SettingsResourceRow
+          key={person.memberId}
+          iconVariant='custom'
+          icon={<Avatar size='md' name={person.name} src={person.image} aria-hidden />}
+          title={person.name}
+          description={person.title ?? person.email}
+          href={`${routes.person(person.memberId)}${originQuery}`}
+          clickLabel={`Open ${person.name}`}
+          navigable
+        />
+      ))}
+    </div>
+  )
+}
+
+interface PersonProps {
+  organizationId: string
+  memberId: string
+}
+
+/** One person's profile: what they do, where they are, and where they sit in the organization. */
+export function Person({ organizationId, memberId }: PersonProps) {
+  const { viewer } = useOrganizationContext()
+  const [origin] = useQueryStates(peopleParsers)
+  const query = usePerson(organizationId, memberId)
+  const [editing, setEditing] = useState(false)
+  const routes = organizationRoutes(organizationId)
+  const originQuery = serializePeopleView({ ...origin, view: origin.view ?? 'directory' })
+  const notFound = isApiClientError(query.error) && query.error.status === 404
+  const refused = isApiClientError(query.error) && query.error.status < 500
+  // A transient refresh failure keeps the loaded profile and any edit open on it; a refusal does not.
+  const loadError = query.data && !refused ? null : query.error
+  const data = loadError ? undefined : query.data
+
+  const chartHref = serializePeopleView(routes.people, {
+    ...origin,
+    view: 'chart',
+    focus: data?.person.memberId ?? memberId,
+    page: origin.focus === data?.person.memberId ? origin.page : 1,
+    panel: null,
+  })
+  return (
+    <CredentialDetailLayout
+      back={
+        <ChipLink href={`${routes.people}${originQuery}`} leftIcon={ArrowLeft}>
+          People
+        </ChipLink>
+      }
+      actions={
+        data ? (
+          <>
+            <ChipLink leftIcon={Workflow} href={chartHref}>
+              View in org chart
+            </ChipLink>
+            {viewer.isAdmin && !data.person.directorySource && (
+              <Chip onClick={() => setEditing(true)}>Edit</Chip>
+            )}
+          </>
+        ) : undefined
+      }
+    >
+      {loadError ? (
+        notFound ? (
+          <SettingsEmptyState variant='inline'>
+            This person isn't in your organization.
+          </SettingsEmptyState>
+        ) : (
+          <SettingsQueryErrorState
+            error={loadError}
+            fallback='Could not load this person'
+            isRetrying={query.isFetching}
+            onRetry={() => void query.refetch()}
+            variant='inline'
+          />
+        )
+      ) : !data ? (
+        <SettingsEmptyState variant='inline'>Loading…</SettingsEmptyState>
+      ) : (
+        <>
+          <CredentialDetailHeading
+            leading={
+              <Avatar size='lg' name={data.person.name} src={data.person.image} aria-hidden />
+            }
+            title={data.person.name}
+            subtitle={data.person.title}
+          />
+          <DetailSection title='Details'>
+            <div className='grid grid-cols-1 gap-x-6 gap-y-3.5 sm:grid-cols-2'>
+              <SettingsField label='Email'>
+                <a
+                  className='break-all text-[var(--text-body)] text-sm hover:underline'
+                  href={`mailto:${data.person.email}`}
+                >
+                  {data.person.email}
+                </a>
+              </SettingsField>
+              <SettingsField label='Department'>
+                {data.person.department ? (
+                  <Link
+                    className='break-all text-[var(--text-body)] text-sm hover:underline'
+                    href={serializePeopleView(routes.people, {
+                      ...origin,
+                      view: 'directory',
+                      search: '',
+                      panel: null,
+                      department: data.person.departmentKey ? null : data.person.department,
+                      departmentKey: data.person.departmentKey ?? null,
+                    })}
+                  >
+                    {data.person.department}
+                  </Link>
+                ) : (
+                  NOT_RECORDED
+                )}
+              </SettingsField>
+              {data.person.directorySource && (
+                <SettingsField label='Managed by'>
+                  {SOURCE_NAMES[data.person.directorySource]}
+                </SettingsField>
+              )}
+              <SettingsField label='Location'>{data.person.location ?? NOT_RECORDED}</SettingsField>
+              <SettingsField label='Start date'>
+                {data.person.startDate ? describeStartDate(data.person.startDate) : NOT_RECORDED}
+              </SettingsField>
+            </div>
+          </DetailSection>
+          <DetailSection title='Reports to'>
+            <PersonRows
+              organizationId={organizationId}
+              originQuery={originQuery}
+              people={data.chain}
+              empty={data.person.managerMemberId ? 'Manager is suspended.' : 'No manager recorded.'}
+            />
+          </DetailSection>
+          <DetailSection
+            title={data.totalReports ? `Direct reports (${data.totalReports})` : 'Direct reports'}
+          >
+            <PersonRows
+              organizationId={organizationId}
+              originQuery={originQuery}
+              people={data.reports}
+              empty='No one reports to this person.'
+            />
+            {data.totalReports > data.reports.length && (
+              <ChipLink href={chartHref}>Browse all {data.totalReports} reports</ChipLink>
+            )}
+          </DetailSection>
+        </>
+      )}
+      {editing && data && !data.person.directorySource && (
+        <PersonModal
+          organizationId={organizationId}
+          person={data.person}
+          onClose={() => setEditing(false)}
+        />
+      )}
+    </CredentialDetailLayout>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/people/chart-canvas.tsx b/apps/sim/app/o/[organizationId]/people/chart-canvas.tsx
new file mode 100644
index 00000000000..f7ae966a52d
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/chart-canvas.tsx
@@ -0,0 +1,299 @@
+'use client'
+
+import { type MouseEvent, useMemo } from 'react'
+import { Avatar, cn, OverflowText, Tooltip } from '@sim/emcn'
+import { ArrowUpRight, ChevronRight, Minus, Plus } from '@sim/emcn/icons'
+import {
+  BLOCK_DIMENSIONS,
+  CONNECTION_KNOB_PEAK_PX,
+  useCanvasColorMode,
+  WorkflowBlockBorder,
+  type WorkflowBorderPort,
+} from '@sim/workflow-renderer'
+import {
+  BaseEdge,
+  type Edge,
+  type EdgeProps,
+  Handle,
+  type Node,
+  type NodeProps,
+  Position,
+  ReactFlow,
+  useReactFlow,
+  useStore,
+} from '@xyflow/react'
+import Link from 'next/link'
+import { CanvasToolbar, CanvasToolbarButton } from '@/components/canvas-toolbar'
+import type { ChartBranch, PersonSummary } from '@/lib/api/contracts/people'
+import { organizationRoutes } from '@/lib/navigation/paths'
+
+import '@xyflow/react/dist/style.css'
+
+type CardData = {
+  person: PersonSummary
+  relation: 'Manager' | 'In focus' | 'Direct report'
+  department?: string | null
+  reportCount?: number
+  ports: WorkflowBorderPort[]
+  profileUrl: string
+  onFocus: (id: string, event: MouseEvent<HTMLButtonElement>) => void
+}
+type CardNode = Node<CardData, 'person'>
+const PORT_POSITIONS = {
+  top: Position.Top,
+  bottom: Position.Bottom,
+  left: Position.Left,
+  right: Position.Right,
+} as const
+const WIDTH = BLOCK_DIMENSIONS.FIXED_WIDTH
+const HEIGHT = BLOCK_DIMENSIONS.MIN_HEIGHT
+const LEVEL = HEIGHT + 48
+const COLUMN = WIDTH / 2 + 32
+
+function PersonCard({ data }: NodeProps<CardNode>) {
+  const { person, relation, reportCount, department, onFocus, profileUrl, ports } = data
+  const focused = relation === 'In focus'
+  const contents = (
+    <>
+      <WorkflowBlockBorder
+        ports={ports}
+        hasRing={false}
+        ringStyles=''
+        isSelected={focused}
+        width={WIDTH}
+        height={HEIGHT}
+        bodyFill='var(--person-card-fill)'
+        cursorSwellEnabled={false}
+      />
+      <span className='relative flex flex-1 items-center gap-2.5 px-3'>
+        <Avatar size='md' name={person.name} src={person.image} aria-hidden />
+        <span className={cn('flex min-w-0 flex-col gap-0.5', !focused && 'pr-5')}>
+          <OverflowText
+            label={person.name}
+            focusTarget='nearest-interactive'
+            className='font-medium text-[var(--text-primary)] text-base'
+          />
+          <OverflowText
+            label={person.title || person.email}
+            className='text-[var(--text-secondary)] text-small'
+          />
+        </span>
+      </span>
+      <span className='relative mx-3 flex h-8 min-w-0 shrink-0 items-center justify-between gap-2 border-[var(--border)] border-t text-[var(--text-secondary)] text-caption'>
+        <OverflowText label={focused ? department || relation : relation} />
+        <span className='flex shrink-0 items-center gap-1 text-[var(--text-body)]'>
+          {focused ? (
+            <>
+              View profile
+              <ArrowUpRight className='size-3.5' />
+            </>
+          ) : (
+            <>
+              {reportCount === undefined
+                ? 'Explore team'
+                : `${reportCount} report${reportCount === 1 ? '' : 's'}`}
+              <ChevronRight className='size-3.5' />
+            </>
+          )}
+        </span>
+      </span>
+    </>
+  )
+  const actionClass =
+    'nodrag nopan pointer-events-auto relative flex size-full cursor-pointer flex-col rounded-2xl bg-[var(--person-card-fill)] text-left outline-offset-2 [--person-card-fill:var(--surface-2)] hover-hover:[--person-card-fill:var(--surface-1)] focus-visible:outline-2 focus-visible:outline-[var(--brand-secondary)] [&_[data-workflow-block-border]_path]:pointer-events-none'
+  return (
+    <>
+      {ports.map((port) => (
+        <Handle
+          key={port.id}
+          type={port.side === Position.Bottom ? 'source' : 'target'}
+          position={PORT_POSITIONS[port.side]}
+          style={{ [port.side]: -CONNECTION_KNOB_PEAK_PX }}
+          className='pointer-events-none size-0! min-h-0! min-w-0! border-0! opacity-0'
+        />
+      ))}
+      {focused ? (
+        <Link
+          href={profileUrl}
+          className={actionClass}
+          aria-label={`View profile for ${person.name}`}
+        >
+          {contents}
+        </Link>
+      ) : (
+        <>
+          <button
+            type='button'
+            className={actionClass}
+            onClick={(event) => onFocus(person.memberId, event)}
+            aria-label={`Explore ${person.name}`}
+          >
+            {contents}
+          </button>
+          <Tooltip.Root>
+            <Tooltip.Trigger asChild>
+              <Link
+                href={profileUrl}
+                className='nodrag nopan pointer-events-auto absolute top-2 right-2 flex pointer-coarse:size-11 size-6 items-center justify-center rounded-sm text-[var(--text-icon)] hover:bg-[var(--surface-hover)] focus-visible:outline-2 focus-visible:outline-[var(--brand-secondary)]'
+                prefetch={false}
+                aria-label={`Open ${person.name}’s profile`}
+              >
+                <ArrowUpRight className='size-[14px]' />
+              </Link>
+            </Tooltip.Trigger>
+            <Tooltip.Content side='top'>View profile</Tooltip.Content>
+          </Tooltip.Root>
+        </>
+      )}
+    </>
+  )
+}
+
+function ReportingLine({ sourceX, sourceY, targetX, targetY }: EdgeProps) {
+  const direction = Math.sign(targetX - sourceX)
+  const radius = Math.min(9, Math.abs(targetX - sourceX), Math.abs(targetY - sourceY))
+  const path =
+    direction === 0
+      ? `M ${sourceX} ${sourceY} V ${targetY}`
+      : `M ${sourceX} ${sourceY} V ${targetY - radius} Q ${sourceX} ${targetY} ${sourceX + direction * radius} ${targetY} H ${targetX}`
+  return (
+    <BaseEdge
+      path={path}
+      className='stroke-[1.5]! stroke-[var(--text-placeholder)]!'
+      interactionWidth={0}
+    />
+  )
+}
+
+const NODE_TYPES = { person: PersonCard }
+const EDGE_TYPES = { reporting: ReportingLine }
+const MIN_ZOOM = 0.35
+const MAX_ZOOM = 1.6
+const FIT = { padding: 0.22, minZoom: 0.45, maxZoom: 1 }
+
+function ChartControls() {
+  const { zoomIn, zoomOut, fitView } = useReactFlow()
+  const zoom = useStore((state) => state.transform[2])
+  return (
+    <CanvasToolbar fitLabel='Fit chart' onFit={() => void fitView(FIT)}>
+      <CanvasToolbarButton
+        label='Zoom out'
+        icon={Minus}
+        disabled={zoom <= MIN_ZOOM}
+        onClick={() => void zoomOut()}
+      />
+      <CanvasToolbarButton
+        label='Zoom in'
+        icon={Plus}
+        disabled={zoom >= MAX_ZOOM}
+        onClick={() => void zoomIn()}
+      />
+    </CanvasToolbar>
+  )
+}
+
+interface ChartCanvasProps {
+  profileQuery: string
+  organizationId: string
+  branch: ChartBranch
+  onFocus: CardData['onFocus']
+}
+
+export function ChartCanvas({ organizationId, branch, onFocus, profileQuery }: ChartCanvasProps) {
+  const colorMode = useCanvasColorMode()
+  const { person, reports, chain } = branch
+  const { nodes, edges } = useMemo(() => {
+    const routes = organizationRoutes(organizationId)
+    const nodes: CardNode[] = []
+    const edges: Edge[] = []
+    function addCard(
+      member: PersonSummary,
+      relation: CardData['relation'],
+      x: number,
+      y: number,
+      sides: Position[],
+      reportCount?: number,
+      department?: string | null
+    ) {
+      nodes.push({
+        id: member.memberId,
+        type: 'person',
+        position: { x: x - WIDTH / 2, y },
+        width: WIDTH,
+        height: HEIGHT,
+        data: {
+          person: member,
+          relation,
+          ports: sides.map((side) => ({
+            id: side,
+            side,
+            position: 'center',
+            plateau: 14,
+            hoverAmplitude: 1,
+            magnetizable: false,
+          })),
+          profileUrl: `${routes.person(member.memberId)}${profileQuery}`,
+          reportCount,
+          department,
+          onFocus,
+        },
+      })
+    }
+    function connect(source: string, target: string) {
+      edges.push({ id: `${source}/${target}`, source, target, type: 'reporting' })
+    }
+    const manager = chain[0]
+    if (manager) {
+      addCard(manager, 'Manager', 0, -LEVEL, [Position.Bottom])
+      connect(manager.memberId, person.memberId)
+    }
+    const focusPorts = [
+      ...(manager ? [Position.Top] : []),
+      ...(reports.length ? [Position.Bottom] : []),
+    ]
+    addCard(person, 'In focus', 0, 0, focusPorts, undefined, person.department)
+    reports.forEach((report, i) => {
+      const single = reports.length === 1
+      const left = i % 2 === 0
+      addCard(
+        report,
+        'Direct report',
+        single ? 0 : left ? -COLUMN : COLUMN,
+        LEVEL + Math.floor(i / 2) * (HEIGHT + 24),
+        [single ? Position.Top : left ? Position.Right : Position.Left],
+        report.reportCount
+      )
+      connect(person.memberId, report.memberId)
+    })
+    return { nodes, edges }
+  }, [organizationId, person, chain, reports, profileQuery, onFocus])
+
+  return (
+    <div className='relative min-h-0 flex-1 bg-[var(--bg)]'>
+      <ReactFlow
+        colorMode={colorMode}
+        className='[--xy-background-color:var(--bg)]'
+        aria-label='Organization chart'
+        nodes={nodes}
+        edges={edges}
+        nodeTypes={NODE_TYPES}
+        edgeTypes={EDGE_TYPES}
+        proOptions={{ hideAttribution: true }}
+        minZoom={MIN_ZOOM}
+        maxZoom={MAX_ZOOM}
+        fitView
+        fitViewOptions={FIT}
+        panOnScroll
+        nodesDraggable={false}
+        nodesConnectable={false}
+        elementsSelectable={false}
+        nodesFocusable={false}
+        edgesFocusable={false}
+        zoomOnDoubleClick={false}
+        deleteKeyCode={null}
+      >
+        <ChartControls />
+      </ReactFlow>
+    </div>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/people/chart-empty-state.tsx b/apps/sim/app/o/[organizationId]/people/chart-empty-state.tsx
new file mode 100644
index 00000000000..19f60470747
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/chart-empty-state.tsx
@@ -0,0 +1,113 @@
+import type { MouseEvent, RefCallback } from 'react'
+import { Chip, ChipLink } from '@sim/emcn'
+import { ArrowUpRight, ChevronRight, RefreshCw, Upload } from '@sim/emcn/icons'
+import { EmptyState } from '@/components/empty-state/empty-state'
+import type { PersonSummary } from '@/lib/api/contracts/people'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import { HAIRLINE } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/hairline'
+import { usePeople } from '@/hooks/queries/people'
+
+function ReportingLinesGraphic() {
+  return (
+    <svg viewBox='0 0 244 112' width='244' height='112' fill='none' aria-hidden='true'>
+      <path d='M122 35v15q0 6-6 6H61q-6 0-6 6v13m67-25q0 6 6 6h55q6 0 6 6v13' {...HAIRLINE} />
+      {[
+        [72, 1],
+        [5, 75],
+        [139, 75],
+      ].map(([x, y]) => (
+        <g key={x} transform={`translate(${x} ${y})`}>
+          <rect width='100' height='34' rx='9' fill='var(--bg)' {...HAIRLINE} />
+          <circle cx='18' cy='17' r='8' fill='var(--surface-4)' />
+          <rect
+            x='33'
+            y='11'
+            width='48'
+            height='4'
+            rx='2'
+            fill='var(--text-muted)'
+            opacity='0.42'
+          />
+          <rect
+            x='33'
+            y='20'
+            width='32'
+            height='3'
+            rx='1.5'
+            fill='var(--text-muted)'
+            opacity='0.22'
+          />
+        </g>
+      ))}
+    </svg>
+  )
+}
+
+interface ChartEmptyStateProps {
+  profileQuery: string
+  organizationId: string
+  person: PersonSummary
+  onFocus: (memberId: string, event: MouseEvent<HTMLButtonElement>) => void
+  currentPersonRef: RefCallback<HTMLAnchorElement>
+  onImport?: () => void
+  onSync?: () => void
+}
+
+export function ChartEmptyState({
+  organizationId,
+  profileQuery,
+  person,
+  onFocus,
+  currentPersonRef,
+  onImport,
+  onSync,
+}: ChartEmptyStateProps) {
+  const roots = usePeople(organizationId, '', '', { scope: 'roots' })
+  const firstTeam = roots.isSuccess ? roots.data.pages[0]?.people[0] : undefined
+  const emptyOrganization = roots.isSuccess && !firstTeam
+  const routes = organizationRoutes(organizationId)
+
+  return (
+    <EmptyState
+      graphic={<ReportingLinesGraphic />}
+      title={emptyOrganization ? 'No reporting lines yet' : `No reporting lines for ${person.name}`}
+      description={
+        emptyOrganization
+          ? onImport
+            ? 'Connect a directory, import people data, or add a manager to a profile to build your org chart.'
+            : 'Teams appear here when an administrator adds managers to people’s profiles.'
+          : 'This profile has no visible manager or direct reports.'
+      }
+      action={
+        <div className='flex flex-wrap items-center justify-center gap-2'>
+          {firstTeam ? (
+            <Chip
+              variant='primary'
+              rightIcon={ChevronRight}
+              onClick={(event) => onFocus(firstTeam.memberId, event)}
+            >
+              Explore a team
+            </Chip>
+          ) : emptyOrganization && onSync ? (
+            <Chip variant='primary' leftIcon={RefreshCw} onClick={onSync}>
+              Manage directory sync
+            </Chip>
+          ) : null}
+          {emptyOrganization && onImport && (
+            <Chip leftIcon={Upload} onClick={onImport}>
+              Import people
+            </Chip>
+          )}
+          <ChipLink
+            ref={currentPersonRef}
+            href={`${routes.person(person.memberId)}${profileQuery}`}
+            aria-label={`View profile for ${person.name}`}
+            rightIcon={ArrowUpRight}
+          >
+            View profile
+          </ChipLink>
+        </div>
+      }
+    />
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/people/columns.ts b/apps/sim/app/o/[organizationId]/people/columns.ts
new file mode 100644
index 00000000000..9a7a45f83fd
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/columns.ts
@@ -0,0 +1,15 @@
+import { Upload } from '@sim/emcn/icons'
+import type { ResourceColumn } from '@/app/workspace/[workspaceId]/components/resource/resource'
+
+/** Shared by the page and its loading chrome so the skeleton matches the table. */
+export const PEOPLE_COLUMNS = [
+  { id: 'name', header: 'Name', widthMultiplier: 1.4 },
+  { id: 'title', header: 'Title', widthMultiplier: 1.4 },
+  { id: 'department', header: 'Department' },
+  { id: 'location', header: 'Location' },
+  { id: 'manager', header: 'Manager', widthMultiplier: 1.2 },
+] as const satisfies readonly ResourceColumn[]
+
+export const PEOPLE_SEARCH_PLACEHOLDER = 'Search people...'
+
+export const IMPORT_PEOPLE_ACTION = { text: 'Import', icon: Upload } as const
diff --git a/apps/sim/app/o/[organizationId]/people/directory-sync-form.tsx b/apps/sim/app/o/[organizationId]/people/directory-sync-form.tsx
new file mode 100644
index 00000000000..9d68645cd42
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/directory-sync-form.tsx
@@ -0,0 +1,223 @@
+import { useState } from 'react'
+import {
+  Chip,
+  ChipLink,
+  ChipModal,
+  ChipModalBody,
+  ChipModalDescription,
+  ChipModalError,
+  ChipModalField,
+  ChipModalFooter,
+  ChipModalHeader,
+} from '@sim/emcn'
+import { isOrganizationSettingsSectionAvailable } from '@/components/settings/navigation'
+import {
+  type PeopleSyncConfig,
+  type PeopleSyncStatus,
+  peopleSyncConfigSchema,
+} from '@/lib/api/contracts/people-sync'
+import { flattenFieldErrors } from '@/lib/api/contracts/primitives'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import { useScimConnection } from '@/ee/scim/hooks/scim'
+import { serializeSsoSettings } from '@/ee/sso/search-params'
+import type { usePeopleSyncActions } from '@/hooks/queries/people-sync'
+
+interface DirectorySyncFormProps {
+  organizationId: string
+  source: PeopleSyncConfig['source']
+  name: string
+  current: PeopleSyncStatus | null
+  actions: ReturnType<typeof usePeopleSyncActions>
+  onBack: () => void
+  onClose: () => void
+}
+
+export function DirectorySyncForm({
+  organizationId,
+  source,
+  name,
+  current,
+  actions,
+  onBack,
+  onClose,
+}: DirectorySyncFormProps) {
+  const [domain, setDomain] = useState(current?.domain ?? '')
+  const [tenantId, setTenantId] = useState(current?.tenantId ?? '')
+  const [clientId, setClientId] = useState(current?.clientId ?? '')
+  const [secret, setSecret] = useState('')
+  const [fieldErrors, setFieldErrors] = useState<
+    Partial<Record<'domain' | 'token' | 'tenantId' | 'clientId' | 'clientSecret', string>>
+  >({})
+  const { settingsFeatures } = useOrganizationContext()
+  const provisioning = useScimConnection(organizationId, source === 'scim')
+  const scimReady = provisioning.isSuccess && provisioning.data.connection?.status === 'active'
+  const title = current ? `Update ${name} credentials` : `Connect ${name}`
+  const disabled = actions.pending
+  const canSubmit =
+    source === 'scim'
+      ? scimReady
+      : secret.trim() && (source === 'okta' ? domain.trim() : tenantId.trim() && clientId.trim())
+
+  function connect() {
+    if (disabled) return
+    const config = peopleSyncConfigSchema.safeParse(
+      source === 'okta'
+        ? { source, domain, token: secret }
+        : source === 'entra'
+          ? { source, tenantId: tenantId.trim(), clientId: clientId.trim(), clientSecret: secret }
+          : { source }
+    )
+    if (!config.success) {
+      setFieldErrors(flattenFieldErrors(config.error))
+      return
+    }
+    setFieldErrors({})
+    actions.configure(config.data, onBack)
+  }
+
+  return (
+    <ChipModal open onOpenChange={(open) => !open && onClose()} srTitle={title}>
+      <ChipModalHeader onClose={onClose}>{title}</ChipModalHeader>
+      <ChipModalBody>
+        <ChipModalDescription>
+          {source === 'okta'
+            ? 'Use an Okta API token with permission to list users in your organization.'
+            : source === 'entra'
+              ? 'Register an app in your Microsoft Entra tenant and grant administrator consent for the Microsoft Graph User.Read.All application permission. Use the client secret value.'
+              : 'Use profiles from your organization’s existing SCIM provisioning connection.'}
+        </ChipModalDescription>
+        {source === 'okta' && (
+          <>
+            <ChipModalField
+              type='input'
+              title='Okta domain'
+              error={fieldErrors.domain}
+              placeholder='company.okta.com'
+              value={domain}
+              onChange={setDomain}
+              disabled={disabled || Boolean(current?.domain)}
+              autoComplete='off'
+            />
+            <ChipModalField
+              type='input'
+              title='API token'
+              error={fieldErrors.token}
+              inputType='password'
+              value={secret}
+              onChange={setSecret}
+              disabled={disabled}
+              autoComplete='off'
+            />
+            <div className='px-2'>
+              <ChipLink
+                href='https://developer.okta.com/docs/guides/create-an-api-token/main/'
+                target='_blank'
+                rel='noreferrer'
+              >
+                Create an Okta API token
+              </ChipLink>
+            </div>
+          </>
+        )}
+        {source === 'entra' && (
+          <>
+            <ChipModalField
+              type='input'
+              title='Tenant ID'
+              error={fieldErrors.tenantId}
+              placeholder='Directory (tenant) ID'
+              value={tenantId}
+              onChange={setTenantId}
+              disabled={disabled || Boolean(current?.tenantId)}
+              autoComplete='off'
+            />
+            <ChipModalField
+              type='input'
+              title='Client ID'
+              error={fieldErrors.clientId}
+              placeholder='Application (client) ID'
+              value={clientId}
+              onChange={setClientId}
+              disabled={disabled}
+              autoComplete='off'
+            />
+            <ChipModalField
+              type='input'
+              title='Client secret'
+              error={fieldErrors.clientSecret}
+              inputType='password'
+              placeholder='Client secret value'
+              value={secret}
+              onChange={setSecret}
+              disabled={disabled}
+              autoComplete='off'
+            />
+            <div className='px-2'>
+              <ChipLink
+                href='https://learn.microsoft.com/en-us/entra/identity-platform/quickstart-register-app'
+                target='_blank'
+                rel='noreferrer'
+              >
+                Register an application
+              </ChipLink>
+            </div>
+          </>
+        )}
+        {source === 'scim' && (
+          <>
+            <ChipModalField type='custom' title='Provisioning connection'>
+              {() => (
+                <div aria-live='polite'>
+                  <p className='text-[var(--text-body)] text-small'>
+                    {provisioning.isPending
+                      ? 'Checking provisioning…'
+                      : provisioning.isError
+                        ? 'Could not read the provisioning connection.'
+                        : scimReady
+                          ? 'Active'
+                          : 'Enable provisioning before connecting this source.'}
+                  </p>
+                  {isOrganizationSettingsSectionAvailable('sso', settingsFeatures) && (
+                    <ChipLink
+                      href={serializeSsoSettings(
+                        organizationRoutes(organizationId).settingsSection('sso'),
+                        { tab: 'provisioning' }
+                      )}
+                    >
+                      Manage provisioning
+                    </ChipLink>
+                  )}
+                  {!provisioning.isFetching && !scimReady && (
+                    <Chip onClick={() => void provisioning.refetch()}>Check again</Chip>
+                  )}
+                </div>
+              )}
+            </ChipModalField>
+          </>
+        )}
+        {source !== 'scim' && (
+          <ChipModalDescription>
+            Sim stores these credentials encrypted for scheduled syncs.
+          </ChipModalDescription>
+        )}
+        {disabled && (
+          <ChipModalDescription>
+            Sync is running. You can close this window and return for the result.
+          </ChipModalDescription>
+        )}
+        <ChipModalError>{actions.error?.message}</ChipModalError>
+      </ChipModalBody>
+      <ChipModalFooter
+        onCancel={onBack}
+        cancelLabel='Back'
+        cancelDisabled={disabled}
+        primaryAction={{
+          label: disabled ? 'Syncing…' : current ? 'Save and sync' : 'Connect and sync',
+          disabled: Boolean(disabled || !canSubmit),
+          onClick: connect,
+        }}
+      />
+    </ChipModal>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/people/directory-sync-modal.tsx b/apps/sim/app/o/[organizationId]/people/directory-sync-modal.tsx
new file mode 100644
index 00000000000..062b4589bf0
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/directory-sync-modal.tsx
@@ -0,0 +1,289 @@
+import { useState } from 'react'
+import {
+  Badge,
+  Chip,
+  ChipConfirmModal,
+  ChipModal,
+  ChipModalBody,
+  ChipModalDescription,
+  ChipModalError,
+  ChipModalField,
+  ChipModalFooter,
+  ChipModalHeader,
+} from '@sim/emcn'
+import type { PeopleSyncConfig, PeopleSyncStatus } from '@/lib/api/contracts/people-sync'
+import { useDeploymentShape } from '@/lib/core/config/deployment-shape'
+import { DirectorySyncForm } from '@/app/o/[organizationId]/people/directory-sync-form'
+import { IMPORT_SOURCES } from '@/app/o/[organizationId]/people/import-source'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import {
+  RESOURCE_LIST_STACK,
+  SettingsResourceRow,
+} from '@/app/workspace/[workspaceId]/settings/components/settings-resource-row'
+import {
+  isDirectorySyncAccessError,
+  usePeopleSyncActions,
+  usePeopleSyncStatus,
+} from '@/hooks/queries/people-sync'
+
+const SOURCES = {
+  okta: IMPORT_SOURCES.okta,
+  entra: IMPORT_SOURCES.entra,
+  scim: IMPORT_SOURCES.directory,
+} as const
+const STATES = {
+  scheduled: { label: 'Connected', variant: 'green' },
+  syncing: { label: 'Syncing', variant: 'amber' },
+  queued: { label: 'Queued', variant: 'amber' },
+  failed: { label: 'Sync failed', variant: 'red' },
+  paused: { label: 'Paused', variant: 'orange' },
+} as const
+const dateFormat = new Intl.DateTimeFormat(undefined, { dateStyle: 'medium', timeStyle: 'short' })
+const PHASE_LABELS = {
+  users: 'Reading people',
+  relationships: 'Reading reporting lines',
+  publish: 'Validating and publishing',
+} as const
+
+interface DirectorySyncModalProps {
+  organizationId: string
+  onClose: () => void
+}
+
+interface SyncStatusProps {
+  sync: PeopleSyncStatus
+}
+function SyncStatus({ sync }: SyncStatusProps) {
+  const paused = sync.state === 'paused'
+  const { label, variant } =
+    !paused && sync.retryBlocked && sync.state !== 'syncing'
+      ? { label: 'Waiting to retry', variant: 'amber' as const }
+      : sync.progress && sync.state === 'queued'
+        ? { label: 'Refresh in progress', variant: 'blue' as const }
+        : STATES[sync.state]
+  const { progress } = sync
+  const dates = [
+    ['Last attempted', sync.lastAttemptAt],
+    ['Last successful sync', sync.lastSuccessAt],
+    ...(sync.lastFailedAt ? [['Last failed sync', sync.lastFailedAt]] : []),
+    ...(!paused
+      ? [sync.retryAt ? ['Next retry', sync.retryAt] : ['Next scheduled sync', sync.nextSyncAt]]
+      : []),
+  ] as const
+  return (
+    <>
+      <ChipModalField type='custom' title='Connection'>
+        {() => (
+          <div className='flex flex-wrap items-center justify-between gap-2'>
+            <span className='min-w-0 break-words text-[var(--text-body)] text-small'>
+              {SOURCES[sync.source].name}
+              {sync.domain && ` · ${sync.domain}`}
+            </span>
+            <span aria-live='polite'>
+              <Badge variant={variant} dot>
+                {label}
+              </Badge>
+            </span>
+          </div>
+        )}
+      </ChipModalField>
+      {progress && !paused && (
+        <ChipModalField type='custom' title='Current refresh'>
+          {() => (
+            <div aria-live='polite' className='flex flex-col gap-1 text-small'>
+              <p className='text-[var(--text-body)]'>
+                {PHASE_LABELS[progress.phase]} · {progress.usersRead.toLocaleString()} users read
+              </p>
+              <p className='text-[var(--text-muted)]'>
+                The chart updates after the full directory has been validated.
+              </p>
+            </div>
+          )}
+        </ChipModalField>
+      )}
+      <ChipModalField type='custom' title='Activity'>
+        {() => (
+          <dl className='flex flex-col gap-2 text-small'>
+            {dates.map(([label, value]) => (
+              <div className='flex flex-wrap justify-between gap-x-3 gap-y-1' key={label}>
+                <dt className='text-[var(--text-muted)]'>{label}</dt>
+                <dd className='text-[var(--text-body)]'>
+                  {value ? <time dateTime={value}>{dateFormat.format(new Date(value))}</time> : '—'}
+                </dd>
+              </div>
+            ))}
+          </dl>
+        )}
+      </ChipModalField>
+      {sync.lastError &&
+        (paused ? (
+          <ChipModalDescription>Last sync error: {sync.lastError}</ChipModalDescription>
+        ) : (
+          <ChipModalError>{sync.lastError}</ChipModalError>
+        ))}
+    </>
+  )
+}
+
+export function DirectorySyncModal({ organizationId, onClose }: DirectorySyncModalProps) {
+  const { settingsFeatures } = useOrganizationContext()
+  const { features, hosted } = useDeploymentShape()
+  const canProvision = features.scim && (!hosted || settingsFeatures.hasEnterprisePlan)
+  const query = usePeopleSyncStatus(organizationId)
+  const actions = usePeopleSyncActions(organizationId)
+  const [mode, setMode] = useState<PeopleSyncConfig['source'] | 'disconnect' | null>(null)
+  const status = isDirectorySyncAccessError(query.error) ? undefined : query.data
+  const sync = status?.sync ?? null
+  const activeMode = status ? mode : null
+  const goBack = () => {
+    setMode(null)
+    actions.reset()
+  }
+  if (activeMode === 'disconnect')
+    return (
+      <ChipConfirmModal
+        open
+        onOpenChange={(open) => !open && goBack()}
+        title='Disconnect directory'
+        text='Disconnecting removes the profile details and reporting lines supplied by this directory. Sim keeps organization memberships and manually recorded profiles.'
+        confirm={{
+          label: 'Disconnect',
+          pending: actions.pending,
+          pendingLabel: 'Disconnecting…',
+          onClick: () => actions.disconnect(goBack),
+        }}
+      >
+        <ChipModalError>{actions.error?.message}</ChipModalError>
+      </ChipConfirmModal>
+    )
+  if (activeMode)
+    return (
+      <DirectorySyncForm
+        key={activeMode}
+        organizationId={organizationId}
+        source={activeMode}
+        name={SOURCES[activeMode].name}
+        current={sync}
+        actions={actions}
+        onBack={goBack}
+        onClose={onClose}
+      />
+    )
+  const title = 'Directory sync'
+  const syncing = sync?.state === 'syncing' || actions.pending
+  const paused = sync?.state === 'paused'
+  const waitingToRetry = Boolean(sync?.retryBlocked)
+  return (
+    <ChipModal open onOpenChange={(open) => !open && onClose()} srTitle={title}>
+      <ChipModalHeader onClose={onClose}>{title}</ChipModalHeader>
+      <ChipModalBody>
+        {query.isPending ? (
+          <ChipModalDescription>Loading directory connection…</ChipModalDescription>
+        ) : query.isError && !status ? (
+          <>
+            <ChipModalError>{query.error.message}</ChipModalError>
+            <div className='px-2'>
+              <Chip disabled={query.isFetching} onClick={() => void query.refetch()}>
+                Retry connection
+              </Chip>
+            </div>
+          </>
+        ) : sync ? (
+          <>
+            <ChipModalDescription>
+              {paused
+                ? 'SCIM provisioning is disabled. Re-enable it in organization settings to resume updates. Your last published chart remains available.'
+                : 'People updates from this directory automatically. You can also start a sync now.'}
+            </ChipModalDescription>
+            <SyncStatus sync={sync} />
+            <div className='flex flex-wrap gap-1 px-2'>
+              {sync.source !== 'scim' && (
+                <Chip
+                  disabled={syncing}
+                  onClick={() => {
+                    actions.reset()
+                    setMode(sync.source)
+                  }}
+                >
+                  Update credentials
+                </Chip>
+              )}
+              <Chip
+                disabled={actions.pending}
+                onClick={() => {
+                  actions.reset()
+                  setMode('disconnect')
+                }}
+              >
+                Disconnect
+              </Chip>
+            </div>
+            {actions.action === 'run' && !paused && (
+              <ChipModalDescription>
+                Sync is running. You can close this window and return for the result.
+              </ChipModalDescription>
+            )}
+            <ChipModalError>{actions.error?.message}</ChipModalError>
+          </>
+        ) : (
+          <>
+            <ChipModalDescription>
+              Connect a directory to keep profiles and reporting lines up to date.
+            </ChipModalDescription>
+            <ChipModalField type='custom' title='Source'>
+              {() => (
+                <div className={RESOURCE_LIST_STACK}>
+                  {(['okta', 'entra', 'scim'] as const).map((source) => {
+                    if (source === 'scim' && !canProvision) return null
+                    const { name, icon: Icon } = SOURCES[source]
+                    return (
+                      <SettingsResourceRow
+                        key={source}
+                        title={name}
+                        description={
+                          source === 'okta'
+                            ? 'Connect with an API token'
+                            : source === 'entra'
+                              ? 'Connect with an app registration'
+                              : 'Use your active provisioning connection'
+                        }
+                        icon={<Icon aria-hidden />}
+                        clickLabel={`Connect ${name}`}
+                        onClick={() => setMode(source)}
+                        navigable
+                      />
+                    )
+                  })}
+                </div>
+              )}
+            </ChipModalField>
+          </>
+        )}
+      </ChipModalBody>
+      <ChipModalFooter
+        onCancel={onClose}
+        cancelLabel='Close'
+        defaultAction='none'
+        primaryAction={
+          sync
+            ? {
+                label: paused
+                  ? 'Sync paused'
+                  : syncing
+                    ? 'Syncing…'
+                    : waitingToRetry
+                      ? 'Waiting to retry'
+                      : sync.state === 'failed'
+                        ? 'Retry sync'
+                        : sync.progress
+                          ? 'Continue sync'
+                          : 'Sync now',
+                disabled: paused || syncing || waitingToRetry,
+                onClick: actions.run,
+              }
+            : undefined
+        }
+      />
+    </ChipModal>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/people/import-source.tsx b/apps/sim/app/o/[organizationId]/people/import-source.tsx
new file mode 100644
index 00000000000..b1b0d1d0872
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/import-source.tsx
@@ -0,0 +1,183 @@
+import { Chip, ChipLink, ChipModalDescription, ChipModalField } from '@sim/emcn'
+import { ShieldCheck, Table } from '@sim/emcn/icons'
+import { MicrosoftIcon, OktaIcon } from '@/components/icons'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import {
+  RESOURCE_LIST_STACK,
+  SettingsResourceRow,
+} from '@/app/workspace/[workspaceId]/settings/components/settings-resource-row'
+import type { useScimConnection } from '@/ee/scim/hooks/scim'
+import { serializeSsoSettings } from '@/ee/sso/search-params'
+
+export const IMPORT_SOURCES = {
+  okta: { name: 'Okta', description: 'Read profiles from your Okta directory', icon: OktaIcon },
+  entra: {
+    name: 'Microsoft Entra ID',
+    description: 'Read profiles from Microsoft Graph',
+    icon: MicrosoftIcon,
+  },
+  directory: {
+    name: 'SCIM provisioning',
+    description: 'Use directory data already provisioned to Sim',
+    icon: ShieldCheck,
+  },
+  file: { name: 'Spreadsheet', description: 'Upload a CSV or Excel file', icon: Table },
+} as const
+
+export type ImportSource = keyof typeof IMPORT_SOURCES
+
+interface ImportSourcePickerProps {
+  canProvision: boolean
+  onChoose: (source: ImportSource) => void
+}
+
+export function ImportSourcePicker({ canProvision, onChoose }: ImportSourcePickerProps) {
+  return (
+    <>
+      <ChipModalDescription>
+        Choose a source for a one-time update to members’ job titles, departments, and reporting
+        lines.
+      </ChipModalDescription>
+      <ChipModalField type='custom' title='Source'>
+        {() => (
+          <div className={RESOURCE_LIST_STACK}>
+            {(['okta', 'entra', 'directory', 'file'] as const).map((source) => {
+              if (source === 'directory' && !canProvision) return null
+              const { name, description, icon: Icon } = IMPORT_SOURCES[source]
+              return (
+                <SettingsResourceRow
+                  key={source}
+                  icon={<Icon aria-hidden />}
+                  title={name}
+                  description={description}
+                  clickLabel={name}
+                  onClick={() => onChoose(source)}
+                  navigable
+                />
+              )
+            })}
+          </div>
+        )}
+      </ChipModalField>
+    </>
+  )
+}
+
+interface ProviderFieldsProps {
+  source: 'okta' | 'entra'
+  domain: string
+  onDomainChange: (value: string) => void
+  token: string
+  onTokenChange: (value: string) => void
+  disabled: boolean
+}
+
+export function ProviderFields({
+  source,
+  domain,
+  onDomainChange,
+  token,
+  onTokenChange,
+  disabled,
+}: ProviderFieldsProps) {
+  const okta = source === 'okta'
+  return (
+    <>
+      <ChipModalDescription>
+        {okta
+          ? 'Use an Okta API token that can read users in your organization.'
+          : 'In Graph Explorer, sign in with your work or school account, grant delegated User.Read.All permission, and copy your access token. Microsoft commercial cloud is supported.'}{' '}
+        Sim uses the token for this import only.
+      </ChipModalDescription>
+      {okta && (
+        <ChipModalField
+          type='input'
+          title='Okta domain'
+          placeholder='company.okta.com'
+          value={domain}
+          autoComplete='off'
+          disabled={disabled}
+          onChange={onDomainChange}
+        />
+      )}
+      <ChipModalField
+        type='input'
+        title={okta ? 'API token' : 'Access token'}
+        inputType='password'
+        placeholder={okta ? 'Paste your token without SSWS' : 'Paste your token without Bearer'}
+        autoComplete='off'
+        value={token}
+        onChange={onTokenChange}
+        disabled={disabled}
+      />
+      <div className='px-2'>
+        <ChipLink
+          href={
+            okta
+              ? 'https://developer.okta.com/docs/guides/create-an-api-token/main/'
+              : 'https://developer.microsoft.com/en-us/graph/graph-explorer'
+          }
+          target='_blank'
+          rel='noreferrer'
+        >
+          {okta ? 'Create an Okta API token' : 'Open Graph Explorer'}
+        </ChipLink>
+      </div>
+    </>
+  )
+}
+
+interface ProvisioningSourceProps {
+  organizationId: string
+  connection: ReturnType<typeof useScimConnection>
+  canOpenSettings: boolean
+}
+
+export function ProvisioningSource({
+  organizationId,
+  connection,
+  canOpenSettings,
+}: ProvisioningSourceProps) {
+  const directory = connection.data?.connection
+  const active = directory?.status === 'active'
+  return (
+    <>
+      <ChipModalDescription>
+        {connection.isLoading
+          ? 'Checking your provisioning connection…'
+          : connection.isError
+            ? 'Could not load your provisioning connection.'
+            : !active
+              ? 'Enable SCIM provisioning and assign accounts in your provider to import their profiles.'
+              : directory.userCount === 0
+                ? 'Your connection is active. Assign accounts to Sim in your identity provider, then refresh here.'
+                : `Your connection has ${directory.userCount} provisioned ${directory.userCount === 1 ? 'account' : 'accounts'}. Preview the profile fields and reporting lines sent by your provider.`}
+      </ChipModalDescription>
+      <div className='flex flex-wrap gap-1 px-2'>
+        {canOpenSettings && !connection.isLoading && !connection.error && (
+          <ChipLink
+            href={serializeSsoSettings(organizationRoutes(organizationId).settingsSection('sso'), {
+              tab: 'provisioning',
+            })}
+          >
+            {active ? 'Manage provisioning' : 'Set up provisioning'}
+          </ChipLink>
+        )}
+        {!connection.isLoading && !active && (
+          <ChipLink
+            href='https://docs.sim.ai/platform/enterprise/scim'
+            target='_blank'
+            rel='noreferrer'
+          >
+            Provisioning guide
+          </ChipLink>
+        )}
+        {!connection.isLoading && (
+          <Chip disabled={connection.isFetching} onClick={() => void connection.refetch()}>
+            {connection.isError ? 'Retry connection' : 'Refresh'}
+          </Chip>
+        )}
+      </div>
+    </>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/people/loading-status.tsx b/apps/sim/app/o/[organizationId]/people/loading-status.tsx
new file mode 100644
index 00000000000..d5bcd1daf60
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/loading-status.tsx
@@ -0,0 +1,17 @@
+import { Loader } from '@sim/emcn'
+
+interface LoadingStatusProps {
+  children: string
+}
+
+export function LoadingStatus({ children }: LoadingStatusProps) {
+  return (
+    <div
+      role='status'
+      className='m-auto flex items-center gap-2 text-[var(--text-muted)] text-small'
+    >
+      <Loader animate />
+      {children}
+    </div>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/people/loading.tsx b/apps/sim/app/o/[organizationId]/people/loading.tsx
index 4a966f50016..0bedf388c48 100644
--- a/apps/sim/app/o/[organizationId]/people/loading.tsx
+++ b/apps/sim/app/o/[organizationId]/people/loading.tsx
@@ -1,10 +1,14 @@
-import { RedesignPageSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
-import { PeopleSkeleton } from '@/platform/app/(shell)/people/_components/people-page/people-skeleton'
+'use client'
+
+import { Users } from '@sim/emcn/icons'
+import { LoadingStatus } from '@/app/o/[organizationId]/people/loading-status'
+import { Resource } from '@/app/workspace/[workspaceId]/components/resource/resource'
 
 export default function PeopleLoading() {
   return (
-    <RedesignPageSurface>
-      <PeopleSkeleton />
-    </RedesignPageSurface>
+    <Resource>
+      <Resource.Header icon={Users} title='People' />
+      <LoadingStatus>Loading people…</LoadingStatus>
+    </Resource>
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/people/page.tsx b/apps/sim/app/o/[organizationId]/people/page.tsx
index dc128179cd7..a8927477798 100644
--- a/apps/sim/app/o/[organizationId]/people/page.tsx
+++ b/apps/sim/app/o/[organizationId]/people/page.tsx
@@ -3,12 +3,10 @@ import type { Metadata } from 'next'
 import { notFound, redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
 import { organizationRoutes } from '@/lib/navigation/paths'
-import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
-import { canBrowsePeople } from '@/lib/people/feature-flag'
+import { isPeopleEnabled } from '@/lib/people/feature-flag'
 import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
-import { RedesignPageSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
-import { PeoplePage as PeopleView } from '@/platform/app/(shell)/people/_components/people-page/people-page'
-import { PeopleSkeleton } from '@/platform/app/(shell)/people/_components/people-page/people-skeleton'
+import PageLoading from '@/app/o/[organizationId]/people/loading'
+import { People } from '@/app/o/[organizationId]/people/people'
 
 export const metadata: Metadata = { title: 'People' }
 
@@ -26,13 +24,10 @@ export default async function PeoplePage({ params }: PeoplePageProps) {
         isInviteFlow: false,
       })
     )
-  const context = await getOrganizationSurfaceContext(organizationId, session.user.id)
-  if (!context || !(await canBrowsePeople(organizationId, context.viewer.role))) notFound()
+  if (!(await isPeopleEnabled(organizationId))) notFound()
   return (
-    <RedesignPageSurface>
-      <Suspense fallback={<PeopleSkeleton />}>
-        <PeopleView organizationId={organizationId} />
-      </Suspense>
-    </RedesignPageSurface>
+    <Suspense fallback={<PageLoading />}>
+      <People organizationId={organizationId} />
+    </Suspense>
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/people/people-chart.tsx b/apps/sim/app/o/[organizationId]/people/people-chart.tsx
new file mode 100644
index 00000000000..d8a07255ebf
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/people-chart.tsx
@@ -0,0 +1,290 @@
+'use client'
+
+import {
+  Fragment,
+  type MouseEvent,
+  type ReactNode,
+  useCallback,
+  useLayoutEffect,
+  useRef,
+} from 'react'
+import {
+  Button,
+  Chip,
+  ChipCombobox,
+  cn,
+  scrollFadeAttributes,
+  scrollFadeXClass,
+  useScrollEdges,
+} from '@sim/emcn'
+import { ChevronLeft, ChevronRight, Search } from '@sim/emcn/icons'
+import { useQueryStates } from 'nuqs'
+import { EmptyState } from '@/components/empty-state/empty-state'
+import { isApiClientError } from '@/lib/api/client/errors'
+import { ChartCanvas } from '@/app/o/[organizationId]/people/chart-canvas'
+import { ChartEmptyState } from '@/app/o/[organizationId]/people/chart-empty-state'
+import { LoadingStatus } from '@/app/o/[organizationId]/people/loading-status'
+import {
+  peopleParsers,
+  peopleUrlKeys,
+  serializePeopleView,
+} from '@/app/o/[organizationId]/people/search-params'
+import { usePeoplePicker } from '@/app/o/[organizationId]/people/use-people-picker'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import { ResourceLoadError } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state'
+import { usePeopleChart } from '@/hooks/queries/people'
+import { useIsMobile } from '@/hooks/use-is-mobile'
+
+interface PeopleChartProps {
+  organizationId: string
+  onImport?: () => void
+  onSync?: () => void
+  viewSwitch: ReactNode
+}
+
+interface FindPersonProps {
+  rootsLabel?: string
+  organizationId: string
+  onSelect: (id: string) => void
+}
+
+function FindPerson({ organizationId, onSelect, rootsLabel }: FindPersonProps) {
+  const { search, pickerProps } = usePeoplePicker(organizationId, rootsLabel ? 'roots' : undefined)
+  return (
+    <ChipCombobox
+      aria-label={rootsLabel ? 'Browse top-level teams' : 'Find a person'}
+      {...pickerProps}
+      overlayContent={
+        rootsLabel ?? (
+          <span className='flex items-center gap-2'>
+            <Search className='size-[14px]' />
+            Find a person
+          </span>
+        )
+      }
+      overlayLabel={rootsLabel ?? 'Find a person'}
+      placeholder={rootsLabel ?? 'Find a person'}
+      searchPlaceholder={rootsLabel ? 'Search team leads…' : 'Search name, title or email…'}
+      className={rootsLabel ? 'max-w-48' : 'w-44 max-w-full'}
+      dropdownWidth={300}
+      align='start'
+      onChange={onSelect}
+      emptyMessage={
+        rootsLabel && !search ? 'No top-level teams with reporting lines yet' : 'No matching people'
+      }
+    />
+  )
+}
+
+interface ReportingPathProps {
+  children: ReactNode
+}
+
+function ReportingPath({ children }: ReportingPathProps) {
+  const scrollRef = useRef<HTMLDivElement>(null)
+  const edges = useScrollEdges(scrollRef, { axis: 'x' })
+  return (
+    <nav aria-label='Reporting path' className='shrink-0 border-[var(--border)] border-y'>
+      <div
+        ref={scrollRef}
+        className={cn('overflow-x-auto px-4 py-1.5 text-small', scrollFadeXClass)}
+        {...scrollFadeAttributes(edges)}
+      >
+        <div className='flex w-max min-w-full items-center gap-1'>{children}</div>
+      </div>
+    </nav>
+  )
+}
+
+export function PeopleChart({ organizationId, viewSwitch, onImport, onSync }: PeopleChartProps) {
+  const { organization } = useOrganizationContext()
+  const [origin, setView] = useQueryStates(peopleParsers, peopleUrlKeys)
+  const { focus, page } = origin
+  const size = useIsMobile() ? 1 : 4
+  const chart = usePeopleChart(organizationId, focus, Math.max(1, Math.min(page, 1_000_000)), size)
+  const notFound = isApiClientError(chart.error) && chart.error.status === 404
+  const refused = isApiClientError(chart.error) && chart.error.status < 500
+  // A transient refresh failure keeps the chart on screen; a refusal replaces it.
+  const branch = refused ? undefined : chart.data
+  const profileQuery = serializePeopleView({
+    ...origin,
+    view: 'chart',
+    focus: branch?.person.memberId ?? focus,
+    page: branch?.page ?? page,
+    panel: null,
+  })
+  const currentPerson = useRef<HTMLElement | null>(null)
+  const previousReports = useRef<HTMLButtonElement>(null)
+  const nextReports = useRef<HTMLButtonElement>(null)
+  const pendingFocus = useRef<{
+    focus: string
+    page: number
+    trigger: HTMLElement
+    target: 'person' | 'previous' | 'next'
+  } | null>(null)
+  const focusPerson = useCallback(
+    (id: string, event?: MouseEvent<HTMLButtonElement>) => {
+      pendingFocus.current =
+        event?.detail === 0
+          ? { focus: id, page: 1, trigger: event.currentTarget, target: 'person' }
+          : null
+      void setView({ focus: id, page: 1, view: 'chart' }, { history: 'push' })
+    },
+    [setView]
+  )
+  const changePage = (
+    value: number,
+    target: 'previous' | 'next',
+    event: MouseEvent<HTMLButtonElement>
+  ) => {
+    pendingFocus.current =
+      event.detail === 0 ? { focus, page: value, trigger: event.currentTarget, target } : null
+    void setView({ page: value })
+  }
+  useLayoutEffect(() => {
+    const pending = pendingFocus.current
+    if (!branch || !pending || pending.focus !== focus || pending.page !== page) return
+    pendingFocus.current = null
+    if (document.activeElement !== document.body && document.activeElement !== pending.trigger)
+      return
+    const controls =
+      pending.target === 'next'
+        ? [nextReports.current, previousReports.current]
+        : [previousReports.current, nextReports.current]
+    const target =
+      pending.target === 'person'
+        ? currentPerson.current
+        : (controls.find((button) => button && !button.disabled) ?? currentPerson.current)
+    target?.focus()
+  }, [branch, focus, page])
+  const setCurrentPerson = useCallback((element: HTMLElement | null) => {
+    currentPerson.current = element
+  }, [])
+  return (
+    <>
+      <div className='flex shrink-0 flex-wrap items-center justify-between gap-2 px-4 py-2'>
+        {viewSwitch}
+        <div className='flex max-w-full items-center gap-2'>
+          <div className='min-w-0'>
+            <FindPerson organizationId={organizationId} onSelect={focusPerson} />
+          </div>
+          <Chip onClick={(event) => focusPerson('', event)} disabled={!focus && page === 1}>
+            My position
+          </Chip>
+        </div>
+      </div>
+      {branch && !branch.chain.length && !branch.totalReports ? (
+        <div className='flex min-h-0 flex-1 flex-col overflow-y-auto border-[var(--border)] border-t'>
+          <ChartEmptyState
+            organizationId={organizationId}
+            person={branch.person}
+            profileQuery={profileQuery}
+            onFocus={focusPerson}
+            currentPersonRef={setCurrentPerson}
+            onImport={onImport}
+            onSync={onSync}
+          />
+        </div>
+      ) : branch ? (
+        <>
+          <ReportingPath>
+            <div className='shrink-0'>
+              <FindPerson
+                organizationId={organizationId}
+                rootsLabel={organization.name}
+                onSelect={focusPerson}
+              />
+            </div>
+            {branch.chain
+              .slice()
+              .reverse()
+              .map((manager) => (
+                <Fragment key={manager.memberId}>
+                  <ChevronRight aria-hidden className='size-3 shrink-0 text-[var(--text-muted)]' />
+                  <Chip onClick={(event) => focusPerson(manager.memberId, event)}>
+                    {manager.name}
+                  </Chip>
+                </Fragment>
+              ))}
+            <ChevronRight aria-hidden className='size-3 shrink-0 text-[var(--text-muted)]' />
+            <h2
+              ref={setCurrentPerson}
+              tabIndex={-1}
+              aria-current='page'
+              className='shrink-0 rounded-sm font-medium text-[var(--text-body)] focus-visible:outline-2 focus-visible:outline-[var(--brand-secondary)]'
+            >
+              {branch.person.name}
+            </h2>
+          </ReportingPath>
+          <ChartCanvas
+            key={`${branch.person.memberId}/${branch.page}/${size}`}
+            organizationId={organizationId}
+            branch={branch}
+            profileQuery={profileQuery}
+            onFocus={focusPerson}
+          />
+          <div
+            className='flex shrink-0 flex-wrap items-center justify-between gap-2 border-[var(--border)] border-t px-4 py-2 text-[var(--text-secondary)] text-small'
+            aria-live='polite'
+          >
+            <span>
+              {branch.totalReports
+                ? `${branch.totalReports} direct report${branch.totalReports === 1 ? '' : 's'}`
+                : 'No direct reports'}
+            </span>
+            {branch.totalReports > size && (
+              <div className='flex items-center gap-2'>
+                <span className='tabular-nums'>
+                  {size === 1
+                    ? branch.page
+                    : `${(branch.page - 1) * size + 1}–${(branch.page - 1) * size + branch.reports.length}`}{' '}
+                  of {branch.totalReports}
+                </span>
+                <Button
+                  ref={previousReports}
+                  aria-label='Previous reports'
+                  variant='ghost'
+                  size='icon'
+                  className='pointer-coarse:size-11'
+                  disabled={branch.page === 1}
+                  onClick={(event) => changePage(branch.page - 1, 'previous', event)}
+                >
+                  <ChevronLeft />
+                </Button>
+                <Button
+                  ref={nextReports}
+                  aria-label='Next reports'
+                  variant='ghost'
+                  size='icon'
+                  className='pointer-coarse:size-11'
+                  disabled={branch.page * size >= branch.totalReports}
+                  onClick={(event) => changePage(branch.page + 1, 'next', event)}
+                >
+                  <ChevronRight />
+                </Button>
+              </div>
+            )}
+          </div>
+        </>
+      ) : chart.error ? (
+        notFound ? (
+          <EmptyState
+            title='Person unavailable'
+            description='This person is no longer in your organization’s directory.'
+            action={
+              focus ? (
+                <Chip onClick={(event) => focusPerson('', event)}>My position</Chip>
+              ) : (
+                <Chip onClick={() => void setView({ view: 'directory' })}>Open directory</Chip>
+              )
+            }
+          />
+        ) : (
+          <ResourceLoadError message={chart.error.message} onRetry={() => void chart.refetch()} />
+        )
+      ) : (
+        <LoadingStatus>Loading org chart…</LoadingStatus>
+      )}
+    </>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/people/people-directory.tsx b/apps/sim/app/o/[organizationId]/people/people-directory.tsx
new file mode 100644
index 00000000000..9f7cac3bf23
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/people-directory.tsx
@@ -0,0 +1,227 @@
+'use client'
+
+import { useCallback, useMemo, useState } from 'react'
+import { Avatar, Chip, ChipCombobox } from '@sim/emcn'
+import Link from 'next/link'
+import { useRouter } from 'next/navigation'
+import { useQueryStates } from 'nuqs'
+import { EmptyState } from '@/components/empty-state/empty-state'
+import type { PersonSummary } from '@/lib/api/contracts/people'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import { PEOPLE_SEARCH_MAX_LENGTH } from '@/lib/people/validation'
+import { SEARCH_DEBOUNCE_MS } from '@/lib/url-state'
+import { PEOPLE_COLUMNS, PEOPLE_SEARCH_PLACEHOLDER } from '@/app/o/[organizationId]/people/columns'
+import { LoadingStatus } from '@/app/o/[organizationId]/people/loading-status'
+import {
+  peopleParsers,
+  peopleUrlKeys,
+  serializePeopleView,
+} from '@/app/o/[organizationId]/people/search-params'
+import {
+  ResourceLoadError,
+  ResourceNoResults,
+} from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state'
+import {
+  type FilterTag,
+  ResourceFilterPanel,
+  ResourceFilterSection,
+  type SearchConfig,
+} from '@/app/workspace/[workspaceId]/components/resource/components/resource-options'
+import {
+  Resource,
+  type ResourceRow,
+} from '@/app/workspace/[workspaceId]/components/resource/resource'
+import { useDepartments, usePeople } from '@/hooks/queries/people'
+import { useDebouncedSearchSetter } from '@/hooks/use-debounced-search-setter'
+import { useSearchFilterValue } from '@/hooks/use-search-filter-value'
+
+/** The filter's value for every department: stored text can't hold a NUL, so no department is this. */
+const KEY_PREFIX = '\u0000key:'
+const ALL_DEPARTMENTS = '\u0000all'
+
+function personCell(person: PersonSummary) {
+  return {
+    icon: <Avatar size='xs' name={person.name} src={person.image} aria-hidden />,
+    label: person.name,
+  }
+}
+
+interface PeopleProps {
+  organizationId: string
+}
+
+export function PeopleDirectory({ organizationId }: PeopleProps) {
+  const router = useRouter()
+  const [origin, setView] = useQueryStates(peopleParsers, peopleUrlKeys)
+  const { search, department, departmentKey } = origin
+  const setSearch = useDebouncedSearchSetter((value, options) =>
+    setView({ view: 'directory', search: value }, options)
+  )
+  const debouncedSearch = useSearchFilterValue(search, SEARCH_DEBOUNCE_MS)
+  const query = debouncedSearch.trim()
+  const people = usePeople(organizationId, query, department, { departmentKey })
+  const profileQuery = serializePeopleView({ ...origin, view: 'directory', panel: null })
+  const profileHref = useCallback(
+    (memberId: string) => `${organizationRoutes(organizationId).person(memberId)}${profileQuery}`,
+    [organizationId, profileQuery]
+  )
+
+  const [departmentSearch, setDepartmentSearch] = useState('')
+  const [departmentsOpen, setDepartmentsOpen] = useState(false)
+  const departmentTerm = useSearchFilterValue(departmentSearch, SEARCH_DEBOUNCE_MS).trim()
+  const departments = useDepartments(organizationId, departmentTerm, departmentsOpen)
+  const departmentWaiting = departmentSearch.trim() !== departmentTerm
+  const changingFilter = people.isPlaceholderData || query !== search.trim()
+
+  const visiblePages = people.isRefetchError || changingFilter ? undefined : people.data?.pages
+  const rows: ResourceRow[] = useMemo(
+    () =>
+      (visiblePages ?? []).flatMap((page) =>
+        page.people.map((person) => ({
+          id: person.memberId,
+          cells: {
+            name: {
+              content: (
+                <Link
+                  href={profileHref(person.memberId)}
+                  prefetch={false}
+                  onClick={(event) => event.stopPropagation()}
+                  className='flex min-w-0 items-center gap-2 rounded-sm text-[var(--text-body)] hover:underline focus-visible:outline-2 focus-visible:outline-[var(--brand-secondary)]'
+                >
+                  <Avatar size='xs' name={person.name} src={person.image} aria-hidden />
+                  <span className='truncate' title={person.name}>
+                    {person.name}
+                  </span>
+                </Link>
+              ),
+            },
+            title: { label: person.title },
+            department: { label: person.department },
+            location: { label: person.location },
+            manager: person.manager ? personCell(person.manager) : { label: null },
+          },
+        }))
+      ),
+    [visiblePages, profileHref]
+  )
+
+  const searchConfig: SearchConfig = {
+    value: search,
+    maxLength: PEOPLE_SEARCH_MAX_LENGTH,
+    onChange: setSearch,
+    onClearAll: () => setSearch(''),
+    placeholder: PEOPLE_SEARCH_PLACEHOLDER,
+  }
+  const setDepartment = (value: string) => {
+    const keyed = value.startsWith(KEY_PREFIX)
+    void setView({
+      view: 'directory',
+      department: keyed ? null : value,
+      departmentKey: keyed ? value.slice(KEY_PREFIX.length) : null,
+    })
+  }
+  const hasDepartment = Boolean(departmentKey || department)
+  const selectedValue = departmentKey
+    ? `${KEY_PREFIX}${departmentKey}`
+    : department || ALL_DEPARTMENTS
+  const departmentLabel = departmentKey
+    ? (!people.isPlaceholderData && people.data?.pages[0]?.selectedDepartment) ||
+      'Selected department'
+    : department
+  const filterTags: FilterTag[] = hasDepartment
+    ? [{ label: `Department: ${departmentLabel}`, onRemove: () => setDepartment('') }]
+    : []
+
+  return (
+    <>
+      <Resource.Options
+        search={searchConfig}
+        filter={{
+          active: hasDepartment,
+          content: (
+            <ResourceFilterPanel>
+              <ResourceFilterSection label='Department'>
+                <ChipCombobox
+                  options={[
+                    { value: ALL_DEPARTMENTS, label: 'All' },
+                    ...(departmentWaiting
+                      ? []
+                      : (departments.data?.pages.flatMap((page) => page.departments) ?? [])
+                    ).map(({ name, count, departmentKey: key }) => ({
+                      value: key ? `${KEY_PREFIX}${key}` : name,
+                      label: `${name} (${count})`,
+                    })),
+                  ]}
+                  value={selectedValue}
+                  onChange={(value) => setDepartment(value === ALL_DEPARTMENTS ? '' : value)}
+                  overlayContent={departmentLabel || 'All'}
+                  overlayLabel={departmentLabel || 'All'}
+                  searchable
+                  searchMaxLength={PEOPLE_SEARCH_MAX_LENGTH}
+                  searchMode='server'
+                  onSearchChange={setDepartmentSearch}
+                  onOpenChange={setDepartmentsOpen}
+                  hasMore={!departmentWaiting && departments.hasNextPage}
+                  onLoadMore={() => void departments.fetchNextPage()}
+                  isLoadingMore={departments.isFetchingNextPage}
+                  isLoading={departmentWaiting || departments.isPending}
+                  error={departments.error?.message}
+                  searchPlaceholder='Search departments...'
+                  emptyMessage='No departments match'
+                  className='w-full'
+                />
+                {departments.isError && (
+                  <Chip
+                    disabled={departments.isFetching}
+                    onClick={() => void departments.refetch()}
+                  >
+                    Retry departments
+                  </Chip>
+                )}
+              </ResourceFilterSection>
+            </ResourceFilterPanel>
+          ),
+        }}
+        filterTags={filterTags}
+      />
+      <Resource.Table
+        virtualized
+        columns={PEOPLE_COLUMNS}
+        rows={rows}
+        onRowClick={(memberId) => router.push(profileHref(memberId))}
+        onLoadMore={() => void people.fetchNextPage()}
+        hasMore={people.hasNextPage && !changingFilter}
+        isLoadingMore={people.isFetchingNextPage}
+        isFetching={people.isFetching}
+        loadMoreFailed={people.isFetchNextPageError}
+        emptyState={
+          people.isPending || changingFilter ? (
+            <LoadingStatus>Loading people…</LoadingStatus>
+          ) : people.isLoadingError || people.isRefetchError ? (
+            <ResourceLoadError
+              message={people.error.message}
+              onRetry={() => void people.refetch()}
+            />
+          ) : !query && !hasDepartment ? (
+            <EmptyState
+              title='No people to show'
+              description='Organization members and people from a connected directory appear here.'
+            />
+          ) : (
+            <div className='flex min-h-0 flex-1 flex-col [overflow-wrap:anywhere]'>
+              <ResourceNoResults
+                search={query}
+                filterCount={hasDepartment ? 1 : 0}
+                searchScope='Searched everyone in your organization.'
+                filterScope='No people match the selected department.'
+                onClear={() =>
+                  void setView({ view: 'directory', search: '', department: '', departmentKey: '' })
+                }
+              />
+            </div>
+          )
+        }
+      />
+    </>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/people/people-import-modal.tsx b/apps/sim/app/o/[organizationId]/people/people-import-modal.tsx
new file mode 100644
index 00000000000..7d6bdc7e66e
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/people-import-modal.tsx
@@ -0,0 +1,331 @@
+'use client'
+
+import { useRef, useState } from 'react'
+import {
+  ChipModal,
+  ChipModalBody,
+  ChipModalDescription,
+  ChipModalError,
+  ChipModalField,
+  ChipModalFooter,
+  ChipModalHeader,
+  cn,
+  scrollFadeAttributes,
+  scrollFadeClass,
+  toast,
+  useScrollEdges,
+} from '@sim/emcn'
+import { getErrorMessage } from '@sim/utils/errors'
+import { isOrganizationSettingsSectionAvailable } from '@/components/settings/navigation'
+import { isApiClientError } from '@/lib/api/client/errors'
+import type { PeopleImportBody, PeopleImportResult } from '@/lib/api/contracts/people'
+import { useDeploymentShape } from '@/lib/core/config/deployment-shape'
+import { saveBlob } from '@/lib/uploads/client/download'
+import {
+  IMPORT_SOURCES,
+  type ImportSource,
+  ImportSourcePicker,
+  ProviderFields,
+  ProvisioningSource,
+} from '@/app/o/[organizationId]/people/import-source'
+import {
+  type PeopleSheet,
+  readPeopleSheet,
+} from '@/app/o/[organizationId]/people/read-people-sheet'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import { useScimConnection } from '@/ee/scim/hooks/scim'
+import { useImportPeople } from '@/hooks/queries/people'
+
+const ACCEPTED_FILES = '.csv,.tsv,.xlsx,.xls'
+const TEMPLATE_CSV =
+  'email,title,department,location,start_date,manager_email\nada@example.com,Engineer,Platform,Berlin,2024-01-31,grace@example.com\n'
+
+function downloadTemplate() {
+  saveBlob(new Blob([TEMPLATE_CSV], { type: 'text/csv' }), 'people-template.csv')
+}
+
+function plural(count: number, noun: string): string {
+  return `${count} ${noun}${count === 1 ? '' : 's'}`
+}
+
+/** The preview's issues in file order, with a count of any past the ones listed. */
+interface ImportIssueListProps {
+  result: PeopleImportResult
+  spreadsheet: boolean
+}
+
+function ImportIssueList({ result, spreadsheet }: ImportIssueListProps) {
+  const listRef = useRef<HTMLUListElement>(null)
+  const edges = useScrollEdges(listRef)
+  const unlisted = result.skipped + result.warnings - result.issues.length
+  return (
+    <ul
+      ref={listRef}
+      {...scrollFadeAttributes(edges)}
+      className={cn(
+        'max-h-[200px] overflow-y-auto rounded-sm border border-[var(--border)] p-2',
+        scrollFadeClass
+      )}
+    >
+      {result.issues.map((issue) => (
+        <li key={`${issue.row}-${issue.message}`} className='py-0.5'>
+          {spreadsheet && <span className='text-[var(--text-muted)]'>Row {issue.row}</span>}{' '}
+          <span
+            className={cn(
+              issue.severity === 'skipped' ? 'text-[var(--text-error)]' : 'text-[var(--text-body)]'
+            )}
+          >
+            {issue.email ? `${issue.email}: ` : ''}
+            {issue.message}
+          </span>
+        </li>
+      ))}
+      {unlisted > 0 && (
+        <li className='py-0.5 text-[var(--text-muted)]'>and {plural(unlisted, 'more issue')}</li>
+      )}
+    </ul>
+  )
+}
+
+interface PeopleImportModalProps {
+  organizationId: string
+  onClose: () => void
+}
+
+export function PeopleImportModal({ organizationId, onClose }: PeopleImportModalProps) {
+  const [source, setSource] = useState<ImportSource | null>(null)
+  const { settingsFeatures } = useOrganizationContext()
+  const { features, hosted } = useDeploymentShape()
+  const canProvision = features.scim && (!hosted || settingsFeatures.hasEnterprisePlan)
+
+  if (source && (source !== 'directory' || canProvision)) {
+    return (
+      <SourceImportModal
+        key={source}
+        source={source}
+        organizationId={organizationId}
+        onClose={onClose}
+        onBack={() => setSource(null)}
+        canOpenSettings={isOrganizationSettingsSectionAvailable('sso', settingsFeatures)}
+      />
+    )
+  }
+
+  return (
+    <ChipModal open onOpenChange={(open) => !open && onClose()} srTitle='Import people data'>
+      <ChipModalHeader onClose={onClose}>Import people data</ChipModalHeader>
+      <ChipModalBody>
+        <ImportSourcePicker canProvision={canProvision} onChoose={setSource} />
+      </ChipModalBody>
+      <ChipModalFooter onCancel={onClose} defaultAction='none' />
+    </ChipModal>
+  )
+}
+
+interface SourceImportModalProps extends PeopleImportModalProps {
+  source: ImportSource
+  onBack: () => void
+  canOpenSettings: boolean
+}
+
+function SourceImportModal({
+  organizationId,
+  source,
+  onBack,
+  onClose,
+  canOpenSettings,
+}: SourceImportModalProps) {
+  const connection = useScimConnection(organizationId, source === 'directory')
+  const importPeople = useImportPeople(organizationId)
+  const [domain, setDomain] = useState('')
+  const [token, setToken] = useState('')
+  const [sheet, setSheet] = useState<PeopleSheet | null>(null)
+  const [reading, setReading] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+  const [preview, setPreview] = useState<PeopleImportResult | null>(null)
+  const busy = useRef(false)
+  const pending = reading || importPeople.isPending
+  const provider = source === 'okta' || source === 'entra'
+  const ready =
+    source === 'file'
+      ? Boolean(sheet)
+      : source === 'directory'
+        ? connection.isSuccess &&
+          connection.data.connection?.status === 'active' &&
+          connection.data.connection.userCount > 0
+        : Boolean(token.trim() && (source !== 'okta' || domain.trim()))
+  const sourceName = IMPORT_SOURCES[source].name
+  const title = preview
+    ? 'Review import'
+    : source === 'file'
+      ? 'Import a spreadsheet'
+      : `Import from ${sourceName}`
+
+  const submit = async (apply: boolean, file?: File) => {
+    if (busy.current || (apply && !preview?.updated)) return
+    busy.current = true
+    setError(null)
+    try {
+      let body: PeopleImportBody
+      if (source === 'file') {
+        let selected = sheet
+        if (file) {
+          setReading(true)
+          setSheet(null)
+          selected = await readPeopleSheet(file)
+          setSheet(selected)
+        }
+        if (!selected) return
+        body = { headers: selected.headers, rows: selected.rows, apply }
+      } else if (source === 'okta') {
+        body = {
+          source,
+          domain: domain.trim(),
+          token: token.trim(),
+          apply,
+          previewDigest: apply ? preview?.previewDigest : undefined,
+        }
+      } else if (source === 'entra') {
+        body = {
+          source,
+          token: token.trim(),
+          apply,
+          previewDigest: apply ? preview?.previewDigest : undefined,
+        }
+      } else {
+        body = { source, apply, previewDigest: apply ? preview?.previewDigest : undefined }
+      }
+      const result = await importPeople.submit(body)
+      if (apply) {
+        toast.success(`Updated ${plural(result.updated, 'profile')}`)
+        onClose()
+      } else {
+        setPreview(result)
+      }
+    } catch (cause) {
+      if (source !== 'file' && apply && isApiClientError(cause) && cause.status === 409)
+        setPreview(null)
+      setError(getErrorMessage(cause, 'Could not import people data'))
+    } finally {
+      busy.current = false
+      setReading(false)
+    }
+  }
+
+  const goBack = () => {
+    if (busy.current) return
+    if (preview) {
+      setPreview(null)
+      setError(null)
+    } else {
+      onBack()
+    }
+  }
+
+  const done = preview?.updated === 0
+  return (
+    <ChipModal
+      open
+      onOpenChange={(open) => !open && onClose()}
+      dismissDisabled={pending}
+      srTitle={title}
+    >
+      <ChipModalHeader onClose={onClose}>{title}</ChipModalHeader>
+      <ChipModalBody>
+        {preview ? (
+          <>
+            <ChipModalDescription>
+              {source === 'file' ? sheet?.fileName : sourceName}
+            </ChipModalDescription>
+            <ChipModalField type='custom' title='Preview'>
+              {() => (
+                <div className='flex flex-col gap-2 text-small'>
+                  <p className='font-medium text-[var(--text-body)]'>
+                    {done
+                      ? 'No profiles to update.'
+                      : `${plural(preview.updated, 'profile')} will be updated.`}
+                  </p>
+                  <p className='text-[var(--text-muted)]'>
+                    {[
+                      `${preview.unchanged} unchanged`,
+                      `${preview.skipped} skipped`,
+                      plural(preview.warnings, 'warning'),
+                    ].join(' · ')}
+                  </p>
+                  {preview.issues.length > 0 && (
+                    <ImportIssueList result={preview} spreadsheet={source === 'file'} />
+                  )}
+                </div>
+              )}
+            </ChipModalField>
+            {!done && (
+              <ChipModalDescription>
+                {source !== 'file'
+                  ? 'Import updates matching members’ profiles. If the directory changes, you’ll be asked to preview it again.'
+                  : 'Import applies these profile updates to matching members.'}
+              </ChipModalDescription>
+            )}
+          </>
+        ) : provider ? (
+          <ProviderFields
+            source={source}
+            domain={domain}
+            onDomainChange={(value) => {
+              setDomain(value)
+              setError(null)
+            }}
+            token={token}
+            onTokenChange={(value) => {
+              setToken(value)
+              setError(null)
+            }}
+            disabled={pending}
+          />
+        ) : source === 'directory' ? (
+          <ProvisioningSource
+            organizationId={organizationId}
+            connection={connection}
+            canOpenSettings={canOpenSettings}
+          />
+        ) : (
+          <ChipModalField
+            type='file'
+            title='File'
+            accept={ACCEPTED_FILES}
+            loading={pending}
+            label={
+              sheet
+                ? `${sheet.fileName} · Choose another file`
+                : 'Drop a file here or click to browse'
+            }
+            description='CSV or Excel with an email column, plus any of title, department, location, start date, and manager email.'
+            onChange={([file]) => file && void submit(false, file)}
+          />
+        )}
+        <ChipModalError>{error}</ChipModalError>
+      </ChipModalBody>
+      <ChipModalFooter
+        onCancel={goBack}
+        cancelLabel='Back'
+        secondaryActions={
+          source === 'file' && !preview
+            ? [{ label: 'Template', onClick: downloadTemplate }]
+            : undefined
+        }
+        primaryAction={{
+          label: pending
+            ? preview
+              ? 'Importing…'
+              : 'Reading…'
+            : done
+              ? 'Done'
+              : preview
+                ? 'Import'
+                : 'Preview import',
+          disabled: pending || (!preview && !ready),
+          onClick: done ? onClose : () => void submit(Boolean(preview)),
+        }}
+      />
+    </ChipModal>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/people/people.tsx b/apps/sim/app/o/[organizationId]/people/people.tsx
new file mode 100644
index 00000000000..6e3b3ed806a
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/people.tsx
@@ -0,0 +1,99 @@
+'use client'
+
+import { useState } from 'react'
+import { ChipSwitch } from '@sim/emcn'
+import { List, RefreshCw, Users, Workflow } from '@sim/emcn/icons'
+import dynamic from 'next/dynamic'
+import { useQueryStates } from 'nuqs'
+import { IMPORT_PEOPLE_ACTION } from '@/app/o/[organizationId]/people/columns'
+import { PeopleDirectory } from '@/app/o/[organizationId]/people/people-directory'
+import { PeopleImportModal } from '@/app/o/[organizationId]/people/people-import-modal'
+import { peopleParsers, peopleUrlKeys } from '@/app/o/[organizationId]/people/search-params'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import { Resource } from '@/app/workspace/[workspaceId]/components/resource/resource'
+
+const PeopleChart = dynamic(() =>
+  import('@/app/o/[organizationId]/people/people-chart').then((module) => module.PeopleChart)
+)
+const DirectorySyncModal = dynamic(() =>
+  import('@/app/o/[organizationId]/people/directory-sync-modal').then(
+    (module) => module.DirectorySyncModal
+  )
+)
+const VIEWS = [
+  { value: 'chart', label: 'Org chart', icon: Workflow },
+  { value: 'directory', label: 'Directory', icon: List },
+] as const
+
+interface PeopleProps {
+  organizationId: string
+}
+
+export function People({ organizationId }: PeopleProps) {
+  const { viewer } = useOrganizationContext()
+  const [{ view, search, department, departmentKey, panel }, setView] = useQueryStates(
+    peopleParsers,
+    peopleUrlKeys
+  )
+  const [importOpen, setImportOpen] = useState(false)
+  const openSync = () => void setView({ panel: 'sync' }, { history: 'push' })
+  const currentView = view ?? (search || department || departmentKey ? 'directory' : 'chart')
+
+  const viewSwitch = (
+    <ChipSwitch
+      aria-label='People view'
+      value={currentView}
+      options={VIEWS}
+      onChange={(next) => void setView({ view: next }, { history: 'push' })}
+    />
+  )
+
+  return (
+    <Resource>
+      <Resource.Header
+        icon={Users}
+        title='People'
+        actions={
+          viewer.isAdmin
+            ? [
+                {
+                  id: 'sync',
+                  text: 'Directory sync',
+                  icon: RefreshCw,
+                  onSelect: openSync,
+                },
+                {
+                  ...IMPORT_PEOPLE_ACTION,
+                  id: 'import',
+                  onSelect: () => setImportOpen(true),
+                },
+              ]
+            : []
+        }
+      />
+      {currentView === 'chart' ? (
+        <PeopleChart
+          organizationId={organizationId}
+          viewSwitch={viewSwitch}
+          onImport={viewer.isAdmin ? () => setImportOpen(true) : undefined}
+          onSync={viewer.isAdmin ? openSync : undefined}
+        />
+      ) : (
+        <>
+          <div className='flex shrink-0 px-4 py-2'>{viewSwitch}</div>
+          <PeopleDirectory organizationId={organizationId} />
+        </>
+      )}
+      {importOpen && !panel && viewer.isAdmin && (
+        <PeopleImportModal organizationId={organizationId} onClose={() => setImportOpen(false)} />
+      )}
+      {panel === 'sync' && viewer.isAdmin && (
+        <DirectorySyncModal
+          key={organizationId}
+          organizationId={organizationId}
+          onClose={() => void setView({ panel: null })}
+        />
+      )}
+    </Resource>
+  )
+}
diff --git a/apps/sim/lib/people/read-sheet.test.ts b/apps/sim/app/o/[organizationId]/people/read-people-sheet.test.ts
similarity index 97%
rename from apps/sim/lib/people/read-sheet.test.ts
rename to apps/sim/app/o/[organizationId]/people/read-people-sheet.test.ts
index c0d4307eb91..3babf9af531 100644
--- a/apps/sim/lib/people/read-sheet.test.ts
+++ b/apps/sim/app/o/[organizationId]/people/read-people-sheet.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import * as XLSX from 'xlsx'
-import { readPeopleSheet } from '@/lib/people/read-sheet'
+import { readPeopleSheet } from '@/app/o/[organizationId]/people/read-people-sheet'
 
 /** January 31, 2024 as a date serial in each of Excel's two date systems. */
 const SERIAL_1900 = 45322
diff --git a/apps/sim/lib/people/read-sheet.ts b/apps/sim/app/o/[organizationId]/people/read-people-sheet.ts
similarity index 100%
rename from apps/sim/lib/people/read-sheet.ts
rename to apps/sim/app/o/[organizationId]/people/read-people-sheet.ts
diff --git a/apps/sim/lib/people/search-params.ts b/apps/sim/app/o/[organizationId]/people/search-params.ts
similarity index 84%
rename from apps/sim/lib/people/search-params.ts
rename to apps/sim/app/o/[organizationId]/people/search-params.ts
index c2aacdee25f..a34714387f1 100644
--- a/apps/sim/lib/people/search-params.ts
+++ b/apps/sim/app/o/[organizationId]/people/search-params.ts
@@ -7,14 +7,11 @@ import {
   PEOPLE_SEARCH_MAX_LENGTH,
 } from '@/lib/people/validation'
 
-export const boundedSearch = (value: string) =>
-  truncateAtCodePoint(value, PEOPLE_SEARCH_MAX_LENGTH, '')
+const boundedSearch = (value: string) => truncateAtCodePoint(value, PEOPLE_SEARCH_MAX_LENGTH, '')
 
 /** `search` matches name, email, title, department, or location; `department` narrows to one. */
 export const peopleParsers = {
-  /** Nullable: with no explicit view, the default depends on whether a filter is set. */
   view: parseAsStringLiteral(['chart', 'directory'] as const),
-  /** Nullable: absent means no panel is open; there is no default panel. */
   panel: parseAsStringLiteral(['sync'] as const),
   focus: createParser({
     parse: (value) => (value.length > 0 && value.length <= PEOPLE_ID_MAX_LENGTH ? value : null),
diff --git a/apps/sim/app/o/[organizationId]/people/use-people-picker.tsx b/apps/sim/app/o/[organizationId]/people/use-people-picker.tsx
new file mode 100644
index 00000000000..36b77209cff
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/people/use-people-picker.tsx
@@ -0,0 +1,46 @@
+import { useState } from 'react'
+import { Avatar } from '@sim/emcn'
+import { PEOPLE_SEARCH_MAX_LENGTH } from '@/lib/people/validation'
+import { SEARCH_DEBOUNCE_MS } from '@/lib/url-state'
+import { usePeople } from '@/hooks/queries/people'
+import { useDebounce } from '@/hooks/use-debounce'
+
+/** Shared, paginated directory search for chart navigation and editing a person's manager. */
+export function usePeoplePicker(
+  organizationId: string,
+  scope?: 'roots' | 'members',
+  excludeMemberId?: string
+) {
+  const [search, setSearch] = useState('')
+  const [open, setOpen] = useState(false)
+  const term = useDebounce(search.trim(), SEARCH_DEBOUNCE_MS)
+  const query = usePeople(organizationId, term, '', { scope, enabled: open })
+  const waiting = search.trim() !== term || query.isPlaceholderData
+  const people =
+    waiting || query.isRefetchError
+      ? []
+      : (query.data?.pages ?? []).flatMap((page) =>
+          page.people.filter((person) => person.memberId !== excludeMemberId)
+        )
+  return {
+    search,
+    people,
+    pickerProps: {
+      searchable: true,
+      searchMaxLength: PEOPLE_SEARCH_MAX_LENGTH,
+      searchMode: 'server' as const,
+      onSearchChange: setSearch,
+      onOpenChange: setOpen,
+      options: people.map((person) => ({
+        value: person.memberId,
+        label: [person.name, person.title, person.email].filter(Boolean).join(' · '),
+        iconElement: <Avatar size='xs' name={person.name} src={person.image} aria-hidden />,
+      })),
+      hasMore: query.hasNextPage && !waiting,
+      onLoadMore: () => void query.fetchNextPage(),
+      isLoading: waiting || (query.isFetching && !query.isFetchingNextPage),
+      isLoadingMore: query.isFetchingNextPage,
+      error: query.error?.message,
+    },
+  }
+}
diff --git a/apps/sim/app/o/[organizationId]/search/chat/[chatId]/page.tsx b/apps/sim/app/o/[organizationId]/search/chat/[chatId]/page.tsx
index 4ea3c665af8..b889fb41c7f 100644
--- a/apps/sim/app/o/[organizationId]/search/chat/[chatId]/page.tsx
+++ b/apps/sim/app/o/[organizationId]/search/chat/[chatId]/page.tsx
@@ -5,8 +5,8 @@ import { getSession } from '@/lib/auth'
 import { getAccessibleCopilotChatAuth } from '@/lib/mothership/chat/lifecycle'
 import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
+import { OrganizationSearch } from '@/app/o/[organizationId]/search/search'
 import { HomeFallback } from '@/app/workspace/[workspaceId]/home/home-fallback'
-import { OrganizationSearchSurface } from '@/platform/app/(shell)/search/_components/search-surface/search-surface'
 
 export const metadata: Metadata = { title: 'Assistant Search' }
 
@@ -29,7 +29,7 @@ export default async function OrganizationSearchChatPage({
   if (chat.mode !== 'assistant') redirect(organizationRoutes(organizationId).chat(chatId))
   return (
     <Suspense fallback={<HomeFallback />}>
-      <OrganizationSearchSurface userId={session.user.id} chatId={chatId} />
+      <OrganizationSearch userId={session.user.id} chatId={chatId} />
     </Suspense>
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/search/page.tsx b/apps/sim/app/o/[organizationId]/search/page.tsx
index b8f7f016558..7f33f99e1e5 100644
--- a/apps/sim/app/o/[organizationId]/search/page.tsx
+++ b/apps/sim/app/o/[organizationId]/search/page.tsx
@@ -4,44 +4,25 @@ import { notFound, redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
 import { WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
-import { Hydrated } from '@/app/o/[organizationId]/_redesign/hydrated'
-import { loadOrganizationSearchView } from '@/app/o/[organizationId]/search/search-params'
+import { OrganizationSearch } from '@/app/o/[organizationId]/search/search'
 import { HomeFallback } from '@/app/workspace/[workspaceId]/home/home-fallback'
-import { OrganizationSearchSurface } from '@/platform/app/(shell)/search/_components/search-surface/search-surface'
-import { prefetchSearch } from '@/platform/lib/data/prefetch'
 
 export const metadata: Metadata = { title: 'Search' }
 
 export default async function OrganizationSearchPage({
   params,
-  searchParams,
 }: {
   params: Promise<{ organizationId: string }>
-  searchParams: Promise<Record<string, string | string[] | undefined>>
 }) {
-  const [{ organizationId }, query] = await Promise.all([params, searchParams])
+  const { organizationId } = await params
   const session = await getSession()
   if (!session?.user?.id) notFound()
   const context = await getOrganizationSurfaceContext(organizationId, session.user.id)
   if (!context) notFound()
   if (!context.searchAccess.memberScoped) redirect(WORKSPACE_SETTINGS_PATH)
-  const surface = <OrganizationSearchSurface userId={session.user.id} />
-  const { q, mode } = loadOrganizationSearchView(query)
   return (
     <Suspense fallback={<HomeFallback />}>
-      {q.trim() || mode === 'assistant' ? (
-        surface
-      ) : (
-        <Hydrated
-          state={prefetchSearch(organizationId, {
-            kind: 'session',
-            userId: session.user.id,
-            sessionId: session.session.id,
-          })}
-        >
-          {surface}
-        </Hydrated>
-      )}
+      <OrganizationSearch userId={session.user.id} />
     </Suspense>
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/search/search-frame.tsx b/apps/sim/app/o/[organizationId]/search/search-frame.tsx
deleted file mode 100644
index 178fde8e528..00000000000
--- a/apps/sim/app/o/[organizationId]/search/search-frame.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-'use client'
-
-import { lazy, type ReactNode, Suspense } from 'react'
-import { cn } from '@sim/emcn'
-import type { OrganizationSearchState } from '@/app/o/[organizationId]/search/use-organization-search'
-import { RESOURCE_HEADER_CLASSES } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
-import { HomeFallback } from '@/app/workspace/[workspaceId]/home/home-fallback'
-
-const OrganizationConversation = lazy(() =>
-  import('@/app/o/[organizationId]/components/organization-conversation').then((module) => ({
-    default: module.OrganizationConversation,
-  }))
-)
-
-interface SearchFrameProps {
-  search: OrganizationSearchState
-  /** The view switch and New control, shown over both views. */
-  header: ReactNode
-  /** The Search view. It renders beside the conversation, never around it. */
-  children: ReactNode
-}
-
-/**
- * Hosts the two views of Search. Assistant stays mounted and `inert` while Search shows, so a running
- * answer keeps streaming and its draft survives a switch.
- */
-export function SearchFrame({ search, header, children }: SearchFrameProps) {
-  const { activeMode } = search
-  return (
-    <div className='h-full min-h-0 min-w-0 bg-[var(--bg)] pt-[var(--workspace-content-title-bar-inset)]'>
-      <div className='flex h-full min-h-0 min-w-0 flex-col [--workspace-content-title-bar-inset:0px]'>
-        {search.assistantMounted && (
-          <div
-            inert={activeMode !== 'assistant'}
-            className={cn(
-              'min-h-0 min-w-0 flex-1 flex-col',
-              activeMode === 'assistant' ? 'flex' : 'hidden'
-            )}
-          >
-            <Suspense fallback={<HomeFallback header={header} />}>
-              <OrganizationConversation
-                key={search.conversationInstance}
-                requestMode='assistant'
-                chatId={search.chatId}
-                header={header}
-                active={activeMode === 'assistant'}
-                summaryRequest={search.pendingSummary}
-                onSummaryConsumed={search.consumeSummary}
-              />
-            </Suspense>
-          </div>
-        )}
-        {!activeMode && <HomeFallback />}
-        {activeMode === 'search' && (
-          <>
-            <div className={cn(RESOURCE_HEADER_CLASSES.layout, RESOURCE_HEADER_CLASSES.content)}>
-              {header}
-            </div>
-            <div className='flex min-h-0 min-w-0 flex-1 flex-col'>{children}</div>
-          </>
-        )}
-      </div>
-    </div>
-  )
-}
diff --git a/apps/sim/app/o/[organizationId]/search/search-params.ts b/apps/sim/app/o/[organizationId]/search/search-params.ts
index ab710d83d2e..40faaad7f1f 100644
--- a/apps/sim/app/o/[organizationId]/search/search-params.ts
+++ b/apps/sim/app/o/[organizationId]/search/search-params.ts
@@ -1,12 +1,10 @@
-import { createLoader, parseAsString, parseAsStringLiteral } from 'nuqs/server'
+import { parseAsString, parseAsStringLiteral } from 'nuqs/server'
 
 export const organizationSearchParsers = {
   q: parseAsString.withDefault(''),
   mode: parseAsStringLiteral(['search', 'assistant']),
 } as const
 
-export const loadOrganizationSearchView = createLoader(organizationSearchParsers)
-
 /** A query is a filter-like view change, not navigation: replace, and clear when empty. */
 export const organizationSearchUrlKeys = {
   history: 'replace',
diff --git a/apps/sim/app/o/[organizationId]/search/search-results-view.tsx b/apps/sim/app/o/[organizationId]/search/search-results-view.tsx
new file mode 100644
index 00000000000..ff4b36973a0
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/search/search-results-view.tsx
@@ -0,0 +1,80 @@
+import { type ReactNode, useRef } from 'react'
+import {
+  cn,
+  overflowFadeSizeClass,
+  scrollFadeAttributes,
+  scrollFadeClass,
+  useScrollEdges,
+} from '@sim/emcn'
+import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
+import type { SearchResource } from '@/lib/mothership/generated/resources'
+import { OrganizationLanding } from '@/app/o/[organizationId]/components/organization-landing'
+import { PAGE_COLUMN_CLASS } from '@/app/o/[organizationId]/components/organization-page'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import { KnowledgeSearchResults } from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results'
+import {
+  SIDEBAR_DIVIDER_PAD_ABOVE_CLASS,
+  SIDEBAR_DIVIDER_PAD_BELOW_CLASS,
+} from '@/app/workspace/[workspaceId]/w/components/sidebar/constants'
+
+interface SearchResultsViewProps {
+  composer: ReactNode
+  query: string
+  onSummarize?: (message: string, filters: WorkspaceSearchFilters) => void
+  onSearchChange?: (search: SearchResource) => void
+}
+
+/** Standalone Search uses the original centered field and docked results layout. */
+export function SearchResultsView({
+  composer,
+  query,
+  onSummarize,
+  onSearchChange,
+}: SearchResultsViewProps) {
+  const { organization } = useOrganizationContext()
+  const scope = { kind: 'organization' as const, organizationId: organization.id }
+  const scrollContainerRef = useRef<HTMLDivElement>(null)
+  const scrollContentRef = useRef<HTMLDivElement>(null)
+  const searching = query.trim().length > 0
+  const scrollEdges = useScrollEdges(scrollContainerRef, {
+    contentRef: scrollContentRef,
+    enabled: searching,
+  })
+  return (
+    <div className='flex h-full min-h-0 flex-col bg-[var(--bg)]'>
+      {searching ? (
+        <>
+          <div className={cn(PAGE_COLUMN_CLASS, SIDEBAR_DIVIDER_PAD_ABOVE_CLASS, 'shrink-0 pt-8')}>
+            {composer}
+          </div>
+          <div
+            ref={scrollContainerRef}
+            className={cn(
+              SIDEBAR_DIVIDER_PAD_BELOW_CLASS,
+              SIDEBAR_DIVIDER_PAD_ABOVE_CLASS,
+              scrollFadeClass,
+              overflowFadeSizeClass,
+              'min-h-0 flex-1 overflow-y-auto [scrollbar-gutter:stable_both-edges]'
+            )}
+            {...scrollFadeAttributes(scrollEdges)}
+          >
+            {/* The rows carry their own `px-2`; this gutter brings each row's mark under the
+                field's own search glyph, so results read as a column hanging from the field. */}
+            <div ref={scrollContentRef} className={cn(PAGE_COLUMN_CLASS, 'px-8')}>
+              <KnowledgeSearchResults
+                scope={scope}
+                query={query}
+                onSummarize={onSummarize}
+                onSearchChange={onSearchChange}
+              />
+            </div>
+          </div>
+        </>
+      ) : (
+        <OrganizationLanding heading={`Search ${organization.name}`}>
+          {composer}
+        </OrganizationLanding>
+      )}
+    </div>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/search/search.tsx b/apps/sim/app/o/[organizationId]/search/search.tsx
new file mode 100644
index 00000000000..1f36e12bf8f
--- /dev/null
+++ b/apps/sim/app/o/[organizationId]/search/search.tsx
@@ -0,0 +1,320 @@
+'use client'
+
+import { lazy, Suspense, useCallback, useEffect, useRef, useState, useTransition } from 'react'
+import { Chip, ComposerActionButton, cn } from '@sim/emcn'
+import { ArrowUp, Plus, Search, Sparkles, StopFilled } from '@sim/emcn/icons'
+import { generateId } from '@sim/utils/id'
+import { useIsFetching, useQueryClient } from '@tanstack/react-query'
+import { usePathname, useRouter, useSearchParams } from 'next/navigation'
+import { useQueryStates } from 'nuqs'
+import { HEADER_ACTION_CLUSTER } from '@/components/page-header-bar'
+import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
+import { resourceScopeKey } from '@/lib/core/resource-scope'
+import { BrowserStorage } from '@/lib/core/utils/browser-storage'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import type { OrganizationSummaryRequest } from '@/app/o/[organizationId]/components/organization-conversation'
+import { SearchInputBar } from '@/app/o/[organizationId]/components/search-input-bar'
+import { SearchLandingHistory } from '@/app/o/[organizationId]/components/search-landing-history'
+import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
+import {
+  organizationSearchParsers,
+  organizationSearchUrlKeys,
+} from '@/app/o/[organizationId]/search/search-params'
+import { SearchResultsView } from '@/app/o/[organizationId]/search/search-results-view'
+import { useSearchHistoryActions } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-history-context'
+import { RESOURCE_HEADER_CLASSES } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
+import { MicButton } from '@/app/workspace/[workspaceId]/home/components/user-input/components/mic-button/mic-button'
+import { MicrophonePermissionHelp } from '@/app/workspace/[workspaceId]/home/components/user-input/components/microphone-permission-help/microphone-permission-help'
+import { HomeFallback } from '@/app/workspace/[workspaceId]/home/home-fallback'
+import { knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
+import { useHydrated } from '@/hooks/use-hydrated'
+import { useVoiceInput } from '@/hooks/use-voice-input'
+import { useMothershipDraftsStore } from '@/stores/mothership-drafts/store'
+
+const OrganizationConversation = lazy(() =>
+  import('@/app/o/[organizationId]/components/organization-conversation').then((module) => ({
+    default: module.OrganizationConversation,
+  }))
+)
+
+const SEARCH_MODES = [
+  { value: 'search', label: 'Search', icon: Search },
+  { value: 'assistant', label: 'Assistant', icon: Sparkles },
+] as const
+
+interface OrganizationSearchProps {
+  userId: string
+  chatId?: string
+}
+
+interface SearchFieldProps {
+  userId: string
+  initialValue: string
+  onSubmit: (value: string) => void
+}
+
+/** Search commits a query on submit while retaining an independent editable draft. */
+function SearchField({ userId, initialValue, onSubmit }: SearchFieldProps) {
+  const inputRef = useRef<HTMLTextAreaElement>(null)
+  const hydrated = useHydrated()
+  const { organization } = useOrganizationContext()
+  const queryClient = useQueryClient()
+  const queryKey = knowledgeKeys.searchQuery(
+    resourceScopeKey({ kind: 'organization', organizationId: organization.id }),
+    initialValue.trim(),
+    userId
+  )
+  const isSearching = useIsFetching({ queryKey }) > 0
+  const latestDraftKey = `${userId}:organization:${organization.id}:search`
+  const latestDraft = useMothershipDraftsStore((state) => state.drafts[latestDraftKey])
+  const ownerQuery = initialValue || latestDraft?.searchQuery || ''
+  const draftKey = `${latestDraftKey}:query:${encodeURIComponent(ownerQuery)}`
+  const draft = useMothershipDraftsStore((state) => state.drafts[draftKey])
+  const value =
+    draft?.text ?? (latestDraft?.searchQuery === ownerQuery ? latestDraft.text : initialValue)
+  const setValue = (text: string) => {
+    const { setDraft } = useMothershipDraftsStore.getState()
+    const payload = { text, searchQuery: ownerQuery }
+    setDraft(draftKey, payload)
+    setDraft(latestDraftKey, payload)
+  }
+  const submit = (text = value) => {
+    if (!text.trim() || (isSearching && text.trim() === initialValue.trim())) return
+    const { clearDraft } = useMothershipDraftsStore.getState()
+    if (text.trim() === value.trim()) {
+      clearDraft(draftKey)
+      if (latestDraft?.searchQuery === ownerQuery) clearDraft(latestDraftKey)
+    }
+    clearDraft(`${latestDraftKey}:query:${encodeURIComponent(text.trim())}`)
+    onSubmit(text)
+  }
+  const voice = useVoiceInput({
+    organizationId: organization.id,
+    getValue: () => value,
+    onChange: setValue,
+  })
+  const canSubmit = hydrated && value.trim().length > 0
+
+  useEffect(() => {
+    if (hydrated) inputRef.current?.focus()
+  }, [hydrated])
+
+  const field = (
+    <SearchInputBar
+      inputRef={inputRef}
+      value={value}
+      disabled={!hydrated}
+      onChange={setValue}
+      onSubmit={() => submit()}
+      floating={!initialValue.trim()}
+      voiceControl={
+        voice.isSupported && (
+          <MicButton
+            audioLevels={voice.audioLevels}
+            isListening={voice.isListening}
+            onToggle={voice.toggleListening}
+          />
+        )
+      }
+      submitControl={
+        <ComposerActionButton
+          type='button'
+          onClick={() => (isSearching ? void queryClient.cancelQueries({ queryKey }) : submit())}
+          disabled={!canSubmit && !isSearching}
+          aria-label={isSearching ? 'Stop search' : 'Search'}
+          aria-busy={isSearching}
+          active={canSubmit || isSearching}
+        >
+          {isSearching ? (
+            <StopFilled className='block size-[14px] fill-white dark:fill-black' />
+          ) : (
+            <ArrowUp className='block size-[16px] text-white dark:text-black' />
+          )}
+        </ComposerActionButton>
+      }
+    />
+  )
+  return (
+    <>
+      {!initialValue.trim() ? (
+        <SearchLandingHistory
+          organizationId={organization.id}
+          userId={userId}
+          onSearch={(query) => submit(query)}
+        >
+          {field}
+        </SearchLandingHistory>
+      ) : (
+        field
+      )}
+      <MicrophonePermissionHelp
+        open={voice.permissionHelpOpen}
+        onOpenChange={voice.setPermissionHelpOpen}
+      />
+    </>
+  )
+}
+
+/** Organization Search owns both document results and assistant conversations. */
+export function OrganizationSearch(props: OrganizationSearchProps) {
+  const { searchAccess } = useOrganizationContext()
+  if (!searchAccess.memberScoped) return null
+  return <OrganizationSearchContent {...props} />
+}
+
+function OrganizationSearchContent({ userId, chatId }: OrganizationSearchProps) {
+  const { organization, mothershipAvailable } = useOrganizationContext()
+  const { recordQuery } = useSearchHistoryActions()
+  const router = useRouter()
+  const pathname = usePathname()
+  const hasSearchParams = useSearchParams().toString() !== ''
+  const routes = organizationRoutes(organization.id)
+  const hasConversation = Boolean(chatId) || pathname.startsWith(`${routes.search}/chat/`)
+  const queryClient = useQueryClient()
+  const [{ q, mode }, setParams] = useQueryStates(
+    organizationSearchParsers,
+    organizationSearchUrlKeys
+  )
+  const routeMode = mode ?? (hasConversation ? 'assistant' : hasSearchParams ? 'search' : null)
+  const activeMode = mothershipAvailable ? routeMode : 'search'
+  const preferenceKey = `organization-search-mode:${userId}:${organization.id}`
+  const [assistantOpened, setAssistantOpened] = useState(activeMode === 'assistant')
+  const [conversationInstance, setConversationInstance] = useState(0)
+  const [isStartingNew, startNewTransition] = useTransition()
+  const [summaries, setSummaries] = useState<OrganizationSummaryRequest[]>([])
+  const consumeSummary = useCallback(
+    (id: string) => setSummaries((current) => current.filter((request) => request.id !== id)),
+    []
+  )
+  useEffect(() => {
+    if (!mothershipAvailable) return
+    if (routeMode) {
+      BrowserStorage.setItem(preferenceKey, routeMode)
+      return
+    }
+    const savedMode = BrowserStorage.getItem<unknown>(preferenceKey, null)
+    // Pin the mode to this history entry so Back survives a later preference change.
+    void setParams({ mode: savedMode === 'assistant' ? 'assistant' : 'search' })
+  }, [mothershipAvailable, preferenceKey, routeMode, setParams])
+
+  if (activeMode === 'assistant' && !assistantOpened) setAssistantOpened(true)
+
+  const changeMode = (next: 'search' | 'assistant') => {
+    void setParams({ mode: next }, { history: 'push' })
+  }
+  const startNew = () => {
+    setSummaries([])
+    const { clearDraft } = useMothershipDraftsStore.getState()
+    const scope = `${userId}:organization:${organization.id}`
+    if (activeMode === 'assistant') {
+      clearDraft(`${scope}:search-assistant`)
+    } else {
+      clearDraft(`${scope}:search`)
+      clearDraft(`${scope}:search:query:`)
+    }
+    startNewTransition(() => {
+      setConversationInstance((current) => current + 1)
+      router.push(mothershipAvailable ? `${routes.search}?mode=${activeMode}` : routes.search, {
+        scroll: false,
+      })
+    })
+  }
+  const summarize = (message: string, assistantSearch: WorkspaceSearchFilters) => {
+    setSummaries((current) => [...current, { id: generateId(), message, assistantSearch }])
+    changeMode('assistant')
+  }
+
+  const submit = (draft: string) => {
+    const next = draft.trim()
+    if (!next) return
+    recordQuery(next)
+    if (next === q.trim()) {
+      void queryClient.invalidateQueries({
+        queryKey: knowledgeKeys.searchQuery(
+          resourceScopeKey({ kind: 'organization', organizationId: organization.id }),
+          next,
+          userId
+        ),
+      })
+    } else {
+      void setParams({ q: next })
+    }
+  }
+  const newLabel = activeMode === 'assistant' ? 'New chat' : 'New search'
+  const header = (
+    <>
+      <nav aria-label='Search views' className={HEADER_ACTION_CLUSTER}>
+        {SEARCH_MODES.filter((entry) => mothershipAvailable || entry.value === 'search').map(
+          (entry) => (
+            <Chip
+              key={entry.value}
+              active={activeMode === entry.value}
+              aria-current={activeMode === entry.value ? 'page' : undefined}
+              leftIcon={entry.icon}
+              mobileCompact
+              onClick={() => changeMode(entry.value)}
+            >
+              {entry.label}
+            </Chip>
+          )
+        )}
+      </nav>
+      {(hasConversation || (activeMode === 'search' && q.trim())) && (
+        <Chip
+          leftIcon={Plus}
+          aria-label={newLabel}
+          onClick={startNew}
+          disabled={isStartingNew}
+          mobileCompact
+        >
+          <span className='hidden md:inline'>{newLabel}</span>
+          <span className='md:hidden'>New</span>
+        </Chip>
+      )}
+    </>
+  )
+  return (
+    <div className='h-full min-h-0 min-w-0 bg-[var(--bg)] pt-[var(--workspace-content-title-bar-inset)]'>
+      <div className='flex h-full min-h-0 min-w-0 flex-col [--workspace-content-title-bar-inset:0px]'>
+        {(assistantOpened || hasConversation) && mothershipAvailable && (
+          <div
+            inert={activeMode !== 'assistant'}
+            className={cn(
+              'min-h-0 min-w-0 flex-1 flex-col',
+              activeMode === 'assistant' ? 'flex' : 'hidden'
+            )}
+          >
+            <Suspense fallback={<HomeFallback header={header} />}>
+              <OrganizationConversation
+                key={conversationInstance}
+                requestMode='assistant'
+                chatId={chatId}
+                header={header}
+                active={activeMode === 'assistant'}
+                summaryRequest={summaries[0]}
+                onSummaryConsumed={consumeSummary}
+              />
+            </Suspense>
+          </div>
+        )}
+        {!activeMode && <HomeFallback />}
+        {activeMode === 'search' && (
+          <>
+            <div className={cn(RESOURCE_HEADER_CLASSES.layout, RESOURCE_HEADER_CLASSES.content)}>
+              {header}
+            </div>
+            <div className='flex min-h-0 min-w-0 flex-1 flex-col'>
+              <SearchResultsView
+                composer={
+                  <SearchField key={q} userId={userId} initialValue={q} onSubmit={submit} />
+                }
+                query={q.trim()}
+                onSummarize={mothershipAvailable ? summarize : undefined}
+              />
+            </div>
+          </>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/apps/sim/app/o/[organizationId]/search/use-organization-search.ts b/apps/sim/app/o/[organizationId]/search/use-organization-search.ts
deleted file mode 100644
index 70eacfa2736..00000000000
--- a/apps/sim/app/o/[organizationId]/search/use-organization-search.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useRef, useState, useTransition } from 'react'
-import { generateId } from '@sim/utils/id'
-import { useIsFetching, useQueryClient } from '@tanstack/react-query'
-import { usePathname, useRouter, useSearchParams } from 'next/navigation'
-import { useQueryStates } from 'nuqs'
-import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
-import { resourceScopeKey } from '@/lib/core/resource-scope'
-import { BrowserStorage } from '@/lib/core/utils/browser-storage'
-import { organizationRoutes } from '@/lib/navigation/paths'
-import type { OrganizationSummaryRequest } from '@/app/o/[organizationId]/components/organization-conversation'
-import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import {
-  organizationSearchParsers,
-  organizationSearchUrlKeys,
-} from '@/app/o/[organizationId]/search/search-params'
-import { useSearchHistoryActions } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-history-context'
-import { knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
-import { useHydrated } from '@/hooks/use-hydrated'
-import { useVoiceInput } from '@/hooks/use-voice-input'
-import { useMothershipDraftsStore } from '@/stores/mothership-drafts/store'
-
-export const SEARCH_MODES = [
-  { value: 'search', label: 'Search' },
-  { value: 'assistant', label: 'Assistant' },
-] as const
-
-type SearchMode = (typeof SEARCH_MODES)[number]['value']
-
-interface UseOrganizationSearchProps {
-  userId: string
-  chatId?: string
-}
-
-function searchDraftKeys(userId: string | undefined, organizationId: string) {
-  const latest = `${userId}:organization:${organizationId}:search`
-  return {
-    latest,
-    assistant: `${latest}-assistant`,
-    query: (query: string) => `${latest}:query:${encodeURIComponent(query)}`,
-  }
-}
-
-/**
- * Everything Organization Search does, independent of how it looks: the mode pinned in the URL, the
- * Summarize hand-off to Assistant, New chat or search, and committing a query.
- */
-export function useOrganizationSearch({ userId, chatId }: UseOrganizationSearchProps) {
-  const { organization, mothershipAvailable } = useOrganizationContext()
-  const { recordQuery } = useSearchHistoryActions()
-  const router = useRouter()
-  const pathname = usePathname()
-  const hasSearchParams = useSearchParams().toString() !== ''
-  const routes = organizationRoutes(organization.id)
-  const hasConversation = Boolean(chatId) || pathname.startsWith(`${routes.search}/chat/`)
-  const queryClient = useQueryClient()
-  const [{ q, mode }, setParams] = useQueryStates(
-    organizationSearchParsers,
-    organizationSearchUrlKeys
-  )
-  const routeMode = mode ?? (hasConversation ? 'assistant' : hasSearchParams ? 'search' : null)
-  const activeMode = mothershipAvailable ? routeMode : 'search'
-  const preferenceKey = `organization-search-mode:${userId}:${organization.id}`
-  const [assistantOpened, setAssistantOpened] = useState(activeMode === 'assistant')
-  const [conversationInstance, setConversationInstance] = useState(0)
-  const [isStartingNew, startNewTransition] = useTransition()
-  const [summaries, setSummaries] = useState<OrganizationSummaryRequest[]>([])
-  const consumeSummary = useCallback(
-    (id: string) => setSummaries((current) => current.filter((request) => request.id !== id)),
-    []
-  )
-  useEffect(() => {
-    if (!mothershipAvailable) return
-    if (routeMode) {
-      BrowserStorage.setItem(preferenceKey, routeMode)
-      return
-    }
-    const savedMode = BrowserStorage.getItem<unknown>(preferenceKey, null)
-    // Pin the mode to this history entry so Back survives a later preference change.
-    void setParams({ mode: savedMode === 'assistant' ? 'assistant' : 'search' })
-  }, [mothershipAvailable, preferenceKey, routeMode, setParams])
-
-  if (activeMode === 'assistant' && !assistantOpened) setAssistantOpened(true)
-
-  const changeMode = (next: SearchMode) => {
-    void setParams({ mode: next }, { history: 'push' })
-  }
-  const startNew = () => {
-    setSummaries([])
-    const { clearDraft } = useMothershipDraftsStore.getState()
-    const drafts = searchDraftKeys(userId, organization.id)
-    if (activeMode === 'assistant') {
-      clearDraft(drafts.assistant)
-    } else {
-      clearDraft(drafts.latest)
-      clearDraft(drafts.query(''))
-    }
-    startNewTransition(() => {
-      setConversationInstance((current) => current + 1)
-      router.push(mothershipAvailable ? `${routes.search}?mode=${activeMode}` : routes.search, {
-        scroll: false,
-      })
-    })
-  }
-  const summarize = (message: string, assistantSearch: WorkspaceSearchFilters) => {
-    setSummaries((current) => [...current, { id: generateId(), message, assistantSearch }])
-    changeMode('assistant')
-  }
-  const submit = (draft: string) => {
-    const next = draft.trim()
-    if (!next) return
-    recordQuery(next)
-    if (next === q.trim()) {
-      void queryClient.invalidateQueries({
-        queryKey: knowledgeKeys.searchQuery(
-          resourceScopeKey({ kind: 'organization', organizationId: organization.id }),
-          next,
-          userId
-        ),
-      })
-    } else {
-      void setParams({ q: next })
-    }
-  }
-  return {
-    chatId,
-    query: q,
-    activeMode,
-    modes: SEARCH_MODES.filter((entry) => mothershipAvailable || entry.value === 'search'),
-    changeMode,
-    assistantMounted: (assistantOpened || hasConversation) && mothershipAvailable,
-    conversationInstance,
-    pendingSummary: summaries[0],
-    consumeSummary,
-    summarize: mothershipAvailable ? summarize : undefined,
-    submit,
-    newLabel: activeMode === 'assistant' ? 'New chat' : 'New search',
-    canStartNew: hasConversation || (activeMode === 'search' && Boolean(q.trim())),
-    startNew,
-    isStartingNew,
-  }
-}
-
-export type OrganizationSearchState = ReturnType<typeof useOrganizationSearch>
-
-interface UseSearchFieldDraftProps {
-  userId: string
-  initialValue: string
-  onSubmit: (value: string) => void
-}
-
-/** Search commits a query on submit while retaining an independent editable draft. */
-export function useSearchFieldDraft({ userId, initialValue, onSubmit }: UseSearchFieldDraftProps) {
-  const inputRef = useRef<HTMLTextAreaElement>(null)
-  const hydrated = useHydrated()
-  const { organization } = useOrganizationContext()
-  const queryClient = useQueryClient()
-  const queryKey = knowledgeKeys.searchQuery(
-    resourceScopeKey({ kind: 'organization', organizationId: organization.id }),
-    initialValue.trim(),
-    userId
-  )
-  const isSearching = useIsFetching({ queryKey }) > 0
-  const drafts = searchDraftKeys(userId, organization.id)
-  const latestDraftKey = drafts.latest
-  const latestDraft = useMothershipDraftsStore((state) => state.drafts[latestDraftKey])
-  const ownerQuery = initialValue || latestDraft?.searchQuery || ''
-  const draftKey = drafts.query(ownerQuery)
-  const draft = useMothershipDraftsStore((state) => state.drafts[draftKey])
-  const value =
-    draft?.text ?? (latestDraft?.searchQuery === ownerQuery ? latestDraft.text : initialValue)
-  const setValue = (text: string) => {
-    const { setDraft } = useMothershipDraftsStore.getState()
-    const payload = { text, searchQuery: ownerQuery }
-    setDraft(draftKey, payload)
-    setDraft(latestDraftKey, payload)
-  }
-  const submit = (text = value) => {
-    if (!text.trim() || (isSearching && text.trim() === initialValue.trim())) return
-    const { clearDraft } = useMothershipDraftsStore.getState()
-    if (text.trim() === value.trim()) {
-      clearDraft(draftKey)
-      if (latestDraft?.searchQuery === ownerQuery) clearDraft(latestDraftKey)
-    }
-    clearDraft(drafts.query(text.trim()))
-    onSubmit(text)
-  }
-  const voice = useVoiceInput({
-    organizationId: organization.id,
-    getValue: () => value,
-    onChange: setValue,
-  })
-
-  useEffect(() => {
-    if (hydrated) inputRef.current?.focus()
-  }, [hydrated])
-
-  return {
-    inputRef,
-    hydrated,
-    value,
-    setValue,
-    submit,
-    voice,
-    isSearching,
-    canSubmit: hydrated && value.trim().length > 0,
-    /** The field's action button: Stop while this query runs, otherwise Search. */
-    submitOrStop: () => (isSearching ? void queryClient.cancelQueries({ queryKey }) : submit()),
-  }
-}
diff --git a/apps/sim/app/o/[organizationId]/settings/navigation.test.ts b/apps/sim/app/o/[organizationId]/settings/navigation.test.ts
index 0a567718b87..675a7be8ba6 100644
--- a/apps/sim/app/o/[organizationId]/settings/navigation.test.ts
+++ b/apps/sim/app/o/[organizationId]/settings/navigation.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import type { OrganizationSettingsFeatures } from '@/components/settings/navigation'
+import { buildOrganizationNavItems } from '@/app/o/[organizationId]/components/organization-sidebar/navigation'
 import {
   organizationSettingsNavigation,
   resolveOrganizationSettingsSection,
@@ -23,6 +24,11 @@ describe('organization settings navigation', () => {
     expect(resolveOrganizationSettingsSection('sessions')).toBe('security')
     expect(resolveOrganizationSettingsSection('/o/one/settings/network')).toBeNull()
     expect(resolveOrganizationSettingsSection('skills')).toBeNull()
+    expect(
+      buildOrganizationNavItems('org', { searchAvailable: true, mothershipAvailable: true }).map(
+        ({ id }) => id
+      )
+    ).toEqual(['home', 'search', 'integrations'])
   })
   it('keeps both setup pages hidden from non-admins when Search is disabled', () => {
     const sections = organizationSettingsNavigation(false, enterprise, {
diff --git a/apps/sim/app/o/[organizationId]/settings/organization-settings-rail.tsx b/apps/sim/app/o/[organizationId]/settings/organization-settings-rail.tsx
deleted file mode 100644
index 3b746ba2501..00000000000
--- a/apps/sim/app/o/[organizationId]/settings/organization-settings-rail.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-'use client'
-
-import { OrganizationSettingsSidebar } from '@/app/o/[organizationId]/settings/organization-settings-sidebar'
-
-interface OrganizationSettingsRailProps {
-  collapsed: boolean
-}
-
-/**
- * Settings' own navigation inside the organization rail. It keeps the rail markup its chips read:
- * collapsed labels hide through `.sidebar-container`, and their width through `group/rail`.
- */
-export function OrganizationSettingsRail({ collapsed }: OrganizationSettingsRailProps) {
-  return (
-    <div
-      className='group/rail sidebar-container flex h-full flex-col overflow-hidden bg-[var(--surface-1)] [&_.group.cursor-pointer]:duration-0'
-      data-collapsed={collapsed || undefined}
-    >
-      <OrganizationSettingsSidebar isCollapsed={collapsed} showCollapsedTooltips={collapsed} />
-    </div>
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/index.ts b/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/index.ts
index cd37a146c47..b278c03e8e7 100644
--- a/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/index.ts
@@ -4,6 +4,8 @@ export { DocumentsEmptyState } from '@/app/workspace/[workspaceId]/components/re
 export { FilesEmptyState } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/files-empty-state'
 export { KnowledgeEmptyState } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/knowledge-empty-state'
 export { LogsEmptyState } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/logs-empty-state'
+export { ResourceLoadError } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/resource-load-error'
 export { ResourceNoResults } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/resource-no-results'
+export { SimLinksEmptyState } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/sim-links-empty-state'
 export { TablesEmptyState } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/tables-empty-state'
 export { TestsEmptyState } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/tests-empty-state'
diff --git a/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/resource-load-error.tsx b/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/resource-load-error.tsx
new file mode 100644
index 00000000000..eaff2e66928
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/resource-load-error.tsx
@@ -0,0 +1,16 @@
+import { Chip } from '@sim/emcn'
+
+interface ResourceLoadErrorProps {
+  message: string
+  onRetry: () => void
+}
+
+/** What a resource table shows when its first page failed to load. */
+export function ResourceLoadError({ message, onRetry }: ResourceLoadErrorProps) {
+  return (
+    <div role='alert' className='flex flex-col items-center gap-3 p-6'>
+      <p className='text-[var(--text-error)] text-small'>{message}</p>
+      <Chip onClick={onRetry}>Retry</Chip>
+    </div>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/sim-links-empty-state.tsx b/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/sim-links-empty-state.tsx
new file mode 100644
index 00000000000..b0f2bcfbc48
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/sim-links-empty-state.tsx
@@ -0,0 +1,127 @@
+import { Chip, cn } from '@sim/emcn'
+import { EmptyState } from '@/components/empty-state/empty-state'
+import { HAIRLINE } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/hairline'
+import { MASK_NO_REPEAT } from '@/app/workspace/[workspaceId]/components/resource/components/resource-empty-state/mask'
+
+/**
+ * Skeleton ink — see the `INK` note in `tables-empty-state.tsx` for why not the surface
+ * ramp. `mark` is the tables selection ring's opaque mix, so the held link reads as the
+ * one drawn shortcut rather than more placeholder.
+ */
+const INK = {
+  title: 'color-mix(in srgb, var(--text-secondary) 30%, transparent)',
+  detail: 'color-mix(in srgb, var(--text-secondary) 15%, transparent)',
+  mark: 'color-mix(in srgb, var(--text-secondary) 46%, var(--bg))',
+} as const
+
+/** The logs feed's falloff — a link directory is the same repeating structure. */
+const DIRECTORY_FADE =
+  '[-webkit-mask-image:linear-gradient(to_bottom,#000_44%,transparent_100%)] [mask-image:linear-gradient(to_bottom,#000_44%,transparent_100%)]'
+
+interface LinkRow {
+  name: number
+  destination: number
+}
+
+/** The held link leads, wholly inside the fade's opaque head, so its card never dissolves. */
+const ROWS: readonly LinkRow[] = [
+  { name: 54, destination: 132 },
+  { name: 70, destination: 108 },
+  { name: 46, destination: 140 },
+  { name: 62, destination: 118 },
+] as const
+
+const HELD_ROW = 0
+const ROW_PITCH = 38
+const PILL_X = 12
+const PILL_PADDING = 10
+
+/** A link directory: short names pointing at their destinations, one held in a card. */
+function SimLinksGraphic() {
+  return (
+    <svg
+      viewBox='0 0 286 148'
+      width={286}
+      height={148}
+      fill='none'
+      aria-hidden='true'
+      focusable='false'
+      className={cn('block max-w-none shrink-0', DIRECTORY_FADE, MASK_NO_REPEAT)}
+    >
+      {ROWS.map((row, index) => {
+        const y = 6 + index * ROW_PITCH
+        const held = index === HELD_ROW
+        const ink = held ? INK.mark : INK.title
+        const arrowX = PILL_X + row.name + PILL_PADDING * 2 + 10
+        return (
+          <g key={y}>
+            {held ? (
+              <rect
+                x='0.5'
+                y={y - 2}
+                width='285'
+                height='36'
+                rx='8'
+                fill='var(--surface-2)'
+                {...HAIRLINE}
+              />
+            ) : null}
+            <rect
+              x={PILL_X}
+              y={y + 8}
+              width={row.name + PILL_PADDING * 2}
+              height='16'
+              rx='8'
+              fill='var(--surface-2)'
+              stroke={held ? INK.mark : 'var(--border)'}
+              strokeWidth={held ? 1.4 : HAIRLINE.strokeWidth}
+            />
+            <rect
+              x={PILL_X + PILL_PADDING}
+              y={y + 14}
+              width={row.name}
+              height='4'
+              rx='2'
+              fill={ink}
+            />
+            <path
+              d={`M ${arrowX} ${y + 16} H ${arrowX + 18} M ${arrowX + 13} ${y + 11.5} L ${arrowX + 18} ${y + 16} L ${arrowX + 13} ${y + 20.5}`}
+              stroke={ink}
+              strokeWidth={1.4}
+              strokeLinecap='round'
+              strokeLinejoin='round'
+            />
+            <rect
+              x={arrowX + 28}
+              y={y + 14}
+              width={row.destination}
+              height='4'
+              rx='2'
+              fill={INK.detail}
+            />
+          </g>
+        )
+      })}
+    </svg>
+  )
+}
+
+interface SimLinksEmptyStateProps {
+  onCreate: () => void
+}
+
+/** Empty state for an organization with no Sim links yet. */
+export function SimLinksEmptyState({ onCreate }: SimLinksEmptyStateProps) {
+  return (
+    <EmptyState
+      graphic={<SimLinksGraphic />}
+      title='Links'
+      description='Create short links like handbook for the pages your team opens most.'
+      action={
+        <Chip variant='primary' onClick={onCreate}>
+          New link
+        </Chip>
+      }
+    />
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/components/workspace-chrome/workspace-chrome.tsx b/apps/sim/app/workspace/[workspaceId]/components/workspace-chrome/workspace-chrome.tsx
index 67fe8bc5e0b..5762d963c63 100644
--- a/apps/sim/app/workspace/[workspaceId]/components/workspace-chrome/workspace-chrome.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/components/workspace-chrome/workspace-chrome.tsx
@@ -69,7 +69,7 @@ interface WorkspaceChromeProps {
    * The rail this chrome hosts. Rendered once inside the shell and never re-mounted
    * across collapse, peek, or fullscreen; it reads collapse and peek state through
    * {@link useSidebarChrome}. The workspace passes its own `Sidebar`; the organization
-   * surface passes the design-system `Sidebar`.
+   * surface passes `OrganizationSidebar`.
    */
   sidebar: ReactNode
   /** Cookie-derived collapse state from the server layout; seeds the sidebar's first render. */
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results.tsx
index 9437876eaa1..e2125fc0f5e 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results.tsx
@@ -1,19 +1,27 @@
 'use client'
 
+import { useEffect, useMemo, useState } from 'react'
 import { Chip, ChipLink } from '@sim/emcn'
+import { useQueryStates } from 'nuqs'
 import { ActivityStatus } from '@/components/ui/activity-status'
 import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
 import { useSession } from '@/lib/auth/client'
-import type { ResourceScope } from '@/lib/core/resource-scope'
+import { type ResourceScope, resourceScopeKey } from '@/lib/core/resource-scope'
+import { organizationRoutes } from '@/lib/navigation/paths'
 import { SearchFilters } from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-filters'
-import { useLiveSearchResults } from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results/use-live-search-results'
 import {
+  groupResultsByDocument,
   handleResultsKeyDown,
-  liveSearchResultsKey,
   type SearchResultsProps,
   toSource,
 } from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results/utils'
 import { SourceCard } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-card'
+import {
+  resourceUrlKeys,
+  searchFilterParsers,
+  searchFiltersFromParams,
+} from '@/app/workspace/[workspaceId]/home/search-params'
+import { useWorkspaceKnowledgeSearch } from '@/hooks/queries/kb/knowledge'
 
 type KnowledgeSearchResultsProps = (
   | { workspaceId: string; scope?: never }
@@ -34,6 +42,7 @@ export function KnowledgeSearchResults({
   nativeQueries,
   reuseFreshResult,
   onSummarize,
+  onSearchChange,
 }: KnowledgeSearchResultsProps) {
   const scope: ResourceScope = suppliedScope ?? { kind: 'workspace', workspaceId: workspaceId! }
   const { data: session } = useSession()
@@ -41,7 +50,7 @@ export function KnowledgeSearchResults({
   const Results = LiveSearchResults
   return (
     <Results
-      key={liveSearchResultsKey(scope, session?.user?.id, trimmed)}
+      key={JSON.stringify([resourceScopeKey(scope), session?.user?.id, trimmed])}
       scope={scope}
       query={trimmed}
       suppliedFilters={suppliedFilters}
@@ -49,28 +58,65 @@ export function KnowledgeSearchResults({
       nativeQueries={nativeQueries}
       reuseFreshResult={reuseFreshResult}
       onSummarize={onSummarize}
+      onSearchChange={onSearchChange}
     />
   )
 }
 
 /** Live results do not mount index or sync-status queries. */
-function LiveSearchResults(props: SearchResultsProps) {
-  const { scope, query } = props
-  const {
-    awaitingRange,
-    isPending,
-    isFetching,
-    isError,
-    refetch,
-    documents,
-    showFilterControls,
-    sourceTypes,
-    noResults,
-    connectAppsHref,
-    someAppsUnavailable,
-    coverageIncomplete,
-    summarizerFor,
-  } = useLiveSearchResults(props)
+function LiveSearchResults({
+  scope,
+  query,
+  suppliedFilters,
+  topK,
+  nativeQueries,
+  reuseFreshResult,
+  onSummarize,
+  onSearchChange,
+}: SearchResultsProps) {
+  const [hasShownFilters, setHasShownFilters] = useState(false)
+  const [searchedAt] = useState(() => Date.now())
+  const [params] = useQueryStates(searchFilterParsers, resourceUrlKeys)
+  const filters = useMemo(
+    () => suppliedFilters ?? searchFiltersFromParams(params, searchedAt),
+    [suppliedFilters, params.source, params.updated, params.from, params.to, searchedAt]
+  )
+  const awaitingRange =
+    !suppliedFilters && params.updated === 'custom' && !(params.from && params.to)
+  const { data, isPending, isFetching, isError, refetch } = useWorkspaceKnowledgeSearch(
+    scope,
+    awaitingRange ? '' : query,
+    filters,
+    topK ?? 20,
+    { nativeQueries, reuseFreshResult }
+  )
+  useEffect(() => {
+    onSearchChange?.({
+      scope,
+      query,
+      filters,
+      ...(topK ? { topK } : {}),
+      ...(nativeQueries ? { nativeQueries } : {}),
+    })
+  }, [
+    scope.kind,
+    scope.kind === 'organization' ? scope.organizationId : scope.workspaceId,
+    query,
+    filters,
+    topK,
+    nativeQueries,
+    onSearchChange,
+  ])
+  const showFilters = hasShownFilters || data !== undefined || awaitingRange || isError
+  if (showFilters && !hasShownFilters) setHasShownFilters(true)
+  const documents = groupResultsByDocument(data?.results ?? [])
+  const accounts = data?.live?.accounts ?? []
+  const sources = [
+    ...new Set([
+      ...accounts.map((account) => account.provider),
+      ...(filters.source ? [filters.source] : []),
+    ]),
+  ]
   return (
     <div aria-busy={!awaitingRange && isFetching} className='flex flex-col'>
       {!awaitingRange && isFetching && (
@@ -94,26 +140,42 @@ function LiveSearchResults(props: SearchResultsProps) {
           )}
         </div>
       )}
-      {showFilterControls && <SearchFilters sourceTypes={sourceTypes} />}
-      {noResults && (
-        <p className='px-2 py-2 text-[var(--text-muted)] text-caption'>Search found no results.</p>
-      )}
-      {connectAppsHref && (
+      {!suppliedFilters && showFilters && <SearchFilters sourceTypes={sources} />}
+      {!awaitingRange &&
+        !isPending &&
+        !isFetching &&
+        !isError &&
+        data?.retrieval.status === 'complete' &&
+        documents.length === 0 && (
+          <p className='px-2 py-2 text-[var(--text-muted)] text-caption'>
+            Search found no results.
+          </p>
+        )}
+      {!isFetching && data?.live && accounts.length === 0 && (
         <div className='flex items-center gap-2 px-2 py-2'>
           <p role='status' className='text-[var(--text-muted)] text-caption'>
             No connected apps are available for this search.
           </p>
-          <ChipLink variant='border' href={connectAppsHref}>
+          <ChipLink
+            variant='border'
+            href={
+              scope.kind === 'organization'
+                ? organizationRoutes(scope.organizationId).integrations
+                : `/workspace/${scope.workspaceId}/integrations`
+            }
+          >
             Connect apps
           </ChipLink>
         </div>
       )}
-      {someAppsUnavailable && (
+      {accounts.some((account) =>
+        ['unavailable', 'timeout', 'rate_limited', 'reconnect'].includes(account.status)
+      ) && (
         <p role='status' className='px-2 py-1 text-[var(--text-muted)] text-caption'>
           Some apps couldn’t be searched. Showing available results.
         </p>
       )}
-      {coverageIncomplete && (
+      {!data?.live && data?.retrieval.status === 'partial' && (
         <p className='px-2 py-1 text-[var(--text-muted)] text-caption'>
           Coverage is incomplete. Narrow the query or ask Assistant to refine it.
         </p>
@@ -130,7 +192,15 @@ function LiveSearchResults(props: SearchResultsProps) {
             key={result.documentId}
             source={toSource(result, query, scope)}
             query={query}
-            onSummarize={summarizerFor(result.documentId)}
+            onSummarize={
+              isFetching || !onSummarize
+                ? undefined
+                : (cited) =>
+                    onSummarize(`Summarize "${cited.title ?? cited.url}"`, {
+                      ...filters,
+                      documentIds: [result.documentId],
+                    })
+            }
           />
         ))}
       </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-filters.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-filters.tsx
index 8493dd08cfe..c1d28baf693 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-filters.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-filters.tsx
@@ -1,13 +1,19 @@
 import { ChipDatePicker, ChipDropdown } from '@sim/emcn'
-import { useSearchFilterControls } from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results/use-search-filter-controls'
+import { useQueryStates } from 'nuqs'
+import { connectorDisplayName } from '@/lib/sim-search/connectors'
+import {
+  resourceUrlKeys,
+  searchFilterParsers,
+  UPDATED_WINDOWS,
+} from '@/app/workspace/[workspaceId]/home/search-params'
 
 interface SearchFiltersProps {
   sourceTypes: readonly string[]
 }
 
-/** The refinement controls in the app's chip chrome. */
+/** Shared refinements for indexed and live search, backed by the same URL parameters. */
 export function SearchFilters({ sourceTypes }: SearchFiltersProps) {
-  const { source, updated, range } = useSearchFilterControls(sourceTypes)
+  const [filters, setFilters] = useQueryStates(searchFilterParsers, resourceUrlKeys)
   return (
     <div
       role='group'
@@ -17,30 +23,46 @@ export function SearchFilters({ sourceTypes }: SearchFiltersProps) {
       <ChipDropdown
         variant='ghost'
         shape='round'
-        aria-label={source.label}
+        aria-label={`Filter by source: ${filters.source ? (filters.source === 'upload' ? 'Uploads' : connectorDisplayName(filters.source)) : 'All sources'}`}
         matchTriggerWidth={false}
-        value={source.value}
-        options={source.options}
-        onChange={source.onChange}
+        value={filters.source ?? ''}
+        options={[
+          { value: '', label: 'All sources' },
+          ...sourceTypes.map((type) => ({
+            value: type,
+            label: type === 'upload' ? 'Uploads' : connectorDisplayName(type),
+          })),
+        ]}
+        onChange={(source) => void setFilters({ source: source || null })}
       />
       <ChipDropdown
         variant='ghost'
         shape='round'
-        aria-label={updated.label}
+        aria-label={`Filter by date: ${UPDATED_WINDOWS.find((window) => window.id === filters.updated)?.label ?? 'Any time'}`}
         matchTriggerWidth={false}
-        value={updated.value}
-        options={updated.options}
-        onChange={updated.onChange}
+        value={filters.updated}
+        options={UPDATED_WINDOWS.map((window) => ({ value: window.id, label: window.label }))}
+        onChange={(value) => {
+          const window = UPDATED_WINDOWS.find((entry) => entry.id === value)
+          if (window)
+            void setFilters(
+              window.id === 'custom'
+                ? { updated: window.id }
+                : { updated: window.id, from: null, to: null }
+            )
+        }}
       />
-      {range && (
+      {filters.updated === 'custom' && (
         <ChipDatePicker
           mode='range'
           variant='ghost'
           placeholder='Updated between'
-          startDate={range.start}
-          endDate={range.end}
-          onRangeChange={range.onChange}
-          onClear={range.onClear}
+          startDate={filters.from?.toISOString().slice(0, 10)}
+          endDate={filters.to?.toISOString().slice(0, 10)}
+          onRangeChange={(start, end) =>
+            void setFilters({ from: new Date(start), to: new Date(end) })
+          }
+          onClear={() => void setFilters({ updated: 'any', from: null, to: null })}
         />
       )}
     </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-transitions.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-transitions.test.tsx
index ac0eb328744..a9c1d36f774 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-transitions.test.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-transitions.test.tsx
@@ -22,6 +22,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 const mocks = vi.hoisted(() => ({
   userId: 'reader',
+  summarize: vi.fn(),
   urlUpdate: vi.fn(),
 }))
 vi.mock('@/lib/auth/client', () => authClientMock)
@@ -32,6 +33,30 @@ vi.mock('@/hooks/use-speech-to-text', () => ({
   useSpeechToText: () => ({ isSupported: false }),
 }))
 vi.mock('@/hooks/queries/kb/connectors', () => kbConnectorsQueriesMock)
+vi.mock(
+  '@/app/workspace/[workspaceId]/home/components/message-content/components/source-card',
+  () => ({
+    SourceCard: ({
+      source,
+      onSummarize,
+    }: {
+      source: { title: string; url: string }
+      onSummarize?: (source: { title: string; url: string }) => void
+    }) => (
+      <div>
+        <a href={source.url} data-source-link>
+          {source.title}
+        </a>
+        <button type='button'>Copy link</button>
+        {onSummarize && (
+          <button type='button' onClick={() => onSummarize(source)}>
+            Summarize
+          </button>
+        )}
+      </div>
+    ),
+  })
+)
 
 import type {
   WorkspaceKnowledgeSearchBody,
@@ -42,10 +67,12 @@ import {
   resolveDeploymentShape,
   seedDeploymentShape,
 } from '@/lib/core/config/deployment-shape'
+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 { knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
 import { searchHistoryKeys } from '@/hooks/queries/utils/search-history-keys'
-import { SearchHistory } from '@/platform/app/(shell)/search/_components/search-surface/search-history'
-import { OrganizationSearchSurface } from '@/platform/app/(shell)/search/_components/search-surface/search-surface'
 import { useMothershipDraftsStore } from '@/stores/mothership-drafts/store'
 
 nextNavigationMockFns.mockUsePathname.mockReturnValue('/o/organization/search')
@@ -110,12 +137,36 @@ afterEach(() => {
   vi.useRealTimers()
 })
 
-async function render(params = '') {
+async function render({
+  scope = { kind: 'organization', organizationId: 'organization' },
+  query = 'launch',
+  params = '',
+  organizationPage = false,
+  filters,
+  topK,
+}: {
+  scope?: ResourceScope
+  query?: string
+  params?: string
+  organizationPage?: boolean
+  filters?: import('@/lib/api/contracts/knowledge').WorkspaceSearchFilters
+  topK?: number
+} = {}) {
   await act(async () => {
     root.render(
       <QueryClientProvider client={client}>
         <NuqsTestingAdapter hasMemory searchParams={params} onUrlUpdate={mocks.urlUpdate}>
-          <OrganizationSearchSurface userId='reader' />
+          {organizationPage ? (
+            <OrganizationSearch userId='reader' />
+          ) : (
+            <KnowledgeSearchResults
+              scope={scope}
+              query={query}
+              filters={filters}
+              topK={topK}
+              onSummarize={mocks.summarize}
+            />
+          )}
         </NuqsTestingAdapter>
       </QueryClientProvider>
     )
@@ -164,7 +215,7 @@ describe('live search submission feedback', () => {
     async (draft) => {
       const shape = resolveDeploymentShape()
       seedDeploymentShape({ ...shape, features: shape.features })
-      await render('?q=launch')
+      await render({ organizationPage: true, params: '?q=launch' })
       await act(async () => {
         await vi.advanceTimersByTimeAsync(1)
       })
@@ -216,12 +267,16 @@ describe('live search submission feedback', () => {
   it('acknowledges the submitted query before exposing refinement controls', async () => {
     const shape = resolveDeploymentShape()
     seedDeploymentShape({ ...shape, features: shape.features })
-    await render('?q=launch')
+    await render({ organizationPage: true, params: '?q=launch' })
     await act(async () => {
       await vi.advanceTimersByTimeAsync(1)
     })
     expect(requests).toHaveLength(1)
-    expect(container.querySelector('[role="group"][aria-label="Search filters"]')).toBeNull()
+    expect(
+      [...container.querySelectorAll('button')].some(
+        (element) => element.textContent === 'All sources'
+      )
+    ).toBe(false)
     expect(
       container.querySelector<HTMLButtonElement>('button[aria-label="Stop search"]')?.disabled
     ).toBe(false)
@@ -271,9 +326,9 @@ it('removes cached private history when access is denied during revalidation', a
   await act(async () => {
     root.render(
       <QueryClientProvider client={client}>
-        <SearchHistory userId='reader' onSearch={() => {}}>
+        <SearchLandingHistory organizationId='organization' userId='reader' onSearch={() => {}}>
           <input aria-label='Search' />
-        </SearchHistory>
+        </SearchLandingHistory>
       </QueryClientProvider>
     )
     await vi.advanceTimersByTimeAsync(1)
@@ -297,7 +352,7 @@ it('keeps an unsent draft when a different recent search is opened', async () =>
     sources: [],
     queries: [{ query: 'launch', searchedAt: new Date().toISOString() }],
   })
-  await render()
+  await render({ organizationPage: true })
   const recent = [...container.querySelectorAll('button')].find(
     (button) => button.textContent === 'launch'
   )
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/use-live-search-results.ts b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/use-live-search-results.ts
deleted file mode 100644
index b35ec488274..00000000000
--- a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/use-live-search-results.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { useState } from 'react'
-import { useQueryStates } from 'nuqs'
-import { organizationRoutes } from '@/lib/navigation/paths'
-import {
-  groupResultsByDocument,
-  type SearchResultsProps,
-} from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results/utils'
-import type { SourceTagData } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
-import {
-  resourceUrlKeys,
-  searchFilterParsers,
-  searchFiltersFromParams,
-} from '@/app/workspace/[workspaceId]/home/search-params'
-import { useWorkspaceKnowledgeSearch } from '@/hooks/queries/kb/knowledge'
-
-const UNAVAILABLE_ACCOUNT_STATUSES = ['unavailable', 'timeout', 'rate_limited', 'reconnect']
-
-/**
- * What a live search shows and when. Mount it under a key from `liveSearchResultsKey`: the rolling
- * date anchor and the revealed filters belong to one query in one access scope.
- */
-export function useLiveSearchResults({
-  scope,
-  query,
-  suppliedFilters,
-  topK,
-  nativeQueries,
-  reuseFreshResult,
-  onSummarize,
-}: SearchResultsProps) {
-  const [hasShownFilters, setHasShownFilters] = useState(false)
-  const [searchedAt] = useState(() => Date.now())
-  const [params] = useQueryStates(searchFilterParsers, resourceUrlKeys)
-  const filters = suppliedFilters ?? searchFiltersFromParams(params, searchedAt)
-  const awaitingRange =
-    !suppliedFilters && params.updated === 'custom' && !(params.from && params.to)
-  const { data, isPending, isFetching, isError, refetch } = useWorkspaceKnowledgeSearch(
-    scope,
-    awaitingRange ? '' : query,
-    filters,
-    topK ?? 20,
-    { nativeQueries, reuseFreshResult }
-  )
-  const showFilters = hasShownFilters || data !== undefined || awaitingRange || isError
-  if (showFilters && !hasShownFilters) setHasShownFilters(true)
-  const documents = groupResultsByDocument(data?.results ?? [])
-  const accounts = data?.live?.accounts ?? []
-  return {
-    awaitingRange,
-    isPending,
-    isFetching,
-    isError,
-    refetch,
-    documents,
-    showFilterControls: !suppliedFilters && showFilters,
-    sourceTypes: [
-      ...new Set([
-        ...accounts.map((account) => account.provider),
-        ...(filters.source ? [filters.source] : []),
-      ]),
-    ],
-    noResults:
-      !awaitingRange &&
-      !isPending &&
-      !isFetching &&
-      !isError &&
-      data?.retrieval.status === 'complete' &&
-      documents.length === 0,
-    connectAppsHref:
-      !isFetching && data?.live && accounts.length === 0
-        ? scope.kind === 'organization'
-          ? organizationRoutes(scope.organizationId).integrations
-          : `/workspace/${scope.workspaceId}/integrations`
-        : null,
-    someAppsUnavailable: accounts.some((account) =>
-      UNAVAILABLE_ACCOUNT_STATUSES.includes(account.status)
-    ),
-    coverageIncomplete: !data?.live && data?.retrieval.status === 'partial',
-    /** Summarize's hand-off for one document: scoped to it, and absent while results may change. */
-    summarizerFor: (documentId: string) =>
-      isFetching || !onSummarize
-        ? undefined
-        : (cited: SourceTagData) =>
-            onSummarize(`Summarize "${cited.title ?? cited.url}"`, {
-              ...filters,
-              documentIds: [documentId],
-            }),
-  }
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/use-search-filter-controls.ts b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/use-search-filter-controls.ts
deleted file mode 100644
index 99c4db35d75..00000000000
--- a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/use-search-filter-controls.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { useQueryStates } from 'nuqs'
-import { connectorDisplayName } from '@/lib/sim-search/connectors'
-import {
-  resourceUrlKeys,
-  searchFilterParsers,
-  UPDATED_WINDOWS,
-} from '@/app/workspace/[workspaceId]/home/search-params'
-
-/** A picker can't hold an empty string, so "every source" has a value of its own. */
-const ALL_SOURCES = '__all_sources__'
-
-function sourceOptionLabel(type: string): string {
-  return type === 'upload' ? 'Uploads' : connectorDisplayName(type)
-}
-
-/** Shared refinements for indexed and live search, backed by the same URL parameters. */
-export function useSearchFilterControls(sourceTypes: readonly string[]) {
-  const [filters, setFilters] = useQueryStates(searchFilterParsers, resourceUrlKeys)
-  return {
-    source: {
-      value: filters.source ?? ALL_SOURCES,
-      label: `Filter by source: ${filters.source ? sourceOptionLabel(filters.source) : 'All sources'}`,
-      options: [
-        { value: ALL_SOURCES, label: 'All sources' },
-        ...sourceTypes.map((type) => ({ value: type, label: sourceOptionLabel(type) })),
-      ],
-      onChange: (source: string) =>
-        void setFilters({ source: source === ALL_SOURCES ? null : source }),
-    },
-    updated: {
-      value: filters.updated,
-      label: `Filter by date: ${UPDATED_WINDOWS.find((window) => window.id === filters.updated)?.label ?? 'Any time'}`,
-      options: UPDATED_WINDOWS.map((window) => ({ value: window.id, label: window.label })),
-      onChange: (value: string) => {
-        const window = UPDATED_WINDOWS.find((entry) => entry.id === value)
-        if (window)
-          void setFilters(
-            window.id === 'custom'
-              ? { updated: window.id }
-              : { updated: window.id, from: null, to: null }
-          )
-      },
-    },
-    range:
-      filters.updated === 'custom'
-        ? {
-            start: filters.from?.toISOString().slice(0, 10),
-            end: filters.to?.toISOString().slice(0, 10),
-            onChange: (start: string, end: string) =>
-              void setFilters({ from: new Date(start), to: new Date(end) }),
-            onClear: () => void setFilters({ updated: 'any', from: null, to: null }),
-          }
-        : null,
-  }
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/utils.ts b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/utils.ts
index f95930ae20e..6c20582454f 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/utils.ts
@@ -2,7 +2,7 @@ import type {
   WorkspaceKnowledgeSearchResult,
   WorkspaceSearchFilters,
 } from '@/lib/api/contracts/knowledge'
-import { type ResourceScope, resourceScopeKey } from '@/lib/core/resource-scope'
+import type { ResourceScope } from '@/lib/core/resource-scope'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { matchSnippet } from '@/lib/knowledge/search/snippet'
 import type { SearchResource } from '@/lib/mothership/generated/resources'
@@ -12,15 +12,6 @@ import {
   type SourceTagData,
 } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
 
-/** A new query, reader or access scope starts a fresh search and rolling-date anchor. */
-export function liveSearchResultsKey(
-  scope: ResourceScope,
-  userId: string | undefined,
-  query: string
-): string {
-  return JSON.stringify([resourceScopeKey(scope), userId, query])
-}
-
 /**
  * One card per document, keeping the best-ranked chunk of each: the list is
  * already in rank order, so the first chunk seen for a document is its best.
@@ -90,4 +81,5 @@ export interface SearchResultsProps {
   query: string
   /** Binds the Assistant turn to the selected canonical document. */
   onSummarize?: (prompt: string, filters: WorkspaceSearchFilters) => void
+  onSearchChange?: (search: SearchResource) => void
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/index.ts b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/index.ts
index 0bbe8af07fb..aa84967bfba 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/index.ts
@@ -4,6 +4,6 @@ export { ChatContent } from './chat-content'
 export { MessageSources } from './message-sources'
 export { Options } from './options'
 export { QuestionDisplay } from './question'
-export { highlightTerms, SourceCard } from './source-card'
+export { SourceCard } from './source-card'
 export { SourceChip, sourceLabel } from './source-chip'
 export { PendingTagIndicator, parseSpecialTags, SpecialTags } from './special-tags'
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/index.ts b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/index.ts
index ad7cccef9e3..269cd5ca45c 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/index.ts
@@ -1,4 +1 @@
-export {
-  highlightTerms,
-  SourceCard,
-} from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card'
+export { SourceCard } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card'
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card.tsx
index 0014e5e09dd..03a469f216d 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card.tsx
@@ -46,11 +46,7 @@ const SOURCE_ROW_MARK_CLASSES = cn(chipIconSlotClass, 'mt-0.5')
  * document matched. Terms are matched as whole words in any script,
  * case-insensitively, by the same rule the snippet was centred with.
  */
-export function highlightTerms(
-  text: string,
-  query: string | undefined,
-  termClassName = 'font-medium text-[var(--text-primary)]'
-): ReactNode {
+function highlightTerms(text: string, query: string | undefined): ReactNode {
   const matches = findTermMatches(text, queryTerms(query))
   if (matches.length === 0) return text
   const parts: ReactNode[] = []
@@ -58,7 +54,7 @@ export function highlightTerms(
   for (const match of matches) {
     if (match.index > cursor) parts.push(text.slice(cursor, match.index))
     parts.push(
-      <strong key={match.index} className={termClassName}>
+      <strong key={match.index} className='font-medium text-[var(--text-primary)]'>
         {text.slice(match.index, match.index + match.length)}
       </strong>
     )
@@ -74,18 +70,6 @@ function parseUpdatedAt(value: string | undefined): Date | null {
   return Number.isNaN(date.getTime()) ? null : date
 }
 
-/** Where a source lives, who wrote it and when it changed, in the order a result row reads them. */
-export function sourceMeta(source: SourceTagData): string {
-  const updatedAt = parseUpdatedAt(source.updatedAt)
-  return [
-    sourceSiteName(source),
-    source.author?.trim() || null,
-    updatedAt ? formatDate(updatedAt) : null,
-  ]
-    .filter((part): part is string => Boolean(part))
-    .join(' · ')
-}
-
 interface SourceActionsProps {
   source: SourceTagData
   onSummarize?: (source: SourceTagData) => void
@@ -146,7 +130,12 @@ interface SourceCardProps {
 /** Source results share the same document identity and actions across search and cited evidence. */
 export function SourceCard({ source, query, onSummarize, dense = false }: SourceCardProps) {
   const navigate = useSourceNavigation(source)
-  const meta = sourceMeta(source)
+  const updatedAt = parseUpdatedAt(source.updatedAt)
+  const meta = [
+    sourceSiteName(source),
+    source.author?.trim() || null,
+    updatedAt ? formatDate(updatedAt) : null,
+  ].filter((part): part is string => Boolean(part))
 
   if (dense) {
     return (
@@ -177,7 +166,7 @@ export function SourceCard({ source, query, onSummarize, dense = false }: Source
             />
           </a>
           <OverflowText
-            label={meta}
+            label={meta.join(' · ')}
             className='max-w-[40%] shrink-0 text-[var(--text-tertiary)] text-caption'
           />
           <SourceActions source={source} />
@@ -209,7 +198,10 @@ export function SourceCard({ source, query, onSummarize, dense = false }: Source
           </div>
         </div>
         <div className='flex min-w-0 flex-col gap-1 pl-6'>
-          <OverflowText label={meta} className='text-[var(--text-tertiary)] text-caption' />
+          <OverflowText
+            label={meta.join(' · ')}
+            className='text-[var(--text-tertiary)] text-caption'
+          />
           {source.snippet && (
             <p className='line-clamp-3 text-[var(--text-body)] text-small [overflow-wrap:anywhere]'>
               {highlightTerms(source.snippet, query)}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/mic-button/mic-button.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/mic-button/mic-button.tsx
index 401708bdb21..2bc3eb549a4 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/mic-button/mic-button.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/mic-button/mic-button.tsx
@@ -21,7 +21,7 @@ interface VoiceWaveformProps {
   isListening: boolean
 }
 
-export function VoiceWaveform({ audioLevels, isListening }: VoiceWaveformProps) {
+function VoiceWaveform({ audioLevels, isListening }: VoiceWaveformProps) {
   const prefersReducedMotion = usePrefersReducedMotion()
   const barRefs = useRef<Array<SVGLineElement | null>>([])
 
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.dom.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.dom.test.tsx
index 2e76d28d5a2..67e039f7322 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.dom.test.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.dom.test.tsx
@@ -162,13 +162,7 @@ interface NetworkState {
    * - `deduped` — the 409 the server returns for an already-claimed send
    */
   postBehavior: 'hang' | 'accept' | 'deduped' | 'tool' | 'task'
-  postBodies: Array<{
-    message: string
-    mode?: string
-    userMessageId?: string
-    chatId?: string
-    effort?: string
-  }>
+  postBodies: Array<{ message: string; userMessageId?: string; chatId?: string; effort?: string }>
   pendingAdmissions: Map<string, () => void>
   abortSettlements: boolean[]
   abortBodies: CopilotChatAbortBody[]
@@ -323,8 +317,7 @@ let queryClient: QueryClient
 
 function renderUseChat(
   owner: string | { organizationId: string } = 'ws-1',
-  requestMode?: 'agent' | 'assistant',
-  getChatUrl?: (chatId: string) => string
+  requestMode?: 'agent' | 'assistant'
 ): {
   getResult: () => ReturnType<typeof useChat>
   unmount: () => void
@@ -338,7 +331,7 @@ function renderUseChat(
   let result: ReturnType<typeof useChat> | undefined
 
   function Probe() {
-    result = useChat(owner, undefined, { requestMode, getChatUrl })
+    result = useChat(owner, undefined, { requestMode })
     return null
   }
 
@@ -1162,36 +1155,6 @@ describe('useChat remount send recovery', () => {
     expect(state.postBodies[0].chatId).toBe('chat-a')
   })
 
-  it('moves an Assistant turn from organization Home to its Search chat, and Home starts over', async () => {
-    mockUsePathname.mockReturnValue('/o/org-1/home')
-    state.postBehavior = 'task'
-    const replace = vi.spyOn(window.history, 'replaceState')
-    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',
-      })
-    })
-    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}?mode=assistant`)
-
-    mockUsePathname.mockReturnValue(chatPath)
-    selectMode('assistant')
-    expect(getResult().resolvedChatId).toBe(DEDUPED_CHAT_ID)
-    expect(getResult().messages.length).toBeGreaterThan(0)
-
-    mockUsePathname.mockReturnValue('/o/org-1/home')
-    selectMode('assistant')
-    await waitFor(() => getResult().resolvedChatId === undefined)
-    expect(getResult().messages).toEqual([])
-  })
-
   it('does not navigate from an unmounted stopped send when admission arrives late', async () => {
     let admit!: (response: Response) => void
     vi.stubGlobal('fetch', (input: RequestInfo | URL, init?: RequestInit) => {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/help-modal/help-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/help-modal/help-modal.tsx
index 64fcbaf2081..33ec2732321 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/help-modal/help-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/help-modal/help-modal.tsx
@@ -12,23 +12,29 @@ import {
 import { X } from '@sim/emcn/icons'
 import { createLogger } from '@sim/logger'
 import { useMutation } from '@tanstack/react-query'
+import imageCompression from 'browser-image-compression'
 import Image from 'next/image'
 import { Controller, useForm } from 'react-hook-form'
 import { z } from 'zod'
-import {
-  ACCEPTED_HELP_IMAGE_TYPES,
-  compressHelpImage,
-  DEFAULT_HELP_REQUEST_TYPE,
-  HELP_REQUEST_TYPE_OPTIONS,
-  submitHelpRequest,
-  validateHelpImage,
-} from '@/lib/help/request'
 
 const logger = createLogger('HelpModal')
 
+const MAX_FILE_SIZE = 20 * 1024 * 1024
+const TARGET_SIZE_MB = 2
+const ACCEPTED_IMAGE_TYPES = ['image/jpeg', 'image/jpg', 'image/png', 'image/webp', 'image/gif']
+
 const SCROLL_DELAY_MS = 100
 const SUCCESS_RESET_DELAY_MS = 2000
 
+const DEFAULT_REQUEST_TYPE = 'bug'
+
+const REQUEST_TYPE_OPTIONS = [
+  { label: 'Bug report', value: 'bug' },
+  { label: 'Feedback', value: 'feedback' },
+  { label: 'Feature request', value: 'feature_request' },
+  { label: 'Other', value: 'other' },
+]
+
 const formSchema = z.object({
   subject: z.string().min(1, 'Subject is required'),
   message: z.string().min(1, 'Message is required'),
@@ -57,6 +63,58 @@ interface SubmitHelpVariables {
   workspaceId?: string
 }
 
+async function compressImage(file: File): Promise<File> {
+  if (file.size < TARGET_SIZE_MB * 1024 * 1024 || file.type === 'image/gif') {
+    return file
+  }
+
+  try {
+    const compressedFile = await imageCompression(file, {
+      maxSizeMB: TARGET_SIZE_MB,
+      maxWidthOrHeight: 1920,
+      useWebWorker: true,
+      fileType: file.type,
+      initialQuality: 0.8,
+      alwaysKeepResolution: true,
+    })
+
+    return new File([compressedFile], file.name, {
+      type: file.type,
+      lastModified: Date.now(),
+    })
+  } catch (error) {
+    logger.warn('Image compression failed, using original file:', { error })
+    return file
+  }
+}
+
+async function submitHelpRequest({ data, images, workflowId, workspaceId }: SubmitHelpVariables) {
+  const formData = new FormData()
+  formData.append('subject', data.subject)
+  formData.append('message', data.message)
+  formData.append('type', data.type)
+  if (workspaceId) formData.append('workspaceId', workspaceId)
+  formData.append('userAgent', navigator.userAgent)
+  if (workflowId) {
+    formData.append('workflowId', workflowId)
+  }
+
+  images.forEach((image, index) => {
+    formData.append(`image_${index}`, image)
+  })
+
+  // boundary-raw-fetch: multipart/form-data submission with image attachments, requestJson only supports JSON bodies
+  const response = await fetch('/api/help', {
+    method: 'POST',
+    body: formData,
+  })
+
+  if (!response.ok) {
+    const errorData = await response.json().catch(() => null)
+    throw new Error(errorData?.error || 'Failed to submit help request')
+  }
+}
+
 export function HelpModal({ open, onOpenChange, workflowId, workspaceId }: HelpModalProps) {
   const scrollContainerRef = useRef<HTMLDivElement>(null)
   const imagesRef = useRef<ImageWithPreview[]>([])
@@ -70,13 +128,13 @@ export function HelpModal({ open, onOpenChange, workflowId, workspaceId }: HelpM
     defaultValues: {
       subject: '',
       message: '',
-      type: DEFAULT_HELP_REQUEST_TYPE,
+      type: DEFAULT_REQUEST_TYPE,
     },
     mode: 'onSubmit',
   })
 
   const helpMutation = useMutation({
-    mutationFn: (variables: SubmitHelpVariables) => submitHelpRequest(variables),
+    mutationFn: submitHelpRequest,
     onSuccess: (_data, variables) => {
       setSubmitStatus('success')
       reset()
@@ -101,7 +159,7 @@ export function HelpModal({ open, onOpenChange, workflowId, workspaceId }: HelpM
       reset({
         subject: '',
         message: '',
-        type: DEFAULT_HELP_REQUEST_TYPE,
+        type: DEFAULT_REQUEST_TYPE,
       })
     } else {
       const previewsToRevoke = imagesRef.current
@@ -150,12 +208,17 @@ export function HelpModal({ open, onOpenChange, workflowId, workspaceId }: HelpM
       let hasError = false
 
       for (const file of Array.from(files)) {
-        if (validateHelpImage(file)) {
+        if (file.size > MAX_FILE_SIZE) {
+          hasError = true
+          continue
+        }
+
+        if (!ACCEPTED_IMAGE_TYPES.includes(file.type)) {
           hasError = true
           continue
         }
 
-        const compressedFile = await compressHelpImage(file)
+        const compressedFile = await compressImage(file)
         const imageWithPreview = Object.assign(compressedFile, {
           preview: URL.createObjectURL(compressedFile),
         }) as ImageWithPreview
@@ -202,7 +265,7 @@ export function HelpModal({ open, onOpenChange, workflowId, workspaceId }: HelpM
                 title='Request'
                 value={field.value}
                 onChange={field.onChange}
-                options={HELP_REQUEST_TYPE_OPTIONS}
+                options={REQUEST_TYPE_OPTIONS}
                 placeholder='Select a request type'
                 error={fieldState.error?.message}
               />
@@ -242,7 +305,7 @@ export function HelpModal({ open, onOpenChange, workflowId, workspaceId }: HelpM
             title='Attach images (optional)'
             label='Drop images here or click to browse'
             description='PNG, JPEG, WebP, GIF (max 20MB each)'
-            accept={ACCEPTED_HELP_IMAGE_TYPES.join(',')}
+            accept={ACCEPTED_IMAGE_TYPES.join(',')}
             multiple
             onChange={processFiles}
           />
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-footer/sidebar-footer.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-footer/sidebar-footer.tsx
index 33b4e7154bc..68054db6e28 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-footer/sidebar-footer.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-footer/sidebar-footer.tsx
@@ -2,6 +2,7 @@
 
 import type { ComponentType } from 'react'
 import { ANONYMOUS_USER_ID } from '@sim/auth/principal'
+import type { DesktopUpdateState } from '@sim/desktop-bridge'
 import {
   Chip,
   chipContentLabelClass,
@@ -22,6 +23,7 @@ import { useRouter } from 'next/navigation'
 import { SlackIcon } from '@/components/icons'
 import { SettingsIntentLink } from '@/components/settings/settings-intent-link'
 import { signOutAndRedirect } from '@/lib/auth/sign-out'
+import { getDesktopUpdates } from '@/lib/desktop'
 import { rememberSettingsReturnUrl } from '@/lib/navigation/settings-return'
 import { getUserColor } from '@/lib/workspaces/colors'
 import { SidebarTooltip } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-tooltip'
@@ -30,14 +32,22 @@ import {
   SIDEBAR_RAIL_CHIP_CLASS,
 } from '@/app/workspace/[workspaceId]/w/components/sidebar/constants'
 import { useUserProfile } from '@/hooks/queries/user-profile'
-import {
-  desktopUpdateActionLabel,
-  hasAvailableDesktopUpdate,
-  runDesktopUpdateAction,
-  useDesktopUpdateState,
-} from '@/hooks/use-desktop-update-state'
+import { useDesktopUpdateState } from '@/hooks/use-desktop-update-state'
 import { useSettingsDirtyStore } from '@/stores/settings/dirty/store'
 
+function hasAvailableDesktopUpdate(state: DesktopUpdateState): boolean {
+  return state.status === 'available' || state.status === 'downloading' || state.status === 'ready'
+}
+
+function desktopUpdateActionLabel(state: DesktopUpdateState): string {
+  if (state.status === 'downloading') {
+    return state.percent === undefined
+      ? 'Downloading update…'
+      : `Downloading update ${state.percent}%`
+  }
+  return state.status === 'ready' ? 'Restart to update' : 'Update'
+}
+
 /** Compact primary update circle using the same footprint as the surrounding sidebar icons. */
 function DesktopUpdateIcon({ className }: { className?: string }) {
   return (
@@ -120,7 +130,14 @@ export function SidebarFooter({
   const updateAvailable = hasAvailableDesktopUpdate(updateState)
   const canSignOut = Boolean(profile && profile.id !== ANONYMOUS_USER_ID)
 
-  const handleUpdateSelect = () => runDesktopUpdateAction(updateState)
+  const handleUpdateSelect = () => {
+    const updates = getDesktopUpdates()
+    if (updateState.status === 'ready') {
+      updates?.install()
+    } else if (updateState.status === 'available') {
+      updates?.check()
+    }
+  }
 
   /**
    * Built from plain `img`/`div` rather than the emcn `Avatar`, whose Radix root
diff --git a/apps/sim/hooks/queries/oauth-provider.ts b/apps/sim/hooks/queries/oauth-provider.ts
index 00fd58b905f..d5ace0d7638 100644
--- a/apps/sim/hooks/queries/oauth-provider.ts
+++ b/apps/sim/hooks/queries/oauth-provider.ts
@@ -113,17 +113,3 @@ export function useOAuthSwitchAccount() {
     },
   })
 }
-
-/** Whether an app the viewer authorized can read Search, paging until one is found or none is left. */
-export function useHasSearchAuthorization(enabled: boolean): boolean {
-  const apps = useAuthorizedApps('', { enabled })
-  const authorized =
-    apps.data?.pages.some((page) =>
-      page.apps.some((app) => oauthScopeSatisfies(app.scopes, OAUTH_SEARCH_READ_SCOPE))
-    ) ?? false
-  const { hasNextPage, isFetching, isError, fetchNextPage } = apps
-  useEffect(() => {
-    if (enabled && !authorized && hasNextPage && !isFetching && !isError) void fetchNextPage()
-  }, [enabled, authorized, hasNextPage, isFetching, isError, fetchNextPage])
-  return authorized
-}
diff --git a/apps/sim/hooks/queries/organization-accounts.ts b/apps/sim/hooks/queries/organization-accounts.ts
index 8c93c712cda..a94b62779cb 100644
--- a/apps/sim/hooks/queries/organization-accounts.ts
+++ b/apps/sim/hooks/queries/organization-accounts.ts
@@ -165,7 +165,7 @@ export function useDisconnectPersonalOrganizationAccount() {
   })
 }
 
-export function organizationAccountsQueryOptions(organizationId?: string) {
+function organizationAccountsQueryOptions(organizationId?: string) {
   return queryOptions({
     queryKey: organizationAccountsKeys.detail(organizationId),
     staleTime: ORGANIZATION_ACCOUNTS_STALE_TIME,
diff --git a/apps/sim/hooks/queries/organization-home.ts b/apps/sim/hooks/queries/organization-home.ts
deleted file mode 100644
index 34e5372fe6b..00000000000
--- a/apps/sim/hooks/queries/organization-home.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { useQuery } from '@tanstack/react-query'
-import { requestJson } from '@/lib/api/client/request'
-import {
-  getOrganizationHomeCalendarContract,
-  getOrganizationHomeEmailContract,
-} from '@/lib/api/contracts/organization-home'
-import { organizationAccountsKeys } from '@/hooks/queries/utils/organization-accounts-keys'
-
-/** Each read costs a request per thread at the member's mail provider, so focus re-reads are spaced. */
-const EMAIL_STALE_TIME = 2 * 60 * 1000
-/** A day's meetings change less often than a mailbox, and every day browsed is its own read. */
-const CALENDAR_STALE_TIME = 5 * 60 * 1000
-
-/** Nested under the organization's accounts, so anything that changes a connection refreshes Home. */
-const organizationHomeKeys = {
-  all: organizationAccountsKeys.details(),
-  organization: (organizationId: string) =>
-    [...organizationAccountsKeys.detail(organizationId), 'home'] as const,
-  email: (organizationId: string) =>
-    [...organizationHomeKeys.organization(organizationId), 'email'] as const,
-  calendar: (organizationId: string, date: string, timeZone: string) =>
-    [...organizationHomeKeys.organization(organizationId), 'calendar', date, timeZone] as const,
-}
-
-interface HomeWidgetQueryOptions {
-  enabled: boolean
-}
-
-/** Refreshes on focus once stale, in place of polling: the person is back to look at it. */
-export function useOrganizationHomeEmail(
-  organizationId: string,
-  { enabled }: HomeWidgetQueryOptions
-) {
-  return useQuery({
-    queryKey: organizationHomeKeys.email(organizationId),
-    queryFn: ({ signal }) =>
-      requestJson(getOrganizationHomeEmailContract, { params: { id: organizationId }, signal }),
-    enabled,
-    staleTime: EMAIL_STALE_TIME,
-    refetchOnWindowFocus: true,
-  })
-}
-
-export function useOrganizationHomeCalendar(
-  organizationId: string,
-  date: string,
-  timeZone: string,
-  { enabled }: HomeWidgetQueryOptions
-) {
-  return useQuery({
-    queryKey: organizationHomeKeys.calendar(organizationId, date, timeZone),
-    queryFn: ({ signal }) =>
-      requestJson(getOrganizationHomeCalendarContract, {
-        params: { id: organizationId },
-        query: { date, timeZone },
-        signal,
-      }),
-    enabled,
-    staleTime: CALENDAR_STALE_TIME,
-    refetchOnWindowFocus: true,
-  })
-}
diff --git a/apps/sim/hooks/queries/search-history.ts b/apps/sim/hooks/queries/search-history.ts
index a158a941d15..919709decfd 100644
--- a/apps/sim/hooks/queries/search-history.ts
+++ b/apps/sim/hooks/queries/search-history.ts
@@ -44,30 +44,3 @@ export function useClearSearchHistory(organizationId: string, userId: string) {
       queryClient.invalidateQueries({ queryKey: searchHistoryKeys.list(organizationId, userId) }),
   })
 }
-
-/** Takes the source off the list at once and restores it if the server refuses. */
-export function useRemoveSearchHistorySource(organizationId: string, userId: string | undefined) {
-  const queryClient = useQueryClient()
-  const queryKey = searchHistoryKeys.list(organizationId, userId)
-  return useMutation({
-    mutationFn: (url: string) =>
-      requestJson(removeSearchHistorySourceContract, {
-        params: { id: organizationId },
-        body: { url },
-      }),
-    onMutate: async (url) => {
-      await queryClient.cancelQueries({ queryKey })
-      const previous = queryClient.getQueryData<SearchHistoryResponse>(queryKey)
-      if (previous)
-        queryClient.setQueryData<SearchHistoryResponse>(queryKey, {
-          ...previous,
-          sources: previous.sources.filter((source) => source.url !== url),
-        })
-      return { previous }
-    },
-    onError: (_error, _url, context) => {
-      if (context?.previous) queryClient.setQueryData(queryKey, context.previous)
-    },
-    onSettled: () => queryClient.invalidateQueries({ queryKey }),
-  })
-}
diff --git a/apps/sim/hooks/queries/search-integrations.ts b/apps/sim/hooks/queries/search-integrations.ts
index 202887f60bc..95c74c4b9f2 100644
--- a/apps/sim/hooks/queries/search-integrations.ts
+++ b/apps/sim/hooks/queries/search-integrations.ts
@@ -13,7 +13,7 @@ import {
   searchIntegrationKeys,
 } from '@/hooks/queries/utils/search-integration-keys'
 
-export function searchIntegrationsQueryOptions(organizationId: string) {
+function searchIntegrationsQueryOptions(organizationId: string) {
   return queryOptions({
     queryKey: searchIntegrationKeys.list(organizationId),
     queryFn: async ({ signal }) =>
diff --git a/apps/sim/hooks/queries/sim-links.ts b/apps/sim/hooks/queries/sim-links.ts
index a128dfa7435..8817c92e90d 100644
--- a/apps/sim/hooks/queries/sim-links.ts
+++ b/apps/sim/hooks/queries/sim-links.ts
@@ -18,7 +18,7 @@ import type { SimLinkSort } from '@/lib/sim-links/validation'
 import type { SortDirection } from '@/lib/url-state'
 import { SIM_LINKS_STALE_TIME, simLinkKeys } from '@/hooks/queries/utils/sim-link-keys'
 
-export function simLinksQueryOptions(
+function simLinksQueryOptions(
   organizationId: string,
   search: string,
   sort: SimLinkSort,
diff --git a/apps/sim/hooks/queries/utils/prefetch-query-on-intent.ts b/apps/sim/hooks/queries/utils/prefetch-query-on-intent.ts
index dc9badd20b4..9e63d2f63fb 100644
--- a/apps/sim/hooks/queries/utils/prefetch-query-on-intent.ts
+++ b/apps/sim/hooks/queries/utils/prefetch-query-on-intent.ts
@@ -5,7 +5,7 @@ type QueryFilterKey = NonNullable<
 >
 
 /** Removes a speculative read that failed and that nothing is mounted to report. */
-export function dropFailedSpeculativeQuery(queryClient: QueryClient, queryKey: QueryKey): void {
+function dropFailedSpeculativeQuery(queryClient: QueryClient, queryKey: QueryKey): void {
   const state = queryClient.getQueryState(queryKey)
   if (state?.status !== 'error' || state.data !== undefined) return
 
diff --git a/apps/sim/hooks/use-desktop-update-state.ts b/apps/sim/hooks/use-desktop-update-state.ts
index 1b7c6007463..32ccb904f1a 100644
--- a/apps/sim/hooks/use-desktop-update-state.ts
+++ b/apps/sim/hooks/use-desktop-update-state.ts
@@ -4,26 +4,6 @@ import { useEffect, useState } from 'react'
 import type { DesktopUpdateState } from '@sim/desktop-bridge'
 import { getDesktopUpdates } from '@/lib/desktop'
 
-export function hasAvailableDesktopUpdate(state: DesktopUpdateState): boolean {
-  return state.status === 'available' || state.status === 'downloading' || state.status === 'ready'
-}
-
-export function desktopUpdateActionLabel(state: DesktopUpdateState): string {
-  if (state.status === 'downloading') {
-    return state.percent === undefined
-      ? 'Downloading update…'
-      : `Downloading update ${state.percent}%`
-  }
-  return state.status === 'ready' ? 'Restart to update' : 'Update'
-}
-
-/** Installs a downloaded update, or starts downloading an available one. */
-export function runDesktopUpdateAction(state: DesktopUpdateState): void {
-  const updates = getDesktopUpdates()
-  if (state.status === 'ready') updates?.install()
-  else if (state.status === 'available') updates?.check()
-}
-
 const INITIAL_UPDATE_STATE: DesktopUpdateState = { status: 'idle' }
 
 export function useDesktopUpdateState(): DesktopUpdateState {
diff --git a/apps/sim/lib/api/contracts/common.ts b/apps/sim/lib/api/contracts/common.ts
index 2bd1c2334c7..b846d3407ae 100644
--- a/apps/sim/lib/api/contracts/common.ts
+++ b/apps/sim/lib/api/contracts/common.ts
@@ -13,7 +13,6 @@ export const helpFormBodySchema = z.object({
   message: z.string().min(1, 'Message is required'),
   type: z.enum(['bug', 'feedback', 'feature_request', 'other']),
 })
-export type HelpFormBody = z.input<typeof helpFormBodySchema>
 
 export const integrationRequestBodySchema = z.object({
   integrationName: z
diff --git a/apps/sim/lib/api/contracts/organization-home.ts b/apps/sim/lib/api/contracts/organization-home.ts
deleted file mode 100644
index 05c06ecbd8b..00000000000
--- a/apps/sim/lib/api/contracts/organization-home.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { z } from 'zod'
-import { organizationIdSchema } from '@/lib/api/contracts/primitives'
-import { defineRouteContract } from '@/lib/api/contracts/types'
-import { isValidTimezone } from '@/lib/core/utils/timezone'
-import {
-  HOME_CALENDAR_ATTENDEE_LIMIT,
-  HOME_CALENDAR_EVENT_LIMIT,
-  HOME_EMAIL_THREAD_LIMIT,
-  HOME_TEXT_LIMITS,
-} from '@/lib/organizations/home/limits'
-
-const paramsSchema = z.object({ id: organizationIdSchema })
-
-const homeWidgetAccountSchema = z.object({
-  credentialId: z.string().min(1).max(128),
-  displayName: z.string().max(512),
-  /**
-   * What this read found for the account. `not_offered` means the organization or the viewer's
-   * permission group no longer allows the provider, and `not_read` that the account fell past the
-   * per-read account limit.
-   */
-  state: z.enum(['ready', 'needs_reauth', 'not_offered', 'unavailable', 'not_read']),
-})
-export type HomeWidgetAccount = z.output<typeof homeWidgetAccountSchema>
-
-const homeEmailThreadSchema = z.object({
-  id: z.string().min(1).max(512),
-  credentialId: z.string().min(1).max(128),
-  sender: z.string().max(HOME_TEXT_LIMITS.name),
-  subject: z.string().max(HOME_TEXT_LIMITS.title),
-  excerpt: z.string().max(HOME_TEXT_LIMITS.excerpt),
-  receivedAt: z.iso.datetime(),
-  /** Messages in the thread, when the provider groups them and there is more than one. */
-  messageCount: z.number().int().min(2).optional(),
-  url: z.string().url().max(2048),
-})
-
-export const getOrganizationHomeEmailContract = defineRouteContract({
-  method: 'GET',
-  path: '/api/organizations/[id]/home/email',
-  params: paramsSchema,
-  response: {
-    mode: 'json',
-    schema: z.object({
-      accounts: z.array(homeWidgetAccountSchema),
-      threads: z.array(homeEmailThreadSchema).max(HOME_EMAIL_THREAD_LIMIT),
-    }),
-  },
-})
-export type OrganizationHomeEmail = z.output<
-  typeof getOrganizationHomeEmailContract.response.schema
->
-
-const homeCalendarEventSchema = z.object({
-  id: z.string().min(1).max(1024),
-  credentialId: z.string().min(1).max(128),
-  title: z.string().max(HOME_TEXT_LIMITS.title),
-  allDay: z.boolean(),
-  startAt: z.iso.datetime(),
-  endAt: z.iso.datetime(),
-  url: z.string().url().max(2048).optional(),
-  people: z
-    .array(z.object({ name: z.string().max(HOME_TEXT_LIMITS.name) }))
-    .max(HOME_CALENDAR_ATTENDEE_LIMIT),
-})
-
-export const getOrganizationHomeCalendarContract = defineRouteContract({
-  method: 'GET',
-  path: '/api/organizations/[id]/home/calendar',
-  params: paramsSchema,
-  query: z.object({
-    date: z.iso.date({ error: 'Expected a calendar date in YYYY-MM-DD form' }),
-    timeZone: z
-      .string()
-      .min(1)
-      .max(64)
-      .refine(isValidTimezone, 'Expected an IANA timezone such as America/Los_Angeles'),
-  }),
-  response: {
-    mode: 'json',
-    schema: z.object({
-      accounts: z.array(homeWidgetAccountSchema),
-      /** The instants that bound the requested day in the requested zone. */
-      window: z.object({ startAt: z.iso.datetime(), endAt: z.iso.datetime() }),
-      events: z.array(homeCalendarEventSchema).max(HOME_CALENDAR_EVENT_LIMIT),
-    }),
-  },
-})
-export type OrganizationHomeCalendar = z.output<
-  typeof getOrganizationHomeCalendarContract.response.schema
->
diff --git a/apps/sim/lib/core/utils/timezone.ts b/apps/sim/lib/core/utils/timezone.ts
index 738457ce28a..5a5f1b93eaf 100644
--- a/apps/sim/lib/core/utils/timezone.ts
+++ b/apps/sim/lib/core/utils/timezone.ts
@@ -30,13 +30,6 @@ export function isCalendarDate(value: string | null): value is string {
   return !Number.isNaN(instant.getTime()) && instant.toISOString().slice(0, 10) === value
 }
 
-/** Adds whole days to a `yyyy-MM-dd` date. Anchored at noon so no zone or DST can shift the day. */
-export function addCalendarDays(date: string, days: number): string {
-  const next = new Date(`${date}T12:00:00Z`)
-  next.setUTCDate(next.getUTCDate() + days)
-  return next.toISOString().slice(0, 10)
-}
-
 /** A wall-clock reading of an instant in some timezone. */
 export interface WallClockParts {
   year: number
diff --git a/apps/sim/lib/credential-groups/member-integrations.ts b/apps/sim/lib/credential-groups/member-integrations.ts
index 1792350bfe6..84a793d1f96 100644
--- a/apps/sim/lib/credential-groups/member-integrations.ts
+++ b/apps/sim/lib/credential-groups/member-integrations.ts
@@ -26,19 +26,6 @@ const SEARCH_ACCOUNT_PROVIDERS = new Set([
   }),
 ])
 
-/** Who has a member integrations inventory at all: the rule behind the member Integrations page. */
-export function canReadMemberIntegrations(surface: {
-  searchAccess: { memberScoped: boolean }
-  viewer: { canConnectSearchIntegrations: boolean }
-  connectedAccountsAvailable: boolean
-}): boolean {
-  return (
-    surface.searchAccess.memberScoped &&
-    surface.viewer.canConnectSearchIntegrations &&
-    surface.connectedAccountsAvailable
-  )
-}
-
 export function assistantAccountOptions(data: OrganizationAccountsSettings, search: string) {
   const providers = data.assistantProviders.filter(
     (provider) => !SEARCH_ACCOUNT_PROVIDERS.has(provider)
diff --git a/apps/sim/lib/credential-groups/search-readiness.ts b/apps/sim/lib/credential-groups/search-readiness.ts
deleted file mode 100644
index 892a4fc93dd..00000000000
--- a/apps/sim/lib/credential-groups/search-readiness.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import type { SearchIntegrationStatus } from '@/lib/api/contracts/knowledge/search-integrations'
-import type { OrganizationAccountsSettings } from '@/lib/api/contracts/organization-accounts'
-import {
-  liveSearchProviderForCredential,
-  supportsLiveSearchMode,
-} from '@/lib/sim-search/live/provider-catalog'
-
-/** Get started's first step: the viewer reads Search through their own connection or a source. */
-export function hasSearchIntegrationReady(
-  accounts: OrganizationAccountsSettings | undefined,
-  policies: SearchIntegrationStatus[] | undefined
-): boolean {
-  const usable = policies?.filter((policy) => policy.approved && policy.available !== false)
-  const approved = new Set(usable?.map((policy) => policy.connectorType))
-  const group = accounts?.credentialGroup
-  const readyOptions = new Set(
-    group?.options
-      .filter((option) => {
-        const provider = liveSearchProviderForCredential(option.provider)
-        return (
-          option.status === 'active' &&
-          option.configurationStatus === 'ready' &&
-          provider &&
-          supportsLiveSearchMode(provider, 'member') &&
-          approved.has(provider)
-        )
-      })
-      .map((option) => option.id)
-  )
-  const readyServers = new Set(
-    group?.mcpServers
-      .filter((server) => {
-        const provider = liveSearchProviderForCredential(`mcp:${server.managedConnectorId}`)
-        return (
-          server.enabled &&
-          provider &&
-          approved.has(provider) &&
-          accounts?.availableMcpConnectors.some((id) => id === server.managedConnectorId)
-        )
-      })
-      .map((server) => server.id)
-  )
-  const hasConnection =
-    group?.status === 'active' &&
-    (accounts?.viewerAccounts?.some(
-      (account) => account.status === 'active' && readyOptions.has(account.optionId)
-    ) ||
-      accounts?.viewerMcpAccounts?.some(
-        (account) => account.status === 'active' && readyServers.has(account.mcpServerId)
-      ))
-  return Boolean(hasConnection || usable?.some((policy) => policy.configuredServiceSource))
-}
diff --git a/apps/sim/lib/help/request.ts b/apps/sim/lib/help/request.ts
deleted file mode 100644
index 74f56db9342..00000000000
--- a/apps/sim/lib/help/request.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { createLogger } from '@sim/logger'
-import type { HelpFormBody } from '@/lib/api/contracts/common'
-
-const logger = createLogger('HelpRequest')
-
-const MAX_HELP_IMAGE_BYTES = 20 * 1024 * 1024
-const TARGET_SIZE_MB = 2
-export const ACCEPTED_HELP_IMAGE_TYPES = [
-  'image/jpeg',
-  'image/jpg',
-  'image/png',
-  'image/webp',
-  'image/gif',
-]
-
-export const HELP_REQUEST_TYPE_OPTIONS: { label: string; value: HelpFormBody['type'] }[] = [
-  { label: 'Bug report', value: 'bug' },
-  { label: 'Feedback', value: 'feedback' },
-  { label: 'Feature request', value: 'feature_request' },
-  { label: 'Other', value: 'other' },
-]
-
-export const DEFAULT_HELP_REQUEST_TYPE = 'bug'
-
-/** Why `file` cannot be attached to a help request, or null when it can. */
-export function validateHelpImage(file: Pick<File, 'size' | 'type'>): string | null {
-  if (file.size > MAX_HELP_IMAGE_BYTES) return 'Images must be 20MB or smaller.'
-  if (!ACCEPTED_HELP_IMAGE_TYPES.includes(file.type))
-    return 'Attach a JPEG, PNG, WebP or GIF image.'
-  return null
-}
-
-export async function compressHelpImage(file: File): Promise<File> {
-  if (file.size < TARGET_SIZE_MB * 1024 * 1024 || file.type === 'image/gif') {
-    return file
-  }
-
-  try {
-    const { default: imageCompression } = await import('browser-image-compression')
-    const compressedFile = await imageCompression(file, {
-      maxSizeMB: TARGET_SIZE_MB,
-      maxWidthOrHeight: 1920,
-      useWebWorker: true,
-      fileType: file.type,
-      initialQuality: 0.8,
-      alwaysKeepResolution: true,
-    })
-
-    return new File([compressedFile], file.name, {
-      type: file.type,
-      lastModified: Date.now(),
-    })
-  } catch (error) {
-    logger.warn('Image compression failed, using original file:', { error })
-    return file
-  }
-}
-
-interface SubmitHelpRequestInput {
-  data: HelpFormBody
-  images: readonly File[]
-  workflowId?: string
-  workspaceId?: string
-}
-
-export async function submitHelpRequest({
-  data,
-  images,
-  workflowId,
-  workspaceId,
-}: SubmitHelpRequestInput): Promise<void> {
-  const formData = new FormData()
-  formData.append('subject', data.subject)
-  formData.append('message', data.message)
-  formData.append('type', data.type)
-  if (workspaceId) formData.append('workspaceId', workspaceId)
-  formData.append('userAgent', navigator.userAgent)
-  if (workflowId) {
-    formData.append('workflowId', workflowId)
-  }
-
-  images.forEach((image, index) => {
-    formData.append(`image_${index}`, image)
-  })
-
-  // boundary-raw-fetch: multipart/form-data submission with image attachments, requestJson only supports JSON bodies
-  const response = await fetch('/api/help', {
-    method: 'POST',
-    body: formData,
-  })
-
-  if (!response.ok) {
-    const errorData = await response.json().catch(() => null)
-    throw new Error(errorData?.error || 'Failed to submit help request')
-  }
-}
diff --git a/apps/sim/lib/organizations/application/home-widgets.integration.ts b/apps/sim/lib/organizations/application/home-widgets.integration.ts
deleted file mode 100644
index 8dfb4e9f87a..00000000000
--- a/apps/sim/lib/organizations/application/home-widgets.integration.ts
+++ /dev/null
@@ -1,479 +0,0 @@
-/**
- * The Home widgets' real authorization and persistence boundary: only the acting member's own grant
- * ever reaches a provider, gates hold on the server, and a refused token changes stored state. Only
- * the provider's network is replaced.
- */
-import type { SessionPrincipal } from '@sim/auth/principal'
-import { db } from '@sim/db'
-import {
-  credential,
-  credentialGroup,
-  credentialGroupEnrollment,
-  member,
-  organization,
-  organizationSearchIntegration,
-  resourcePolicy,
-  user,
-} from '@sim/db/schema'
-import { authMock, authMockFns } from '@sim/testing/mocks/auth.mock'
-import { generateId } from '@sim/utils/id'
-import { and, eq, inArray } from 'drizzle-orm'
-import { NextRequest } from 'next/server'
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
-import { PrincipalKindAuthorizationError } from '@/lib/core/application/workspace-authorization'
-import * as providerTransport from '@/lib/core/security/input-validation.server'
-import { getCredentialGroupProviderAdapter } from '@/lib/credential-groups/provider-registry'
-import { encryptManagedOAuthTokenSet } from '@/lib/credentials/managed-oauth'
-import * as knowledgeAvailability from '@/lib/knowledge/access/availability'
-import {
-  readOrganizationHomeCalendar,
-  readOrganizationHomeEmail,
-} from '@/lib/organizations/application/home-widgets'
-import { HOME_EMAIL_THREAD_LIMIT } from '@/lib/organizations/home/limits'
-import { GET as getCalendarRoute } from '@/app/api/organizations/[id]/home/calendar/route'
-import { GET as getEmailRoute } from '@/app/api/organizations/[id]/home/email/route'
-
-vi.mock('@/lib/auth', () => authMock)
-vi.mock('@/connectors/gmail/mailbox', async (importOriginal) => ({
-  ...(await importOriginal<typeof import('@/connectors/gmail/mailbox')>()),
-  getGmailMailboxEmail: async () => 'reader@example.com',
-}))
-
-vi.hoisted(() => {
-  Object.assign(process.env, {
-    GOOGLE_CLIENT_ID: 'home-google-fixture-client',
-    GOOGLE_CLIENT_SECRET: 'home-google-fixture-secret',
-    MICROSOFT_CLIENT_ID: 'home-microsoft-fixture-client',
-    MICROSOFT_CLIENT_SECRET: 'home-microsoft-fixture-secret',
-  })
-})
-
-const organizationId = generateId()
-const otherOrganizationId = generateId()
-const memberId = generateId()
-const colleagueId = generateId()
-const outsiderId = generateId()
-const groupId = generateId()
-const memberGmail = `member-gmail-${generateId()}`
-const memberCalendar = `member-calendar-${generateId()}`
-const memberOutlook = `member-outlook-${generateId()}`
-const colleagueGmail = `colleague-gmail-${generateId()}`
-
-const session = (userId: string): SessionPrincipal => ({
-  kind: 'session',
-  userId,
-  sessionId: generateId(),
-})
-const input = { organizationId }
-const day = { organizationId, date: '2026-11-05', timeZone: 'America/Los_Angeles' }
-
-function providerResponse(body: unknown, status = 200) {
-  const text = JSON.stringify(body)
-  return {
-    ok: status < 400,
-    status,
-    statusText: '',
-    headers: new Headers() as never,
-    body: null,
-    text: async () => text,
-    json: async () => body,
-    arrayBuffer: async () => new TextEncoder().encode(text).buffer as ArrayBuffer,
-  }
-}
-
-const provider = vi.spyOn(providerTransport, 'secureFetchWithValidation')
-
-/** A Gmail, Calendar and Graph stand-in that records the token behind each request. */
-function serveProviders(overrides: { status?: number } = {}) {
-  const tokens: string[] = []
-  provider.mockImplementation(async (url, options) => {
-    tokens.push(String(options.headers?.Authorization))
-    if (overrides.status) return providerResponse({ error: 'provider text' }, overrides.status)
-    if (url.includes('gmail.googleapis.com') && url.includes('/threads?'))
-      return providerResponse({
-        threads: Array.from({ length: 40 }, (_, index) => ({ id: `thread-${index}` })),
-      })
-    if (url.includes('gmail.googleapis.com'))
-      return providerResponse({
-        id: 'thread',
-        messages: [
-          {
-            id: 'message',
-            snippet: 'Preview',
-            payload: {
-              headers: [
-                { name: 'From', value: 'Ada <ada@example.com>' },
-                { name: 'Subject', value: 'Engines' },
-                { name: 'Date', value: 'Thu, 5 Nov 2026 10:00:00 +0000' },
-              ],
-            },
-          },
-        ],
-      })
-    if (url.includes('www.googleapis.com/calendar'))
-      return providerResponse({
-        items: [
-          {
-            id: 'event',
-            status: 'confirmed',
-            summary: 'Review',
-            htmlLink: 'https://calendar.google.com/event?eid=1',
-            start: { dateTime: '2026-11-05T17:00:00Z' },
-            end: { dateTime: '2026-11-05T17:30:00Z' },
-          },
-        ],
-      })
-    if (url.includes('/me/mailFolders/inbox/messages'))
-      return providerResponse({
-        value: [
-          {
-            id: 'outlook-message',
-            subject: 'Budget',
-            bodyPreview: 'Preview',
-            from: { emailAddress: { name: 'Grace', address: 'grace@example.com' } },
-            receivedDateTime: '2026-11-05T09:00:00Z',
-          },
-        ],
-      })
-    return providerResponse({ value: [] })
-  })
-  return tokens
-}
-
-function setStatus(credentialId: string, managedOauthStatus: 'active' | 'needs_reauth') {
-  return db.update(credential).set({ managedOauthStatus }).where(eq(credential.id, credentialId))
-}
-
-function setApproval(connectorType: string, approved: boolean) {
-  return db
-    .update(organizationSearchIntegration)
-    .set({ approved })
-    .where(
-      and(
-        eq(organizationSearchIntegration.organizationId, organizationId),
-        eq(organizationSearchIntegration.connectorType, connectorType)
-      )
-    )
-}
-
-beforeAll(async () => {
-  const policies = {
-    gmail: await getCredentialGroupProviderAdapter('gmail').getPolicy(undefined, {}),
-    'google-calendar': await getCredentialGroupProviderAdapter('google-calendar').getPolicy(
-      undefined,
-      {}
-    ),
-    outlook: await getCredentialGroupProviderAdapter('outlook').getPolicy(undefined, {}),
-  }
-  const people = [memberId, colleagueId, outsiderId]
-  await db.insert(user).values(
-    people.map((id) => ({
-      id,
-      email: `${id}@example.test`,
-      name: 'Home fixture',
-      emailVerified: true,
-      createdAt: new Date(),
-      updatedAt: new Date(),
-    }))
-  )
-  await db.insert(organization).values(
-    [organizationId, otherOrganizationId].map((id) => ({
-      id,
-      name: 'Home fixture',
-      slug: id,
-      createdAt: new Date(),
-    }))
-  )
-  await db.insert(member).values([
-    { id: generateId(), userId: memberId, organizationId, role: 'member' },
-    { id: generateId(), userId: colleagueId, organizationId, role: 'member' },
-    {
-      id: generateId(),
-      userId: outsiderId,
-      organizationId: otherOrganizationId,
-      role: 'member',
-    },
-  ])
-  await db.insert(credentialGroup).values({
-    id: groupId,
-    organizationId,
-    publicId: generateId(),
-    name: 'Connected accounts',
-    options: (['gmail', 'google-calendar', 'outlook'] as const).map((provider) => ({
-      id: provider,
-      provider,
-      label: provider,
-      authorizationAppId: policies[provider].authorizationAppId,
-      requiredScopes: policies[provider].requiredScopes,
-      scopeVersion: policies[provider].scopeVersion,
-      required: false,
-      status: 'active' as const,
-    })),
-  })
-  await db.insert(resourcePolicy).values({
-    id: generateId(),
-    organizationId,
-    resourceType: 'credential_group',
-    resourceId: groupId,
-    document: { version: 2, resource: { type: 'credential_group', id: groupId }, statements: [] },
-  })
-  await db.insert(organizationSearchIntegration).values(
-    ['gmail', 'google_calendar'].map((connectorType) => ({
-      organizationId,
-      connectorType,
-      approved: true,
-    }))
-  )
-  const enrollments = new Map(people.map((id) => [id, generateId()]))
-  await db.insert(credentialGroupEnrollment).values(
-    [memberId, colleagueId].map((userId) => ({
-      id: enrollments.get(userId) as string,
-      userId,
-      credentialGroupId: groupId,
-      email: `${userId}@example.test`,
-      status: 'completed' as const,
-      invitationTokenHash: generateId().replaceAll('-', '').repeat(2),
-      invitationExpiresAt: new Date(Date.now() + 60_000),
-      invitedAt: new Date(),
-    }))
-  )
-  const grants = [
-    { id: memberGmail, userId: memberId, option: 'gmail', providerId: 'google-email' },
-    {
-      id: memberCalendar,
-      userId: memberId,
-      option: 'google-calendar',
-      providerId: 'google-calendar',
-    },
-    { id: memberOutlook, userId: memberId, option: 'outlook', providerId: 'outlook' },
-    { id: colleagueGmail, userId: colleagueId, option: 'gmail', providerId: 'google-email' },
-  ] as const
-  for (const grant of grants) {
-    const policy = policies[grant.option]
-    await db.insert(credential).values({
-      id: grant.id,
-      createdBy: grant.userId,
-      credentialGroupEnrollmentId: enrollments.get(grant.userId),
-      credentialGroupOptionId: grant.option,
-      organizationId,
-      type: 'managed_oauth',
-      displayName: `${grant.id}@example.test`,
-      providerId: grant.providerId,
-      managedOauthStatus: 'active',
-      managedOauthScopeVersion: policy.scopeVersion,
-      grantedScopes: policy.requiredScopes,
-      providerSubjectId: grant.id,
-      authorizationAppId: policy.authorizationAppId,
-      encryptedOauthTokenSet: await encryptManagedOAuthTokenSet({
-        accessToken: `token-for-${grant.id}`,
-      }),
-      accessTokenExpiresAt: new Date(Date.now() + 3_600_000),
-      grantedAt: new Date(),
-    })
-  }
-})
-
-beforeEach(async () => {
-  await db
-    .update(credential)
-    .set({ managedOauthStatus: 'active' })
-    .where(inArray(credential.id, [memberGmail, memberCalendar, memberOutlook, colleagueGmail]))
-  await db
-    .update(organizationSearchIntegration)
-    .set({ approved: true })
-    .where(eq(organizationSearchIntegration.organizationId, organizationId))
-})
-
-afterEach(() => {
-  provider.mockReset()
-})
-
-afterAll(async () => {
-  await db
-    .delete(organization)
-    .where(inArray(organization.id, [organizationId, otherOrganizationId]))
-  await db.delete(user).where(inArray(user.id, [memberId, colleagueId, outsiderId]))
-  provider.mockRestore()
-})
-
-describe('whose mail a widget reads', () => {
-  it('sends only the acting member’s token and lists only their accounts', async () => {
-    const tokens = serveProviders()
-    const email = await readOrganizationHomeEmail.execute({ principal: session(memberId), input })
-    expect(email.accounts.map((account) => account.credentialId).sort()).toEqual(
-      [memberGmail, memberOutlook].sort()
-    )
-    expect(new Set(tokens)).toEqual(
-      new Set([`Bearer token-for-${memberGmail}`, `Bearer token-for-${memberOutlook}`])
-    )
-  })
-
-  it('gives a colleague their own account, not the first member’s', async () => {
-    const tokens = serveProviders()
-    const email = await readOrganizationHomeEmail.execute({
-      principal: session(colleagueId),
-      input,
-    })
-    expect(email.accounts.map((account) => account.credentialId)).toEqual([colleagueGmail])
-    expect(new Set(tokens)).toEqual(new Set([`Bearer token-for-${colleagueGmail}`]))
-  })
-
-  it('refuses someone outside the organization before any provider is asked', async () => {
-    serveProviders()
-    await expect(
-      readOrganizationHomeEmail.execute({ principal: session(outsiderId), input })
-    ).rejects.toMatchObject({ code: 'not_found' })
-    expect(provider).not.toHaveBeenCalled()
-  })
-
-  it('refuses a principal that is not a session, so no key or delegated run can read mail', async () => {
-    serveProviders()
-    await expect(
-      readOrganizationHomeEmail.execute({
-        principal: { kind: 'personal_api_key', userId: memberId, keyId: generateId() },
-        input,
-      })
-    ).rejects.toBeInstanceOf(PrincipalKindAuthorizationError)
-    expect(provider).not.toHaveBeenCalled()
-  })
-})
-
-describe('what a widget reports', () => {
-  it('refuses a member with no integrations surface, before any provider', async () => {
-    serveProviders()
-    const memberScoped = vi.spyOn(knowledgeAvailability, 'isKnowledgeMemberAccessAvailable')
-    memberScoped.mockResolvedValueOnce(false)
-    await expect(
-      readOrganizationHomeEmail.execute({ principal: session(memberId), input })
-    ).rejects.toMatchObject({ code: 'forbidden' })
-    expect(provider).not.toHaveBeenCalled()
-    memberScoped.mockRestore()
-  })
-
-  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 }),
-      readOrganizationHomeCalendar.execute({ principal: session(memberId), input: day }),
-    ])
-    const outlook = (accounts: { credentialId: string; state: string }[]) =>
-      accounts.find((account) => account.credentialId === memberOutlook)?.state
-    expect(outlook(email.accounts)).toBe('needs_reauth')
-    expect(outlook(calendar.accounts)).toBe('needs_reauth')
-  })
-
-  it('reports a connection awaiting reconnection without asking its provider', async () => {
-    const tokens = serveProviders()
-    await setStatus(memberGmail, 'needs_reauth')
-    const email = await readOrganizationHomeEmail.execute({ principal: session(memberId), input })
-    expect(email.accounts.find((a) => a.credentialId === memberGmail)?.state).toBe('needs_reauth')
-    expect(tokens).not.toContain(`Bearer token-for-${memberGmail}`)
-  })
-
-  it('records a token the provider refuses, so the next read asks to reconnect', async () => {
-    serveProviders({ status: 401 })
-    const email = await readOrganizationHomeEmail.execute({ principal: session(memberId), input })
-    expect(email.accounts.find((a) => a.credentialId === memberGmail)?.state).toBe('needs_reauth')
-    const [stored] = await db
-      .select({ status: credential.managedOauthStatus })
-      .from(credential)
-      .where(eq(credential.id, memberGmail))
-    expect(stored.status).toBe('needs_reauth')
-  })
-
-  it('reports an upstream failure as retryable and leaves the connection alone', async () => {
-    serveProviders({ status: 503 })
-    const email = await readOrganizationHomeEmail.execute({ principal: session(memberId), input })
-    expect(email.accounts.map((account) => account.state)).toEqual(['unavailable', 'unavailable'])
-    expect(email.threads).toEqual([])
-    const [stored] = await db
-      .select({ status: credential.managedOauthStatus })
-      .from(credential)
-      .where(eq(credential.id, memberGmail))
-    expect(stored.status).toBe('active')
-  })
-
-  it('stops reading a provider the organization withdrew, without asking it', async () => {
-    const tokens = serveProviders()
-    await setApproval('gmail', false)
-    const email = await readOrganizationHomeEmail.execute({ principal: session(memberId), input })
-    expect(email.accounts.find((a) => a.credentialId === memberGmail)?.state).toBe('not_offered')
-    expect(tokens).not.toContain(`Bearer token-for-${memberGmail}`)
-  })
-
-  it('bounds the list merged across accounts', async () => {
-    serveProviders()
-    const email = await readOrganizationHomeEmail.execute({ principal: session(memberId), input })
-    expect(email.threads).toHaveLength(HOME_EMAIL_THREAD_LIMIT)
-  })
-
-  it('reads the requested day in the requested zone', async () => {
-    serveProviders()
-    const calendar = await readOrganizationHomeCalendar.execute({
-      principal: session(memberId),
-      input: day,
-    })
-    expect(calendar.window).toEqual({
-      startAt: '2026-11-05T08:00:00.000Z',
-      endAt: '2026-11-06T08:00:00.000Z',
-    })
-    const urls = provider.mock.calls.map(([url]) => new URL(url))
-    const google = urls.find((url) => url.hostname === 'www.googleapis.com')
-    const graph = urls.find((url) => url.searchParams.has('startDateTime'))
-    expect(google?.searchParams.get('timeMin')).toBe(calendar.window.startAt)
-    expect(graph?.searchParams.get('startDateTime')).toBe(calendar.window.startAt)
-    expect(calendar.accounts.map((a) => a.credentialId).sort()).toEqual(
-      [memberCalendar, memberOutlook].sort()
-    )
-  })
-})
-
-describe('the routes', () => {
-  const emailRequest = () =>
-    getEmailRoute(
-      new NextRequest(`http://localhost:3000/api/organizations/${organizationId}/home/email`),
-      { params: Promise.resolve({ id: organizationId }) }
-    )
-  const calendarRequest = (query: string) =>
-    getCalendarRoute(
-      new NextRequest(
-        `http://localhost:3000/api/organizations/${organizationId}/home/calendar?${query}`
-      ),
-      { params: Promise.resolve({ id: organizationId }) }
-    )
-  const signInAs = (userId: string) =>
-    authMockFns.mockGetSession.mockResolvedValue({
-      user: { id: userId },
-      session: { id: generateId() },
-    })
-
-  it('answers no session with 401 and never reaches a provider', async () => {
-    serveProviders()
-    authMockFns.mockGetSession.mockResolvedValue(null)
-    expect((await emailRequest()).status).toBe(401)
-    expect(provider).not.toHaveBeenCalled()
-  })
-
-  it('answers a non-member with 404, concealing the organization', async () => {
-    serveProviders()
-    signInAs(outsiderId)
-    expect((await emailRequest()).status).toBe(404)
-    expect(provider).not.toHaveBeenCalled()
-  })
-
-  it('answers a member with their mail, marked uncacheable', async () => {
-    serveProviders()
-    signInAs(memberId)
-    const response = await emailRequest()
-    expect(response.status).toBe(200)
-    expect(response.headers.get('cache-control')).toContain('no-store')
-  })
-
-  it('rejects a malformed day or zone', async () => {
-    serveProviders()
-    signInAs(memberId)
-    expect((await calendarRequest('date=tomorrow&timeZone=UTC')).status).toBe(400)
-    expect((await calendarRequest('date=2026-11-05&timeZone=Mars/Olympus')).status).toBe(400)
-    expect(provider).not.toHaveBeenCalled()
-  })
-})
diff --git a/apps/sim/lib/organizations/application/home-widgets.ts b/apps/sim/lib/organizations/application/home-widgets.ts
deleted file mode 100644
index abbb61ea189..00000000000
--- a/apps/sim/lib/organizations/application/home-widgets.ts
+++ /dev/null
@@ -1,317 +0,0 @@
-import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
-import { createLogger } from '@sim/logger'
-import { compareStrings } from '@sim/utils/string'
-import type {
-  HomeWidgetAccount,
-  OrganizationHomeCalendar,
-  OrganizationHomeEmail,
-} from '@/lib/api/contracts/organization-home'
-import {
-  loadAssistantIntegrationTools,
-  requireAssistantProviderAccess,
-} from '@/lib/assistant-actions/catalog'
-import type { OrganizationMembershipContext } from '@/lib/core/application/organization-authorization'
-import { defineOrganizationOperation } from '@/lib/core/application/organization-operation'
-import { OrchestrationError } from '@/lib/core/orchestration/types'
-import { addCalendarDays, zonedWallClockToUtc } from '@/lib/core/utils/timezone'
-import { defineOrganizationAccountsUseCase } from '@/lib/credential-groups/application/organization-accounts'
-import {
-  type CredentialGroupProvider,
-  findCredentialGroupProviderFromProviderId,
-} from '@/lib/credential-groups/providers'
-import { listViewerOrganizationAccounts } from '@/lib/credential-groups/viewer-accounts'
-import {
-  ManagedOAuthCredentialError,
-  rejectManagedOAuthToken,
-  resolveManagedOAuthToken,
-} from '@/lib/credentials/managed-oauth'
-import { getOwnOrganizationManagedOAuthCredentials } from '@/lib/credentials/organization-managed'
-import { isKnowledgeMemberAccessAvailable } from '@/lib/knowledge/access/availability'
-import { recordCredentialAccess } from '@/lib/oauth/token-resolution'
-import {
-  HOME_CALENDAR_EVENT_LIMIT,
-  HOME_EMAIL_THREAD_LIMIT,
-  HOME_WIDGET_ACCOUNT_LIMIT,
-} from '@/lib/organizations/home/limits'
-import {
-  type HomeCalendarEvent,
-  type HomeCalendarWindow,
-  type HomeEmailThread,
-  HomeProviderReadError,
-  readGmailThreads,
-  readGoogleCalendarDay,
-  readOutlookCalendarDay,
-  readOutlookMessages,
-} from '@/lib/organizations/home/provider-reads'
-import { canConnectSearchIntegrations } from '@/lib/organizations/surface'
-
-const logger = createLogger('OrganizationHomeWidgets')
-
-const READ_TIMEOUT_MS = 20_000
-
-/**
- * Session-only, so no API key, delegated service or Copilot run can read a member's mail through
- * these. Both carry the capability behind the connected-accounts read that lists the same accounts.
- */
-export const organizationHomeOperations = {
-  readEmail: defineOrganizationOperation({
-    id: 'organization_home.email.read',
-    minimumRole: 'member',
-    principalKinds: ['session'],
-    capability: 'integrations.manage',
-  }),
-  readCalendar: defineOrganizationOperation({
-    id: 'organization_home.calendar.read',
-    minimumRole: 'member',
-    principalKinds: ['session'],
-    capability: 'integrations.manage',
-  }),
-} as const
-
-/** The boundary the assistant's direct tools answer to, which a widget must not sidestep. */
-async function isProviderContentReadable(organizationId: string, providerId: string) {
-  try {
-    await requireAssistantProviderAccess(organizationId, providerId)
-    return true
-  } catch (error) {
-    if (error instanceof OrchestrationError && error.code === 'forbidden') return false
-    throw error
-  }
-}
-
-interface ProviderTokenInput {
-  context: OrganizationMembershipContext
-  credentialId: string
-  providerId: string
-}
-
-function resolveToken({ context, credentialId, providerId }: ProviderTokenInput) {
-  return resolveManagedOAuthToken({
-    credentialId,
-    organizationId: context.organizationId,
-    expectedProviderId: providerId,
-    requiredScopes: [],
-  })
-}
-
-function isTokenRejected(error: unknown) {
-  return error instanceof HomeProviderReadError && error.failure === 'token_rejected'
-}
-
-/**
- * One read with the member's token, and one more with a fresh token if the first is refused. A
- * concurrent read of the same account may already have rotated it, so the fresh token is resolved
- * whether or not this call was the one that rejected the old token.
- */
-async function readWithToken<T>(
-  input: ProviderTokenInput,
-  read: (accessToken: string) => Promise<T[]>
-): Promise<T[]> {
-  const { context, credentialId, providerId } = input
-  const { accessToken } = await resolveToken(input)
-  recordCredentialAccess({
-    actorId: context.userId,
-    workspaceId: null,
-    resourceId: credentialId,
-    providerId,
-    credentialType: 'oauth',
-  })
-  try {
-    return await read(accessToken)
-  } catch (error) {
-    if (!isTokenRejected(error)) throw error
-  }
-  const rejected = await rejectManagedOAuthToken({
-    credentialId,
-    organizationId: context.organizationId,
-    expectedProviderId: providerId,
-    requiredScopes: [],
-    rejectedAccessToken: accessToken,
-  })
-  if (rejected)
-    recordAudit({
-      actorId: context.userId,
-      action: AuditAction.CREDENTIAL_UPDATED,
-      resourceType: AuditResourceType.CREDENTIAL,
-      resourceId: credentialId,
-      description: 'Marked provider-rejected managed OAuth credential as needing reauthorization',
-      metadata: {
-        organizationId: context.organizationId,
-        provider: providerId,
-        credentialType: 'managed_oauth',
-      },
-    })
-  const retry = await resolveToken(input)
-  try {
-    return await read(retry.accessToken)
-  } catch (error) {
-    if (isTokenRejected(error)) throw new HomeProviderReadError('needs_reauth', 401)
-    throw error
-  }
-}
-
-const REAUTH_ERROR_CODES: ReadonlySet<ManagedOAuthCredentialError['code']> = new Set([
-  'MANAGED_CREDENTIAL_NEEDS_REAUTH',
-  'MANAGED_CREDENTIAL_REVOKED',
-  'MANAGED_CREDENTIAL_INSUFFICIENT_SCOPE',
-])
-
-/** Sorts a failed read into the widget's states. Logs only its classification, never a response. */
-function failedState(
-  error: unknown,
-  meta: { organizationId: string; credentialId: string; providerId: string }
-): Exclude<HomeWidgetAccount['state'], 'ready' | 'not_read' | 'not_offered'> {
-  if (error instanceof HomeProviderReadError && error.failure === 'needs_reauth')
-    return 'needs_reauth'
-  if (error instanceof ManagedOAuthCredentialError && REAUTH_ERROR_CODES.has(error.code))
-    return 'needs_reauth'
-  logger.warn('A Home widget could not read a connected account', {
-    ...meta,
-    reason:
-      error instanceof HomeProviderReadError
-        ? error.failure
-        : error instanceof ManagedOAuthCredentialError
-          ? error.code
-          : error instanceof Error
-            ? error.name
-            : 'unknown',
-    httpStatus: error instanceof HomeProviderReadError ? error.httpStatus : undefined,
-  })
-  return 'unavailable'
-}
-
-interface WidgetReadResult<T> {
-  accounts: HomeWidgetAccount[]
-  rows: (T & { credentialId: string })[]
-}
-
-/**
- * Reads the viewer's own accounts for a widget. The account list is scoped to the acting user's
- * enrollments and no input names a credential, so a request cannot reach another member's grant;
- * each one then proves a verified owner and a live binding again before its token is resolved.
- */
-async function readViewerAccounts<T>(
-  context: OrganizationMembershipContext,
-  readers: Partial<Record<CredentialGroupProvider, (accessToken: string) => Promise<T[]>>>
-): Promise<WidgetReadResult<T>> {
-  const { organizationId, userId } = context
-  const [{ providers: allowed, config }, memberScoped] = await Promise.all([
-    loadAssistantIntegrationTools({ organizationId, userId }),
-    isKnowledgeMemberAccessAvailable({ organizationId }),
-  ])
-  // The member Integrations page's rule, less what the use case established before running this.
-  if (!memberScoped || !canConnectSearchIntegrations(config))
-    throw new OrchestrationError('forbidden', 'Integrations are not available to you here')
-  const [accounts, owned] = await Promise.all([
-    listViewerOrganizationAccounts({ organizationId, userId }),
-    getOwnOrganizationManagedOAuthCredentials({ organizationId, userId }),
-  ])
-  const candidates = accounts
-    .flatMap((account) => {
-      const provider = findCredentialGroupProviderFromProviderId(account.providerId)
-      const read = provider && readers[provider]
-      return provider && read ? [{ ...account, provider, read }] : []
-    })
-    .sort((left, right) => compareStrings(left.credentialId, right.credentialId))
-  if (candidates.length === 0) return { accounts: [], rows: [] }
-  const ownedIds = new Set(owned.map((credential) => credential.id))
-  const readable = new Map(
-    await Promise.all(
-      [...new Set(candidates.map((candidate) => candidate.providerId))].map(
-        async (providerId) =>
-          [providerId, await isProviderContentReadable(organizationId, providerId)] as const
-      )
-    )
-  )
-
-  const isReadable = ({
-    provider,
-    providerId,
-    status,
-    credentialId,
-  }: (typeof candidates)[number]) =>
-    allowed.includes(provider) &&
-    readable.get(providerId) === true &&
-    status !== 'needs_reauth' &&
-    ownedIds.has(credentialId)
-  const toRead = new Set(
-    candidates
-      .filter(isReadable)
-      .slice(0, HOME_WIDGET_ACCOUNT_LIMIT)
-      .map((candidate) => candidate.credentialId)
-  )
-
-  const results = await Promise.all(
-    candidates.map(async (candidate) => {
-      const { credentialId, displayName, provider, providerId, status, read } = candidate
-      const settled = (state: HomeWidgetAccount['state'], rows: T[] = []) => ({
-        account: { credentialId, displayName, state },
-        rows: rows.map((row) => ({ ...row, credentialId })),
-      })
-      if (!allowed.includes(provider) || !readable.get(providerId)) return settled('not_offered')
-      if (status === 'needs_reauth') return settled('needs_reauth')
-      if (!ownedIds.has(credentialId)) return settled('not_offered')
-      if (!toRead.has(credentialId)) return settled('not_read')
-      try {
-        return settled('ready', await readWithToken({ context, credentialId, providerId }, read))
-      } catch (error) {
-        return settled(failedState(error, { organizationId, credentialId, providerId }))
-      }
-    })
-  )
-  return {
-    accounts: results.map((result) => result.account),
-    rows: results.flatMap((result) => result.rows),
-  }
-}
-
-/** The viewer's latest mail across the email accounts they connected. */
-export const readOrganizationHomeEmail = defineOrganizationAccountsUseCase({
-  operation: organizationHomeOperations.readEmail,
-  async execute({ context }): Promise<OrganizationHomeEmail> {
-    const signal = AbortSignal.timeout(READ_TIMEOUT_MS)
-    const { accounts, rows } = await readViewerAccounts<HomeEmailThread>(context, {
-      gmail: (accessToken) => readGmailThreads({ accessToken, signal }),
-      outlook: (accessToken) => readOutlookMessages({ accessToken, signal }),
-    })
-    return {
-      accounts,
-      threads: rows
-        .sort((left, right) => compareStrings(right.receivedAt, left.receivedAt))
-        .slice(0, HOME_EMAIL_THREAD_LIMIT),
-    }
-  },
-})
-
-function dayWindow(date: string, timeZone: string): HomeCalendarWindow {
-  return {
-    startAt: zonedWallClockToUtc(`${date}T00:00`, timeZone).toISOString(),
-    endAt: zonedWallClockToUtc(`${addCalendarDays(date, 1)}T00:00`, timeZone).toISOString(),
-  }
-}
-
-/** One day of the viewer's meetings across the calendar accounts they connected. */
-export const readOrganizationHomeCalendar = defineOrganizationAccountsUseCase({
-  operation: organizationHomeOperations.readCalendar,
-  async execute({
-    input,
-    context,
-  }: {
-    input: { organizationId: string; date: string; timeZone: string }
-    context: OrganizationMembershipContext
-  }): Promise<OrganizationHomeCalendar> {
-    const signal = AbortSignal.timeout(READ_TIMEOUT_MS)
-    const window = dayWindow(input.date, input.timeZone)
-    const { accounts, rows } = await readViewerAccounts<HomeCalendarEvent>(context, {
-      'google-calendar': (accessToken) => readGoogleCalendarDay({ accessToken, signal, window }),
-      outlook: (accessToken) => readOutlookCalendarDay({ accessToken, signal, window }),
-    })
-    return {
-      accounts,
-      window,
-      events: rows
-        .sort((left, right) => compareStrings(left.startAt, right.startAt))
-        .slice(0, HOME_CALENDAR_EVENT_LIMIT),
-    }
-  },
-})
diff --git a/apps/sim/lib/organizations/home/limits.ts b/apps/sim/lib/organizations/home/limits.ts
deleted file mode 100644
index 9c21783e95c..00000000000
--- a/apps/sim/lib/organizations/home/limits.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/** What one read of a Home widget may return, whatever the provider holds. */
-export const HOME_EMAIL_THREAD_LIMIT = 15
-export const HOME_CALENDAR_EVENT_LIMIT = 50
-export const HOME_CALENDAR_ATTENDEE_LIMIT = 8
-export const HOME_TEXT_LIMITS = { name: 256, title: 512, excerpt: 512 } as const
-
-/** Accounts one read will reach, so a viewer's account count cannot multiply provider requests. */
-export const HOME_WIDGET_ACCOUNT_LIMIT = 4
diff --git a/apps/sim/lib/organizations/home/provider-reads.test.ts b/apps/sim/lib/organizations/home/provider-reads.test.ts
deleted file mode 100644
index 1d893e51f38..00000000000
--- a/apps/sim/lib/organizations/home/provider-reads.test.ts
+++ /dev/null
@@ -1,270 +0,0 @@
-/**
- * @vitest-environment node
- *
- * Failure modes owned here, because no other layer can see them: a provider status mapping to the
- * wrong widget state, a mail body entering the response, an unbounded field, and a Graph time read
- * in a zone Sim did not ask for.
- */
-import {
-  inputValidationMock,
-  inputValidationMockFns,
-} from '@sim/testing/mocks/input-validation.mock'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  HOME_CALENDAR_ATTENDEE_LIMIT,
-  HOME_EMAIL_THREAD_LIMIT,
-  HOME_TEXT_LIMITS,
-} from '@/lib/organizations/home/limits'
-import {
-  HomeProviderReadError,
-  readGmailThreads,
-  readGoogleCalendarDay,
-  readOutlookCalendarDay,
-  readOutlookMessages,
-} from '@/lib/organizations/home/provider-reads'
-import { gmailThreadUrl } from '@/connectors/gmail/mailbox'
-import { GoogleApiError } from '@/connectors/google-workspace/api-errors'
-
-const { mailboxEmail } = vi.hoisted(() => ({ mailboxEmail: vi.fn() }))
-vi.mock('@/lib/core/security/input-validation.server', () => inputValidationMock)
-vi.mock('@/connectors/gmail/mailbox', async (importOriginal) => ({
-  ...(await importOriginal<typeof import('@/connectors/gmail/mailbox')>()),
-  getGmailMailboxEmail: mailboxEmail,
-}))
-
-const { mockSecureFetchWithValidation: providerFetch } = inputValidationMockFns
-const signal = new AbortController().signal
-const window = { startAt: '2026-11-05T08:00:00.000Z', endAt: '2026-11-06T08:00:00.000Z' }
-
-function respond(body: unknown, status = 200, headers: Record<string, string> = {}) {
-  const text = JSON.stringify(body)
-  return {
-    ok: status < 400,
-    status,
-    statusText: '',
-    headers: new Headers(headers),
-    body: null,
-    text: async () => text,
-    json: async () => body,
-    arrayBuffer: async () => new TextEncoder().encode(text).buffer,
-  }
-}
-
-function gmailThread(id: string, messages: Record<string, unknown>[]) {
-  return {
-    id,
-    historyId: '1',
-    messages: messages.map((message) => ({ id: `${id}-m`, ...message })),
-  }
-}
-
-function metadataMessage(from: string, subject: string, snippet: string) {
-  return {
-    snippet,
-    payload: {
-      headers: [
-        { name: 'From', value: from },
-        { name: 'Subject', value: subject },
-        { name: 'Date', value: 'Thu, 5 Nov 2026 10:00:00 +0000' },
-      ],
-    },
-  }
-}
-
-beforeEach(() => {
-  mailboxEmail.mockResolvedValue('reader@example.com')
-  providerFetch.mockReset()
-})
-
-describe('provider status classification', () => {
-  it('does not ask for a reconnect when Google reports quota in a 403 body', async () => {
-    providerFetch.mockResolvedValue(
-      respond({ error: { errors: [{ reason: 'userRateLimitExceeded' }] } }, 403, {})
-    )
-    await expect(readOutlookMessages({ accessToken: 'token', signal })).rejects.toMatchObject({
-      failure: 'unavailable',
-    })
-  })
-
-  it.each([
-    [401, [], 'token_rejected'],
-    [403, ['insufficientPermissions'], 'needs_reauth'],
-    [403, ['userRateLimitExceeded'], 'unavailable'],
-    [500, [], 'unavailable'],
-  ])('maps a %i mailbox lookup %o to %s', async (status, reasons, failure) => {
-    providerFetch.mockResolvedValue(respond({ threads: [{ id: 'thread-1' }] }, 200, {}))
-    mailboxEmail.mockRejectedValueOnce(
-      new GoogleApiError('gmail.users.getProfile', status, reasons)
-    )
-    await expect(readGmailThreads({ accessToken: 'token', signal })).rejects.toMatchObject({
-      failure,
-    })
-  })
-
-  it.each([
-    [401, {}, 'token_rejected'],
-    [403, {}, 'needs_reauth'],
-    [403, { 'retry-after': '30' }, 'unavailable'],
-    [403, { 'x-ratelimit-remaining': '0' }, 'unavailable'],
-    [429, {}, 'unavailable'],
-    [500, {}, 'unavailable'],
-  ])('reads %i %o as %s', async (status, headers, failure) => {
-    providerFetch.mockResolvedValue(respond({ error: 'secret provider text' }, status, headers))
-    const read = readOutlookMessages({ accessToken: 'token', signal })
-    await expect(read).rejects.toBeInstanceOf(HomeProviderReadError)
-    await expect(read).rejects.toMatchObject({ failure })
-    await expect(read).rejects.not.toThrow(/secret provider text/)
-  })
-})
-
-describe('reading mail', () => {
-  it('asks Gmail for metadata only and never follows a redirect with the token', async () => {
-    providerFetch.mockImplementation(async (url: string) =>
-      url.includes('/threads?')
-        ? respond({ threads: [{ id: 'thread-1' }] })
-        : respond(
-            gmailThread('thread-1', [
-              metadataMessage('Ada Lovelace <ada@example.com>', 'Engines', 'Notes on engines'),
-              metadataMessage('"Babbage, Charles" <cb@example.com>', 'Re: Engines', 'Agreed'),
-            ])
-          )
-    )
-    const threads = await readGmailThreads({ accessToken: 'token', signal })
-    const threadUrl = new URL(providerFetch.mock.calls[1][0] as string)
-    expect(threadUrl.searchParams.get('format')).toBe('metadata')
-    expect(threadUrl.searchParams.getAll('metadataHeaders')).toEqual(['From', 'Subject', 'Date'])
-    for (const [, options] of providerFetch.mock.calls) {
-      expect(options).toMatchObject({ maxRedirects: 0, maxResponseBytes: expect.any(Number) })
-    }
-    expect(threads).toEqual([
-      {
-        id: 'thread-1',
-        sender: 'Babbage, Charles',
-        subject: 'Re: Engines',
-        excerpt: 'Agreed',
-        receivedAt: '2026-11-05T10:00:00.000Z',
-        messageCount: 2,
-        url: gmailThreadUrl('thread-1', 'reader@example.com'),
-      },
-    ])
-  })
-
-  it('bounds how many Gmail threads it reads and how long each field can be', async () => {
-    const huge = 'x'.repeat(100_000)
-    providerFetch.mockImplementation(async (url: string) =>
-      url.includes('/threads?')
-        ? respond({ threads: Array.from({ length: 40 }, (_, i) => ({ id: `t${i}` })) })
-        : respond(gmailThread('t', [metadataMessage(huge, huge, huge)]))
-    )
-    const threads = await readGmailThreads({ accessToken: 'token', signal })
-    expect(providerFetch).toHaveBeenCalledTimes(1 + HOME_EMAIL_THREAD_LIMIT)
-    expect(threads).toHaveLength(HOME_EMAIL_THREAD_LIMIT)
-    expect(threads[0].sender.length).toBeLessThanOrEqual(HOME_TEXT_LIMITS.name)
-    expect(threads[0].subject.length).toBeLessThanOrEqual(HOME_TEXT_LIMITS.title)
-    expect(threads[0].excerpt.length).toBeLessThanOrEqual(HOME_TEXT_LIMITS.excerpt)
-  })
-
-  it('keeps an Outlook preview and drops the message body Graph returned with it', async () => {
-    providerFetch.mockResolvedValue(
-      respond({
-        value: [
-          {
-            id: 'AAM/k+1=',
-            subject: 'Budget',
-            bodyPreview: 'Short preview',
-            body: { contentType: 'html', content: '<p>The whole confidential body</p>' },
-            from: { emailAddress: { name: 'Grace', address: 'grace@example.com' } },
-            receivedDateTime: '2026-11-05T09:00:00Z',
-          },
-        ],
-      })
-    )
-    const [message] = await readOutlookMessages({ accessToken: 'token', signal })
-    expect(JSON.stringify(message)).not.toContain('confidential')
-    expect(
-      new URL(providerFetch.mock.calls[0][0] as string).searchParams.get('$select')?.split(',')
-    ).not.toContain('body')
-    expect(message).toMatchObject({ sender: 'Grace', excerpt: 'Short preview' })
-    expect(message.url).toBe('https://outlook.office.com/mail/inbox/id/AAM%2Fk%2B1%3D')
-  })
-})
-
-describe('reading a calendar day', () => {
-  it('asks Google for the primary calendar within the window and removes cancelled events', async () => {
-    providerFetch.mockResolvedValue(
-      respond({
-        items: [
-          {
-            id: 'event-1',
-            status: 'confirmed',
-            summary: 'Review',
-            htmlLink: 'https://calendar.google.com/event?eid=1',
-            start: { dateTime: '2026-11-05T17:00:00Z' },
-            end: { dateTime: '2026-11-05T17:30:00Z' },
-            attendees: Array.from({ length: 30 }, (_, i) => ({ email: `p${i}@example.com` })),
-          },
-          {
-            id: 'event-2',
-            status: 'cancelled',
-            start: { dateTime: '2026-11-05T18:00:00Z' },
-            end: { dateTime: '2026-11-05T18:30:00Z' },
-          },
-          {
-            id: 'event-3',
-            status: 'confirmed',
-            summary: 'Offsite',
-            htmlLink: 'javascript:alert(1)',
-            start: { date: '2026-11-05' },
-            end: { date: '2026-11-06' },
-          },
-        ],
-      })
-    )
-    const events = await readGoogleCalendarDay({ accessToken: 'token', signal, window })
-    const url = new URL(providerFetch.mock.calls[0][0] as string)
-    expect(url.pathname).toContain('/calendars/primary/events')
-    expect(url.searchParams.get('timeMin')).toBe(window.startAt)
-    expect(url.searchParams.get('timeMax')).toBe(window.endAt)
-    expect(events.map((event) => event.id)).toEqual(['event-1', 'event-3'])
-    expect(events[0].people).toHaveLength(HOME_CALENDAR_ATTENDEE_LIMIT)
-    expect(events[1]).toMatchObject({ allDay: true, startAt: window.startAt, endAt: window.endAt })
-    expect(events[1].url).toBeUndefined()
-  })
-
-  it('reads Graph’s UTC timestamps, refuses any other zone, and removes cancelled occurrences', async () => {
-    providerFetch.mockResolvedValue(
-      respond({
-        value: [
-          {
-            id: 'graph-1',
-            subject: 'Standup',
-            start: { dateTime: '2026-11-05T17:00:00.0000000', timeZone: 'UTC' },
-            end: { dateTime: '2026-11-05T17:15:00.0000000', timeZone: 'UTC' },
-            webLink: 'https://outlook.office365.com/owa/?itemid=1',
-          },
-          {
-            id: 'graph-2',
-            isCancelled: true,
-            subject: 'Canceled: Sync',
-            start: { dateTime: '2026-11-05T18:00:00.0000000', timeZone: 'UTC' },
-            end: { dateTime: '2026-11-05T18:15:00.0000000', timeZone: 'UTC' },
-          },
-          {
-            id: 'graph-3',
-            subject: 'Elsewhere',
-            start: { dateTime: '2026-11-05T17:00:00.0000000', timeZone: 'Pacific Standard Time' },
-            end: { dateTime: '2026-11-05T17:15:00.0000000', timeZone: 'Pacific Standard Time' },
-          },
-        ],
-      })
-    )
-    const events = await readOutlookCalendarDay({ accessToken: 'token', signal, window })
-    expect(events).toEqual([
-      expect.objectContaining({
-        id: 'graph-1',
-        startAt: '2026-11-05T17:00:00.000Z',
-        endAt: '2026-11-05T17:15:00.000Z',
-      }),
-    ])
-  })
-})
diff --git a/apps/sim/lib/organizations/home/provider-reads.ts b/apps/sim/lib/organizations/home/provider-reads.ts
deleted file mode 100644
index 574a0e438f4..00000000000
--- a/apps/sim/lib/organizations/home/provider-reads.ts
+++ /dev/null
@@ -1,347 +0,0 @@
-import { toArray, toRecord } from '@sim/utils/object'
-import { truncate } from '@sim/utils/string'
-import { secureFetchWithValidation } from '@/lib/core/security/input-validation.server'
-import { mapWithConcurrency } from '@/lib/core/utils/concurrency'
-import { hasRateLimitEvidence } from '@/lib/knowledge/documents/utils'
-import {
-  HOME_CALENDAR_ATTENDEE_LIMIT,
-  HOME_CALENDAR_EVENT_LIMIT,
-  HOME_EMAIL_THREAD_LIMIT,
-  HOME_TEXT_LIMITS,
-} from '@/lib/organizations/home/limits'
-import { getGmailMailboxEmail, gmailThreadUrl } from '@/connectors/gmail/mailbox'
-import {
-  GoogleApiError,
-  isGoogleQuotaReason,
-  readGoogleErrorDetails,
-} from '@/connectors/google-workspace/api-errors'
-import { gmailGetThreadV2Tool } from '@/tools/gmail/get_thread'
-import { gmailListThreadsV2Tool } from '@/tools/gmail/list_threads'
-import { listV2Tool as googleCalendarListTool } from '@/tools/google_calendar/list'
-import { outlookCalendarListEventsTool } from '@/tools/outlook/calendar_list_events'
-import { flattenGraphEvent } from '@/tools/outlook/calendar-utils'
-import { outlookReadTool } from '@/tools/outlook/read'
-import type { CleanedOutlookEvent, GraphEvent } from '@/tools/outlook/types'
-import type { ToolConfig } from '@/tools/types'
-
-const REQUEST_TIMEOUT_MS = 10_000
-const RESPONSE_MAX_BYTES = 4 * 1024 * 1024
-const GMAIL_THREAD_CONCURRENCY = 5
-/** The Outlook read tool's own ceiling for a folder listing. */
-const OUTLOOK_MESSAGE_LIMIT = 10
-/** Asks only for what a widget shows, so no mail or event body is ever fetched. */
-const GMAIL_THREAD_FIELDS = [
-  ['metadataHeaders', 'From'],
-  ['metadataHeaders', 'Subject'],
-  ['metadataHeaders', 'Date'],
-] as const
-const OUTLOOK_MESSAGE_FIELDS = [
-  ['$select', 'id,subject,bodyPreview,from,sender,receivedDateTime'],
-] as const
-const OUTLOOK_EVENT_FIELDS = [
-  ['$select', 'id,subject,start,end,isAllDay,isCancelled,attendees,webLink'],
-] as const
-const UNKNOWN_SENDER = 'Unknown sender'
-const NO_SUBJECT = '(No subject)'
-
-export type HomeProviderFailure =
-  /** The provider rejected this access token; a refreshed one may still work. */
-  | 'token_rejected'
-  /** The provider refuses this grant until the member connects again. */
-  | 'needs_reauth'
-  | 'unavailable'
-
-/** Carries a classification only: a provider's response text never leaves this module. */
-export class HomeProviderReadError extends Error {
-  constructor(
-    readonly failure: HomeProviderFailure,
-    readonly httpStatus?: number
-  ) {
-    super(`Home provider read failed: ${failure}`)
-    this.name = 'HomeProviderReadError'
-  }
-}
-
-export interface HomeEmailThread {
-  id: string
-  sender: string
-  subject: string
-  excerpt: string
-  receivedAt: string
-  messageCount?: number
-  url: string
-}
-
-export interface HomeCalendarEvent {
-  id: string
-  title: string
-  allDay: boolean
-  startAt: string
-  endAt: string
-  url?: string
-  people: { name: string }[]
-}
-
-export interface HomeCalendarWindow {
-  startAt: string
-  endAt: string
-}
-
-interface ProviderReadInput {
-  accessToken: string
-  signal: AbortSignal
-}
-
-/**
- * Sends a tool's own request under the widget's bounds. The tool's URL and headers are reused, with
- * the `narrowing` parameters added; what differs from a workflow run is that nothing follows a
- * redirect with the token, and a response past the byte limit fails rather than filling memory.
- */
-async function requestTool<P>(
-  tool: Pick<ToolConfig<P, unknown>, 'request'>,
-  params: P,
-  signal: AbortSignal,
-  narrowing: readonly (readonly [string, string])[] = []
-) {
-  const { url, headers } = tool.request
-  const target = new URL(typeof url === 'function' ? url(params) : url)
-  for (const [name, value] of narrowing) target.searchParams.append(name, value)
-  const response = await secureFetchWithValidation(target.toString(), {
-    profile: 'configuredEndpoint',
-    method: 'GET',
-    headers: headers(params),
-    signal,
-    timeout: REQUEST_TIMEOUT_MS,
-    maxResponseBytes: RESPONSE_MAX_BYTES,
-    maxRedirects: 0,
-    acceptCompressed: true,
-  })
-  if (response.ok) return response
-  const body = await response.text().catch(() => '')
-  if (response.status === 401) throw new HomeProviderReadError('token_rejected', 401)
-  // Google reports quota as a 403 reason in the body, which reconnecting would not fix.
-  const { reasons } = await readGoogleErrorDetails(new Response(body))
-  if (
-    response.status === 403 &&
-    !hasRateLimitEvidence(response.headers) &&
-    !reasons.some(isGoogleQuotaReason)
-  )
-    throw new HomeProviderReadError('needs_reauth', 403)
-  throw new HomeProviderReadError('unavailable', response.status)
-}
-
-async function runTool<P, R>(
-  tool: ToolConfig<P, R>,
-  params: P,
-  signal: AbortSignal,
-  narrowing?: readonly (readonly [string, string])[]
-): Promise<R> {
-  const response = await requestTool(tool, params, signal, narrowing)
-  if (!tool.transformResponse) throw new HomeProviderReadError('unavailable')
-  return tool.transformResponse(
-    new Response(await response.arrayBuffer(), { status: response.status }),
-    params,
-    { signal }
-  )
-}
-
-const ELLIPSIS = '...'
-
-function bounded(value: string | null | undefined, limit: number) {
-  return truncate((value ?? '').trim(), limit - ELLIPSIS.length, ELLIPSIS)
-}
-
-/** The display name from an RFC 5322 mailbox: `Ada Lovelace <ada@example.com>` reads as Ada. */
-function senderName(from: string | null | undefined) {
-  const mailbox = (from ?? '').trim()
-  const named = /^"?([^"<]+?)"?\s*<[^>]*>$/.exec(mailbox)?.[1]?.trim()
-  return bounded(named || mailbox.replace(/^<|>$/g, ''), HOME_TEXT_LIMITS.name)
-}
-
-function isoOrNull(value: string | null | undefined) {
-  const time = value ? Date.parse(value) : Number.NaN
-  return Number.isFinite(time) ? new Date(time).toISOString() : null
-}
-
-function mailboxReadFailure(error: unknown): HomeProviderReadError {
-  if (!(error instanceof GoogleApiError)) return new HomeProviderReadError('unavailable')
-  if (error.status === 401) return new HomeProviderReadError('token_rejected', 401)
-  if (error.status === 403 && !error.rateLimited && error.category !== 'rate_limit')
-    return new HomeProviderReadError('needs_reauth', 403)
-  return new HomeProviderReadError('unavailable', error.status)
-}
-
-export async function readGmailThreads({
-  accessToken,
-  signal,
-}: ProviderReadInput): Promise<HomeEmailThread[]> {
-  const list = await runTool(
-    gmailListThreadsV2Tool,
-    { accessToken, labelIds: 'INBOX', maxResults: HOME_EMAIL_THREAD_LIMIT },
-    signal
-  )
-  if (!list.success) throw new HomeProviderReadError('unavailable')
-  const mailbox = await getGmailMailboxEmail(accessToken, { signal }).catch((error: unknown) => {
-    throw mailboxReadFailure(error)
-  })
-  const threads = await mapWithConcurrency(
-    list.output.threads.slice(0, HOME_EMAIL_THREAD_LIMIT),
-    GMAIL_THREAD_CONCURRENCY,
-    async ({ id }) => {
-      const thread = await runTool(
-        gmailGetThreadV2Tool,
-        { accessToken, threadId: id, format: 'metadata' },
-        signal,
-        GMAIL_THREAD_FIELDS
-      )
-      if (!thread.success) throw new HomeProviderReadError('unavailable')
-      const messages = thread.output.messages
-      const latest = messages[messages.length - 1]
-      const receivedAt = isoOrNull(latest?.date)
-      if (!latest || !receivedAt) return null
-      return {
-        id,
-        sender: senderName(latest.from) || UNKNOWN_SENDER,
-        subject: bounded(latest.subject, HOME_TEXT_LIMITS.title) || NO_SUBJECT,
-        excerpt: bounded(latest.snippet, HOME_TEXT_LIMITS.excerpt),
-        receivedAt,
-        ...(messages.length > 1 ? { messageCount: messages.length } : {}),
-        url: gmailThreadUrl(id, mailbox),
-      }
-    }
-  )
-  return threads.filter((thread) => thread !== null)
-}
-
-/** Latest messages in the Outlook inbox. Graph does not group these into threads here. */
-export async function readOutlookMessages({
-  accessToken,
-  signal,
-}: ProviderReadInput): Promise<HomeEmailThread[]> {
-  const { output } = await runTool(
-    outlookReadTool,
-    { accessToken, folder: 'inbox', maxResults: OUTLOOK_MESSAGE_LIMIT },
-    signal,
-    OUTLOOK_MESSAGE_FIELDS
-  )
-  return output.results.flatMap((message) => {
-    const receivedAt = isoOrNull(message.receivedDateTime)
-    if (!receivedAt) return []
-    return [
-      {
-        id: message.id,
-        sender:
-          bounded(
-            message.from?.name || message.from?.address || message.sender?.name,
-            HOME_TEXT_LIMITS.name
-          ) || UNKNOWN_SENDER,
-        subject: bounded(message.subject, HOME_TEXT_LIMITS.title) || NO_SUBJECT,
-        excerpt: bounded(message.bodyPreview, HOME_TEXT_LIMITS.excerpt),
-        receivedAt,
-        url: `https://outlook.office.com/mail/inbox/id/${encodeURIComponent(message.id)}`,
-      },
-    ]
-  })
-}
-
-function httpsUrl(value: string | null | undefined) {
-  return value?.startsWith('https://') && value.length <= 2048 && URL.canParse(value)
-    ? value
-    : undefined
-}
-
-function attendees(people: readonly (string | null | undefined)[]) {
-  return people
-    .flatMap((name) => (name?.trim() ? [{ name: bounded(name, HOME_TEXT_LIMITS.name) }] : []))
-    .slice(0, HOME_CALENDAR_ATTENDEE_LIMIT)
-}
-
-interface CalendarReadInput extends ProviderReadInput {
-  window: HomeCalendarWindow
-}
-
-/** One day of the member's primary Google calendar, with recurring events expanded. */
-export async function readGoogleCalendarDay({
-  accessToken,
-  signal,
-  window,
-}: CalendarReadInput): Promise<HomeCalendarEvent[]> {
-  const { output } = await runTool(
-    googleCalendarListTool,
-    {
-      accessToken,
-      calendarId: 'primary',
-      timeMin: window.startAt,
-      timeMax: window.endAt,
-      maxResults: HOME_CALENDAR_EVENT_LIMIT,
-      orderBy: 'startTime',
-    },
-    signal
-  )
-  return output.events.flatMap((event) => {
-    if (event.status === 'cancelled') return []
-    const allDay = Boolean(event.start.date)
-    const startAt = allDay ? window.startAt : isoOrNull(event.start.dateTime)
-    const endAt = allDay ? window.endAt : isoOrNull(event.end.dateTime)
-    if (!startAt || !endAt) return []
-    return [
-      {
-        id: event.id,
-        title: bounded(event.summary, HOME_TEXT_LIMITS.title) || 'Untitled event',
-        allDay,
-        startAt,
-        endAt,
-        url: httpsUrl(event.htmlLink),
-        people: attendees(
-          (event.attendees ?? []).map((person) => person.displayName || person.email)
-        ),
-      },
-    ]
-  })
-}
-
-/** Graph answers in UTC unless asked otherwise, and no other zone is ever requested here. */
-function graphInstant(value: CleanedOutlookEvent['start']) {
-  return value?.timeZone === 'UTC' && value.dateTime ? isoOrNull(`${value.dateTime}Z`) : null
-}
-
-/** One day of the mailbox's default Outlook calendar, with cancelled occurrences removed. */
-export async function readOutlookCalendarDay({
-  accessToken,
-  signal,
-  window,
-}: CalendarReadInput): Promise<HomeCalendarEvent[]> {
-  const response = await requestTool(
-    outlookCalendarListEventsTool,
-    {
-      accessToken,
-      startDateTime: window.startAt,
-      endDateTime: window.endAt,
-      maxResults: HOME_CALENDAR_EVENT_LIMIT,
-    },
-    signal,
-    OUTLOOK_EVENT_FIELDS
-  )
-  const rows = toArray<GraphEvent & { isCancelled?: boolean }>(
-    toRecord(await response.json()).value
-  )
-  return rows.flatMap((row) => {
-    if (row.isCancelled) return []
-    const event = flattenGraphEvent(row)
-    const allDay = event.isAllDay === true
-    const startAt = allDay ? window.startAt : graphInstant(event.start)
-    const endAt = allDay ? window.endAt : graphInstant(event.end)
-    if (!startAt || !endAt) return []
-    return [
-      {
-        id: event.id,
-        title: bounded(event.subject, HOME_TEXT_LIMITS.title) || 'Untitled event',
-        allDay,
-        startAt,
-        endAt,
-        url: httpsUrl(event.webLink),
-        people: attendees(event.attendees.map((person) => person.name || person.address)),
-      },
-    ]
-  })
-}
diff --git a/apps/sim/lib/organizations/surface.ts b/apps/sim/lib/organizations/surface.ts
index c9d8818ed4b..da534387b83 100644
--- a/apps/sim/lib/organizations/surface.ts
+++ b/apps/sim/lib/organizations/surface.ts
@@ -58,7 +58,7 @@ export interface OrganizationSurfaceContext extends OrganizationChatAccess {
   deployment: DeploymentShape
 }
 
-export function canConnectSearchIntegrations(config: PermissionGroupConfig | null): boolean {
+function canConnectSearchIntegrations(config: PermissionGroupConfig | null): boolean {
   return (
     !capabilityDeniedBy('integrations.manage', config) &&
     !capabilityDeniedBy('knowledge.use', config)
diff --git a/apps/sim/lib/people/feature-flag.ts b/apps/sim/lib/people/feature-flag.ts
index 185d5a99553..9331e5dac91 100644
--- a/apps/sim/lib/people/feature-flag.ts
+++ b/apps/sim/lib/people/feature-flag.ts
@@ -6,7 +6,7 @@ import { isFeatureEnabled } from '@/lib/core/config/feature-flags'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
 import { isOrganizationCapabilityWithheld } from '@/lib/permission-groups/capability-assertions'
 
-function isPeopleEnabled(organizationId: string): Promise<boolean> {
+export function isPeopleEnabled(organizationId: string): Promise<boolean> {
   return isFeatureEnabled('people', { orgId: organizationId })
 }
 
diff --git a/apps/sim/lib/postcss/platform-embed.cjs b/apps/sim/lib/postcss/platform-embed.cjs
deleted file mode 100644
index 56e233f5cba..00000000000
--- a/apps/sim/lib/postcss/platform-embed.cjs
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Confines the design system's embedded stylesheet to `[data-platform-ui]`.
- *
- * Next keeps route CSS loaded after client navigation, so one unscoped rule in a flagged page would
- * reach every legacy page afterwards. Each selector gains the scope through `:where()`, which adds
- * no specificity, so the cascade inside the surface stays the one the design system was written for.
- *
- * `data-theme="system"` follows the host app, not the OS: next-themes puts `.dark` on `<html>` before
- * first paint, so the surface needs no JavaScript to match it and cannot flash the wrong theme before
- * hydration. `scripts/check-platform-css.ts` compiles the entry through this plugin and verifies it.
- */
-const EMBEDDED_ENTRY = 'platform/design-system/styles/embedded.css'
-const SCOPE = '[data-platform-ui]'
-const DARK_THEME = /^\[data-platform-ui\]\[data-theme=["']?dark["']?\]/
-
-function scopeSelector(selector) {
-  if (DARK_THEME.test(selector)) {
-    const followsHost = selector.replace(
-      DARK_THEME,
-      ':where(html.dark) [data-platform-ui][data-theme="system"]'
-    )
-    return [selector, followsHost]
-  }
-  if (selector.includes(SCOPE)) return [selector]
-  return [`:where(${SCOPE}) ${selector}`]
-}
-
-const plugin = () => ({
-  postcssPlugin: 'sim-platform-embed',
-  OnceExit(root, { result }) {
-    if (!result.opts.from?.replaceAll('\\', '/').endsWith(EMBEDDED_ENTRY)) return
-    root.walkRules((rule) => {
-      rule.selectors = rule.selectors.flatMap(scopeSelector)
-    })
-  },
-})
-plugin.postcss = true
-
-module.exports = plugin
diff --git a/apps/sim/package.json b/apps/sim/package.json
index 877f854df70..e60bf5a6c14 100644
--- a/apps/sim/package.json
+++ b/apps/sim/package.json
@@ -53,7 +53,6 @@
     "ci:e2e-desktop-inbox": "bash ../../.github/scripts/http-e2e.sh desktop-inbox",
     "ci:e2e-assistant-actions": "bash ../../.github/scripts/http-e2e.sh assistant-actions",
     "ci:e2e-organization-search": "bash ../../.github/scripts/http-e2e.sh organization-search",
-    "ci:e2e-org-redesign": "bash ../../.github/scripts/http-e2e.sh org-redesign",
     "ci:e2e-docs-platform": "bun --no-env-file scripts/test-docs-search-provider-e2e.ts",
     "ci:e2e-project-files": "bash ../../.github/scripts/http-e2e.sh project-files",
     "ci:e2e-mobile": "bash ../../.github/scripts/http-e2e.sh mobile",
@@ -97,7 +96,6 @@
     "@aws-sdk/s3-request-presigner": "3.1150.0",
     "@azure/communication-email": "1.1.0",
     "@azure/storage-blob": "12.27.0",
-    "@base-ui/react": "1.9.0",
     "@better-auth/oauth-provider": "1.6.27",
     "@better-auth/sso": "1.6.27",
     "@better-auth/stripe": "1.6.27",
@@ -207,7 +205,6 @@
     "croner": "^9.0.0",
     "cronstrue": "3.3.0",
     "csv-parse": "7.0.3",
-    "d3-shape": "3.2.0",
     "date-fns": "4.4.0",
     "decimal.js": "10.6.0",
     "diff": "9.0.0",
@@ -288,7 +285,6 @@
     "typebox": "1.3.27",
     "undici": "7.30.1",
     "unified": "11.0.5",
-    "use-sync-external-store": "1.6.0",
     "word-extractor": "1.0.4",
     "ws": "8.21.3",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
@@ -312,7 +308,6 @@
     "@types/archiver": "8.0.0",
     "@types/busboy": "1.5.4",
     "@types/chrome": "0.3.6",
-    "@types/d3-shape": "3.1.8",
     "@types/hast": "3.0.5",
     "@types/heic-convert": "2.1.1",
     "@types/html-to-text": "9.0.4",
diff --git a/apps/sim/platform/app/(shell)/_components/command-menu/command-menu.tsx b/apps/sim/platform/app/(shell)/_components/command-menu/command-menu.tsx
deleted file mode 100644
index 965eb1edebc..00000000000
--- a/apps/sim/platform/app/(shell)/_components/command-menu/command-menu.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-'use client'
-
-import type {
-  ShellChat,
-  ShellDestination,
-  ShellWorkspace,
-} from '@/platform/app/(shell)/_components/model'
-import { CommandPalette } from '@/platform/design-system/components/command-palette/command-palette'
-import { OverlayDialog } from '@/platform/design-system/components/modal/overlay-dialog'
-import { useSearchModalStore } from '@/stores/modals/search/store'
-
-interface CommandMenuProps {
-  navigate: (href: string) => void
-  chats: readonly ShellChat[]
-  workspaces: readonly ShellWorkspace[]
-  destinations: readonly ShellDestination[]
-}
-
-/** The same store the desktop shell's View > Search toggles. Reads it here so the rail needn't. */
-export function CommandMenu({ navigate, chats, workspaces, destinations }: CommandMenuProps) {
-  const open = useSearchModalStore((state) => state.isOpen)
-  const setOpen = useSearchModalStore((state) => state.setOpen)
-  if (!open) return null
-  return (
-    <OverlayDialog label='Search' presentation='command' open onClose={() => setOpen(false)}>
-      <CommandPalette
-        label='Search the platform'
-        onSelect={(href) => {
-          setOpen(false)
-          navigate(href)
-        }}
-        groups={[
-          { items: destinations },
-          {
-            label: 'Workspaces',
-            items: workspaces.map((item) => ({ id: item.id, label: item.name, value: item.href })),
-          },
-          {
-            label: 'Chats',
-            items: chats.map((item) => ({ id: item.id, label: item.title, value: item.href })),
-          },
-        ]}
-      />
-    </OverlayDialog>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/invite-modal/invite-modal.tsx b/apps/sim/platform/app/(shell)/_components/invite-modal/invite-modal.tsx
deleted file mode 100644
index 6efb3c24236..00000000000
--- a/apps/sim/platform/app/(shell)/_components/invite-modal/invite-modal.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { SelectField } from '@/platform/design-system/components/field/fields'
-import { Modal } from '@/platform/design-system/components/modal/modal'
-import { RecipientField } from '@/platform/design-system/components/workspace-fields/workspace-fields'
-import { ORGANIZATION_ROLE_OPTIONS, useInviteMembers } from '@/platform/lib/data/invite'
-
-interface InviteModalProps {
-  onClose: () => void
-}
-
-interface Recipient {
-  address: string
-  invalid?: boolean
-}
-
-type InviteRole = (typeof ORGANIZATION_ROLE_OPTIONS)[number]['value']
-
-/**
- * Invites people to the organization. Workspace grants belong to the workspace entry points. Failed
- * addresses stay in the field with their reasons so a retry resends only those, and the seat warning
- * never blocks, because the server decides per address.
- */
-export function InviteModal({ onClose }: InviteModalProps) {
-  const invite = useInviteMembers()
-  const [recipients, setRecipients] = useState<Recipient[]>([])
-  const [role, setRole] = useState<InviteRole>('member')
-
-  const problem = recipients
-    .filter((recipient) => recipient.invalid)
-    .map((recipient) => invite.addressProblem(recipient.address))
-    .find(Boolean)
-
-  return (
-    <Modal
-      title='Invite people'
-      open
-      onOpenChange={onClose}
-      confirmLabel='Send invites'
-      confirmDisabled={recipients.length === 0 || Boolean(problem)}
-      onConfirm={async () => {
-        const { failed, message } = await invite.submit(
-          recipients.map(({ address }) => address),
-          role
-        )
-        if (message) {
-          setRecipients(failed.map((address) => ({ address })))
-          throw new Error(message)
-        }
-      }}
-    >
-      <RecipientField
-        label='Email addresses'
-        placeholder='name@company.com'
-        recipients={recipients}
-        onRecipientsChange={setRecipients}
-        validate={(address) => invite.addressProblem(address) === null}
-        error={problem ?? undefined}
-        hint={invite.seatWarning(recipients.length)}
-      />
-      <SelectField
-        label='Role'
-        options={ORGANIZATION_ROLE_OPTIONS}
-        value={role}
-        onValueChange={(next) => setRole(next === 'admin' ? 'admin' : 'member')}
-      />
-    </Modal>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/model.ts b/apps/sim/platform/app/(shell)/_components/model.ts
deleted file mode 100644
index 057ea98c78f..00000000000
--- a/apps/sim/platform/app/(shell)/_components/model.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-
-interface ShellItem {
-  id: string
-  title: string
-}
-
-export interface ShellWorkspace {
-  id: string
-  name: string
-  href: string
-  logoUrl?: string | null
-  permissions: 'admin' | 'write' | 'read' | null
-  isPinned: boolean
-}
-
-export interface ShellChat extends ShellItem {
-  /** Assistant chats live under Search, agent chats at the chat route. */
-  href: string
-  isActive: boolean
-  isUnread: boolean
-  isPinned: boolean
-}
-
-export interface ShellDestination {
-  id: string
-  label: string
-  icon: IconName
-  value: string
-}
-
-export type ShellQueryStatus = 'pending' | 'error' | 'success'
-
-export interface ShellData {
-  organization: { id: string; name: string; memberCount: number; logo: string | null }
-  /** Absent until the viewer's profile has loaded. */
-  user?: { name: string; image: string | null; canSignOut: boolean }
-  workspaces: ShellWorkspace[]
-  chats: ShellChat[]
-  /** So a list can tell loading and failure from empty. */
-  status: { workspaces: ShellQueryStatus; chats: ShellQueryStatus }
-  workspaceCreation: { canCreate: boolean; reason: string | null }
-  /** False when the viewer's chat list would be refused, so the section is not offered. */
-  chatsAvailable: boolean
-  destinations: readonly ShellDestination[]
-}
-
-/** Leaving the current page. Each goes through the settings guard, so a draft is never lost. */
-export interface ShellActions {
-  signOut: () => void
-  /** Runs `leave` now, or once the viewer agrees to discard unsaved settings. */
-  requestLeave: (leave: () => void) => void
-  /** Also remembers where Settings' Back returns to. */
-  navigate: (href: string) => void
-}
diff --git a/apps/sim/platform/app/(shell)/_components/notification-tray/notification-tray.tsx b/apps/sim/platform/app/(shell)/_components/notification-tray/notification-tray.tsx
deleted file mode 100644
index 02d8cae0eae..00000000000
--- a/apps/sim/platform/app/(shell)/_components/notification-tray/notification-tray.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { toast } from '@sim/emcn'
-
-interface Notice {
-  id: string
-  title: string
-  description?: string
-  action?: string
-  onAction?: () => void
-  /** How the toast reads. Unset is a plain status, such as an undo offer. */
-  variant?: 'success' | 'error'
-}
-
-/** The notices a toast is showing, so re-raising or dismissing a notice id reaches its toast. */
-const toastIdByNotice = new Map<string, string>()
-
-function dismiss(id: string) {
-  const toastId = toastIdByNotice.get(id)
-  if (toastId) toast.dismiss(toastId)
-}
-
-function notify({ id, title, description, action, onAction, variant }: Notice) {
-  dismiss(id)
-  const toastId = toast({
-    message: title,
-    description,
-    variant,
-    action: action && onAction ? { label: action, onClick: onAction } : undefined,
-    onDismiss: () => {
-      if (toastIdByNotice.get(id) === toastId) toastIdByNotice.delete(id)
-    },
-  })
-  toastIdByNotice.set(id, toastId)
-}
-
-const NOTICES = { notify, dismiss }
-
-/**
- * Delivers design-system notices through the app's existing toast stack, in place of the Platform
- * shell's tray. Same module path and hook as the tray, so ported components stay unchanged.
- */
-export function usePlatformNotices() {
-  return NOTICES
-}
diff --git a/apps/sim/platform/app/(shell)/_components/organization-menu/organization-menu.module.css b/apps/sim/platform/app/(shell)/_components/organization-menu/organization-menu.module.css
deleted file mode 100644
index 5bd130a8b12..00000000000
--- a/apps/sim/platform/app/(shell)/_components/organization-menu/organization-menu.module.css
+++ /dev/null
@@ -1,31 +0,0 @@
-.menu {
-  inline-size: min(
-    calc(var(--shell-org-menu-width) - 2 * var(--ui-popup-padding)),
-    calc(100vw - var(--spacing-32))
-  );
-}
-.overview {
-  display: flex;
-  align-items: flex-start;
-  gap: var(--ui-row-gap);
-  padding: var(--ui-row-block) var(--ui-row-inset);
-}
-.overview > button {
-  align-self: center;
-}
-.copy {
-  display: grid;
-  flex: 1;
-  min-inline-size: 0;
-  overflow-wrap: anywhere;
-  gap: var(--ui-stack-gap);
-}
-.copy > [data-type="T050"] {
-  color: var(--ui-secondary);
-}
-.logoInput {
-  display: none;
-}
-.error {
-  color: var(--control-danger);
-}
diff --git a/apps/sim/platform/app/(shell)/_components/organization-menu/organization-menu.tsx b/apps/sim/platform/app/(shell)/_components/organization-menu/organization-menu.tsx
deleted file mode 100644
index 556de90c068..00000000000
--- a/apps/sim/platform/app/(shell)/_components/organization-menu/organization-menu.tsx
+++ /dev/null
@@ -1,205 +0,0 @@
-'use client'
-
-import { type RefObject, useId, useRef, useState } from 'react'
-import { getErrorMessage } from '@sim/utils/errors'
-import { LOGO_ACCEPT_ATTRIBUTE } from '@/lib/uploads/client/logo-file'
-import { InviteModal } from '@/platform/app/(shell)/_components/invite-modal/invite-modal'
-import type { ShellData } from '@/platform/app/(shell)/_components/model'
-import styles from '@/platform/app/(shell)/_components/organization-menu/organization-menu.module.css'
-import { Avatar } from '@/platform/design-system/components/avatar/avatar'
-import { Button } from '@/platform/design-system/components/button/button'
-import { Input } from '@/platform/design-system/components/field/inputs'
-import { IdentityButton } from '@/platform/design-system/components/identity-button/identity-button'
-import { MenuItem } from '@/platform/design-system/components/menu/action-menu'
-import { AnchoredPopover } from '@/platform/design-system/components/menu/anchored-popover'
-import { useOrganizationActions } from '@/platform/lib/data/shell-actions'
-import { plural } from '@/platform/lib/plural'
-
-function focusNameField(frame: HTMLDivElement | null) {
-  const field = frame?.querySelector('input')
-  field?.focus()
-  field?.select()
-}
-
-interface OrganizationMenuProps {
-  anchor: RefObject<HTMLElement | null>
-  organization: ShellData['organization']
-  onOpen: () => void
-  onSettings: () => void
-}
-
-export function OrganizationMenu({
-  anchor,
-  organization,
-  onOpen,
-  onSettings,
-}: OrganizationMenuProps) {
-  const [open, setOpen] = useState(false)
-  const [invite, setInvite] = useState(false)
-  const [draftName, setDraftName] = useState<string | null>(null)
-  const [renameError, setRenameError] = useState<string | null>(null)
-  const actions = useOrganizationActions()
-  const { isRenaming: renaming, isUploadingLogo: uploading } = actions
-  /** The name just saved, shown until the refreshed surface replaces the one it was saved over. */
-  const [savedName, setSavedName] = useState<{ name: string; replaces: string } | null>(null)
-  const opener = useRef<HTMLElement>(null)
-  const fileInput = useRef<HTMLInputElement>(null)
-  const card = useRef<HTMLDivElement>(null)
-  const errorId = useId()
-  if (savedName && savedName.replaces !== organization.name) setSavedName(null)
-  const name = savedName?.name ?? organization.name
-  const logo = organization.logo ?? undefined
-
-  function stopRenaming() {
-    setDraftName(null)
-    setRenameError(null)
-  }
-
-  /** The rename field unmounts when the draft ends, and focus would otherwise fall to the page. */
-  function returnFocusToCard() {
-    requestAnimationFrame(() => card.current?.querySelector('button')?.focus())
-  }
-
-  async function submitRename(): Promise<boolean> {
-    if (draftName === null || renaming) return false
-    const next = draftName.trim()
-    if (!next || next === name) {
-      stopRenaming()
-      return true
-    }
-    try {
-      await actions.rename(next)
-      setSavedName({ name: next, replaces: organization.name })
-      stopRenaming()
-      return true
-    } catch (error) {
-      setRenameError(getErrorMessage(error, 'Failed to rename organization'))
-      return false
-    }
-  }
-
-  return (
-    <>
-      <AnchoredPopover
-        presentation='menu'
-        label='Organization menu'
-        anchor={anchor}
-        open={open}
-        onOpenChange={(next, trigger) => {
-          // The field's blur saves the draft; closing now would unmount it and hide a failure.
-          if (!next && draftName !== null) return
-          if (next && trigger instanceof HTMLElement) opener.current = trigger
-          if (next) onOpen()
-          setOpen(next)
-        }}
-        trigger={(button) => (
-          <IdentityButton
-            render={button}
-            label='Organization menu'
-            leading={<Avatar name={name} src={logo} organization size='inline' />}
-            trailingIcon='I051'
-          >
-            {name}
-          </IdentityButton>
-        )}
-      >
-        <div ref={card} className={styles.menu}>
-          <div className={styles.overview}>
-            <Avatar name={name} src={logo} organization size='inline' />
-            <div className={styles.copy}>
-              {draftName !== null ? (
-                <div
-                  ref={focusNameField}
-                  onBlur={() => void submitRename()}
-                  onKeyDown={(event) => {
-                    if (event.key === 'Enter') {
-                      event.preventDefault()
-                      void submitRename().then((saved) => {
-                        if (saved) returnFocusToCard()
-                      })
-                    } else if (event.key === 'Escape') {
-                      event.preventDefault()
-                      event.stopPropagation()
-                      stopRenaming()
-                      returnFocusToCard()
-                    }
-                  }}
-                >
-                  <Input
-                    label='Organization name'
-                    value={draftName}
-                    disabled={renaming}
-                    invalid={Boolean(renameError)}
-                    describedBy={renameError ? errorId : undefined}
-                    onChange={(value) => {
-                      setDraftName(value)
-                      setRenameError(null)
-                    }}
-                  />
-                </div>
-              ) : (
-                <span data-type='T059'>{name}</span>
-              )}
-              {renameError && (
-                <span id={errorId} className={styles.error} role='alert' data-type='T052'>
-                  {renameError}
-                </span>
-              )}
-              <span data-type='T050'>{plural(organization.memberCount, 'member')}</span>
-            </div>
-            {actions.canInvite && (
-              <Button
-                size='compact'
-                onClick={() => {
-                  opener.current?.focus({ preventScroll: true })
-                  setOpen(false)
-                  setInvite(true)
-                }}
-              >
-                Invite
-              </Button>
-            )}
-          </div>
-          {actions.canEditIdentity && (
-            <>
-              <input
-                ref={fileInput}
-                className={styles.logoInput}
-                type='file'
-                accept={LOGO_ACCEPT_ATTRIBUTE}
-                aria-label='Organization logo'
-                disabled={uploading}
-                onChange={(event) => {
-                  const file = event.target.files?.[0]
-                  event.target.value = ''
-                  if (file) void actions.uploadLogo(file)
-                }}
-              />
-              <MenuItem
-                label='Rename organization'
-                icon='I036'
-                onSelect={() => setDraftName(name)}
-              />
-              <MenuItem
-                label='Change organization logo'
-                icon='I059'
-                detail={uploading ? 'Uploading' : undefined}
-                disabled={uploading}
-                onSelect={() => fileInput.current?.click()}
-              />
-            </>
-          )}
-          <MenuItem
-            label='Settings'
-            icon='I116'
-            onSelect={() => {
-              setOpen(false)
-              onSettings()
-            }}
-          />
-        </div>
-      </AnchoredPopover>
-      {invite && <InviteModal onClose={() => setInvite(false)} />}
-    </>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/search/search-results.tsx b/apps/sim/platform/app/(shell)/_components/search/search-results.tsx
deleted file mode 100644
index 91de922e467..00000000000
--- a/apps/sim/platform/app/(shell)/_components/search/search-results.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-'use client'
-
-import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
-import { useSession } from '@/lib/auth/client'
-import type { ResourceScope } from '@/lib/core/resource-scope'
-import { useLiveSearchResults } from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results/use-live-search-results'
-import { useSearchFilterControls } from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results/use-search-filter-controls'
-import {
-  handleResultsKeyDown,
-  liveSearchResultsKey,
-  toSource,
-} from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results/utils'
-import styles from '@/platform/app/(shell)/_components/search/search.module.css'
-import { SourceRow } from '@/platform/app/(shell)/_components/search/source-row'
-import { Button, Chip } from '@/platform/design-system/components/button/button'
-import { EmptyState } from '@/platform/design-system/components/empty-state/empty-state'
-import { DateRangePicker } from '@/platform/design-system/components/picker/date-picker'
-import { Select } from '@/platform/design-system/components/picker/select'
-import { InlineNotice } from '@/platform/design-system/components/status/status'
-
-function SearchFilterControls({ sourceTypes }: { sourceTypes: readonly string[] }) {
-  const { source, updated, range } = useSearchFilterControls(sourceTypes)
-  return (
-    <div className={styles.filters} role='group' aria-label='Search filters'>
-      <div className={styles.filter}>
-        <Select
-          variant='quiet'
-          label={source.label}
-          value={source.value}
-          options={source.options}
-          onValueChange={source.onChange}
-        />
-      </div>
-      <div className={styles.filter}>
-        <Select
-          variant='quiet'
-          label={updated.label}
-          value={updated.value}
-          options={updated.options}
-          onValueChange={updated.onChange}
-        />
-      </div>
-      {range && (
-        <div className={styles.range}>
-          <DateRangePicker
-            label='Updated between'
-            labelHidden
-            placeholder='Updated between'
-            clearable
-            value={range.start && range.end ? { start: range.start, end: range.end } : null}
-            onValueChange={(next) =>
-              next ? range.onChange(next.start, next.end) : range.onClear()
-            }
-          />
-        </div>
-      )}
-    </div>
-  )
-}
-
-interface LiveResultsProps {
-  scope: ResourceScope
-  query: string
-  onSummarize?: (prompt: string, filters: WorkspaceSearchFilters) => void
-}
-
-function LiveResults({ scope, query, onSummarize }: LiveResultsProps) {
-  const results = useLiveSearchResults({ scope, query, onSummarize })
-  const { awaitingRange, isFetching, isPending, isError } = results
-  return (
-    <div className={styles.results} aria-busy={!awaitingRange && isFetching}>
-      {!awaitingRange && isFetching && (
-        <p className={styles.quiet} data-type='T060' role='status'>
-          {isPending ? 'Searching' : 'Updating results'}
-        </p>
-      )}
-      {awaitingRange && <p data-type='T060'>Choose the days to search.</p>}
-      {isError && (
-        <InlineNotice
-          intent='danger'
-          message='Search couldn’t run.'
-          action={
-            <Button variant='quiet' size='compact' onClick={() => void results.refetch()}>
-              Try again
-            </Button>
-          }
-        />
-      )}
-      {results.showFilterControls && <SearchFilterControls sourceTypes={results.sourceTypes} />}
-      {results.noResults && <EmptyState title='Search found no results.' />}
-      {results.connectAppsHref && (
-        <InlineNotice
-          message='No connected apps are available for this search.'
-          action={<Chip href={results.connectAppsHref}>Connect apps</Chip>}
-        />
-      )}
-      {results.someAppsUnavailable && (
-        <InlineNotice
-          intent='warning'
-          message='Some apps couldn’t be searched. Showing available results.'
-        />
-      )}
-      {results.coverageIncomplete && (
-        <InlineNotice
-          intent='warning'
-          message='Coverage is incomplete. Narrow the query or ask Assistant to refine it.'
-        />
-      )}
-      <div
-        className={styles.rows}
-        role='region'
-        aria-label='Search results'
-        aria-busy={isFetching}
-        onKeyDown={handleResultsKeyDown}
-      >
-        {results.documents.map((result) => (
-          <SourceRow
-            key={result.documentId}
-            source={toSource(result, query, scope)}
-            query={query}
-            onSummarize={results.summarizerFor(result.documentId)}
-          />
-        ))}
-      </div>
-    </div>
-  )
-}
-
-/** A query's results. A new query, reader or scope remounts them, restarting the date anchor. */
-export function SearchResults({ scope, query, onSummarize }: LiveResultsProps) {
-  const { data: session } = useSession()
-  return (
-    <LiveResults
-      key={liveSearchResultsKey(scope, session?.user?.id, query)}
-      scope={scope}
-      query={query}
-      onSummarize={onSummarize}
-    />
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/search/search.module.css b/apps/sim/platform/app/(shell)/_components/search/search.module.css
deleted file mode 100644
index 70645a63324..00000000000
--- a/apps/sim/platform/app/(shell)/_components/search/search.module.css
+++ /dev/null
@@ -1,102 +0,0 @@
-.results,
-.rows {
-  display: grid;
-  min-inline-size: 0;
-}
-.results {
-  gap: var(--ui-section-gap);
-}
-.rows {
-  gap: var(--spacing-2);
-}
-.filters {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: var(--spacing-8);
-}
-.filter {
-  inline-size: 10.5rem;
-  max-inline-size: 100%;
-}
-.range {
-  inline-size: 15rem;
-  max-inline-size: 100%;
-}
-.quiet {
-  color: var(--ui-secondary);
-}
-.row,
-.compactRow {
-  display: flex;
-  gap: var(--ui-row-gap);
-  min-inline-size: 0;
-  padding-inline: var(--spacing-8);
-  border-radius: var(--ui-control-radius);
-}
-.row {
-  align-items: start;
-  padding-block: var(--spacing-8);
-}
-.compactRow {
-  align-items: center;
-  min-block-size: var(--spacing-app-chip);
-}
-.row:hover,
-.row:focus-within,
-.compactRow:hover,
-.compactRow:focus-within {
-  background: var(--ui-hover);
-}
-.mark {
-  display: inline-flex;
-  flex: none;
-  align-items: center;
-  justify-content: center;
-  inline-size: var(--spacing-16);
-  block-size: var(--spacing-20);
-}
-.rowBody {
-  display: grid;
-  flex: 1;
-  gap: var(--spacing-2);
-  min-inline-size: 0;
-}
-.title {
-  min-inline-size: 0;
-  overflow-wrap: anywhere;
-}
-.title:hover,
-.compactTitle:hover {
-  text-decoration: underline;
-}
-.row .title:focus-visible,
-.compactRow .compactTitle:focus-visible {
-  border-radius: var(--radius-2);
-  outline: var(--spacing-stroke-default) solid var(--ui-secondary);
-}
-.meta,
-.compactMeta {
-  min-inline-size: 0;
-  color: var(--ui-secondary);
-}
-.snippet {
-  display: -webkit-box;
-  overflow: hidden;
-  color: var(--ui-secondary);
-  overflow-wrap: anywhere;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
-}
-.term {
-  color: var(--ui-ink);
-  font-weight: var(--font-weight-medium);
-}
-.compactTitle {
-  flex: 1;
-  min-inline-size: 0;
-}
-.compactMeta {
-  flex: none;
-  max-inline-size: 40%;
-}
diff --git a/apps/sim/platform/app/(shell)/_components/search/source-row.tsx b/apps/sim/platform/app/(shell)/_components/search/source-row.tsx
deleted file mode 100644
index 20fc4e93c10..00000000000
--- a/apps/sim/platform/app/(shell)/_components/search/source-row.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-'use client'
-
-import { memo, type ReactNode, useState } from 'react'
-import { toast, useCopyToClipboard } from '@sim/emcn'
-import {
-  useOpenSimLinkForm,
-  useSimLinkOrganizationId,
-} from '@/app/o/[organizationId]/links/sim-link-organization-provider'
-import { useExistingSimLink } from '@/app/o/[organizationId]/links/sim-link-shortcut'
-import {
-  highlightTerms,
-  sourceMeta,
-} from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-card/source-card'
-import {
-  SourceIcon,
-  sourceLabel,
-} from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-chip'
-import { useSourceNavigation } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-history-context'
-import type { SourceTagData } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags'
-import { useHydrated } from '@/hooks/use-hydrated'
-import styles from '@/platform/app/(shell)/_components/search/search.module.css'
-import { ActionMenu, type MenuAction } from '@/platform/design-system/components/menu/action-menu'
-import { OverflowText } from '@/platform/design-system/components/overflow-text/overflow-text'
-
-/**
- * The Sim link entry of a source's menu: copies the link that already opens this address, or offers
- * to create one. It looks up only while the menu is open, and fails closed: a failed lookup offers
- * nothing rather than risk a duplicate. The form opens at the layout root, outside the menu.
- */
-function useSimLinkAction(source: SourceTagData, menuOpen: boolean): MenuAction | null {
-  const organizationId = useSimLinkOrganizationId()
-  const openForm = useOpenSimLinkForm()
-  const { existing, isPending, isError, copyExisting } = useExistingSimLink(
-    organizationId ?? '',
-    source.url,
-    menuOpen
-  )
-  if (!organizationId || isError) return null
-  if (existing) {
-    return {
-      id: 'sim-link',
-      label: `Copy sim/${existing.name}`,
-      icon: 'I006',
-      onSelect: async () => {
-        if (await copyExisting()) toast.success(`Copied sim/${existing.name}`)
-      },
-    }
-  }
-  return {
-    id: 'sim-link',
-    label: 'Create link',
-    icon: 'I074',
-    disabled: isPending,
-    onSelect: () => openForm(source.url, sourceLabel(source)),
-  }
-}
-
-interface SourceActionsProps {
-  source: SourceTagData
-  onSummarize?: (source: SourceTagData) => void
-}
-
-function SourceActions({ source, onSummarize }: SourceActionsProps) {
-  const [menuOpen, setMenuOpen] = useState(false)
-  const { copied, copy } = useCopyToClipboard({ resetMs: 1500 })
-  const simLinkAction = useSimLinkAction(source, menuOpen)
-  return (
-    <ActionMenu
-      label={copied ? 'Link copied' : `Actions for ${sourceLabel(source)}`}
-      icon={copied ? 'I072' : 'I108'}
-      align='end'
-      tooltip={false}
-      open={menuOpen}
-      onOpenChange={setMenuOpen}
-      actions={[
-        ...(onSummarize
-          ? [
-              {
-                id: 'summarize',
-                label: 'Summarize',
-                icon: 'I075',
-                onSelect: () => onSummarize(source),
-              } as const,
-            ]
-          : []),
-        {
-          id: 'copy-link',
-          label: 'Copy link',
-          icon: 'I006',
-          onSelect: async () => {
-            if (!(await copy(source.url))) toast.error('Unable to copy link')
-          },
-        },
-        ...(simLinkAction ? [simLinkAction] : []),
-      ]}
-    />
-  )
-}
-
-interface SourceLinkProps {
-  source: SourceTagData
-  className: string
-  type: string
-  children: ReactNode
-}
-
-/** Opens the document in a new tab and records the view; arrow keys move between these links. */
-function SourceLink({ source, className, type, children }: SourceLinkProps) {
-  const navigate = useSourceNavigation(source)
-  return (
-    <a
-      className={className}
-      data-type={type}
-      data-source-link=''
-      href={source.url}
-      target='_blank'
-      rel='noopener noreferrer'
-      onClick={navigate}
-      onAuxClick={navigate}
-    >
-      {children}
-    </a>
-  )
-}
-
-function SourceMark({ source }: { source: SourceTagData }) {
-  return (
-    <span className={styles.mark}>
-      <SourceIcon source={source} />
-    </span>
-  )
-}
-
-interface SourceRowProps {
-  source: SourceTagData
-  /** The query the document was found for; its terms are bolded in the snippet. */
-  query?: string
-  onSummarize?: (source: SourceTagData) => void
-}
-
-/** One search result: where it lives, why it matched, and what can be done with it. */
-export function SourceRow({ source, query, onSummarize }: SourceRowProps) {
-  const meta = sourceMeta(source)
-  return (
-    <div className={styles.row}>
-      <SourceMark source={source} />
-      <div className={styles.rowBody}>
-        <SourceLink source={source} className={styles.title} type='T048'>
-          {sourceLabel(source)}
-        </SourceLink>
-        <span className={styles.meta} data-type='T052'>
-          <OverflowText text={meta}>{meta}</OverflowText>
-        </span>
-        {source.snippet && (
-          <p className={styles.snippet} data-type='T060'>
-            {highlightTerms(source.snippet, query, styles.term)}
-          </p>
-        )}
-      </div>
-      <SourceActions source={source} onSummarize={onSummarize} />
-    </div>
-  )
-}
-
-/**
- * A source as one line, for recent activity. Memoized because the field's draft lives above it, so
- * every keystroke would otherwise re-render each row's menu and overflow measurement.
- */
-export const CompactSourceRow = memo(function CompactSourceRow({
-  source,
-}: {
-  source: SourceTagData
-}) {
-  const label = sourceLabel(source)
-  // Its date is in the viewer's zone, which the server cannot render.
-  const meta = sourceMeta(useHydrated() ? source : { ...source, updatedAt: undefined })
-  return (
-    <div className={styles.compactRow}>
-      <SourceMark source={source} />
-      <SourceLink source={source} className={styles.compactTitle} type='T060'>
-        <OverflowText text={label}>{label}</OverflowText>
-      </SourceLink>
-      <span className={styles.compactMeta} data-type='T052'>
-        <OverflowText text={meta}>{meta}</OverflowText>
-      </span>
-      <SourceActions source={source} />
-    </div>
-  )
-})
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/account-menu.tsx b/apps/sim/platform/app/(shell)/_components/sidebar/account-menu.tsx
deleted file mode 100644
index 8dd336aa01c..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/account-menu.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-'use client'
-
-import { type RefObject, useState } from 'react'
-import styles from '@/platform/app/(shell)/_components/sidebar/sidebar.module.css'
-import { Avatar } from '@/platform/design-system/components/avatar/avatar'
-import { IdentityButton } from '@/platform/design-system/components/identity-button/identity-button'
-import { MenuItem } from '@/platform/design-system/components/menu/action-menu'
-import { AnchoredPopover } from '@/platform/design-system/components/menu/anchored-popover'
-import { Tooltip } from '@/platform/design-system/components/tooltip/tooltip'
-
-interface AccountMenuProps {
-  anchor: RefObject<HTMLElement | null>
-  name: string
-  image: string | null
-  /** The rail shows the photo alone, and names the account in a tooltip. */
-  iconOnly: boolean
-  canSignOut: boolean
-  onOpen: () => void
-  onSettings: () => void
-  onSignOut: () => void
-}
-
-export function AccountMenu({
-  anchor,
-  name,
-  image,
-  iconOnly,
-  canSignOut,
-  onOpen,
-  onSettings,
-  onSignOut,
-}: AccountMenuProps) {
-  const [open, setOpen] = useState(false)
-  return (
-    <AnchoredPopover
-      presentation='menu'
-      label='Account menu'
-      anchor={anchor}
-      open={open}
-      onOpenChange={(next) => {
-        if (next) onOpen()
-        setOpen(next)
-      }}
-      trigger={(button) => (
-        <Tooltip label={name} enabled={iconOnly}>
-          <IdentityButton
-            render={button}
-            label={name}
-            leading={<Avatar name={name} src={image ?? undefined} size='inline' />}
-          >
-            {iconOnly ? undefined : name}
-          </IdentityButton>
-        </Tooltip>
-      )}
-    >
-      <div className={styles.accountMenu}>
-        <MenuItem
-          label='Settings'
-          icon='I116'
-          onSelect={() => {
-            setOpen(false)
-            onSettings()
-          }}
-        />
-        {canSignOut && (
-          <MenuItem
-            label='Sign out'
-            icon='I132'
-            onSelect={() => {
-              setOpen(false)
-              onSignOut()
-            }}
-          />
-        )}
-      </div>
-    </AnchoredPopover>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/chats-section.tsx b/apps/sim/platform/app/(shell)/_components/sidebar/chats-section.tsx
deleted file mode 100644
index 2db9b0e20da..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/chats-section.tsx
+++ /dev/null
@@ -1,263 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { toast } from '@sim/emcn'
-import { usePathname, useRouter } from 'next/navigation'
-import { isPathOrDescendant, organizationRoutes } from '@/lib/navigation/paths'
-import { ChatNavigationLink } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/chat-navigation-link/chat-navigation-link'
-import { useChatSelection } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-chat-selection'
-import type { ShellChat, ShellQueryStatus } from '@/platform/app/(shell)/_components/model'
-import { NameModal } from '@/platform/app/(shell)/_components/sidebar/name-modal'
-import { RailFlyout } from '@/platform/app/(shell)/_components/sidebar/rail-flyout'
-import {
-  copyLinkAction,
-  openInNewTabAction,
-} from '@/platform/app/(shell)/_components/sidebar/row-links'
-import { PinnedIndicator, SectionRow } from '@/platform/app/(shell)/_components/sidebar/section-row'
-import { SectionStatus } from '@/platform/app/(shell)/_components/sidebar/section-status'
-import styles from '@/platform/app/(shell)/_components/sidebar/sidebar-collections.module.css'
-import { Disclosure } from '@/platform/design-system/components/disclosure/disclosure'
-import { ActionMenu, type MenuAction } from '@/platform/design-system/components/menu/action-menu'
-import { Modal } from '@/platform/design-system/components/modal/modal'
-import { useChatListActions } from '@/platform/lib/data/chat-list'
-import { useFolderStore } from '@/stores/folders/store'
-
-const CHAT_TITLE_MAX_LENGTH = 200
-
-const CHAT_ORDERS = ['Recent activity', 'Name (A–Z)', 'Name (Z–A)'] as const
-type ChatOrder = (typeof CHAT_ORDERS)[number]
-
-function sortChats(chats: readonly ShellChat[], order: ChatOrder): readonly ShellChat[] {
-  if (order === 'Recent activity') return chats
-  const direction = order === 'Name (A–Z)' ? 1 : -1
-  return [...chats].sort(
-    (a, b) => Number(b.isPinned) - Number(a.isPinned) || direction * a.title.localeCompare(b.title)
-  )
-}
-
-/** The slot fits one glyph. A dot reports what changed; a pin is already told by the row's place. */
-function chatStatus(chat: ShellChat, isCurrent: boolean) {
-  if (chat.isActive)
-    return (
-      <span className={styles.indicator} role='img' aria-label='Running'>
-        <span className={styles.dot} data-running='' />
-      </span>
-    )
-  if (chat.isUnread && !isCurrent)
-    return (
-      <span className={styles.indicator} role='img' aria-label='Unread'>
-        <span className={styles.dot} />
-      </span>
-    )
-  return chat.isPinned ? <PinnedIndicator /> : null
-}
-
-type ChatEdit = { kind: 'rename'; chatId: string } | { kind: 'remove'; chatIds: readonly string[] }
-
-interface ChatsSectionProps {
-  organizationId: string
-  chats: readonly ShellChat[]
-  status: ShellQueryStatus
-  onRetry: () => void
-  collapsed: boolean
-  open: boolean
-  onOpenChange: (open: boolean) => void
-}
-
-export function ChatsSection({
-  organizationId,
-  chats,
-  status,
-  onRetry,
-  collapsed,
-  open,
-  onOpenChange,
-}: ChatsSectionProps) {
-  const pathname = usePathname()
-  const router = useRouter()
-  const actions = useChatListActions(organizationId)
-  const [editing, setEditing] = useState<ChatEdit | null>(null)
-  const [order, setOrder] = useState<ChatOrder>('Recent activity')
-  const ordered = sortChats(chats, order)
-  const { selectedChats, handleChatClick } = useChatSelection({
-    chatIds: ordered.map((chat) => chat.id),
-  })
-  const isMultiSelecting = selectedChats.size > 1
-
-  function rowActions(chat: ShellChat): MenuAction[] {
-    if (isMultiSelecting && selectedChats.has(chat.id)) {
-      const targets = ordered.filter((row) => selectedChats.has(row.id))
-      return [
-        {
-          id: 'remove',
-          destructive: true,
-          label: `Delete ${targets.length} chats`,
-          icon: 'I061',
-          onSelect: () => setEditing({ kind: 'remove', chatIds: targets.map((row) => row.id) }),
-        },
-      ]
-    }
-    return [
-      openInNewTabAction(chat.href),
-      copyLinkAction(chat.href),
-      {
-        id: 'read',
-        label: chat.isUnread ? 'Mark as read' : 'Mark as unread',
-        icon: chat.isUnread ? 'I072' : 'I106',
-        onSelect: () => actions.setRead(chat.id, chat.isUnread),
-      },
-      {
-        id: 'pin',
-        label: chat.isPinned ? 'Unpin' : 'Pin',
-        icon: 'I131',
-        onSelect: () => actions.setPinned(chat.id, !chat.isPinned),
-      },
-      {
-        id: 'rename',
-        label: 'Rename',
-        icon: 'I036',
-        onSelect: () => setEditing({ kind: 'rename', chatId: chat.id }),
-      },
-      {
-        id: 'remove',
-        destructive: true,
-        label: 'Delete',
-        icon: 'I061',
-        separatorBefore: true,
-        onSelect: () => setEditing({ kind: 'remove', chatIds: [chat.id] }),
-      },
-    ]
-  }
-
-  /** Leaving the open chat returns to where its mode lives: Search for assistant, Home for agent. */
-  function leaveIfRemoved(removed: readonly ShellChat[]) {
-    const current = removed.find((chat) => window.location.pathname === chat.href)
-    if (!current) return
-    const routes = organizationRoutes(organizationId)
-    router.push(isPathOrDescendant(current.href, routes.search) ? routes.search : routes.home)
-  }
-
-  /** A removal that only partly lands narrows the dialog to what is left and reports why. */
-  async function confirmRemoval(targets: readonly ShellChat[]) {
-    const { removedIds, failure } = await actions.remove(targets.map((chat) => chat.id))
-    leaveIfRemoved(targets.filter((chat) => removedIds.includes(chat.id)))
-    if (!failure) {
-      useFolderStore.getState().clearChatSelection()
-      return true
-    }
-    toast.error(failure)
-    setEditing({
-      kind: 'remove',
-      chatIds: targets.map((chat) => chat.id).filter((id) => !removedIds.includes(id)),
-    })
-    return false
-  }
-
-  function renderRows(hold?: (held: boolean) => void) {
-    return (
-      <div className={styles.group}>
-        <SectionStatus
-          status={status}
-          isEmpty={chats.length === 0}
-          emptyLabel='No chats yet'
-          failureLabel='Could not load chats'
-          onRetry={onRetry}
-        />
-        {ordered.map((chat) => {
-          const isCurrent = pathname === chat.href
-          return (
-            <SectionRow
-              key={chat.id}
-              label={chat.title}
-              actions={rowActions(chat)}
-              selected={isMultiSelecting && selectedChats.has(chat.id)}
-              status={chatStatus(chat, isCurrent)}
-              onMenuOpenChange={(menuOpen) => {
-                if (menuOpen && !selectedChats.has(chat.id))
-                  useFolderStore.getState().selectChatOnly(chat.id)
-                hold?.(menuOpen)
-              }}
-              render={
-                <ChatNavigationLink
-                  href={chat.href}
-                  chatId={chat.id}
-                  isCurrentRoute={isCurrent}
-                  onSelectChat={handleChatClick}
-                  aria-current={isCurrent ? 'page' : undefined}
-                />
-              }
-            />
-          )
-        })}
-      </div>
-    )
-  }
-
-  const renamingChat =
-    editing?.kind === 'rename' ? chats.find((chat) => chat.id === editing.chatId) : undefined
-  const removing =
-    editing?.kind === 'remove' ? chats.filter((chat) => editing.chatIds.includes(chat.id)) : []
-
-  return (
-    <>
-      {collapsed ? (
-        <RailFlyout label='Chats' icon='I073'>
-          {renderRows}
-        </RailFlyout>
-      ) : (
-        <Disclosure
-          variant='section'
-          label='Chats'
-          open={open}
-          onOpenChange={onOpenChange}
-          actions={
-            <ActionMenu
-              label='Sort chats'
-              triggerSize='compact'
-              icon='I050'
-              actions={CHAT_ORDERS.map((label) => ({
-                id: label,
-                label,
-                checked: label === order,
-                onSelect: () => setOrder(label),
-              }))}
-            />
-          }
-        >
-          {open && renderRows()}
-        </Disclosure>
-      )}
-      {renamingChat && (
-        <NameModal
-          title='Rename chat'
-          confirmLabel='Save'
-          fieldLabel='Chat name'
-          emptyMessage='Enter a chat name.'
-          maxLength={CHAT_TITLE_MAX_LENGTH}
-          initial={renamingChat.title}
-          onSubmit={(name) => actions.rename(renamingChat.id, name)}
-          onClose={() => setEditing(null)}
-        />
-      )}
-      {removing.length > 0 && (
-        <Modal
-          open
-          onOpenChange={() => setEditing(null)}
-          variant='confirm'
-          title={removing.length > 1 ? `Delete ${removing.length} chats` : 'Delete chat'}
-          confirmLabel='Delete'
-          destructive
-          onConfirm={() => confirmRemoval(removing)}
-        >
-          <p data-type='T048'>
-            {removing.length === 1
-              ? `Delete “${removing[0].title}”?`
-              : `Delete ${removing.length} chats?`}{' '}
-            You can restore {removing.length === 1 ? 'it' : 'them'} from Recently deleted in
-            Settings.
-          </p>
-        </Modal>
-      )}
-    </>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/help-menu.tsx b/apps/sim/platform/app/(shell)/_components/sidebar/help-menu.tsx
deleted file mode 100644
index b535c87918c..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/help-menu.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { openLinkInNewTab } from '@/platform/app/(shell)/_components/sidebar/row-links'
-import { SupportModal } from '@/platform/app/(shell)/_components/sidebar/support-modal'
-import { ActionMenu, type MenuAction } from '@/platform/design-system/components/menu/action-menu'
-import { useHelp } from '@/platform/lib/data/shell-actions'
-
-export function HelpMenu() {
-  const help = useHelp()
-  const [contacting, setContacting] = useState(false)
-  const { desktopUpdate, downloadUrl, changelogUrl } = help
-  const actions: MenuAction[] = []
-  if (desktopUpdate)
-    actions.push({
-      id: 'desktop-update',
-      label: desktopUpdate.label,
-      icon: 'I049',
-      disabled: desktopUpdate.disabled,
-      onSelect: desktopUpdate.run,
-    })
-  actions.push(
-    {
-      id: 'documentation',
-      label: 'Docs',
-      icon: 'I079',
-      trailingIcon: 'I030',
-      separatorBefore: Boolean(desktopUpdate),
-      onSelect: help.openDocumentation,
-    },
-    {
-      id: 'slack',
-      label: 'Join Slack',
-      icon: 'I123',
-      trailingIcon: 'I030',
-      onSelect: help.joinSlack,
-    },
-    {
-      id: 'support',
-      label: 'Contact support',
-      icon: 'I047',
-      onSelect: () => setContacting(true),
-    }
-  )
-  if (downloadUrl)
-    actions.push({
-      id: 'downloads',
-      label: 'Download apps',
-      icon: 'I102',
-      separatorBefore: true,
-      children: [
-        {
-          id: 'macos',
-          label: 'Sim for macOS',
-          icon: 'I041',
-          trailingIcon: 'I030',
-          onSelect: () => openLinkInNewTab(downloadUrl),
-        },
-      ],
-    })
-  if (changelogUrl)
-    actions.push({
-      id: 'changelog',
-      label: 'Changelog',
-      icon: 'I046',
-      separatorBefore: !downloadUrl,
-      onSelect: () => openLinkInNewTab(changelogUrl),
-    })
-  return (
-    <>
-      <ActionMenu
-        label={desktopUpdate ? 'Help, update available' : 'Help'}
-        triggerSize='row'
-        icon={desktopUpdate ? 'I049' : 'I047'}
-        actions={actions}
-      />
-      {contacting && <SupportModal onClose={() => setContacting(false)} />}
-    </>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/name-modal.tsx b/apps/sim/platform/app/(shell)/_components/sidebar/name-modal.tsx
deleted file mode 100644
index 2f5b923011a..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/name-modal.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-'use client'
-
-import { readFormText } from '@/platform/app/(shell)/_components/sidebar/row-links'
-import { TextField } from '@/platform/design-system/components/field/fields'
-import { Modal } from '@/platform/design-system/components/modal/modal'
-
-interface NameModalProps {
-  title: string
-  confirmLabel: string
-  fieldLabel: string
-  emptyMessage: string
-  maxLength: number
-  /** The current name, when renaming. An unchanged one saves nothing. */
-  initial?: string
-  onSubmit: (name: string) => Promise<void>
-  onClose: () => void
-}
-
-export function NameModal({
-  title,
-  confirmLabel,
-  fieldLabel,
-  emptyMessage,
-  maxLength,
-  initial,
-  onSubmit,
-  onClose,
-}: NameModalProps) {
-  return (
-    <Modal
-      open
-      onOpenChange={onClose}
-      title={title}
-      confirmLabel={confirmLabel}
-      onConfirm={async (values) => {
-        const name = readFormText(values, 'name')
-        if (!name) throw new Error(emptyMessage)
-        if (name !== initial) await onSubmit(name)
-      }}
-    >
-      <TextField
-        label={fieldLabel}
-        name='name'
-        required
-        maxLength={maxLength}
-        defaultValue={initial}
-      />
-    </Modal>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/rail-flyout.tsx b/apps/sim/platform/app/(shell)/_components/sidebar/rail-flyout.tsx
deleted file mode 100644
index 37d9ef9b8d8..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/rail-flyout.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-'use client'
-
-import type { ReactNode } from 'react'
-import { Popover } from '@base-ui/react/popover'
-import { useHoverMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-hover-menu'
-import styles from '@/platform/app/(shell)/_components/sidebar/sidebar.module.css'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-import popup from '@/platform/design-system/components/menu/popup.shared.module.css'
-import { usePopoverContainer } from '@/platform/design-system/components/menu/use-popover-container'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-/** A boundary, so the rows are built only when the panel is mounted, not on every rail render. */
-function RailFlyoutRows({ render }: { render: () => ReactNode }) {
-  return render()
-}
-
-interface RailFlyoutProps {
-  label: string
-  icon: IconName
-  /** Holding the flyout open keeps it under a menu its rows open, which sits outside its bounds. */
-  children: (hold: (held: boolean) => void) => ReactNode
-}
-
-/**
- * A section of the collapsed rail: one icon, with every row in a panel on hover. Focus stays where
- * it was, because a pointer passing over the rail must not take it from the composer.
- */
-export function RailFlyout({ label, icon, children }: RailFlyoutProps) {
-  const hover = useHoverMenu()
-  const portal = usePopoverContainer()
-  const scrollEdges = useScrollEdges<HTMLDivElement>()
-  return (
-    <Popover.Root
-      open={hover.isOpen}
-      onOpenChange={(next) => (next ? hover.open() : hover.close())}
-    >
-      <div {...hover.triggerProps} className={styles.railRow}>
-        <ControlRow
-          render={<Popover.Trigger ref={portal.trigger} />}
-          accessibleLabel={label}
-          icon={icon}
-        />
-      </div>
-      {portal.container && (
-        <Popover.Portal container={portal.container}>
-          <Popover.Positioner
-            className={popup.positioner}
-            side='inline-end'
-            align='start'
-            sideOffset={4}
-            collisionPadding={8}
-            positionMethod='fixed'
-          >
-            <Popover.Popup
-              ref={scrollEdges}
-              initialFocus={false}
-              finalFocus={false}
-              className={`${popup.panel} ${styles.flyout}`}
-              data-presentation='menu'
-              aria-label={label}
-              data-material='floating'
-              data-elevation='menu'
-              onMouseEnter={hover.contentProps.onMouseEnter}
-              onMouseLeave={hover.contentProps.onMouseLeave}
-            >
-              <RailFlyoutRows render={() => children(hover.setLocked)} />
-            </Popover.Popup>
-          </Popover.Positioner>
-        </Popover.Portal>
-      )}
-    </Popover.Root>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/row-links.ts b/apps/sim/platform/app/(shell)/_components/sidebar/row-links.ts
deleted file mode 100644
index 153e35603b0..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/row-links.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { toast } from '@sim/emcn'
-import type { MenuAction } from '@/platform/design-system/components/menu/action-menu'
-
-function absoluteHref(href: string): string {
-  return new URL(href, window.location.origin).href
-}
-
-async function copyLink(href: string) {
-  try {
-    await navigator.clipboard.writeText(absoluteHref(href))
-  } catch {
-    toast.error('Failed to copy link')
-  }
-}
-
-export function openLinkInNewTab(href: string) {
-  window.open(absoluteHref(href), '_blank', 'noopener,noreferrer')
-}
-
-export function openInNewTabAction(href: string): MenuAction {
-  return {
-    id: 'open-new-tab',
-    label: 'Open in new tab',
-    icon: 'I037',
-    onSelect: () => openLinkInNewTab(href),
-  }
-}
-
-export function copyLinkAction(href: string): MenuAction {
-  return { id: 'copy-link', label: 'Copy link', icon: 'I006', onSelect: () => void copyLink(href) }
-}
-
-export function readFormText(values: FormData, name: string): string {
-  const value = values.get(name)
-  return typeof value === 'string' ? value.trim() : ''
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/section-row.tsx b/apps/sim/platform/app/(shell)/_components/sidebar/section-row.tsx
deleted file mode 100644
index a7a5e3af78b..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/section-row.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import type { ReactElement, ReactNode } from 'react'
-import styles from '@/platform/app/(shell)/_components/sidebar/sidebar-collections.module.css'
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import {
-  ActionMenu,
-  ContextActionMenu,
-  type MenuAction,
-} from '@/platform/design-system/components/menu/action-menu'
-
-export function PinnedIndicator() {
-  return (
-    <span className={styles.indicator} role='img' aria-label='Pinned'>
-      <Icon name='I131' />
-    </span>
-  )
-}
-
-interface SectionRowProps {
-  label: string
-  actions: readonly MenuAction[]
-  /** The row's link, which owns its navigation and prefetching. */
-  render: ReactElement
-  leading?: ReactNode
-  status?: ReactNode
-  selected?: boolean
-  onMenuOpenChange?: (open: boolean) => void
-}
-
-/** A row of the rail's collections. Its options button and a right click open the same menu. */
-export function SectionRow({
-  label,
-  actions,
-  render,
-  leading,
-  status,
-  selected,
-  onMenuOpenChange,
-}: SectionRowProps) {
-  const menuLabel = `Actions for ${label}`
-  return (
-    <ContextActionMenu label={menuLabel} actions={actions} onOpenChange={onMenuOpenChange}>
-      <div className={styles.row} data-selected={selected || undefined}>
-        <ControlRow
-          label={label}
-          leading={leading}
-          status={status}
-          action={
-            <ActionMenu
-              label={menuLabel}
-              tooltip={false}
-              icon='I108'
-              triggerSize='compact'
-              align='end'
-              actions={actions}
-              onOpenChange={onMenuOpenChange}
-            />
-          }
-          render={render}
-        />
-      </div>
-    </ContextActionMenu>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/section-status.tsx b/apps/sim/platform/app/(shell)/_components/sidebar/section-status.tsx
deleted file mode 100644
index 3656acee00b..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/section-status.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import type { ShellQueryStatus } from '@/platform/app/(shell)/_components/model'
-import styles from '@/platform/app/(shell)/_components/sidebar/sidebar-collections.module.css'
-import { FailureNotice } from '@/platform/design-system/components/status/status'
-
-interface SectionStatusProps {
-  status: ShellQueryStatus
-  isEmpty: boolean
-  emptyLabel: string
-  failureLabel: string
-  onRetry: () => void
-}
-
-/** Loading stays silent, like the legacy sidebar; empty and failure each say which they are. */
-export function SectionStatus({
-  status,
-  isEmpty,
-  emptyLabel,
-  failureLabel,
-  onRetry,
-}: SectionStatusProps) {
-  if (status === 'error') return <FailureNotice message={failureLabel} onRetry={onRetry} />
-  if (status === 'success' && isEmpty)
-    return (
-      <p className={styles.message} data-type='T052'>
-        {emptyLabel}
-      </p>
-    )
-  return null
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/sidebar-collections.module.css b/apps/sim/platform/app/(shell)/_components/sidebar/sidebar-collections.module.css
deleted file mode 100644
index efbb3ebb617..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/sidebar-collections.module.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.group {
-  display: grid;
-  gap: var(--ui-list-gap);
-}
-.row {
-  display: grid;
-  min-inline-size: 0;
-  border-radius: var(--ui-control-radius);
-}
-.row[data-selected] {
-  background: var(--ui-selected);
-}
-.indicator {
-  display: flex;
-  align-items: center;
-}
-.dot {
-  inline-size: var(--spacing-6);
-  block-size: var(--spacing-6);
-  border-radius: var(--radius-full);
-  background: var(--status-info);
-}
-.dot[data-running] {
-  background: var(--status-warning);
-}
-.message {
-  display: flex;
-  align-items: center;
-  min-block-size: var(--spacing-app-chip);
-  padding-inline: var(--ui-row-inset);
-  color: var(--ui-secondary);
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/sidebar.module.css b/apps/sim/platform/app/(shell)/_components/sidebar/sidebar.module.css
deleted file mode 100644
index 2f37469876d..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/sidebar.module.css
+++ /dev/null
@@ -1,169 +0,0 @@
-.sidebar {
-  display: flex;
-  block-size: 100%;
-  overflow: hidden;
-}
-.sidebar[data-peeking] {
-  border-radius: calc(var(--radius) - 1px);
-}
-/* The peek card floats, so it is the frame its menus are placed against, and it must not clip them. */
-[data-peek]:has(.sidebar) {
-  overflow: visible;
-}
-/* Floating layers sit above a legacy page's own stacking beside the rail. */
-.sidebar [data-side] {
-  z-index: var(--z-popover);
-}
-.sidebar [role="tooltip"] {
-  z-index: var(--z-tooltip);
-}
-.sidebar[data-settings] [data-platform-ui] {
-  background: var(--surface-1);
-}
-.sidebar[data-settings] [data-material="shell"] {
-  background: transparent;
-  backdrop-filter: none;
-}
-.column {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  min-inline-size: 0;
-  min-block-size: 0;
-}
-.dragLane {
-  block-size: var(--desktop-title-bar-height);
-}
-.header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--ui-row-gap);
-  padding: var(--shell-edge-inset) var(--ui-row-inset) 0;
-}
-[data-sim-desktop-title-bar="inset"] .sidebar:not([data-peeking]) .header {
-  padding-block-start: var(--desktop-title-bar-height);
-}
-.sidebar[data-collapsed] .header {
-  display: grid;
-}
-.actions {
-  display: flex;
-  flex: none;
-  align-items: center;
-  gap: var(--ui-action-gap);
-  -webkit-app-region: no-drag;
-}
-.collapseControl {
-  display: flex;
-}
-[data-sim-desktop-title-bar="inset"] .collapseControl {
-  display: none;
-}
-.railMark {
-  display: grid;
-  flex: none;
-  grid-template-areas: "mark";
-  place-items: center;
-}
-.railLogo,
-.railGlyph {
-  display: flex;
-  grid-area: mark;
-}
-.railGlyph {
-  visibility: hidden;
-}
-button:hover > .railMark > .railLogo {
-  visibility: hidden;
-}
-button:hover > .railMark > .railGlyph {
-  visibility: visible;
-}
-.body {
-  flex: 1;
-  min-block-size: 0;
-}
-.body > [data-platform-ui] {
-  block-size: 100%;
-}
-.bodyFrame {
-  display: grid;
-  grid-template-rows: auto minmax(0, 1fr);
-  block-size: 100%;
-}
-.nav {
-  display: grid;
-  gap: var(--ui-list-gap);
-  padding: var(--ui-product-section-gap) var(--ui-row-inset);
-}
-.sections {
-  display: grid;
-  gap: var(--ui-product-section-gap);
-  min-inline-size: 0;
-  padding-inline: var(--ui-row-inset);
-  padding-block-end: var(--ui-row-inset);
-}
-.sidebar[data-collapsed] .sections {
-  gap: var(--ui-list-gap);
-}
-.railRow {
-  display: grid;
-  min-inline-size: 0;
-}
-.flyout {
-  inline-size: var(--shell-org-menu-width);
-}
-.footer {
-  display: flex;
-  align-items: center;
-  gap: var(--ui-row-gap);
-  min-block-size: var(--spacing-app-chip);
-  padding: var(--spacing-8) var(--ui-row-inset) var(--shell-edge-inset);
-}
-.sidebar[data-collapsed] .footer {
-  flex-direction: column-reverse;
-  align-items: stretch;
-  gap: var(--ui-list-gap);
-}
-.help {
-  display: flex;
-  flex: none;
-  margin-inline-start: auto;
-}
-.sidebar[data-collapsed] .help {
-  justify-content: center;
-  margin-inline-start: 0;
-}
-.accountSkeleton {
-  inline-size: var(--spacing-96);
-  block-size: var(--spacing-14);
-  border-radius: var(--ui-control-radius);
-  background: var(--ui-hover);
-}
-.sidebar[data-collapsed] .accountSkeleton {
-  inline-size: 100%;
-}
-.accountMenu {
-  inline-size: min(
-    calc(var(--shell-org-menu-width) - 2 * var(--ui-popup-padding)),
-    calc(100vw - var(--spacing-32))
-  );
-}
-.edge {
-  position: relative;
-  z-index: 2;
-  flex: none;
-  inline-size: 0.25rem;
-  margin-inline-start: -0.25rem;
-  cursor: ew-resize;
-}
-.edge[data-collapsed] {
-  cursor: e-resize;
-}
-@media (max-width: 48rem) {
-  .edge,
-  .collapseControl {
-    display: none;
-  }
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/sidebar.tsx b/apps/sim/platform/app/(shell)/_components/sidebar/sidebar.tsx
deleted file mode 100644
index 5b3b19779f2..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/sidebar.tsx
+++ /dev/null
@@ -1,268 +0,0 @@
-'use client'
-
-import { useRef, useState } from 'react'
-import Link from 'next/link'
-import { usePathname } from 'next/navigation'
-import { isMacPlatform } from '@/lib/core/utils/platform'
-import { isPathOrDescendant, organizationRoutes } from '@/lib/navigation/paths'
-import { RedesignSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
-import { OrganizationSettingsRail } from '@/app/o/[organizationId]/settings/organization-settings-rail'
-import { useSidebarChrome } from '@/app/workspace/[workspaceId]/components/workspace-chrome'
-import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
-import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands'
-import { useSidebarResize } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-sidebar-resize'
-import { isSidebarBackgroundClick } from '@/app/workspace/[workspaceId]/w/components/sidebar/utils'
-import { CommandMenu } from '@/platform/app/(shell)/_components/command-menu/command-menu'
-import { OrganizationMenu } from '@/platform/app/(shell)/_components/organization-menu/organization-menu'
-import { AccountMenu } from '@/platform/app/(shell)/_components/sidebar/account-menu'
-import { ChatsSection } from '@/platform/app/(shell)/_components/sidebar/chats-section'
-import { HelpMenu } from '@/platform/app/(shell)/_components/sidebar/help-menu'
-import {
-  copyLinkAction,
-  openInNewTabAction,
-} from '@/platform/app/(shell)/_components/sidebar/row-links'
-import styles from '@/platform/app/(shell)/_components/sidebar/sidebar.module.css'
-import { WorkspacesSection } from '@/platform/app/(shell)/_components/sidebar/workspaces-section'
-import { Avatar } from '@/platform/design-system/components/avatar/avatar'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import { ContextActionMenu } from '@/platform/design-system/components/menu/action-menu'
-import { ScrollArea } from '@/platform/design-system/components/scroll-area/scroll-area'
-import { Tooltip } from '@/platform/design-system/components/tooltip/tooltip'
-import { useNavWarmers } from '@/platform/lib/data/nav-warmers'
-import { type OrganizationNavFlags, useOrganizationShell } from '@/platform/lib/data/shell'
-import { useShellActions } from '@/platform/lib/data/shell-actions'
-import { useFolderStore } from '@/stores/folders/store'
-import { useSearchModalStore } from '@/stores/modals/search/store'
-
-/**
- * The organization surface's rail in the design system's style, hosted by the same `WorkspaceChrome`
- * as the workspace sidebar, so the collapse cookie, resize, mobile drawer and desktop peek behave the
- * same. Collapse and peek state come from the chrome.
- *
- * Three surfaces beside each other rather than one around the rail, because Settings keeps its own
- * legacy navigation between the header and footer, and nothing legacy can render inside a surface.
- * Nothing between a surface and the chrome is positioned: a menu portals into its surface and is
- * positioned against the chrome's frame, which is what keeps it outside the rail's clipped width.
- */
-export function Sidebar(flags: OrganizationNavFlags) {
-  const { isCollapsed: railCollapsed, isPeeking, onToggle } = useSidebarChrome()
-  const collapsed = railCollapsed && !isPeeking
-  const pathname = usePathname() ?? ''
-  const { data, retryChats, retryWorkspaces } = useOrganizationShell(flags)
-  const actions = useShellActions()
-  const { organization, destinations } = data
-  const header = useRef<HTMLDivElement>(null)
-  const footer = useRef<HTMLDivElement>(null)
-  const { handlePointerDown } = useSidebarResize()
-  const warmers = useNavWarmers()
-  const [workspacesOpen, setWorkspacesOpen] = useState(true)
-  const [chatsOpen, setChatsOpen] = useState(true)
-  const setCommandOpen = useSearchModalStore((state) => state.setOpen)
-
-  const routes = organizationRoutes(organization.id)
-  const isSettings = isPathOrDescendant(pathname, routes.settings)
-  const membersSettings = routes.settingsSection('members')
-  const generalSettings = routes.settingsSection('general')
-  const shortcutModifier = isMacPlatform() ? '⌘' : 'Ctrl+'
-
-  useRegisterGlobalCommands(() =>
-    createCommands([
-      { id: 'toggle-sidebar', handler: () => onToggle() },
-      { id: 'open-search', handler: () => setCommandOpen(!useSearchModalStore.getState().isOpen) },
-    ])
-  )
-
-  return (
-    <aside
-      className={styles.sidebar}
-      data-collapsed={collapsed || undefined}
-      data-peeking={isPeeking || undefined}
-      data-settings={isSettings || undefined}
-      aria-label='Organization sidebar'
-      onClick={(event) => {
-        const onFlyout =
-          event.target instanceof Element && event.target.closest('[data-material="floating"]')
-        if (isSidebarBackgroundClick(event) && !onFlyout) {
-          useFolderStore.getState().clearChatSelection()
-        }
-      }}
-    >
-      <div className={styles.column}>
-        <RedesignSurface>
-          <div data-material='shell'>
-            {!isPeeking && (
-              <div
-                aria-hidden
-                className={`desktop-window-drag-region desktop-workspace-window-drag-region ${styles.dragLane}`}
-              />
-            )}
-            <div ref={header} className={styles.header}>
-              {collapsed ? (
-                <ControlRow
-                  render={<button type='button' onClick={onToggle} />}
-                  accessibleLabel='Expand sidebar'
-                  leading={
-                    <span className={styles.railMark}>
-                      <span className={styles.railLogo}>
-                        <Avatar
-                          name={organization.name}
-                          src={organization.logo ?? undefined}
-                          organization
-                          size='inline'
-                        />
-                      </span>
-                      <span className={styles.railGlyph}>
-                        <Icon name='I066' />
-                      </span>
-                    </span>
-                  }
-                />
-              ) : (
-                <>
-                  <OrganizationMenu
-                    anchor={header}
-                    organization={organization}
-                    onOpen={() => warmers.warmSettings('members')}
-                    onSettings={() => actions.navigate(membersSettings)}
-                  />
-                  <div className={styles.actions}>
-                    <Tooltip label={`Quick search (${shortcutModifier}K)`}>
-                      <IconButton
-                        size='row'
-                        label='Quick search'
-                        icon='I089'
-                        onClick={() => setCommandOpen(true)}
-                      />
-                    </Tooltip>
-                    <span className={styles.collapseControl}>
-                      <Tooltip label={`Collapse sidebar (${shortcutModifier}B)`}>
-                        <IconButton
-                          size='row'
-                          label='Collapse sidebar'
-                          icon='I066'
-                          onClick={onToggle}
-                        />
-                      </Tooltip>
-                    </span>
-                  </div>
-                </>
-              )}
-            </div>
-          </div>
-          <CommandMenu
-            navigate={actions.navigate}
-            chats={data.chats}
-            workspaces={data.workspaces}
-            destinations={destinations}
-          />
-        </RedesignSurface>
-        <div className={styles.body}>
-          {isSettings ? (
-            <OrganizationSettingsRail collapsed={collapsed} />
-          ) : (
-            <RedesignSurface>
-              <div className={styles.bodyFrame} data-material='shell'>
-                <nav className={styles.nav} aria-label='Main navigation'>
-                  {destinations.map((item) => {
-                    const selected = isPathOrDescendant(pathname, item.value)
-                    const row = (
-                      <ControlRow
-                        label={collapsed ? undefined : item.label}
-                        accessibleLabel={collapsed ? item.label : undefined}
-                        icon={item.icon}
-                        render={
-                          <Link href={item.value} aria-current={selected ? 'page' : undefined} />
-                        }
-                      />
-                    )
-                    return (
-                      <ContextActionMenu
-                        key={item.id}
-                        label={`Actions for ${item.label}`}
-                        actions={[openInNewTabAction(item.value), copyLinkAction(item.value)]}
-                      >
-                        <div
-                          className={styles.railRow}
-                          onPointerEnter={() => {
-                            if (!selected) warmers.schedule(item.id)
-                          }}
-                          onPointerLeave={warmers.cancel}
-                        >
-                          {collapsed ? <Tooltip label={item.label}>{row}</Tooltip> : row}
-                        </div>
-                      </ContextActionMenu>
-                    )
-                  })}
-                </nav>
-                <ScrollArea label='Workspaces and chats' hideScrollbar>
-                  <div className={styles.sections}>
-                    <WorkspacesSection
-                      data={data}
-                      actions={actions}
-                      onRetry={retryWorkspaces}
-                      collapsed={collapsed}
-                      open={workspacesOpen}
-                      onOpenChange={setWorkspacesOpen}
-                    />
-                    {data.chatsAvailable && (
-                      <ChatsSection
-                        organizationId={organization.id}
-                        chats={data.chats}
-                        status={data.status.chats}
-                        onRetry={retryChats}
-                        collapsed={collapsed}
-                        open={chatsOpen}
-                        onOpenChange={setChatsOpen}
-                      />
-                    )}
-                  </div>
-                </ScrollArea>
-              </div>
-            </RedesignSurface>
-          )}
-        </div>
-        <RedesignSurface>
-          <div ref={footer} className={styles.footer} data-material='shell'>
-            {data.user ? (
-              <AccountMenu
-                anchor={footer}
-                name={data.user.name}
-                image={data.user.image}
-                iconOnly={collapsed}
-                canSignOut={data.user.canSignOut}
-                onOpen={() => warmers.warmSettings('general')}
-                onSettings={() => actions.navigate(generalSettings)}
-                onSignOut={actions.signOut}
-              />
-            ) : (
-              <span className={styles.accountSkeleton} aria-hidden />
-            )}
-            <div className={styles.help}>
-              <HelpMenu />
-            </div>
-          </div>
-        </RedesignSurface>
-      </div>
-      {!isPeeking && (
-        <div
-          className={styles.edge}
-          data-collapsed={collapsed || undefined}
-          role={collapsed ? 'button' : 'separator'}
-          tabIndex={0}
-          aria-orientation={collapsed ? undefined : 'vertical'}
-          aria-label={collapsed ? 'Expand sidebar' : 'Resize sidebar'}
-          onPointerDown={collapsed ? undefined : handlePointerDown}
-          onClick={collapsed ? onToggle : undefined}
-          onKeyDown={(event) => {
-            if (collapsed && (event.key === 'Enter' || event.key === ' ')) {
-              event.preventDefault()
-              onToggle()
-            }
-          }}
-        />
-      )}
-    </aside>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/support-modal.tsx b/apps/sim/platform/app/(shell)/_components/sidebar/support-modal.tsx
deleted file mode 100644
index 221704bf099..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/support-modal.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { toast } from '@sim/emcn'
-import { getErrorMessage } from '@sim/utils/errors'
-import { generateId } from '@sim/utils/id'
-import {
-  ACCEPTED_HELP_IMAGE_TYPES,
-  compressHelpImage,
-  DEFAULT_HELP_REQUEST_TYPE,
-  HELP_REQUEST_TYPE_OPTIONS,
-  submitHelpRequest,
-  validateHelpImage,
-} from '@/lib/help/request'
-import { readFormText } from '@/platform/app/(shell)/_components/sidebar/row-links'
-import { AttachmentGrid } from '@/platform/design-system/components/attachments/attachment-grid'
-import {
-  SelectField,
-  TextAreaField,
-  TextField,
-} from '@/platform/design-system/components/field/fields'
-import { FileField } from '@/platform/design-system/components/field/file-field'
-import { Modal } from '@/platform/design-system/components/modal/modal'
-
-interface SupportImage {
-  id: string
-  file: File
-}
-
-interface SupportModalProps {
-  onClose: () => void
-}
-
-export function SupportModal({ onClose }: SupportModalProps) {
-  const [images, setImages] = useState<readonly SupportImage[]>([])
-  const [imageError, setImageError] = useState<string>()
-  const [processing, setProcessing] = useState(false)
-
-  async function attach(file: File) {
-    setImageError(undefined)
-    setProcessing(true)
-    try {
-      const problem = validateHelpImage(file)
-      if (problem) throw new Error(problem)
-      const image = { id: generateId(), file: await compressHelpImage(file) }
-      setImages((previous) => [...previous, image])
-    } catch (error) {
-      setImageError(getErrorMessage(error, 'That image could not be attached.'))
-    } finally {
-      setProcessing(false)
-    }
-  }
-
-  function detach(id: string) {
-    setImages((previous) => previous.filter((image) => image.id !== id))
-  }
-
-  return (
-    <Modal
-      open
-      onOpenChange={onClose}
-      title='Contact support'
-      confirmLabel='Send'
-      confirmDisabled={processing}
-      onConfirm={async (values) => {
-        const subject = readFormText(values, 'subject')
-        const message = readFormText(values, 'message')
-        if (!subject) throw new Error('Subject is required')
-        if (!message) throw new Error('Message is required')
-        const type = HELP_REQUEST_TYPE_OPTIONS.find(
-          (option) => option.value === readFormText(values, 'type')
-        )
-        if (!type) throw new Error('Select a request type')
-        await submitHelpRequest({
-          data: { type: type.value, subject, message },
-          images: images.map((image) => image.file),
-        })
-        toast.success('Request sent')
-      }}
-    >
-      <SelectField
-        label='Request'
-        name='type'
-        defaultValue={DEFAULT_HELP_REQUEST_TYPE}
-        options={HELP_REQUEST_TYPE_OPTIONS}
-      />
-      <TextField
-        label='Subject'
-        name='subject'
-        required
-        placeholder='Brief description of your request'
-      />
-      <TextAreaField
-        label='Message'
-        name='message'
-        required
-        placeholder='Please provide details about your request...'
-      />
-      <FileField
-        label='Images'
-        optional
-        accept={ACCEPTED_HELP_IMAGE_TYPES.join(',')}
-        disabled={processing}
-        error={imageError}
-        onFileChange={(file) => void attach(file)}
-      />
-      {images.length > 0 && (
-        <AttachmentGrid
-          label='Attached images'
-          attachments={images.map((image) => ({
-            id: image.id,
-            kind: 'image',
-            name: image.file.name,
-            description: 'Image attachment',
-            previewFile: image.file,
-          }))}
-          onRemove={detach}
-        />
-      )}
-    </Modal>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/_components/sidebar/workspaces-section.tsx b/apps/sim/platform/app/(shell)/_components/sidebar/workspaces-section.tsx
deleted file mode 100644
index ededc5aa6be..00000000000
--- a/apps/sim/platform/app/(shell)/_components/sidebar/workspaces-section.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { SettingsGuardedLink } from '@/components/settings/settings-guarded-link'
-import type {
-  ShellActions,
-  ShellData,
-  ShellWorkspace,
-} from '@/platform/app/(shell)/_components/model'
-import { NameModal } from '@/platform/app/(shell)/_components/sidebar/name-modal'
-import { RailFlyout } from '@/platform/app/(shell)/_components/sidebar/rail-flyout'
-import { openInNewTabAction } from '@/platform/app/(shell)/_components/sidebar/row-links'
-import { PinnedIndicator, SectionRow } from '@/platform/app/(shell)/_components/sidebar/section-row'
-import { SectionStatus } from '@/platform/app/(shell)/_components/sidebar/section-status'
-import styles from '@/platform/app/(shell)/_components/sidebar/sidebar-collections.module.css'
-import { Avatar } from '@/platform/design-system/components/avatar/avatar'
-import { Chip, IconButton } from '@/platform/design-system/components/button/button'
-import { Disclosure } from '@/platform/design-system/components/disclosure/disclosure'
-import { type MenuAction, MenuItem } from '@/platform/design-system/components/menu/action-menu'
-import { useWorkspaceActions } from '@/platform/lib/data/workspaces'
-
-const PAGE_SIZE = 5
-const WORKSPACE_NAME_MAX_LENGTH = 100
-const CREATE_UNAVAILABLE = 'Workspace creation is unavailable.'
-
-interface WorkspacesSectionProps {
-  data: ShellData
-  actions: ShellActions
-  onRetry: () => void
-  collapsed: boolean
-  open: boolean
-  onOpenChange: (open: boolean) => void
-}
-
-export function WorkspacesSection({
-  data,
-  actions,
-  onRetry,
-  collapsed,
-  open,
-  onOpenChange,
-}: WorkspacesSectionProps) {
-  const workspaceActions = useWorkspaceActions()
-  const [visibleCount, setVisibleCount] = useState(PAGE_SIZE)
-  const [creating, setCreating] = useState(false)
-  const [renamingId, setRenamingId] = useState<string | null>(null)
-  const { workspaces } = data
-  const { canCreate, reason } = data.workspaceCreation
-  const renaming = workspaces.find((workspace) => workspace.id === renamingId)
-  const hasMore = workspaces.length > visibleCount
-
-  function rowActions(item: ShellWorkspace): MenuAction[] {
-    return [
-      openInNewTabAction(item.href),
-      {
-        id: 'pin',
-        label: item.isPinned ? 'Unpin' : 'Pin',
-        icon: 'I131',
-        onSelect: () => workspaceActions.setPinned(item.id, !item.isPinned),
-      },
-      {
-        id: 'rename',
-        label: 'Rename',
-        icon: 'I036',
-        disabled: item.permissions !== 'admin',
-        onSelect: () => setRenamingId(item.id),
-      },
-    ]
-  }
-
-  function startCreating() {
-    actions.requestLeave(() => setCreating(true))
-  }
-
-  function renderRows(rows: readonly ShellWorkspace[], hold?: (held: boolean) => void) {
-    return (
-      <>
-        <SectionStatus
-          status={data.status.workspaces}
-          isEmpty={workspaces.length === 0}
-          emptyLabel='No workspaces yet'
-          failureLabel='Could not load workspaces'
-          onRetry={onRetry}
-        />
-        {rows.map((item) => (
-          <SectionRow
-            key={item.id}
-            label={item.name}
-            actions={rowActions(item)}
-            onMenuOpenChange={hold}
-            leading={
-              <Avatar name={item.name} src={item.logoUrl ?? undefined} organization size='inline' />
-            }
-            status={item.isPinned && <PinnedIndicator />}
-            render={<SettingsGuardedLink href={item.href} />}
-          />
-        ))}
-      </>
-    )
-  }
-
-  return (
-    <>
-      {collapsed ? (
-        <RailFlyout label='Workspaces' icon='I025'>
-          {(hold) => (
-            <div className={styles.group}>
-              {canCreate && <MenuItem label='New workspace' icon='I074' onSelect={startCreating} />}
-              {renderRows(workspaces, hold)}
-            </div>
-          )}
-        </RailFlyout>
-      ) : (
-        <Disclosure
-          variant='section'
-          label='Workspaces'
-          open={open}
-          onOpenChange={onOpenChange}
-          actions={
-            <IconButton
-              tooltip
-              size='compact'
-              label={canCreate ? 'New workspace' : (reason ?? CREATE_UNAVAILABLE)}
-              icon='I074'
-              disabled={!canCreate}
-              onClick={startCreating}
-            />
-          }
-        >
-          <div className={styles.group}>
-            {renderRows(workspaces.slice(0, visibleCount))}
-            {workspaces.length > PAGE_SIZE && (
-              <Chip onClick={() => setVisibleCount(hasMore ? visibleCount + PAGE_SIZE : PAGE_SIZE)}>
-                {hasMore ? 'See more' : 'See less'}
-              </Chip>
-            )}
-          </div>
-        </Disclosure>
-      )}
-      {creating && (
-        <NameModal
-          title='Create workspace'
-          confirmLabel='Create'
-          fieldLabel='Name'
-          emptyMessage='Enter a workspace name.'
-          maxLength={WORKSPACE_NAME_MAX_LENGTH}
-          onSubmit={async (name) => actions.navigate(await workspaceActions.create(name))}
-          onClose={() => setCreating(false)}
-        />
-      )}
-      {renaming && (
-        <NameModal
-          title='Rename workspace'
-          confirmLabel='Save'
-          fieldLabel='Name'
-          emptyMessage='Enter a workspace name.'
-          maxLength={WORKSPACE_NAME_MAX_LENGTH}
-          initial={renaming.name}
-          onSubmit={(name) => workspaceActions.rename(renaming.id, name)}
-          onClose={() => setRenamingId(null)}
-        />
-      )}
-    </>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/activity-chart/activity-chart.module.css b/apps/sim/platform/app/(shell)/home/_components/activity-chart/activity-chart.module.css
deleted file mode 100644
index 8991f36765a..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/activity-chart/activity-chart.module.css
+++ /dev/null
@@ -1,90 +0,0 @@
-.chart {
-  display: grid;
-  gap: var(--spacing-16);
-  inline-size: 100%;
-  min-inline-size: 0;
-  max-block-size: var(--ui-widget-max-size);
-  overflow: auto;
-  overscroll-behavior: contain;
-}
-
-.header,
-.ticks {
-  display: flex;
-  justify-content: space-between;
-  gap: var(--spacing-8);
-}
-
-.header {
-  align-items: flex-start;
-  flex-wrap: wrap;
-}
-
-.heading {
-  display: grid;
-  gap: var(--ui-stack-gap);
-}
-
-.total,
-.scale {
-  font-variant-numeric: tabular-nums;
-}
-
-.grid {
-  display: grid;
-  grid-template-columns: var(--spacing-44) minmax(0, 1fr);
-  row-gap: var(--spacing-8);
-}
-
-.scale,
-.lines {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-
-.scale,
-.ticks {
-  color: var(--ui-secondary);
-}
-
-.plot {
-  position: relative;
-  min-inline-size: 0;
-  block-size: calc(var(--spacing-chart-plot) + var(--spacing-32));
-}
-
-.plot > svg {
-  position: relative;
-}
-
-.lines {
-  position: absolute;
-  inset: var(--spacing-7) 0;
-  pointer-events: none;
-}
-
-.lines i {
-  border-block-start: var(--spacing-stroke-default) solid var(--activity-chart-grid);
-}
-
-.ticks {
-  grid-column: 2;
-}
-
-.ticks li {
-  min-inline-size: 0;
-  overflow: hidden;
-  white-space: nowrap;
-}
-
-.tooltipPosition {
-  column-gap: var(--spacing-12);
-  inline-size: min(100%, var(--chart-tooltip-width));
-  position: absolute;
-  z-index: 1;
-  translate: 0 calc(-50% - var(--spacing-4));
-  inset-block-start: 0;
-  max-inline-size: 100%;
-  pointer-events: none;
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/activity-chart/activity-chart.tsx b/apps/sim/platform/app/(shell)/home/_components/activity-chart/activity-chart.tsx
deleted file mode 100644
index 715ac6cd06e..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/activity-chart/activity-chart.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import styles from '@/platform/app/(shell)/home/_components/activity-chart/activity-chart.module.css'
-import type {
-  ActivityPoint,
-  HomeActivityState,
-} from '@/platform/app/(shell)/home/_components/model'
-import { RetryButton } from '@/platform/app/(shell)/home/_components/retry-button/retry-button'
-import { SkeletonBlock } from '@/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton'
-import { TrendPlot } from '@/platform/design-system/catalog/plots'
-import { InlineNotice } from '@/platform/design-system/components'
-import { chartNumber, chartTick } from '@/platform/design-system/components/chart/chart-format'
-import { ChartTooltip } from '@/platform/design-system/components/chart/chart-tooltip'
-import { usePlotInspection } from '@/platform/design-system/components/chart/use-plot-inspection'
-import { RangePicker } from '@/platform/design-system/components/menu/range-picker'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-import { formatCalendarDate } from '@/platform/lib/time'
-
-interface HomeActivityChartProps {
-  title: string
-  state: HomeActivityState
-  onRetry: () => void
-}
-
-interface ActivitySeriesProps {
-  title: string
-  points: readonly ActivityPoint[]
-}
-
-function ActivitySeries({ title, points }: ActivitySeriesProps) {
-  const tickEdges = useScrollEdges<HTMLLIElement>('horizontal')
-  const inspection = usePlotInspection(points.length)
-  const active = inspection.active
-  const point = active === undefined ? undefined : points[active]
-  const values = points.map((item) => item.value)
-  const max = values.reduce((max, value) => Math.max(max, value), 2)
-  const power = 10 ** Math.floor(Math.log10(max))
-  const peak = ([1, 2, 5, 10].find((step) => step * power >= max) ?? 10) * power
-  const labels = points.filter(
-    (_, i) => i === 0 || i === Math.floor((points.length - 1) / 2) || i === points.length - 1
-  )
-  return (
-    <div className={styles.grid}>
-      <div aria-hidden='true' className={styles.scale} data-type='T034'>
-        {[peak, peak / 2, 0].map((n) => (
-          <span key={n}>{chartTick(n)}</span>
-        ))}
-      </div>
-      <div
-        className={styles.plot}
-        data-plot='home-activity'
-        role='group'
-        aria-label={`${title} data`}
-        aria-describedby={point ? inspection.tooltipId : undefined}
-        tabIndex={points.length ? 0 : undefined}
-        onFocus={inspection.onFocus}
-        onBlur={inspection.onBlur}
-        onKeyDown={inspection.onKeyDown}
-        onPointerMove={inspection.onPointerMove}
-        onPointerLeave={inspection.onPointerLeave}
-      >
-        <div className={styles.lines} aria-hidden='true'>
-          <i />
-          <i />
-          <i />
-        </div>
-        <TrendPlot label={title} values={values} maximum={peak} active={active} straight />
-        {point && (
-          <div ref={inspection.tooltipAnchor} className={styles.tooltipPosition}>
-            <ChartTooltip
-              id={inspection.tooltipId}
-              heading={formatCalendarDate(point.date, 'full')}
-              entries={[{ label: title, value: point.value }]}
-            />
-          </div>
-        )}
-      </div>
-      <ul className={styles.ticks} aria-label='Chart periods' data-type='T034'>
-        {labels.map((label) => (
-          <li ref={tickEdges} key={label.date}>
-            {formatCalendarDate(label.date)}
-          </li>
-        ))}
-      </ul>
-    </div>
-  )
-}
-
-const WINDOW_DAYS = [7, 30, 90] as const
-const RANGE_LABELS = WINDOW_DAYS.map((days) => `Last ${days} days`)
-
-export function HomeActivityChart({ title, state, onRetry }: HomeActivityChartProps) {
-  const [range, setRange] = useState(RANGE_LABELS[0])
-  const scrollEdges = useScrollEdges<HTMLElement>('vertical', { tabStop: true })
-  if (state.status === 'hidden') return null
-  const ready = state.status === 'ready'
-  const days = WINDOW_DAYS[RANGE_LABELS.indexOf(range)]
-  const points = ready ? state.points.slice(-days) : []
-  const total = points.reduce((sum, point) => sum + point.value, 0)
-  return (
-    <section ref={scrollEdges} className={styles.chart} aria-label={title}>
-      <header className={styles.header}>
-        <div className={styles.heading}>
-          <h2 data-type='T042'>{title}</h2>
-          {ready && (
-            <span className={styles.total} data-type='T076'>
-              {chartNumber.format(total)}
-            </span>
-          )}
-        </div>
-        {ready && (
-          <RangePicker
-            label='Range'
-            options={RANGE_LABELS}
-            value={range}
-            onValueChange={setRange}
-          />
-        )}
-      </header>
-      {state.status === 'loading' && <SkeletonBlock label={`Loading ${title}`} />}
-      {state.status === 'error' && (
-        <InlineNotice
-          intent='warning'
-          message='This chart could not load.'
-          action={<RetryButton retrying={state.retrying} onRetry={onRetry} />}
-        />
-      )}
-      {ready && <ActivitySeries key={range} title={title} points={points} />}
-    </section>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/activity-list/activity-list.module.css b/apps/sim/platform/app/(shell)/home/_components/activity-list/activity-list.module.css
deleted file mode 100644
index b264b8ea1b7..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/activity-list/activity-list.module.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.entries {
-  display: grid;
-  gap: var(--ui-list-gap);
-  min-inline-size: 0;
-}
-.viewport {
-  display: grid;
-  min-block-size: 0;
-  margin-inline: calc(-1 * var(--ui-row-inset));
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/activity-list/activity-list.tsx b/apps/sim/platform/app/(shell)/home/_components/activity-list/activity-list.tsx
deleted file mode 100644
index 03fda973918..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/activity-list/activity-list.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import styles from '@/platform/app/(shell)/home/_components/activity-list/activity-list.module.css'
-import { HomeSection } from '@/platform/app/(shell)/home/_components/home-section/home-section'
-import type {
-  AttentionItem,
-  EmailItem,
-  HomeListState,
-} from '@/platform/app/(shell)/home/_components/model'
-import { RetryButton } from '@/platform/app/(shell)/home/_components/retry-button/retry-button'
-import { WidgetSkeleton } from '@/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton'
-import {
-  ActivityRow,
-  Avatar,
-  EmptyState,
-  Icon,
-  InlineNotice,
-  ScrollArea,
-} from '@/platform/design-system/components'
-import { formatRelativeTime } from '@/platform/lib/time'
-
-interface EmailListProps {
-  items: readonly EmailItem[]
-  asOf: number
-  onOpen: (mail: EmailItem) => void
-}
-
-function relativeTime(at: number | undefined, asOf: number) {
-  return at === undefined ? undefined : formatRelativeTime(at, asOf)
-}
-
-export function EmailList({ items, asOf, onOpen }: EmailListProps) {
-  if (!items.length) return <EmptyState title='No email yet' />
-  return (
-    <div className={styles.viewport}>
-      <ScrollArea label='Email messages'>
-        <ul className={styles.entries}>
-          {items.map((mail) => (
-            <ActivityRow
-              key={mail.id}
-              leading={<Avatar size='inline' name={mail.sender} />}
-              title={mail.sender}
-              count={mail.count}
-              detailLead={mail.subject}
-              detail={mail.excerpt}
-              metadata={relativeTime(mail.receivedAt, asOf)}
-              onOpen={() => onOpen(mail)}
-            />
-          ))}
-        </ul>
-      </ScrollArea>
-    </div>
-  )
-}
-
-interface AttentionListProps {
-  state: HomeListState<AttentionItem>
-  asOf: number
-  onRetry: () => void
-}
-
-export function AttentionList({ state, asOf, onRetry }: AttentionListProps) {
-  return (
-    <HomeSection title='Needs your attention'>
-      {state.status === 'loading' && <WidgetSkeleton label='Loading what needs your attention' />}
-      {state.status === 'error' && (
-        <InlineNotice
-          intent='warning'
-          message='This could not load.'
-          action={<RetryButton retrying={state.retrying} onRetry={onRetry} />}
-        />
-      )}
-      {state.status === 'ready' && (
-        <>
-          {state.partial && (
-            <InlineNotice
-              intent='warning'
-              message='Some items could not load.'
-              action={<RetryButton onRetry={onRetry} />}
-            />
-          )}
-          {state.items.length > 0 ? (
-            <div className={styles.viewport}>
-              <ScrollArea label='Attention requests'>
-                <ul className={styles.entries}>
-                  {state.items.map((row) => (
-                    <ActivityRow
-                      key={row.id}
-                      leading={<Icon name={row.icon} />}
-                      title={row.title}
-                      detail={row.detail}
-                      metadata={relativeTime(row.occurredAt, asOf)}
-                      {...(row.onOpen ? { onOpen: row.onOpen } : { href: row.href })}
-                    />
-                  ))}
-                </ul>
-              </ScrollArea>
-            </div>
-          ) : (
-            !state.partial && (
-              <EmptyState
-                title='You’re all caught up'
-                description='Anything that needs you will appear here.'
-              />
-            )
-          )}
-        </>
-      )}
-    </HomeSection>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/calendar/calendar-day.module.css b/apps/sim/platform/app/(shell)/home/_components/calendar/calendar-day.module.css
deleted file mode 100644
index d68ef9fc2a9..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/calendar/calendar-day.module.css
+++ /dev/null
@@ -1,137 +0,0 @@
-.toolbar,
-.dayControls,
-.hour,
-.event,
-.now {
-  display: flex;
-  align-items: center;
-  gap: var(--ui-row-gap);
-}
-.toolbar {
-  flex: none;
-  justify-content: space-between;
-  margin-inline-end: calc(-1 * var(--ui-action-overhang));
-  color: var(--ui-secondary);
-}
-.dayControls {
-  gap: var(--ui-stack-gap);
-}
-.dayControls [aria-label="Previous day"] svg {
-  transform: scaleX(-1);
-}
-.viewport {
-  position: relative;
-  block-size: var(--ui-widget-max-size);
-  min-block-size: 0;
-  overflow-y: auto;
-  overscroll-behavior: contain;
-}
-.timeline {
-  display: grid;
-  grid-template-columns: var(--spacing-60) minmax(0, 1fr);
-  grid-auto-rows: calc(var(--spacing-64) / 60);
-  column-gap: var(--ui-row-gap);
-  padding-block: var(--ui-row-inset);
-  min-inline-size: 0;
-}
-.hour,
-.now {
-  grid-column: 1 / -1;
-  align-self: start;
-  color: var(--ui-secondary);
-}
-.hour {
-  margin-block-start: -0.5lh;
-}
-.hour::after,
-.now::after {
-  content: "";
-  flex: 1;
-  block-size: var(--spacing-stroke-default);
-  background: var(--ui-divider);
-}
-.event {
-  position: relative;
-  grid-column: 2;
-  min-inline-size: 0;
-  overflow: hidden;
-  padding: var(--ui-row-block) var(--ui-row-inset);
-  border-radius: var(--ui-control-radius);
-  background: var(--control-muted-fill);
-}
-.event:has(.eventName[href]:hover) {
-  background: var(--control-muted-hover);
-}
-.event:has(.eventName[href]:active) {
-  background: var(--control-muted-pressed);
-}
-.event > :last-child {
-  position: relative;
-}
-.eventName[href]::before {
-  content: "";
-  position: absolute;
-  inset: 0;
-}
-.eventName {
-  display: grid;
-  text-align: start;
-  grid-template-columns: minmax(0, 1fr);
-  flex: 1;
-  min-inline-size: 0;
-  gap: var(--ui-stack-gap);
-}
-.eventName small {
-  color: var(--ui-secondary);
-}
-.now {
-  align-self: center;
-  pointer-events: none;
-}
-.now::before {
-  content: "";
-  order: 1;
-  inline-size: var(--spacing-4);
-  block-size: var(--spacing-4);
-  border-radius: var(--radius-full);
-  background: var(--ui-secondary);
-}
-.now::after {
-  order: 2;
-  background: var(--ui-border);
-}
-.allDay {
-  display: grid;
-  gap: var(--ui-list-gap);
-  min-inline-size: 0;
-  margin-block-end: var(--ui-list-gap);
-}
-.allDayEvent:has(.eventName[href]:hover) {
-  background: var(--control-muted-hover);
-}
-.allDayEvent:has(.eventName[href]:active) {
-  background: var(--control-muted-pressed);
-}
-.allDayEvent {
-  position: relative;
-  display: flex;
-  min-inline-size: 0;
-  padding: var(--ui-row-block) var(--ui-row-inset);
-  border-radius: var(--ui-control-radius);
-  background: var(--control-muted-fill);
-}
-.event[data-lanes="2"] {
-  inline-size: 50%;
-}
-.event[data-lanes="2"][data-lane="1"] {
-  margin-inline-start: 50%;
-}
-.event[data-lanes="3"] {
-  inline-size: calc(100% / 3);
-}
-.event[data-lanes="3"][data-lane="1"] {
-  margin-inline-start: calc(100% / 3);
-}
-.event[data-lanes="3"][data-lane="2"] {
-  margin-inline-start: calc(200% / 3);
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/calendar/calendar-day.tsx b/apps/sim/platform/app/(shell)/home/_components/calendar/calendar-day.tsx
deleted file mode 100644
index 0296e069b77..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/calendar/calendar-day.tsx
+++ /dev/null
@@ -1,242 +0,0 @@
-'use client'
-
-import { useLayoutEffect, useRef, useState } from 'react'
-import styles from '@/platform/app/(shell)/home/_components/calendar/calendar-day.module.css'
-import type {
-  CalendarMeeting,
-  HomeCalendarDay,
-} from '@/platform/app/(shell)/home/_components/model'
-import { RetryButton } from '@/platform/app/(shell)/home/_components/retry-button/retry-button'
-import { SkeletonBlock } from '@/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton'
-import {
-  AvatarGroup,
-  Button,
-  IconButton,
-  InlineNotice,
-  OverflowText,
-} from '@/platform/design-system/components'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-import { formatCalendarDate, formatClockTime, formatTimeRange } from '@/platform/lib/time'
-
-interface CalendarDayProps {
-  calendar: HomeCalendarDay
-  onDayChange: (delta: number) => void
-  onReturnToToday: () => void
-  onRetry: () => void
-}
-
-function externalUrl(url: string | undefined) {
-  return url?.startsWith('https://') && URL.canParse(url) ? url : undefined
-}
-
-/** An hour label this close to the current time would sit under it. */
-const NOW_LABEL_CLEARANCE_MINUTES = 15
-const HOURS = Array.from({ length: 24 }, (_, hour) => formatClockTime(hour * 3_600_000))
-/** A short meeting still needs room for its name and time. */
-const MIN_MEETING_ROWS = 30
-const MAX_MEETING_LANES = 3
-
-function timeSlot(startMinute: number, duration = 1) {
-  return `${startMinute + 1} / span ${duration}`
-}
-
-/**
- * Places meetings that overlap side by side, in as few lanes as each overlapping run needs. Past
- * the lanes the width can show, later meetings share a lane rather than shrink out of reading.
- */
-function meetingLanes(meetings: readonly CalendarMeeting[]) {
-  const placed = new Map<string, { lane: number; lanes: number }>()
-  const ordered = [...meetings].sort((a, b) => a.startMinute - b.startMinute)
-  let run: CalendarMeeting[] = []
-  let laneEnds: number[] = []
-  let runEnd = -1
-  const closeRun = () => {
-    for (const meeting of run) {
-      const position = placed.get(meeting.id)
-      if (position) position.lanes = Math.min(laneEnds.length, MAX_MEETING_LANES)
-    }
-    run = []
-    laneEnds = []
-  }
-  for (const meeting of ordered) {
-    if (meeting.startMinute >= runEnd) closeRun()
-    const end = meeting.startMinute + Math.max(meeting.duration, MIN_MEETING_ROWS)
-    const free = laneEnds.findIndex((laneEnd) => laneEnd <= meeting.startMinute)
-    const lane = free === -1 ? laneEnds.length : free
-    laneEnds[lane] = end
-    placed.set(meeting.id, { lane: lane % MAX_MEETING_LANES, lanes: 1 })
-    run.push(meeting)
-    runEnd = Math.max(runEnd, end)
-  }
-  closeRun()
-  return placed
-}
-
-export function CalendarDay({ calendar, onDayChange, onReturnToToday, onRetry }: CalendarDayProps) {
-  const today = calendar.nowMinute !== null
-  const [returnCount, setReturnCount] = useState(0)
-  const [atNow, setAtNow] = useState(true)
-  const viewport = useRef<HTMLDivElement>(null)
-  const now = useRef<HTMLSpanElement>(null)
-  const firstMeeting = useRef<HTMLElement>(null)
-  const restingTop = useRef<number | null>(null)
-  const focusOnReturn = useRef(false)
-  const scrollEdges = useScrollEdges('vertical', { viewport, tabStop: true })
-  const earliest = calendar.meetings.reduce<CalendarMeeting | undefined>(
-    (first, event) => (!first || event.startMinute < first.startMinute ? event : first),
-    undefined
-  )?.id
-
-  // Forgets the reading position only when the viewport changes: the clock ticks underneath it.
-  useLayoutEffect(() => {
-    restingTop.current = null
-  }, [calendar.date, calendar.status, returnCount])
-
-  useLayoutEffect(() => {
-    const marker = now.current ?? firstMeeting.current
-    const root = viewport.current
-    if (!marker || !root) return
-    const atRest = () =>
-      restingTop.current === null || Math.abs(root.scrollTop - restingTop.current) <= 1
-    const updatePosition = () => setAtNow(atRest())
-    const measure = () => {
-      const keepCentered = atRest()
-      const centered = marker.offsetTop + (marker.offsetHeight - root.clientHeight) / 2
-      restingTop.current = Math.max(0, Math.min(centered, root.scrollHeight - root.clientHeight))
-      if (keepCentered) root.scrollTop = restingTop.current
-      updatePosition()
-    }
-    measure()
-    const observer = new ResizeObserver(measure)
-    observer.observe(root)
-    if (marker.parentElement) observer.observe(marker.parentElement)
-    root.addEventListener('scroll', updatePosition, { passive: true })
-    return () => {
-      observer.disconnect()
-      root.removeEventListener('scroll', updatePosition)
-    }
-  }, [calendar.date, calendar.nowMinute, calendar.status, earliest, returnCount])
-
-  // Today may still be loading when the reader returns to it, so focus waits for its viewport.
-  useLayoutEffect(() => {
-    if (!focusOnReturn.current || !viewport.current) return
-    focusOnReturn.current = false
-    viewport.current.focus({ preventScroll: true })
-  }, [calendar.status, returnCount])
-
-  function returnToNow() {
-    focusOnReturn.current = true
-    onReturnToToday()
-    // Replacing the viewport cancels an in-flight native keyboard or momentum scroll.
-    setReturnCount((count) => count + 1)
-  }
-
-  const lanes = meetingLanes(calendar.meetings)
-  return (
-    <>
-      <div className={styles.toolbar}>
-        <span data-type='T052'>{formatCalendarDate(calendar.date, 'weekday')}</span>
-        <div className={styles.dayControls}>
-          {(!today || !atNow) && (
-            <Button variant='quiet' size='compact' onClick={returnToNow}>
-              Now
-            </Button>
-          )}
-          <IconButton icon='I032' label='Previous day' tooltip onClick={() => onDayChange(-1)} />
-          <IconButton icon='I032' label='Next day' tooltip onClick={() => onDayChange(1)} />
-        </div>
-      </div>
-      {calendar.status === 'loading' && <SkeletonBlock label='Loading this day' />}
-      {calendar.status === 'error' && (
-        <InlineNotice
-          intent='warning'
-          message='This day could not load.'
-          action={<RetryButton onRetry={onRetry} />}
-        />
-      )}
-      {calendar.status === 'ready' && (
-        <div
-          key={returnCount}
-          ref={scrollEdges}
-          role='region'
-          aria-label='Calendar schedule'
-          className={styles.viewport}
-        >
-          {calendar.allDay.length > 0 && (
-            <ul className={styles.allDay} aria-label='All-day events'>
-              {calendar.allDay.map((event) => (
-                <li key={event.id} className={styles.allDayEvent} data-type='T059'>
-                  <a
-                    className={styles.eventName}
-                    href={externalUrl(event.providerUrl)}
-                    target='_blank'
-                    rel='noopener noreferrer'
-                  >
-                    <OverflowText text={event.title} />
-                  </a>
-                </li>
-              ))}
-            </ul>
-          )}
-          <div className={styles.timeline}>
-            {HOURS.map((time, index) => (
-              <span
-                key={time}
-                className={styles.hour}
-                data-type='T035'
-                style={{
-                  gridRow: timeSlot(index * 60, 60),
-                  visibility:
-                    calendar.nowMinute !== null &&
-                    Math.abs(index * 60 - calendar.nowMinute) < NOW_LABEL_CLEARANCE_MINUTES
-                      ? 'hidden'
-                      : undefined,
-                }}
-              >
-                {time}
-              </span>
-            ))}
-            {calendar.meetings.map((event) => (
-              <article
-                key={event.id}
-                ref={event.id === earliest ? firstMeeting : undefined}
-                className={styles.event}
-                data-lane={lanes.get(event.id)?.lane}
-                data-lanes={lanes.get(event.id)?.lanes}
-                style={{
-                  gridRow: timeSlot(event.startMinute, Math.max(event.duration, MIN_MEETING_ROWS)),
-                }}
-              >
-                <a
-                  className={styles.eventName}
-                  href={externalUrl(event.providerUrl)}
-                  target='_blank'
-                  rel='noopener noreferrer'
-                >
-                  <strong data-type='T059'>
-                    <OverflowText text={event.title} />
-                  </strong>
-                  <small data-type='T050'>
-                    {formatTimeRange(event.startMinute, event.startMinute + event.duration)}
-                  </small>
-                </a>
-                <AvatarGroup people={event.people} label='People in this meeting' />
-              </article>
-            ))}
-            {calendar.nowMinute !== null && (
-              <span
-                ref={now}
-                className={styles.now}
-                aria-label='Current time'
-                data-type='T021'
-                style={{ gridRow: timeSlot(calendar.nowMinute) }}
-              >
-                {formatClockTime(calendar.nowMinute * 60_000)}
-              </span>
-            )}
-          </div>
-        </div>
-      )}
-    </>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/connected-widget/connected-widget.module.css b/apps/sim/platform/app/(shell)/home/_components/connected-widget/connected-widget.module.css
deleted file mode 100644
index 21177729dbb..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/connected-widget/connected-widget.module.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.connect {
-  display: grid;
-  block-size: var(--ui-widget-max-size);
-  min-block-size: 0;
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/connected-widget/connected-widget.tsx b/apps/sim/platform/app/(shell)/home/_components/connected-widget/connected-widget.tsx
deleted file mode 100644
index 465eff1193e..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/connected-widget/connected-widget.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-'use client'
-
-import { type ReactNode, useState } from 'react'
-import styles from '@/platform/app/(shell)/home/_components/connected-widget/connected-widget.module.css'
-import { HomeSection } from '@/platform/app/(shell)/home/_components/home-section/home-section'
-import type {
-  HomeAccountView,
-  HomeWidgetActions,
-  HomeWidgetState,
-} from '@/platform/app/(shell)/home/_components/model'
-import { RetryButton } from '@/platform/app/(shell)/home/_components/retry-button/retry-button'
-import { WidgetSkeleton } from '@/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton'
-import { ActionMenu, Button, EmptyState, InlineNotice } from '@/platform/design-system/components'
-import { ConnectionPrompt } from '@/platform/design-system/components/connection-prompt/connection-prompt'
-import type { MenuAction } from '@/platform/design-system/components/menu/action-menu'
-import { Modal } from '@/platform/design-system/components/modal/modal'
-
-const DISCONNECT_NOTICE =
-  'Sim will stop reading this account everywhere it is used, including Integrations. You can reconnect anytime.'
-
-const COPY = {
-  Email: { icon: 'I005', noun: 'email' },
-  Calendar: { icon: 'I088', noun: 'calendar' },
-} as const
-
-interface ConnectedWidgetProps<T> {
-  title: keyof typeof COPY
-  state: HomeWidgetState<T>
-  actions: HomeWidgetActions
-  onHide: () => void
-  children: (data: T) => ReactNode
-}
-
-interface AccountNoticesProps {
-  accounts: readonly HomeAccountView[]
-  onReconnect?: (accountId: string) => void
-  onRetry: () => void
-}
-
-/** The accounts that did not contribute, listed above the ones that did. */
-function AccountNotices({ accounts, onReconnect, onRetry }: AccountNoticesProps) {
-  return accounts.map((account) => {
-    if (account.problem === 'needs_reauth')
-      return (
-        <InlineNotice
-          key={account.id}
-          intent='warning'
-          message={
-            account.canReconnect
-              ? `Reconnect ${account.label} to keep it up to date here.`
-              : `${account.label} is paused. Ask an organization admin to turn it back on.`
-          }
-          action={
-            account.canReconnect && onReconnect ? (
-              <Button size='compact' onClick={() => onReconnect(account.id)}>
-                Reconnect
-              </Button>
-            ) : undefined
-          }
-        />
-      )
-    if (account.problem === 'unavailable')
-      return (
-        <InlineNotice
-          key={account.id}
-          intent='warning'
-          message={`${account.label} could not be reached.`}
-          action={<RetryButton onRetry={onRetry} />}
-        />
-      )
-    if (account.problem === 'not_offered')
-      return (
-        <InlineNotice
-          key={account.id}
-          message={`Your organization does not allow ${account.label} here.`}
-        />
-      )
-    if (account.problem === 'not_read')
-      return (
-        <InlineNotice
-          key={account.id}
-          message={`${account.label} is not shown. Home reads a limited number of accounts.`}
-        />
-      )
-    return null
-  })
-}
-
-export function ConnectedWidget<T>({
-  title,
-  state,
-  actions,
-  onHide,
-  children,
-}: ConnectedWidgetProps<T>) {
-  const [disconnecting, setDisconnecting] = useState<HomeAccountView | null>(null)
-  const { icon, noun } = COPY[title]
-  const connected = 'accounts' in state ? state.accounts : []
-  const several = connected.length > 1
-  const menu: MenuAction[] = [{ id: 'hide', label: `Hide ${title}`, onSelect: onHide }]
-  for (const account of connected) {
-    menu.push({
-      id: `disconnect-${account.id}`,
-      destructive: true,
-      separatorBefore: menu.length === 1,
-      label: `Disconnect ${several ? account.label : title}`,
-      onSelect: () => setDisconnecting(account),
-    })
-  }
-  const reconnectable =
-    state.status === 'needs_reauth' ? state.accounts.filter((a) => a.canReconnect) : []
-  return (
-    <HomeSection
-      title={title}
-      icon={icon}
-      actions={<ActionMenu label={`${title} options`} icon='I108' align='end' actions={menu} />}
-    >
-      {state.status === 'loading' && <WidgetSkeleton label={`Loading your ${noun}`} />}
-      {state.status === 'not_offered' && (
-        <EmptyState
-          title={`Your organization has not turned on ${noun}`}
-          description='Ask an organization admin to set it up under Integrations.'
-        />
-      )}
-      {state.status === 'not_connected' && (
-        <div className={styles.connect}>
-          <ConnectionPrompt
-            title={`Connect your ${noun}`}
-            options={state.options.map(({ id, label, icon: mark }) => ({
-              label,
-              icon: mark,
-              onConnect: actions.connect ? () => actions.connect?.(id) : undefined,
-            }))}
-          />
-        </div>
-      )}
-      {state.status === 'needs_reauth' && (
-        <EmptyState
-          title={`Reconnect your ${noun}`}
-          description={
-            reconnectable.length
-              ? `Sim can no longer read ${state.accounts.map((a) => a.label).join(', ')}.`
-              : 'This connection is paused. Ask an organization admin to turn it back on.'
-          }
-          action={
-            reconnectable.length && actions.reconnect
-              ? reconnectable.map((account) => (
-                  <Button
-                    key={account.id}
-                    size='compact'
-                    onClick={() => actions.reconnect?.(account.id)}
-                  >
-                    {reconnectable.length > 1 ? `Reconnect ${account.label}` : 'Reconnect'}
-                  </Button>
-                ))
-              : undefined
-          }
-        />
-      )}
-      {state.status === 'error' && (
-        <InlineNotice
-          intent='warning'
-          message={`Your ${noun} could not load.`}
-          action={<RetryButton retrying={state.retrying} onRetry={actions.retry} />}
-        />
-      )}
-      {state.status === 'ready' && (
-        <>
-          <AccountNotices
-            accounts={state.accounts}
-            onReconnect={actions.reconnect}
-            onRetry={actions.retry}
-          />
-          {children(state.data)}
-        </>
-      )}
-      <Modal
-        open={disconnecting !== null}
-        onOpenChange={(open) => {
-          if (!open) setDisconnecting(null)
-        }}
-        variant='confirm'
-        title={`Disconnect ${several && disconnecting ? disconnecting.label : title}?`}
-        confirmLabel='Disconnect'
-        destructive
-        description={DISCONNECT_NOTICE}
-        onConfirm={async () => {
-          if (disconnecting) await actions.disconnect(disconnecting.id)
-        }}
-      />
-    </HomeSection>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/get-started/get-started.module.css b/apps/sim/platform/app/(shell)/home/_components/get-started/get-started.module.css
deleted file mode 100644
index dc8ccbc70ec..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/get-started/get-started.module.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.entries {
-  display: grid;
-  gap: var(--ui-list-gap);
-  min-inline-size: 0;
-  margin-inline: calc(-1 * var(--ui-row-inset));
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/get-started/get-started.tsx b/apps/sim/platform/app/(shell)/home/_components/get-started/get-started.tsx
deleted file mode 100644
index 10253486ff5..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/get-started/get-started.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import styles from '@/platform/app/(shell)/home/_components/get-started/get-started.module.css'
-import { HomeSection } from '@/platform/app/(shell)/home/_components/home-section/home-section'
-import type { HomeGetStartedStep } from '@/platform/app/(shell)/home/_components/model'
-import { ActivityRow, Icon } from '@/platform/design-system/components'
-
-interface GetStartedProps {
-  steps: readonly HomeGetStartedStep[]
-}
-
-export function GetStarted({ steps }: GetStartedProps) {
-  return (
-    <HomeSection title='Get started'>
-      <ul className={styles.entries}>
-        {steps.map((step) => (
-          <ActivityRow
-            key={step.id}
-            leading={<Icon name={step.complete ? 'I072' : 'I070'} />}
-            title={step.title}
-            detail={step.detail}
-            metadata={step.complete ? 'Done' : undefined}
-            href={step.href}
-          />
-        ))}
-      </ul>
-    </HomeSection>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/home-conversation/home-conversation.tsx b/apps/sim/platform/app/(shell)/home/_components/home-conversation/home-conversation.tsx
deleted file mode 100644
index d7a16278409..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/home-conversation/home-conversation.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-'use client'
-
-import { useState, useTransition } from 'react'
-import { useRouter } from 'next/navigation'
-import { useSession } from '@/lib/auth/client'
-import { organizationRoutes } from '@/lib/navigation/paths'
-import { OrganizationConversation } from '@/app/o/[organizationId]/components/organization-conversation'
-import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import { SEARCH_MODES } from '@/app/o/[organizationId]/search/use-organization-search'
-import { HomeDashboardSkeleton } from '@/platform/app/(shell)/home/_components/home-dashboard/home-dashboard-skeleton'
-import { LiveHome } from '@/platform/app/(shell)/home/_components/live-home/live-home'
-import { SearchSurfaceHeader } from '@/platform/app/(shell)/search/_components/search-surface/search-surface-header'
-import { useMothershipDraftsStore } from '@/stores/mothership-drafts/store'
-
-/** Search's Assistant keeps its own unsent question; the agent composer keeps the default `home` key. */
-const HOME_ASSISTANT_DRAFT_ID = 'home-assistant'
-
-interface HomeConversationProps {
-  requestMode: 'agent' | 'assistant'
-}
-
-/** The real conversation, landing on the dashboard until the first turn takes over. */
-export function HomeConversation({ requestMode }: HomeConversationProps) {
-  const { organization } = useOrganizationContext()
-  const router = useRouter()
-  const { data: session } = useSession()
-  const routes = organizationRoutes(organization.id)
-  const [conversationInstance, setConversationInstance] = useState(0)
-  const [isStartingNew, startNewTransition] = useTransition()
-  // An Assistant chat started here takes its Search address without leaving this page, so it carries
-  // Search's controls itself, and they navigate rather than switch a view this page doesn't hold.
-  const assistantChatHeader = (
-    <SearchSurfaceHeader
-      search={{
-        activeMode: 'assistant',
-        modes: [...SEARCH_MODES],
-        changeMode: (mode) => {
-          if (mode !== 'search') return
-          const current = new URL(window.location.href)
-          const onChat = current.pathname.startsWith(`${routes.search}/chat/`)
-          const params = new URLSearchParams(onChat ? current.search : '')
-          params.set('mode', 'search')
-          router.push(`${onChat ? current.pathname : routes.search}?${params}`)
-        },
-        newLabel: 'New chat',
-        canStartNew: true,
-        isStartingNew,
-        startNew: () => {
-          useMothershipDraftsStore
-            .getState()
-            .clearDraft(
-              `${session?.user?.id}:organization:${organization.id}:${HOME_ASSISTANT_DRAFT_ID}`
-            )
-          startNewTransition(() => {
-            setConversationInstance((current) => current + 1)
-            router.push(routes.home, { scroll: false })
-          })
-        },
-      }}
-    />
-  )
-  return (
-    <OrganizationConversation
-      key={conversationInstance}
-      requestMode={requestMode}
-      draftId={requestMode === 'assistant' ? HOME_ASSISTANT_DRAFT_ID : undefined}
-      landing={{
-        chatHeader: requestMode === 'assistant' ? assistantChatHeader : undefined,
-        fallback: <HomeDashboardSkeleton requestMode={requestMode} />,
-        render: (slot) => <LiveHome {...slot} />,
-      }}
-    />
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/home-dashboard/home-dashboard-skeleton.tsx b/apps/sim/platform/app/(shell)/home/_components/home-dashboard/home-dashboard-skeleton.tsx
deleted file mode 100644
index 1e46c327f5b..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/home-dashboard/home-dashboard-skeleton.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { RedesignSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
-import styles from '@/platform/app/(shell)/home/_components/home-dashboard/home-dashboard.module.css'
-import {
-  SkeletonBlock,
-  SkeletonLane,
-} from '@/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton'
-
-interface HomeDashboardSkeletonProps {
-  requestMode: 'agent' | 'assistant'
-}
-
-/** Home's arrangement before its data, so nothing moves when the page arrives. */
-export function HomeDashboardSkeleton({ requestMode }: HomeDashboardSkeletonProps) {
-  return (
-    <div className={styles.scroller} aria-busy='true'>
-      <div className={styles.dashboard}>
-        <RedesignSurface>
-          <div className={styles.lead}>
-            <div className={styles.placeholderGreeting} />
-            <div className={styles.placeholderWordmark} />
-          </div>
-        </RedesignSurface>
-        <RedesignSurface>
-          <div className={styles.composer}>
-            <div className={styles.placeholderComposer} data-mode={requestMode} />
-          </div>
-        </RedesignSurface>
-        <RedesignSurface>
-          <div className={styles.sections}>
-            <SkeletonLane label='Loading recents' />
-            {requestMode === 'assistant' && <div className={styles.placeholderGetStarted} />}
-            <div className={styles.columns}>
-              <div className={styles.column}>
-                {requestMode === 'agent' && <SkeletonBlock label='Loading activity' />}
-                <SkeletonBlock label='Loading email' />
-              </div>
-              <div className={styles.column}>
-                <SkeletonBlock label='Loading what needs your attention' />
-                <SkeletonBlock label='Loading your calendar' />
-              </div>
-            </div>
-          </div>
-        </RedesignSurface>
-      </div>
-    </div>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/home-dashboard/home-dashboard.module.css b/apps/sim/platform/app/(shell)/home/_components/home-dashboard/home-dashboard.module.css
deleted file mode 100644
index 8009ee797df..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/home-dashboard/home-dashboard.module.css
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * The composer between the surfaces cannot read design-system tokens, so the frame that shares a
- * column with it uses the values behind `--ui-page-max-size` and `--ui-page-inline-gutter`.
- */
-.scroller {
-  flex: 1;
-  block-size: 100%;
-  min-block-size: 0;
-  overflow-y: auto;
-  scrollbar-gutter: stable;
-  padding-inline: clamp(1rem, 4%, 3rem);
-}
-.dashboard {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr);
-  inline-size: 100%;
-  max-inline-size: 81rem;
-  margin-inline: auto;
-  padding-block: 4rem 1.5rem;
-}
-/* The host page's canvas shows through, so the composer's row does not read as a band. */
-.dashboard > [data-platform-ui] {
-  background: transparent;
-}
-/* Customize Home's menu opens over the composer, whose own stacking stays within its row. */
-.dashboard > :first-child {
-  position: relative;
-  z-index: 2;
-}
-.lead {
-  display: grid;
-  gap: var(--ui-product-section-gap);
-  margin-block-end: var(--ui-section-gap);
-}
-.greeting {
-  display: flex;
-  align-items: start;
-  justify-content: space-between;
-  gap: var(--ui-row-gap);
-  margin-inline-end: calc(-1 * var(--ui-action-overhang));
-}
-.greeting > div {
-  display: grid;
-  gap: var(--ui-stack-gap);
-}
-.greeting p {
-  color: var(--ui-secondary);
-  text-wrap: pretty;
-}
-.wordmark {
-  display: flex;
-  inline-size: var(--spacing-40);
-  block-size: var(--spacing-28);
-}
-.wordmark svg {
-  width: 100%;
-  height: 100%;
-}
-.composer {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr);
-  position: relative;
-  z-index: 1;
-  min-inline-size: 0;
-  margin-block-end: 1.5rem;
-}
-/* The composer and its shortcuts cap at the chat column elsewhere; here they span Home's column. */
-.composer > * {
-  max-width: none;
-}
-.sections {
-  display: grid;
-  gap: var(--ui-product-section-gap);
-}
-.recents {
-  min-inline-size: 0;
-  margin-inline: calc(-1 * var(--ui-row-inset));
-}
-.columns {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(min(100%, var(--container-440)), 1fr));
-  align-items: start;
-  gap: var(--ui-product-section-gap);
-}
-.column {
-  display: grid;
-  gap: var(--ui-product-section-gap);
-  min-inline-size: 0;
-}
-.column:empty {
-  display: none;
-}
-.placeholderGreeting,
-.placeholderWordmark,
-.placeholderComposer,
-.placeholderGetStarted {
-  border-radius: var(--ui-control-radius);
-  background: var(--control-muted-fill);
-}
-.placeholderGreeting {
-  block-size: var(--spacing-56);
-  inline-size: 60%;
-}
-.placeholderWordmark {
-  block-size: var(--spacing-28);
-  inline-size: var(--spacing-40);
-}
-.placeholderGetStarted {
-  block-size: var(--spacing-132);
-}
-/* The real composer's first-paint heights: the Assistant's pill, the agent's field and toolbar. */
-.placeholderComposer {
-  block-size: 2.875rem;
-  border-radius: var(--radius-full);
-}
-.placeholderComposer[data-mode="agent"] {
-  block-size: 6.5rem;
-  border-radius: var(--ui-control-radius);
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/home-dashboard/home-dashboard.tsx b/apps/sim/platform/app/(shell)/home/_components/home-dashboard/home-dashboard.tsx
deleted file mode 100644
index 996d35dc32c..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/home-dashboard/home-dashboard.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-'use client'
-
-import type { ReactNode } from 'react'
-import { RedesignSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
-import type { ChatRequestMode } from '@/app/workspace/[workspaceId]/home/types'
-import { usePlatformNotices } from '@/platform/app/(shell)/_components/notification-tray/notification-tray'
-import { HomeActivityChart } from '@/platform/app/(shell)/home/_components/activity-chart/activity-chart'
-import {
-  AttentionList,
-  EmailList,
-} from '@/platform/app/(shell)/home/_components/activity-list/activity-list'
-import { CalendarDay } from '@/platform/app/(shell)/home/_components/calendar/calendar-day'
-import { ConnectedWidget } from '@/platform/app/(shell)/home/_components/connected-widget/connected-widget'
-import { GetStarted } from '@/platform/app/(shell)/home/_components/get-started/get-started'
-import styles from '@/platform/app/(shell)/home/_components/home-dashboard/home-dashboard.module.css'
-import type { HomeActions, HomeView } from '@/platform/app/(shell)/home/_components/model'
-import { RetryButton } from '@/platform/app/(shell)/home/_components/retry-button/retry-button'
-import { SkeletonLane } from '@/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton'
-import { ActionMenu, Icon, InlineNotice, RecentItems } from '@/platform/design-system/components'
-import type { OrganizationHomeWidget } from '@/stores/organization-home/store'
-
-const WIDGETS: readonly OrganizationHomeWidget[] = ['Activity', 'Email', 'Calendar']
-const WIDGET_LABELS: Record<OrganizationHomeWidget, string> = {
-  Activity: 'Tasks run',
-  Email: 'Email',
-  Calendar: 'Calendar',
-}
-
-const COMPOSER_PROMPTS: Record<ChatRequestMode, string> = {
-  agent: 'What should we get done?',
-  plan: 'What should we understand and plan?',
-  assistant: 'Ask about your company’s knowledge.',
-}
-
-interface HomeDashboardProps {
-  view: HomeView
-  actions: HomeActions
-  requestMode: ChatRequestMode
-  /** The real composer. It sits between surfaces: legacy chrome never renders inside one. */
-  composer: ReactNode
-}
-
-export function HomeDashboard({ view, actions, requestMode, composer }: HomeDashboardProps) {
-  const { notify, dismiss } = usePlatformNotices()
-  const { activity, hiddenWidgets } = view
-  const customizable = WIDGETS.filter(
-    (widget) => widget !== 'Activity' || activity.status !== 'hidden'
-  )
-  function setVisible(widget: OrganizationHomeWidget, visible: boolean) {
-    const id = `hide-${widget}`
-    actions.setWidgetHidden(widget, !visible)
-    if (visible) {
-      dismiss(id)
-    } else {
-      notify({
-        id,
-        title: `${WIDGET_LABELS[widget]} hidden`,
-        action: 'Undo',
-        onAction: () => actions.setWidgetHidden(widget, false),
-      })
-    }
-  }
-  return (
-    <div className={styles.scroller}>
-      <div className={styles.dashboard}>
-        <RedesignSurface>
-          <div className={styles.lead}>
-            <header className={styles.greeting}>
-              <div>
-                <h1 data-type='T076'>
-                  {view.firstName ? `${view.greeting}, ${view.firstName}` : view.greeting}
-                </h1>
-                <p data-type='T048'>{COMPOSER_PROMPTS[requestMode]}</p>
-              </div>
-              <ActionMenu
-                label='Customize Home'
-                heading='Customize Home'
-                icon='I108'
-                align='end'
-                actions={customizable.map((widget) => ({
-                  id: widget,
-                  label: WIDGET_LABELS[widget],
-                  checked: !hiddenWidgets.includes(widget),
-                  onSelect: () => setVisible(widget, hiddenWidgets.includes(widget)),
-                }))}
-              />
-            </header>
-            <span className={styles.wordmark}>
-              <Icon name='I113' label='Sim' />
-            </span>
-          </div>
-        </RedesignSurface>
-        <section className={styles.composer} aria-label='Start a conversation'>
-          {composer}
-        </section>
-        <RedesignSurface>
-          <div className={styles.sections}>
-            {view.recents.status === 'loading' && <SkeletonLane label='Loading recents' />}
-            {view.recents.status === 'error' && (
-              <InlineNotice
-                intent='warning'
-                message='Recents could not load.'
-                action={
-                  <RetryButton retrying={view.recents.retrying} onRetry={actions.retryRecents} />
-                }
-              />
-            )}
-            {view.recents.status === 'ready' && view.recents.items.length > 0 && (
-              <div className={styles.recents}>
-                <RecentItems
-                  label='Recents'
-                  items={view.recents.items}
-                  onRemove={actions.removeRecent}
-                />
-              </div>
-            )}
-            {view.getStarted.length > 0 && <GetStarted steps={view.getStarted} />}
-            <div className={styles.columns}>
-              <div className={styles.column}>
-                {!hiddenWidgets.includes('Activity') && (
-                  <HomeActivityChart
-                    title={WIDGET_LABELS.Activity}
-                    state={activity}
-                    onRetry={actions.retryActivity}
-                  />
-                )}
-                {!hiddenWidgets.includes('Email') && (
-                  <ConnectedWidget
-                    title='Email'
-                    state={view.email}
-                    actions={actions.email}
-                    onHide={() => setVisible('Email', false)}
-                  >
-                    {(items) => (
-                      <EmailList items={items} asOf={view.asOf} onOpen={actions.openEmail} />
-                    )}
-                  </ConnectedWidget>
-                )}
-              </div>
-              <div className={styles.column}>
-                <AttentionList
-                  state={view.attention}
-                  asOf={view.asOf}
-                  onRetry={actions.retryAttention}
-                />
-                {!hiddenWidgets.includes('Calendar') && (
-                  <ConnectedWidget
-                    title='Calendar'
-                    state={view.calendar}
-                    actions={actions.calendar}
-                    onHide={() => setVisible('Calendar', false)}
-                  >
-                    {(calendar) => (
-                      <CalendarDay
-                        calendar={calendar}
-                        onDayChange={actions.changeDay}
-                        onReturnToToday={actions.returnToToday}
-                        onRetry={actions.calendar.retry}
-                      />
-                    )}
-                  </ConnectedWidget>
-                )}
-              </div>
-            </div>
-          </div>
-        </RedesignSurface>
-      </div>
-    </div>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/home-section/home-section.module.css b/apps/sim/platform/app/(shell)/home/_components/home-section/home-section.module.css
deleted file mode 100644
index cd6964944c5..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/home-section/home-section.module.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.section {
-  display: flex;
-  flex-direction: column;
-  min-inline-size: 0;
-  max-block-size: var(--ui-widget-max-size);
-  gap: var(--ui-popup-padding);
-}
-.heading,
-.heading h2 {
-  display: flex;
-  align-items: center;
-  gap: var(--ui-row-gap);
-}
-.heading {
-  flex: none;
-  justify-content: space-between;
-  min-block-size: var(--spacing-28);
-  margin-inline-end: calc(-1 * var(--ui-action-overhang));
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/home-section/home-section.tsx b/apps/sim/platform/app/(shell)/home/_components/home-section/home-section.tsx
deleted file mode 100644
index 47a016301bb..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/home-section/home-section.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import type { ReactNode } from 'react'
-import styles from '@/platform/app/(shell)/home/_components/home-section/home-section.module.css'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { Icon } from '@/platform/design-system/components'
-
-interface HomeSectionProps {
-  title: string
-  icon?: IconName
-  actions?: ReactNode
-  children: ReactNode
-}
-
-export function HomeSection({ title, icon, actions, children }: HomeSectionProps) {
-  return (
-    <section aria-label={title} className={styles.section}>
-      <header className={styles.heading}>
-        <h2 data-type='T042'>
-          {icon && <Icon name={icon} />}
-          {title}
-        </h2>
-        {actions}
-      </header>
-      {children}
-    </section>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/live-home/live-home.tsx b/apps/sim/platform/app/(shell)/home/_components/live-home/live-home.tsx
deleted file mode 100644
index 1691809ce73..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/live-home/live-home.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-'use client'
-
-import { createContext, memo, type ReactNode, useContext } from 'react'
-import type { OrganizationLandingSlot } from '@/app/o/[organizationId]/components/organization-conversation'
-import { HomeDashboard } from '@/platform/app/(shell)/home/_components/home-dashboard/home-dashboard'
-import { useLiveHome } from '@/platform/lib/data/home'
-
-const ComposerSlot = createContext<ReactNode>(null)
-
-function ComposerOutlet() {
-  return useContext(ComposerSlot)
-}
-
-/** The conversation re-renders on every keystroke; through context, only its composer follows. */
-const LiveDashboard = memo(function LiveDashboard({
-  requestMode,
-}: Pick<OrganizationLandingSlot, 'requestMode'>) {
-  const { view, actions } = useLiveHome(requestMode === 'assistant')
-  return (
-    <HomeDashboard
-      view={view}
-      actions={actions}
-      requestMode={requestMode}
-      composer={<ComposerOutlet />}
-    />
-  )
-})
-
-export function LiveHome({ requestMode, composer }: OrganizationLandingSlot) {
-  return (
-    <ComposerSlot.Provider value={composer}>
-      <LiveDashboard requestMode={requestMode} />
-    </ComposerSlot.Provider>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/model.ts b/apps/sim/platform/app/(shell)/home/_components/model.ts
deleted file mode 100644
index abf4c6b7c2e..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/model.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import type { RecentItem } from '@/platform/design-system/components/recent-items/recent-items'
-import type { OrganizationHomeWidget } from '@/stores/organization-home/store'
-
-export type AttentionItem = {
-  id: string
-  title: string
-  detail: string
-  /** Absent when the item has no moment of its own, such as an account awaiting reconnection. */
-  occurredAt?: number
-  icon: IconName
-} & ({ href: string; onOpen?: never } | { href?: never; onOpen: () => void })
-
-export interface EmailItem {
-  id: string
-  sender: string
-  subject: string
-  excerpt: string
-  receivedAt: number
-  count?: number
-  url: string
-}
-
-export interface CalendarMeeting {
-  id: string
-  title: string
-  startMinute: number
-  duration: number
-  providerUrl?: string
-  people: { name: string }[]
-}
-
-export interface HomeAccountView {
-  id: string
-  label: string
-  /** Why this account is not contributing to the widget; absent when it is. */
-  problem?: 'needs_reauth' | 'unavailable' | 'not_offered' | 'not_read'
-  canReconnect: boolean
-}
-
-export interface HomeConnectOption {
-  id: string
-  label: string
-  icon: IconName
-}
-
-/**
- * Every state an account-backed widget can be in. Each one renders differently, because an
- * organization that offers no email and a mailbox with no mail must never look alike.
- */
-export type HomeWidgetState<T> =
-  | { status: 'loading' }
-  | { status: 'not_offered' }
-  | { status: 'not_connected'; options: readonly HomeConnectOption[] }
-  | { status: 'needs_reauth'; accounts: readonly HomeAccountView[] }
-  | { status: 'error'; retrying: boolean }
-  | { status: 'ready'; data: T; accounts: readonly HomeAccountView[] }
-
-export interface HomeCalendarDay {
-  date: string
-  /** Null on any day but today, which is the only day with a current time. */
-  nowMinute: number | null
-  status: 'loading' | 'error' | 'ready'
-  meetings: readonly CalendarMeeting[]
-  allDay: readonly { id: string; title: string; providerUrl?: string }[]
-}
-
-export type HomeListState<T> =
-  | { status: 'loading' }
-  | { status: 'error'; retrying: boolean }
-  | { status: 'ready'; items: readonly T[]; partial?: boolean }
-
-export interface ActivityPoint {
-  date: string
-  value: number
-}
-
-export type HomeActivityState =
-  | { status: 'hidden' }
-  | { status: 'loading' }
-  | { status: 'error'; retrying: boolean }
-  | { status: 'ready'; points: readonly ActivityPoint[] }
-
-export interface HomeGetStartedStep {
-  id: string
-  title: string
-  detail: string
-  href: string
-  complete: boolean
-}
-
-export interface HomeView {
-  asOf: number
-  greeting: string
-  firstName?: string
-  attention: HomeListState<AttentionItem>
-  activity: HomeActivityState
-  email: HomeWidgetState<readonly EmailItem[]>
-  calendar: HomeWidgetState<HomeCalendarDay>
-  recents: HomeListState<RecentItem>
-  getStarted: readonly HomeGetStartedStep[]
-  hiddenWidgets: readonly OrganizationHomeWidget[]
-}
-
-export interface HomeWidgetActions {
-  /** Absent while the connection cannot be started, which disables its button. */
-  connect?: (optionId: string) => void
-  reconnect?: (accountId: string) => void
-  disconnect: (accountId: string) => void | Promise<void>
-  retry: () => void
-}
-
-export interface HomeActions {
-  email: HomeWidgetActions
-  calendar: HomeWidgetActions
-  openEmail: (mail: EmailItem) => void
-  changeDay: (delta: number) => void
-  returnToToday: () => void
-  retryAttention: () => void
-  retryActivity: () => void
-  retryRecents: () => void
-  removeRecent: (id: string) => void
-  setWidgetHidden: (widget: OrganizationHomeWidget, hidden: boolean) => void
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/retry-button/retry-button.tsx b/apps/sim/platform/app/(shell)/home/_components/retry-button/retry-button.tsx
deleted file mode 100644
index 093e9750b42..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/retry-button/retry-button.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Button } from '@/platform/design-system/components'
-
-interface RetryButtonProps {
-  retrying?: boolean
-  onRetry: () => void
-}
-
-export function RetryButton({ retrying, onRetry }: RetryButtonProps) {
-  return (
-    <Button size='compact' disabled={retrying} onClick={onRetry}>
-      Try again
-    </Button>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton.module.css b/apps/sim/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton.module.css
deleted file mode 100644
index c6e52ab6165..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton.module.css
+++ /dev/null
@@ -1,54 +0,0 @@
-.rows {
-  display: grid;
-  gap: var(--ui-list-gap);
-  min-inline-size: 0;
-}
-.row {
-  display: flex;
-  align-items: start;
-  gap: var(--ui-row-gap);
-  padding: var(--ui-row-block) 0;
-}
-.glyph {
-  flex: none;
-  inline-size: var(--ui-icon-size);
-  block-size: var(--ui-icon-size);
-  border-radius: var(--radius-full);
-  background: var(--control-muted-fill);
-}
-.copy {
-  display: grid;
-  flex: 1;
-  gap: var(--ui-stack-gap);
-  min-inline-size: 0;
-}
-.title,
-.detail {
-  display: block;
-  block-size: 1lh;
-  border-radius: var(--ui-control-radius);
-  background: var(--control-muted-fill);
-}
-.title {
-  inline-size: 40%;
-}
-.detail {
-  inline-size: 80%;
-}
-.block {
-  block-size: var(--ui-widget-max-size);
-  border-radius: var(--ui-control-radius);
-  background: var(--control-muted-fill);
-}
-.lane {
-  display: flex;
-  gap: var(--ui-list-gap);
-  block-size: var(--spacing-30);
-  margin-block-start: var(--spacing-28);
-  margin-inline: calc(-1 * var(--ui-row-inset));
-}
-.lane i {
-  inline-size: var(--spacing-132);
-  border-radius: var(--ui-control-radius);
-  background: var(--control-muted-fill);
-}
diff --git a/apps/sim/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton.tsx b/apps/sim/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton.tsx
deleted file mode 100644
index 4d1516a8f31..00000000000
--- a/apps/sim/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import styles from '@/platform/app/(shell)/home/_components/widget-skeleton/widget-skeleton.module.css'
-
-const ROW_COUNT = 5
-
-interface WidgetSkeletonProps {
-  label: string
-}
-
-/** Holds a widget's list at its final size, so the page does not move when the data arrives. */
-export function WidgetSkeleton({ label }: WidgetSkeletonProps) {
-  return (
-    <div className={styles.rows} role='status' aria-label={label} aria-busy='true'>
-      {Array.from({ length: ROW_COUNT }, (_, index) => (
-        <span key={index} className={styles.row}>
-          <i className={styles.glyph} />
-          <span className={styles.copy}>
-            <i className={styles.title} />
-            <i className={styles.detail} />
-          </span>
-        </span>
-      ))}
-    </div>
-  )
-}
-
-/** The same fill for a chart or schedule, whose shape has no rows. */
-export function SkeletonBlock({ label }: { label: string }) {
-  return <div className={styles.block} role='status' aria-label={label} aria-busy='true' />
-}
-
-/** A recents lane holding its height until the history read settles. */
-export function SkeletonLane({ label }: { label: string }) {
-  return (
-    <div className={styles.lane} role='status' aria-label={label} aria-busy='true'>
-      <i />
-      <i />
-      <i />
-    </div>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/home/search-params.ts b/apps/sim/platform/app/(shell)/home/search-params.ts
deleted file mode 100644
index 4b281b9d436..00000000000
--- a/apps/sim/platform/app/(shell)/home/search-params.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { createParser } from 'nuqs/server'
-import { isCalendarDate } from '@/lib/core/utils/timezone'
-
-/** Nullable: a clean URL means today, which moves at midnight while a chosen day does not. */
-export const homeDayParam = {
-  key: 'day',
-  parser: createParser({
-    parse: (value) => (isCalendarDate(value) ? value : null),
-    serialize: (value: string) => value,
-  }),
-} as const
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/connected-credential/connected-credential.module.css b/apps/sim/platform/app/(shell)/integrations/_components/connected-credential/connected-credential.module.css
deleted file mode 100644
index 21b6b47ca15..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/connected-credential/connected-credential.module.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.section {
-  display: grid;
-  gap: var(--ui-row-gap);
-}
-.identity {
-  display: grid;
-  min-inline-size: 0;
-  gap: var(--ui-stack-gap);
-  overflow-wrap: anywhere;
-}
-.row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--ui-row-gap);
-}
-.muted {
-  color: var(--ui-secondary);
-}
-.actions {
-  display: flex;
-  flex: none;
-  align-items: center;
-  gap: var(--ui-stack-gap);
-}
-.link {
-  color: inherit;
-  text-decoration: underline;
-  text-decoration-color: var(--ui-secondary);
-  text-underline-offset: 2px;
-}
-.link:hover {
-  text-decoration-color: currentColor;
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/connected-credential/connected-credential.tsx b/apps/sim/platform/app/(shell)/integrations/_components/connected-credential/connected-credential.tsx
deleted file mode 100644
index a533b904b67..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/connected-credential/connected-credential.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import Link from 'next/link'
-import styles from '@/platform/app/(shell)/integrations/_components/connected-credential/connected-credential.module.css'
-import { ActionMenu, Button, Modal } from '@/platform/design-system/components'
-import type { IntegrationAccount } from '@/platform/lib/integrations/model'
-
-interface CredentialRow extends IntegrationAccount {
-  statusLabel: string
-  /** Opens this account's permissions when the integration lists several. */
-  href?: string
-}
-
-interface ConnectedCredentialProps {
-  integrationName: string
-  accounts: readonly CredentialRow[]
-  pending: boolean
-  /** Connects a further account into a free slot, when the organization offers one. */
-  addAccount?: { disabled: boolean; onSelect: () => void }
-  onReconnect: (accountId: string) => void
-  onDisconnect: (accountId: string) => Promise<unknown>
-}
-
-export function ConnectedCredential({
-  integrationName,
-  accounts,
-  pending,
-  addAccount,
-  onReconnect,
-  onDisconnect,
-}: ConnectedCredentialProps) {
-  const [confirmingId, setConfirmingId] = useState<string | null>(null)
-  const confirming = accounts.find((account) => account.id === confirmingId)
-  const heading = accounts.length > 1 ? 'Connected accounts' : 'Connected account'
-  return (
-    <section aria-label={heading} className={styles.section}>
-      <h2 data-type='T093'>{heading}</h2>
-      {accounts.map((account) => (
-        <div key={account.id} className={styles.row}>
-          <div className={styles.identity}>
-            {account.href ? (
-              <Link href={account.href} className={styles.link} data-type='T059'>
-                {account.label}
-              </Link>
-            ) : (
-              <p data-type='T059'>{account.label}</p>
-            )}
-            <p className={styles.muted} data-type='T050'>
-              {account.statusLabel}
-            </p>
-          </div>
-          <div className={styles.actions}>
-            {account.status === 'needs_reauth' && account.canReconnect && (
-              <Button
-                size='compact'
-                disabled={pending}
-                aria-label={`Reconnect ${account.label}`}
-                onClick={() => onReconnect(account.id)}
-              >
-                Reconnect
-              </Button>
-            )}
-            <ActionMenu
-              label={`Manage ${account.label}`}
-              icon='I108'
-              triggerSize='row'
-              align='end'
-              tooltip={false}
-              actions={[
-                {
-                  id: 'reconnect',
-                  label: 'Reconnect account',
-                  disabled: pending || !account.canReconnect,
-                  onSelect: () => onReconnect(account.id),
-                },
-                {
-                  id: 'disconnect',
-                  label: 'Disconnect account',
-                  destructive: true,
-                  separatorBefore: true,
-                  disabled: pending,
-                  onSelect: () => setConfirmingId(account.id),
-                },
-              ]}
-            />
-          </div>
-        </div>
-      ))}
-      {addAccount && (
-        <div>
-          <Button disabled={pending || addAccount.disabled} onClick={addAccount.onSelect}>
-            Add account
-          </Button>
-        </div>
-      )}
-      {confirming && (
-        <Modal
-          open
-          onOpenChange={(open) => {
-            if (!open) setConfirmingId(null)
-          }}
-          title={`Disconnect ${integrationName}`}
-          variant='confirm'
-          destructive
-          description={`Disconnect ${confirming.label} from this organization. Workflows using this account will also lose access. You can reconnect later.`}
-          confirmLabel='Disconnect'
-          onConfirm={() => onDisconnect(confirming.id)}
-        />
-      )}
-    </section>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/connection-access/connection-access.module.css b/apps/sim/platform/app/(shell)/integrations/_components/connection-access/connection-access.module.css
deleted file mode 100644
index 84d7043bcf9..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/connection-access/connection-access.module.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.section,
-.heading,
-.group,
-.items {
-  display: grid;
-  min-inline-size: 0;
-}
-.section {
-  gap: var(--ui-section-gap);
-}
-.heading {
-  gap: var(--ui-stack-gap);
-}
-.group {
-  gap: var(--ui-row-gap);
-}
-.items {
-  gap: var(--ui-list-gap);
-  list-style: disc outside;
-  padding-inline-start: var(--spacing-16);
-  overflow-wrap: anywhere;
-}
-.items li::marker,
-.heading p {
-  color: var(--ui-secondary);
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/connection-access/connection-access.tsx b/apps/sim/platform/app/(shell)/integrations/_components/connection-access/connection-access.tsx
deleted file mode 100644
index 4746f6806bc..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/connection-access/connection-access.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import styles from '@/platform/app/(shell)/integrations/_components/connection-access/connection-access.module.css'
-import {
-  SCOPE_GROUPS,
-  scopeGroup,
-} from '@/platform/app/(shell)/integrations/_components/connection-access/scope-groups'
-import { CountedLabel } from '@/platform/design-system/components/overflow-text/counted-label'
-import type { OrganizationIntegration } from '@/platform/lib/integrations/model'
-
-interface AccessGroupProps {
-  title: string
-  items: readonly { id: string; label: string }[]
-}
-
-function AccessGroup({ title, items }: AccessGroupProps) {
-  if (!items.length) return null
-  return (
-    <div className={styles.group}>
-      <h3 data-type='T059'>
-        <CountedLabel label={title} count={items.length} />
-      </h3>
-      <ul className={styles.items} aria-label={title}>
-        {items.map(({ id, label }) => (
-          <li data-type='T060' key={id}>
-            {label}
-          </li>
-        ))}
-      </ul>
-    </div>
-  )
-}
-
-interface ConnectionAccessProps {
-  integration: OrganizationIntegration
-}
-
-export function ConnectionAccess({ integration }: ConnectionAccessProps) {
-  const { searchReads, searchResource, requestedScopes, availability, accessDescription } =
-    integration
-  return (
-    <>
-      {searchResource && availability === 'ready' && (
-        <section className={styles.section} aria-label='Search access'>
-          <header className={styles.heading}>
-            <h2 data-type='T093'>Search access</h2>
-            <p data-type='T060'>{accessDescription}</p>
-          </header>
-          <AccessGroup title='Read-only tools' items={searchReads} />
-        </section>
-      )}
-      {requestedScopes && requestedScopes.length > 0 && (
-        <section className={styles.section} aria-label='Requested permissions'>
-          <h2 data-type='T093'>Requested permissions</h2>
-          {SCOPE_GROUPS.map((group) => (
-            <AccessGroup
-              key={group}
-              title={group}
-              items={requestedScopes.filter(({ id }) => scopeGroup(id) === group)}
-            />
-          ))}
-        </section>
-      )}
-    </>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/connection-access/scope-groups.ts b/apps/sim/platform/app/(shell)/integrations/_components/connection-access/scope-groups.ts
deleted file mode 100644
index 071c891d34d..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/connection-access/scope-groups.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-const ACCOUNT_SCOPES = new Set([
-  'openid',
-  'userinfo.email',
-  'userinfo.profile',
-  'read:me',
-  'offline_access',
-  'refresh_token',
-])
-
-const GOOGLE_WRITE_SCOPES = new Set([
-  'gmail.send',
-  'gmail.modify',
-  'gmail.labels',
-  'calendar',
-  'drive',
-  'drive.file',
-  'meetings.space.created',
-])
-
-export const SCOPE_GROUPS = [
-  'Account and sign-in',
-  'Read and search',
-  'Write and manage',
-  'Provider access',
-] as const
-
-export function scopeGroup(id: string): (typeof SCOPE_GROUPS)[number] {
-  const scope = id.replace(/^https:\/\/www\.googleapis\.com\/auth\//, '')
-  if (ACCOUNT_SCOPES.has(scope)) return 'Account and sign-in'
-  if (GOOGLE_WRITE_SCOPES.has(scope) || /^(write|delete|manage)(:|$)/.test(scope))
-    return 'Write and manage'
-  if (/^(read|search)(:|$)|:(read|history)([.:]|$)|\.readonly$/.test(scope))
-    return 'Read and search'
-  return 'Provider access'
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/integration-details/integration-details.tsx b/apps/sim/platform/app/(shell)/integrations/_components/integration-details/integration-details.tsx
deleted file mode 100644
index 715ab58ce1c..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/integration-details/integration-details.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-'use client'
-
-import { type ReactNode, useLayoutEffect, useRef } from 'react'
-import { ConnectedCredential } from '@/platform/app/(shell)/integrations/_components/connected-credential/connected-credential'
-import { ConnectionAccess } from '@/platform/app/(shell)/integrations/_components/connection-access/connection-access'
-import { ProviderHeading } from '@/platform/app/(shell)/integrations/_components/provider-heading/provider-heading'
-import { Chip, EmptyState } from '@/platform/design-system/components'
-import { ConnectionPrompt } from '@/platform/design-system/components/connection-prompt/connection-prompt'
-import {
-  accountStatus,
-  isConnectable,
-  type OrganizationIntegration,
-} from '@/platform/lib/integrations/model'
-
-interface IntegrationDetailsProps {
-  integration: OrganizationIntegration
-  accountId: string | null
-  integrationHref: string
-  accountHref: (accountId: string) => string
-  pending: boolean
-  onConnect: () => void
-  onReconnect: (accountId: string) => void
-  onDisconnect: (accountId: string) => Promise<unknown>
-  renderToolPermissions: (accountId: string) => ReactNode
-}
-
-export function IntegrationDetails({
-  integration,
-  accountId,
-  integrationHref,
-  accountHref,
-  pending,
-  onConnect,
-  onReconnect,
-  onDisconnect,
-  renderToolPermissions,
-}: IntegrationDetailsProps) {
-  const { accounts, availability, connectionTarget, providerId, name } = integration
-  const titleRef = useRef<HTMLHeadingElement>(null)
-  const accountCount = useRef(accounts.length)
-  useLayoutEffect(() => {
-    if (accounts.length < accountCount.current) titleRef.current?.focus({ preventScroll: true })
-    accountCount.current = accounts.length
-  }, [accounts.length])
-  const selected = accountId
-    ? accounts.find((account) => account.id === accountId)
-    : accounts.length === 1
-      ? accounts[0]
-      : undefined
-  const stale = Boolean(accountId && !selected && !pending)
-  const canConnect = isConnectable(integration)
-  const shown = selected ? [selected] : accounts
-  const reason =
-    availability === 'managed'
-      ? `Managed by your organization. ${integration.accessDescription}`
-      : integration.status
-
-  return (
-    <>
-      <ProviderHeading
-        name={name}
-        titleRef={titleRef}
-        description={integration.description}
-        providerId={providerId}
-        icon={integration.icon}
-      />
-      {stale ? (
-        <EmptyState
-          title='This account is no longer connected.'
-          action={<Chip href={integrationHref}>View integration</Chip>}
-        />
-      ) : shown.length > 0 ? (
-        <ConnectedCredential
-          integrationName={name}
-          accounts={shown.map((account) => ({
-            ...account,
-            statusLabel: accountStatus(integration, account),
-            href: !selected && account.hasToolPermissions ? accountHref(account.id) : undefined,
-          }))}
-          pending={pending}
-          addAccount={
-            connectionTarget && !accountId
-              ? { disabled: !canConnect, onSelect: onConnect }
-              : undefined
-          }
-          onReconnect={onReconnect}
-          onDisconnect={onDisconnect}
-        />
-      ) : (
-        <ConnectionPrompt
-          title={canConnect ? `Connect your ${name} account` : reason}
-          setupGuideUrl={integration.setupGuideUrl}
-          options={
-            availability === 'managed'
-              ? []
-              : [
-                  {
-                    label: name,
-                    icon: { providerId },
-                    onConnect: canConnect && !pending ? onConnect : undefined,
-                  },
-                ]
-          }
-        />
-      )}
-      {selected?.hasToolPermissions && renderToolPermissions(selected.id)}
-      {!stale && <ConnectionAccess integration={integration} />}
-    </>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/integration-list/integration-list.module.css b/apps/sim/platform/app/(shell)/integrations/_components/integration-list/integration-list.module.css
deleted file mode 100644
index e56d3006bd3..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/integration-list/integration-list.module.css
+++ /dev/null
@@ -1,17 +0,0 @@
-.list,
-.group,
-.rows {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr);
-  min-inline-size: 0;
-}
-.list {
-  gap: var(--ui-product-section-gap);
-}
-.group,
-.rows {
-  gap: var(--ui-list-gap);
-}
-.rows {
-  margin-inline: calc(-1 * var(--ui-row-inset));
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/integration-list/integration-list.tsx b/apps/sim/platform/app/(shell)/integrations/_components/integration-list/integration-list.tsx
deleted file mode 100644
index 607549c3155..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/integration-list/integration-list.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import styles from '@/platform/app/(shell)/integrations/_components/integration-list/integration-list.module.css'
-import { IntegrationMark } from '@/platform/app/(shell)/integrations/_components/integration-mark/integration-mark'
-import { ActivityRow, EmptyState, SearchField } from '@/platform/design-system/components'
-import {
-  type GenericSecrets,
-  isConnectable,
-  type OrganizationIntegration,
-} from '@/platform/lib/integrations/model'
-
-const SECTIONS = [
-  'Your accounts',
-  'Available to connect',
-  'Managed by your organization',
-  'Not available',
-] as const
-type Section = (typeof SECTIONS)[number]
-
-function sectionFor(item: OrganizationIntegration): Section {
-  if (item.accounts.length) return 'Your accounts'
-  if (isConnectable(item)) return 'Available to connect'
-  return item.availability === 'managed' ? 'Managed by your organization' : 'Not available'
-}
-
-interface IntegrationListProps {
-  integrations: readonly OrganizationIntegration[]
-  secrets: GenericSecrets | null
-  query: string
-  onQueryChange: (query: string) => void
-  integrationHref: (id: string) => string
-  secretsHref: string
-  /** False while a read could still add rows, so an empty list is not claimed too early. */
-  settled: boolean
-}
-
-export function IntegrationList({
-  integrations,
-  secrets,
-  query,
-  onQueryChange,
-  integrationHref,
-  secretsHref,
-  settled,
-}: IntegrationListProps) {
-  const term = query.trim().toLowerCase()
-  const entries = integrations.map((item) => ({
-    id: item.id,
-    href: integrationHref(item.id),
-    leading: <IntegrationMark providerId={item.providerId} icon={item.icon} />,
-    name: item.name,
-    detail: item.description,
-    status: item.status,
-    section: sectionFor(item),
-    searchable: [
-      item.providerId,
-      item.name,
-      item.description,
-      ...item.accounts.map((account) => account.label),
-    ]
-      .join(' ')
-      .toLowerCase(),
-  }))
-  if (secrets) {
-    const managed = secrets.mode === 'organization'
-    entries.push({
-      id: 'generic-secrets',
-      href: secretsHref,
-      leading: <IntegrationMark />,
-      name: secrets.name,
-      detail: secrets.description,
-      status: managed ? 'Organization managed' : 'Personal secrets',
-      section: managed ? 'Managed by your organization' : 'Available to connect',
-      searchable: `${secrets.name} ${secrets.description}`.toLowerCase(),
-    })
-  }
-  const matches = entries.filter((entry) => entry.searchable.includes(term))
-  return (
-    <div className={styles.list}>
-      <SearchField
-        label='Search integrations'
-        placeholder='Search integrations…'
-        value={query}
-        onValueChange={onQueryChange}
-      />
-      {settled &&
-        matches.length === 0 &&
-        (term ? (
-          <EmptyState title='No matching integrations' />
-        ) : (
-          <EmptyState
-            title='No integrations available'
-            description='Apps enabled for your organization will appear here.'
-          />
-        ))}
-      {SECTIONS.map((section) => {
-        const items = matches.filter((item) => item.section === section)
-        if (!items.length) return null
-        return (
-          <section key={section} className={styles.group} aria-label={section}>
-            <h2 data-type='T059'>{section}</h2>
-            <ul className={styles.rows}>
-              {items.map((item) => (
-                <ActivityRow
-                  key={item.id}
-                  href={item.href}
-                  leading={item.leading}
-                  title={item.name}
-                  detail={item.detail}
-                  metadata={item.status}
-                />
-              ))}
-            </ul>
-          </section>
-        )
-      })}
-    </div>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/integration-mark/integration-mark.module.css b/apps/sim/platform/app/(shell)/integrations/_components/integration-mark/integration-mark.module.css
deleted file mode 100644
index c920b223f8d..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/integration-mark/integration-mark.module.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.mark {
-  flex: none;
-  width: var(--ui-glyph-size);
-  height: var(--ui-glyph-size);
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/integration-mark/integration-mark.tsx b/apps/sim/platform/app/(shell)/integrations/_components/integration-mark/integration-mark.tsx
deleted file mode 100644
index 59b700e88dc..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/integration-mark/integration-mark.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { ComponentType } from 'react'
-import styles from '@/platform/app/(shell)/integrations/_components/integration-mark/integration-mark.module.css'
-import { Icon } from '@/platform/design-system/components'
-import { providerMark } from '@/platform/design-system/components/icon/provider-marks'
-
-const GENERIC_MARK = 'I070'
-
-interface IntegrationMarkProps {
-  providerId?: string
-  /** The app's brand icon, for a provider the design system has no mark for. */
-  icon?: ComponentType<{ className?: string }>
-}
-
-export function IntegrationMark({ providerId, icon: BrandIcon }: IntegrationMarkProps) {
-  if (providerId && providerMark(providerId) !== GENERIC_MARK)
-    return <Icon providerId={providerId} />
-  return BrandIcon ? <BrandIcon className={styles.mark} /> : <Icon name={GENERIC_MARK} />
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/integrations-page/integrations-page.module.css b/apps/sim/platform/app/(shell)/integrations/_components/integrations-page/integrations-page.module.css
deleted file mode 100644
index 2025764941a..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/integrations-page/integrations-page.module.css
+++ /dev/null
@@ -1,24 +0,0 @@
-.page {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr);
-  inline-size: min(var(--ui-page-max-size), calc(100% - 2 * var(--ui-page-inline-gutter)));
-  margin-inline: auto;
-  padding-block: var(--shell-home-row-start) var(--ui-page-inset-block);
-  gap: var(--ui-product-section-gap);
-}
-.heading {
-  display: grid;
-  gap: var(--ui-stack-gap);
-}
-.heading p {
-  color: var(--ui-secondary);
-}
-.back {
-  margin-inline: calc(-1 * var(--ui-row-inset));
-}
-.handoff {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: var(--ui-action-gap);
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/integrations-page/integrations-page.tsx b/apps/sim/platform/app/(shell)/integrations/_components/integrations-page/integrations-page.tsx
deleted file mode 100644
index 15ad36adfaf..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/integrations-page/integrations-page.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import type { ReactNode } from 'react'
-import styles from '@/platform/app/(shell)/integrations/_components/integrations-page/integrations-page.module.css'
-import { Chip } from '@/platform/design-system/components'
-
-interface IntegrationsPageProps {
-  /** A detail page's way back. The index has none. */
-  back?: { href: string; label: string }
-  children: ReactNode
-}
-
-export function IntegrationsPage({ back, children }: IntegrationsPageProps) {
-  return (
-    <main className={styles.page}>
-      {back && (
-        <nav aria-label='Integration navigation' className={styles.back}>
-          <Chip href={back.href} icon='I093'>
-            {back.label}
-          </Chip>
-        </nav>
-      )}
-      {children}
-    </main>
-  )
-}
-
-interface IntegrationsHeadingProps {
-  /** Actions for a flow the member arrived through, such as returning to Slack. */
-  handoff?: ReactNode
-}
-
-export function IntegrationsHeading({ handoff }: IntegrationsHeadingProps) {
-  return (
-    <header className={styles.heading}>
-      <h1 data-type='T076'>Integrations</h1>
-      <p data-type='T048'>Connect your accounts to the apps your organization makes available.</p>
-      {handoff}
-    </header>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/integrations-page/integrations-route.tsx b/apps/sim/platform/app/(shell)/integrations/_components/integrations-page/integrations-route.tsx
deleted file mode 100644
index ea5202f9106..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/integrations-page/integrations-route.tsx
+++ /dev/null
@@ -1,220 +0,0 @@
-'use client'
-
-import { useQueryStates } from 'nuqs'
-import type { SearchConnectionTarget } from '@/lib/knowledge/search/connection-target'
-import { organizationRoutes } from '@/lib/navigation/paths'
-import {
-  integrationSearchParsers,
-  integrationSearchUrlKeys,
-  integrationViewParsers,
-  serializeIntegrationView,
-} from '@/app/o/[organizationId]/integrations/search-params'
-import { SavedSearchCredentialModal } from '@/app/workspace/[workspaceId]/integrations/components/saved-search-credential-modal'
-import { useDebouncedSearchSetter } from '@/hooks/use-debounced-search-setter'
-import { useDesktopOAuthConnectListener, useOAuthReturnRouter } from '@/hooks/use-oauth-return'
-import { IntegrationDetails } from '@/platform/app/(shell)/integrations/_components/integration-details/integration-details'
-import { IntegrationList } from '@/platform/app/(shell)/integrations/_components/integration-list/integration-list'
-import {
-  IntegrationsHeading,
-  IntegrationsPage,
-} from '@/platform/app/(shell)/integrations/_components/integrations-page/integrations-page'
-import { MemberSecrets } from '@/platform/app/(shell)/integrations/_components/member-secrets/member-secrets'
-import { ProviderHeading } from '@/platform/app/(shell)/integrations/_components/provider-heading/provider-heading'
-import { QueryFailure } from '@/platform/app/(shell)/integrations/_components/query-failure/query-failure'
-import { SearchConnectionRequest } from '@/platform/app/(shell)/integrations/_components/search-connection-request/search-connection-request'
-import { SlackSearchActions } from '@/platform/app/(shell)/integrations/_components/slack-search-actions/slack-search-actions'
-import { ToolPermissionsPanel } from '@/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions-panel'
-import { EmptyState, InlineNotice } from '@/platform/design-system/components'
-import { useIntegrationActions, useMemberIntegrations } from '@/platform/lib/data/integrations'
-import { GENERIC_SECRETS_SEGMENT, integrationPath } from '@/platform/lib/integrations/model'
-
-const LOADING_CONNECTIONS = 'Loading your connections'
-const LOADING_CONNECTION = 'Loading connection'
-
-interface IntegrationsRouteFallbackProps {
-  /** A provider's page, which has no index heading to hold. */
-  detail: boolean
-}
-
-/** Holds the page's place while its prefetch settles, in the words its reads use once mounted. */
-export function IntegrationsRouteFallback({ detail }: IntegrationsRouteFallbackProps) {
-  return (
-    <IntegrationsPage>
-      {detail ? (
-        <InlineNotice message={LOADING_CONNECTION} />
-      ) : (
-        <>
-          <IntegrationsHeading />
-          <InlineNotice message={LOADING_CONNECTIONS} />
-        </>
-      )}
-    </IntegrationsPage>
-  )
-}
-
-export interface IntegrationsRouteProps {
-  organizationId: string
-  /** The `/integrations/[provider]` segment; absent on the index. */
-  section?: string
-  connectionRequest?: { target: SearchConnectionTarget; userId: string }
-  slackOnboarding?: { token: string; userId: string }
-}
-
-export function IntegrationsRoute({
-  organizationId,
-  section,
-  connectionRequest,
-  slackOnboarding,
-}: IntegrationsRouteProps) {
-  useOAuthReturnRouter()
-  useDesktopOAuthConnectListener()
-  const { integrations, genericSecrets, inventory, policies, secrets } =
-    useMemberIntegrations(organizationId)
-  const actions = useIntegrationActions(organizationId)
-  const [{ q: search }, setSearchParams] = useQueryStates(
-    integrationSearchParsers,
-    integrationSearchUrlKeys
-  )
-  const setSearch = useDebouncedSearchSetter((value, options) =>
-    setSearchParams({ q: value }, options)
-  )
-  const [{ account }, setParams] = useQueryStates(integrationViewParsers)
-  const routes = organizationRoutes(organizationId)
-  const integrationHref = (id: string) =>
-    serializeIntegrationView(integrationPath(organizationId, id), { q: search })
-  const indexHref = serializeIntegrationView(routes.integrations, { q: search })
-  const memberSecretsHref = serializeIntegrationView(routes.memberSecrets, { q: search })
-
-  const inventoryStatus = inventory.error ? (
-    <QueryFailure message='Could not load your connections' query={inventory} />
-  ) : !inventory.data ? (
-    <InlineNotice message={LOADING_CONNECTIONS} />
-  ) : null
-  const readFailures = (
-    <>
-      {policies.error && (
-        <QueryFailure message='Could not load Search connections' query={policies} />
-      )}
-      {secrets.error && (
-        <QueryFailure message='Could not load secret connections' query={secrets} />
-      )}
-    </>
-  )
-
-  if (!section)
-    return (
-      <IntegrationsPage>
-        <IntegrationsHeading
-          handoff={
-            slackOnboarding && (
-              <SlackSearchActions organizationId={organizationId} {...slackOnboarding} />
-            )
-          }
-        />
-        {connectionRequest && (
-          <SearchConnectionRequest
-            key={JSON.stringify([connectionRequest.userId, connectionRequest.target])}
-            organizationId={organizationId}
-            {...connectionRequest}
-          />
-        )}
-        {inventoryStatus ?? (
-          <>
-            {readFailures}
-            <IntegrationList
-              integrations={integrations}
-              secrets={genericSecrets}
-              query={search}
-              onQueryChange={setSearch}
-              integrationHref={integrationHref}
-              secretsHref={
-                genericSecrets?.mode === 'member'
-                  ? memberSecretsHref
-                  : integrationHref(GENERIC_SECRETS_SEGMENT)
-              }
-              settled={policies.isSuccess && secrets.isSuccess}
-            />
-          </>
-        )}
-      </IntegrationsPage>
-    )
-
-  const integration = integrations.find((item) => item.id === section)
-  const back =
-    account && integration
-      ? { href: integrationHref(integration.id), label: integration.name }
-      : { href: indexHref, label: 'Integrations' }
-  const unavailable = (loading: boolean) =>
-    loading ? (
-      <InlineNotice message={LOADING_CONNECTION} />
-    ) : (
-      <EmptyState title='This integration is no longer available.' />
-    )
-
-  if (section === GENERIC_SECRETS_SEGMENT)
-    return (
-      <IntegrationsPage back={back}>
-        {inventoryStatus}
-        {readFailures}
-        {genericSecrets ? (
-          <>
-            <ProviderHeading name={genericSecrets.name} description={genericSecrets.description} />
-            <MemberSecrets source={genericSecrets} editorHref={memberSecretsHref} />
-          </>
-        ) : (
-          !secrets.error && unavailable(secrets.isPending)
-        )}
-      </IntegrationsPage>
-    )
-
-  return (
-    <>
-      <IntegrationsPage back={back}>
-        {inventoryStatus ?? (
-          <>
-            {readFailures}
-            {integration ? (
-              <IntegrationDetails
-                key={integration.id}
-                integration={integration}
-                accountId={account}
-                integrationHref={integrationHref(integration.id)}
-                accountHref={(credentialId) =>
-                  serializeIntegrationView(integrationPath(organizationId, integration.id), {
-                    q: search,
-                    account: credentialId,
-                  })
-                }
-                pending={actions.pending}
-                onConnect={() => {
-                  if (integration.connectionTarget) actions.connect(integration.connectionTarget)
-                }}
-                onReconnect={actions.reconnect}
-                onDisconnect={async (credentialId) => {
-                  await actions.disconnect(credentialId)
-                  if (account === credentialId) void setParams({ account: null, tools: null })
-                }}
-                renderToolPermissions={(credentialId) => (
-                  <ToolPermissionsPanel
-                    key={credentialId}
-                    organizationId={organizationId}
-                    credentialId={credentialId}
-                  />
-                )}
-              />
-            ) : (
-              !policies.error && unavailable(policies.isPending)
-            )}
-          </>
-        )}
-      </IntegrationsPage>
-      {actions.savedConnection && (
-        <SavedSearchCredentialModal
-          organizationId={organizationId}
-          connection={actions.savedConnection}
-          onClose={actions.closeSavedConnection}
-        />
-      )}
-    </>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/member-secrets/member-secrets.tsx b/apps/sim/platform/app/(shell)/integrations/_components/member-secrets/member-secrets.tsx
deleted file mode 100644
index 375d9e53998..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/member-secrets/member-secrets.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Chip } from '@/platform/design-system/components'
-import { ConnectionPrompt } from '@/platform/design-system/components/connection-prompt/connection-prompt'
-import type { GenericSecrets } from '@/platform/lib/integrations/model'
-
-interface MemberSecretsProps {
-  source: GenericSecrets
-  /** The personal editor, for a source each member keeps their own secrets in. */
-  editorHref: string
-}
-
-export function MemberSecrets({ source, editorHref }: MemberSecretsProps) {
-  if (source.mode === 'member') return <Chip href={editorHref}>Manage secrets</Chip>
-  return (
-    <ConnectionPrompt
-      title='Your organization’s administrators manage these credentials.'
-      setupGuideUrl={source.setupGuideUrl}
-      options={[]}
-    />
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/provider-heading/provider-heading.module.css b/apps/sim/platform/app/(shell)/integrations/_components/provider-heading/provider-heading.module.css
deleted file mode 100644
index f534de998b6..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/provider-heading/provider-heading.module.css
+++ /dev/null
@@ -1,20 +0,0 @@
-.header {
-  display: grid;
-  grid-template-columns: auto minmax(0, 1fr);
-  align-items: start;
-  gap: var(--ui-row-gap);
-}
-.mark {
-  display: grid;
-  place-items: center;
-  block-size: var(--leading-32);
-}
-.copy {
-  display: grid;
-  min-inline-size: 0;
-  overflow-wrap: anywhere;
-  gap: var(--ui-stack-gap);
-}
-.copy p {
-  color: var(--ui-secondary);
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/provider-heading/provider-heading.tsx b/apps/sim/platform/app/(shell)/integrations/_components/provider-heading/provider-heading.tsx
deleted file mode 100644
index b80d1d8bbed..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/provider-heading/provider-heading.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import type { ComponentType, Ref } from 'react'
-import { IntegrationMark } from '@/platform/app/(shell)/integrations/_components/integration-mark/integration-mark'
-import styles from '@/platform/app/(shell)/integrations/_components/provider-heading/provider-heading.module.css'
-
-interface ProviderHeadingProps {
-  name: string
-  description: string
-  providerId?: string
-  icon?: ComponentType<{ className?: string }>
-  titleRef?: Ref<HTMLHeadingElement>
-}
-
-export function ProviderHeading({
-  name,
-  description,
-  providerId,
-  icon,
-  titleRef,
-}: ProviderHeadingProps) {
-  return (
-    <header className={styles.header}>
-      <span className={styles.mark}>
-        <IntegrationMark providerId={providerId} icon={icon} />
-      </span>
-      <div className={styles.copy}>
-        <h1 ref={titleRef} tabIndex={titleRef ? -1 : undefined} data-type='T076'>
-          {name}
-        </h1>
-        <p data-type='T048'>{description}</p>
-      </div>
-    </header>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/query-failure/query-failure.tsx b/apps/sim/platform/app/(shell)/integrations/_components/query-failure/query-failure.tsx
deleted file mode 100644
index 621ddff366f..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/query-failure/query-failure.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { FailureNotice } from '@/platform/design-system/components'
-
-interface QueryFailureProps {
-  message: string
-  query: { isFetching: boolean; refetch: () => unknown }
-}
-
-export function QueryFailure({ message, query }: QueryFailureProps) {
-  return (
-    <FailureNotice
-      message={message}
-      retrying={query.isFetching}
-      onRetry={() => void query.refetch()}
-    />
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/search-connection-request/search-connection-request.tsx b/apps/sim/platform/app/(shell)/integrations/_components/search-connection-request/search-connection-request.tsx
deleted file mode 100644
index 5446a628a9c..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/search-connection-request/search-connection-request.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-'use client'
-
-import type { SearchConnectionTarget } from '@/lib/knowledge/search/connection-target'
-import { SavedSearchCredentialModal } from '@/app/workspace/[workspaceId]/integrations/components/saved-search-credential-modal'
-import { useSearchIntegrationConnection } from '@/hooks/use-search-integration-connection'
-import { Button, FailureNotice } from '@/platform/design-system/components'
-import { ConnectionPrompt } from '@/platform/design-system/components/connection-prompt/connection-prompt'
-
-interface SearchConnectionRequestProps {
-  organizationId: string
-  userId: string
-  target: SearchConnectionTarget
-}
-
-/** A connection a chat or link asked for, offered ahead of the inventory. */
-export function SearchConnectionRequest({
-  organizationId,
-  userId,
-  target,
-}: SearchConnectionRequestProps) {
-  const connection = useSearchIntegrationConnection({
-    organizationId,
-    userId,
-    target,
-    controlId: 'integrations-link',
-  })
-  const { action, label, disabled } = connection
-  return (
-    <>
-      {connection.savedConnection && (
-        <SavedSearchCredentialModal
-          organizationId={organizationId}
-          connection={connection.savedConnection}
-          onClose={connection.closeSavedConnection}
-          onCreated={connection.completeSavedConnection}
-        />
-      )}
-      <ConnectionPrompt
-        title={label}
-        options={
-          connection.connected
-            ? []
-            : [
-                {
-                  label: action,
-                  icon: { providerId: target.connectorType },
-                  onConnect: disabled ? undefined : () => void connection.connect(),
-                },
-              ]
-        }
-      />
-      {connection.pending && (
-        <div>
-          <Button variant='quiet' onClick={connection.cancel}>
-            Cancel
-          </Button>
-        </div>
-      )}
-      {connection.error && (
-        <FailureNotice
-          message={connection.error}
-          onRetry={
-            connection.inventoryError
-              ? () => void connection.retry()
-              : () => void connection.connect()
-          }
-        />
-      )}
-    </>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions-panel.tsx b/apps/sim/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions-panel.tsx
deleted file mode 100644
index 8a83fa39ef9..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions-panel.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-'use client'
-
-import { useQueryStates } from 'nuqs'
-import { integrationViewParsers } from '@/app/o/[organizationId]/integrations/search-params'
-import { useDebouncedSearchSetter } from '@/hooks/use-debounced-search-setter'
-import { ProviderHeading } from '@/platform/app/(shell)/integrations/_components/provider-heading/provider-heading'
-import { QueryFailure } from '@/platform/app/(shell)/integrations/_components/query-failure/query-failure'
-import { ToolPermissions } from '@/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions'
-import { InlineNotice } from '@/platform/design-system/components'
-import { useToolPermissions } from '@/platform/lib/data/integrations'
-
-interface ToolPermissionsPanelProps {
-  organizationId: string
-  credentialId: string
-  /** The account's own page names it; inside an integration's page the heading already has. */
-  showHeading?: boolean
-}
-
-export function ToolPermissionsPanel({
-  organizationId,
-  credentialId,
-  showHeading = false,
-}: ToolPermissionsPanelProps) {
-  const { query, view, pending, save } = useToolPermissions(organizationId, credentialId)
-  const [{ tools: search }, setParams] = useQueryStates(integrationViewParsers)
-  const setSearch = useDebouncedSearchSetter((value, options) =>
-    setParams({ tools: value }, options)
-  )
-  if (query.error) return <QueryFailure message='Could not load tool permissions' query={query} />
-  if (!view) return <InlineNotice message='Loading tool permissions' />
-  return (
-    <>
-      {showHeading && (
-        <ProviderHeading
-          name={view.heading.name}
-          description={view.heading.account}
-          icon={view.heading.icon}
-        />
-      )}
-      <ToolPermissions
-        permissions={view.permissions}
-        query={search}
-        onQueryChange={setSearch}
-        pending={pending}
-        onChange={save}
-      />
-    </>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions.module.css b/apps/sim/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions.module.css
deleted file mode 100644
index 03ef96f40c6..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions.module.css
+++ /dev/null
@@ -1,56 +0,0 @@
-.section,
-.group,
-.list,
-.intro,
-.copy {
-  display: grid;
-  min-inline-size: 0;
-}
-.section {
-  gap: var(--ui-section-gap);
-  container: permission-tools / inline-size;
-}
-.intro,
-.copy {
-  gap: var(--ui-stack-gap);
-}
-.detail {
-  color: var(--ui-secondary);
-}
-.group {
-  gap: var(--ui-stack-gap);
-}
-.tool {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--ui-row-gap);
-  min-inline-size: 0;
-}
-.list {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  gap: var(--ui-list-gap);
-}
-.tool {
-  padding-block: var(--ui-row-block);
-}
-.actions {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: end;
-  gap: var(--ui-action-gap);
-  max-inline-size: 100%;
-}
-.copy {
-  flex: 1;
-  overflow-wrap: anywhere;
-}
-@container permission-tools (max-width: 32rem) {
-  .tool {
-    align-items: start;
-    flex-direction: column;
-  }
-}
diff --git a/apps/sim/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions.tsx b/apps/sim/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions.tsx
deleted file mode 100644
index ab924b42221..00000000000
--- a/apps/sim/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import styles from '@/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions.module.css'
-import { EmptyState, SearchField, SegmentedControl } from '@/platform/design-system/components'
-import { CountedLabel } from '@/platform/design-system/components/overflow-text/counted-label'
-import type {
-  ToolPermissionChange,
-  ToolPermissionsModel,
-  ToolPolicy,
-} from '@/platform/lib/integrations/model'
-
-const POLICY_LABELS: Record<ToolPolicy, string> = { allow: 'Allow', ask: 'Ask', block: 'Block' }
-const POLICIES = ['allow', 'ask', 'block'] as const
-const GROUPS = [
-  { kind: 'read', label: 'Read-only tools' },
-  { kind: 'write', label: 'Write tools' },
-] as const
-const MIXED = 'mixed'
-
-interface ToolPermissionsProps {
-  permissions: ToolPermissionsModel
-  query: string
-  onQueryChange: (query: string) => void
-  pending: boolean
-  onChange: (change: ToolPermissionChange) => void
-}
-
-export function ToolPermissions({
-  permissions,
-  query,
-  onQueryChange,
-  pending,
-  onChange,
-}: ToolPermissionsProps) {
-  const canAllow = permissions.canAutoApprove && permissions.accountActive
-  const choices = POLICIES.map((value) => ({
-    value,
-    label: POLICY_LABELS[value],
-    disabled: pending || (value === 'allow' && !canAllow),
-  }))
-  const filter = query.trim().toLowerCase()
-  const matches = permissions.tools.filter((tool) =>
-    `${tool.label} ${tool.description}`.toLowerCase().includes(filter)
-  )
-
-  return (
-    <section className={styles.section} aria-label='Tool permissions'>
-      <div className={styles.intro}>
-        <h2 data-type='T093'>Tool permissions</h2>
-        {!permissions.canAutoApprove && (
-          <p className={styles.detail} data-type='T060'>
-            Your organization requires approval before tools run.
-          </p>
-        )}
-        {!permissions.accountActive && (
-          <p className={styles.detail} data-type='T060'>
-            This account is disconnected or paused. Reconnect it before allowing tools
-            automatically.
-          </p>
-        )}
-      </div>
-      {permissions.tools.length > 0 && (
-        <SearchField
-          label='Search tools'
-          placeholder='Search tools…'
-          value={query}
-          onValueChange={onQueryChange}
-        />
-      )}
-      {GROUPS.map(({ kind, label }) => {
-        const matching = matches.filter((tool) => tool.kind === kind)
-        if (!matching.length) return null
-        const tools = permissions.tools.filter((item) => item.kind === kind)
-        const defaultLabel = POLICY_LABELS[permissions[kind]]
-        const groupValue = tools.every((tool) => tool.policy === tools[0].policy)
-          ? tools[0].policy
-          : MIXED
-        return (
-          <section key={kind} className={styles.group} aria-label={label}>
-            <div className={styles.tool}>
-              <h3 data-type='T059'>
-                <CountedLabel label={label} count={tools.length} />
-              </h3>
-              <div className={styles.actions}>
-                {groupValue === MIXED && (
-                  <span className={styles.detail} data-type='T060'>
-                    Mixed
-                  </span>
-                )}
-                <SegmentedControl<ToolPolicy | typeof MIXED>
-                  label={`${label} permission`}
-                  options={choices}
-                  value={groupValue}
-                  onSelect={(policy) => {
-                    if (policy !== MIXED) onChange({ kind: 'group', effect: kind, policy })
-                  }}
-                />
-              </div>
-            </div>
-            <ul className={styles.list}>
-              {matching.map((tool) => (
-                <li className={styles.tool} key={tool.id}>
-                  <div className={styles.copy}>
-                    <span data-type='T059'>{tool.label}</span>
-                    {tool.description && (
-                      <span className={styles.detail} data-type='T060'>
-                        {tool.description}
-                      </span>
-                    )}
-                  </div>
-                  <div className={styles.actions}>
-                    <SegmentedControl<ToolPolicy>
-                      label={`${tool.label} permission`}
-                      description={
-                        tool.inherited
-                          ? `Inherits ${defaultLabel} from ${label.toLowerCase()}.`
-                          : undefined
-                      }
-                      options={choices}
-                      value={tool.policy}
-                      onSelect={(policy) => onChange({ kind: 'tool', toolId: tool.id, policy })}
-                    />
-                  </div>
-                </li>
-              ))}
-            </ul>
-          </section>
-        )
-      })}
-      {!matches.length && (
-        <EmptyState
-          title={filter ? 'No matching tools' : 'No Assistant tools are available for this account'}
-        />
-      )}
-    </section>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/links/_components/links-page/link-editor.tsx b/apps/sim/platform/app/(shell)/links/_components/links-page/link-editor.tsx
deleted file mode 100644
index 226c38c6e1a..00000000000
--- a/apps/sim/platform/app/(shell)/links/_components/links-page/link-editor.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-'use client'
-
-import { SIM_LINK_NAME_MAX_LENGTH } from '@sim/browser-extension-protocol'
-import type { SimLink } from '@/lib/api/contracts/sim-links'
-import { SIM_LINK_DESCRIPTION_MAX_LENGTH, SIM_LINK_VARIABLE } from '@/lib/sim-links/validation'
-import styles from '@/platform/app/(shell)/links/_components/links-page/links-page.module.css'
-import { Button, Checkbox, FieldFrame, Modal, TextField } from '@/platform/design-system/components'
-import { openLinkDocs, useLinkEditor } from '@/platform/lib/data/links'
-
-interface LinkEditorProps {
-  organizationId: string
-  /** The link being edited; omit to create one. */
-  link?: SimLink
-  /** Prefills the name of a new link, such as one opened from an unknown sim/ link. */
-  initialName?: string
-  onClose: () => void
-}
-
-/**
- * The URL fields are plain text and nothing is `required`, so a problem reaches the shared schema
- * and shows its message on the field instead of a browser validation bubble.
- */
-export function LinkEditor({ organizationId, link, initialName, onClose }: LinkEditorProps) {
-  const editor = useLinkEditor(organizationId, link, initialName)
-  const { draft, errors, pending } = editor
-  return (
-    <Modal
-      open
-      onOpenChange={(open) => {
-        if (!open) onClose()
-      }}
-      title={link ? `Edit ${link.name}` : 'New link'}
-      confirmLabel={link ? 'Save' : 'Create'}
-      onConfirm={editor.save}
-    >
-      <TextField
-        inputMode='url'
-        label='Destination URL'
-        placeholder='https://'
-        disabled={pending}
-        value={draft.url}
-        onChange={(value) => editor.change('url', value)}
-        error={errors.url}
-      />
-      {editor.variable && (
-        <TextField
-          inputMode='url'
-          label='Default destination'
-          placeholder='https://'
-          optional
-          disabled={pending}
-          value={draft.defaultUrl ?? ''}
-          onChange={(value) => editor.change('defaultUrl', value || null)}
-          error={errors.defaultUrl}
-          hint={`Opens when no value fills ${SIM_LINK_VARIABLE}.`}
-        />
-      )}
-      <TextField
-        label='Name'
-        placeholder='handbook'
-        disabled={pending}
-        maxLength={SIM_LINK_NAME_MAX_LENGTH}
-        value={draft.name}
-        onChange={editor.changeName}
-        error={errors.name}
-      />
-      <TextField
-        label='Description'
-        placeholder='What is this link for?'
-        optional
-        disabled={pending}
-        maxLength={SIM_LINK_DESCRIPTION_MAX_LENGTH}
-        value={draft.description ?? ''}
-        onChange={(value) => editor.change('description', value)}
-        error={errors.description}
-      />
-      <FieldFrame
-        label='Access'
-        hint={
-          editor.canManage
-            ? undefined
-            : 'Only the creator or an organization admin can change access.'
-        }
-      >
-        <div className={styles.access}>
-          <Checkbox
-            label='Hide from the Links page'
-            checked={draft.unlisted}
-            disabled={!editor.canManage || pending}
-            onCheckedChange={(checked) => editor.change('unlisted', checked)}
-          />
-          <Checkbox
-            label='Only the creator and admins can edit'
-            checked={draft.restrictEdit}
-            disabled={!editor.canManage || pending}
-            onCheckedChange={(checked) => editor.change('restrictEdit', checked)}
-          />
-        </div>
-      </FieldFrame>
-      <div>
-        <Button variant='quiet' size='compact' trailingIcon='I037' onClick={openLinkDocs}>
-          Learn more
-        </Button>
-      </div>
-    </Modal>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/links/_components/links-page/links-frame.tsx b/apps/sim/platform/app/(shell)/links/_components/links-page/links-frame.tsx
deleted file mode 100644
index 75797a3b75a..00000000000
--- a/apps/sim/platform/app/(shell)/links/_components/links-page/links-frame.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-'use client'
-
-import type { ReactNode } from 'react'
-import { useDeploymentShape } from '@/lib/core/config/deployment-shape'
-import styles from '@/platform/app/(shell)/links/_components/links-page/links-page.module.css'
-import { ActionMenu, Button, SearchField } from '@/platform/design-system/components'
-import type { MenuAction } from '@/platform/design-system/components/menu/action-menu'
-import { openChromeStore } from '@/platform/lib/data/links'
-
-const SKELETON_ROWS = 6
-
-interface LinksFrameProps {
-  search?: string
-  onSearch?: (value: string) => void
-  onCreate?: () => void
-  sortLabel?: string
-  sortActions?: readonly MenuAction[]
-  /** Holds the page's controls still while the route loads. */
-  loading?: boolean
-  children: ReactNode
-}
-
-/** The page's title, actions, search and sort, shared with its loading state so nothing shifts. */
-export function LinksFrame({
-  search = '',
-  onSearch,
-  onCreate,
-  sortLabel = 'Sort',
-  sortActions = [],
-  loading,
-  children,
-}: LinksFrameProps) {
-  const { hosted } = useDeploymentShape()
-  return (
-    <main className={styles.page} inert={loading} aria-busy={loading || undefined}>
-      <header className={styles.heading}>
-        <h1 data-type='T076'>Links</h1>
-        <div className={styles.actions}>
-          {hosted && (
-            <Button icon='I041' onClick={openChromeStore}>
-              Install Sim for Chrome
-            </Button>
-          )}
-          <Button variant='primary' icon='I074' onClick={onCreate}>
-            New link
-          </Button>
-        </div>
-      </header>
-      <div className={styles.options}>
-        <SearchField
-          label='Search links'
-          placeholder='Search links...'
-          value={search}
-          onValueChange={onSearch}
-        />
-        <ActionMenu label={sortLabel} align='end' actions={sortActions} />
-      </div>
-      {children}
-    </main>
-  )
-}
-
-export function LinkRowsSkeleton() {
-  return (
-    <div role='status' aria-label='Loading links' className={styles.skeleton}>
-      {Array.from({ length: SKELETON_ROWS }, (_, index) => (
-        <span key={index} className={styles.skeletonRow} />
-      ))}
-    </div>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/links/_components/links-page/links-page.module.css b/apps/sim/platform/app/(shell)/links/_components/links-page/links-page.module.css
deleted file mode 100644
index 99413c7283f..00000000000
--- a/apps/sim/platform/app/(shell)/links/_components/links-page/links-page.module.css
+++ /dev/null
@@ -1,58 +0,0 @@
-.page {
-  /* Everything above and below the table's own scroller, so the page itself stays still. */
-  --ui-table-viewport-offset: calc(
-    var(--shell-home-row-start) +
-    2 *
-    var(--spacing-app-control-md) +
-    3 *
-    var(--ui-product-section-gap)
-  );
-  display: grid;
-  grid-template-columns: minmax(0, 1fr);
-  align-content: start;
-  inline-size: min(var(--ui-page-max-size), calc(100% - 2 * var(--ui-page-inline-gutter)));
-  margin-inline: auto;
-  padding-block: var(--shell-home-row-start) var(--ui-page-inset-block);
-  gap: var(--ui-product-section-gap);
-}
-.heading,
-.actions,
-.options {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-}
-.heading {
-  justify-content: space-between;
-  gap: var(--spacing-8);
-}
-.actions {
-  gap: var(--ui-action-gap);
-}
-.options {
-  gap: var(--spacing-8);
-}
-.options > :first-child {
-  flex: 1 1 var(--spacing-128);
-  min-inline-size: 0;
-}
-.favicon {
-  flex: none;
-  inline-size: var(--spacing-16);
-  block-size: var(--spacing-16);
-  border-radius: var(--radius-2);
-}
-.skeleton {
-  display: grid;
-  gap: var(--ui-list-gap);
-}
-.skeletonRow {
-  display: block;
-  block-size: var(--spacing-40);
-  border-radius: var(--radius-4);
-  background: var(--ui-hover);
-}
-.access {
-  display: grid;
-  gap: var(--spacing-8);
-}
diff --git a/apps/sim/platform/app/(shell)/links/_components/links-page/links-page.tsx b/apps/sim/platform/app/(shell)/links/_components/links-page/links-page.tsx
deleted file mode 100644
index c8532fb5b4b..00000000000
--- a/apps/sim/platform/app/(shell)/links/_components/links-page/links-page.tsx
+++ /dev/null
@@ -1,275 +0,0 @@
-'use client'
-
-import { type MouseEvent, memo, type ReactNode, type TouchEvent, useMemo, useState } from 'react'
-import { Favicon } from '@/components/favicon'
-import type { SimLink } from '@/lib/api/contracts/sim-links'
-import { simLinkOrigin } from '@/lib/sim-links/validation'
-import { LinkEditor } from '@/platform/app/(shell)/links/_components/links-page/link-editor'
-import {
-  LinkRowsSkeleton,
-  LinksFrame,
-} from '@/platform/app/(shell)/links/_components/links-page/links-frame'
-import styles from '@/platform/app/(shell)/links/_components/links-page/links-page.module.css'
-import {
-  ActionMenu,
-  Avatar,
-  Button,
-  ContextActionMenu,
-  DataTable,
-  EmptyState,
-  FailureNotice,
-  Icon,
-  Modal,
-  OverflowText,
-  TableLabel,
-} from '@/platform/design-system/components'
-import type { MenuAction } from '@/platform/design-system/components/menu/action-menu'
-import type { LoadMoreState } from '@/platform/design-system/components/scroll-area/use-load-more'
-import { openLink, useLinksPage } from '@/platform/lib/data/links'
-import { formatRelativeTime } from '@/platform/lib/time'
-
-const COLUMNS = [
-  { key: 'name', label: 'Name', kind: 'text' },
-  { key: 'destination', label: 'Destination', kind: 'text', showFrom: 'compact' },
-  { key: 'description', label: 'Description', kind: 'text', showFrom: 'wide' },
-  { key: 'owner', label: 'Created by', kind: 'text', showFrom: 'wide' },
-  { key: 'access', label: 'Access', kind: 'text', showFrom: 'wide' },
-  { key: 'updated', label: 'Updated', kind: 'text', showFrom: 'wide' },
-] as const
-
-/** How the link is shared beyond the default: open to everyone and editable by any member. */
-function accessLabel(link: SimLink): string | null {
-  const limits = [link.unlisted && 'Unlisted', link.restrictEdit && 'Restricted'].filter(Boolean)
-  return limits.length ? limits.join(', ') : null
-}
-
-/** The row's actions. `canEdit` gates both changes; `canManage` only gates the editor's Access. */
-function linkActions(
-  link: SimLink,
-  { onCopy, onEdit, onDelete }: RowActions
-): readonly MenuAction[] {
-  return [
-    { id: 'open', label: 'Open', icon: 'I030', onSelect: () => openLink(link.name) },
-    { id: 'copy', label: 'Copy link', icon: 'I006', onSelect: () => void onCopy(link.name) },
-    ...(link.canEdit
-      ? ([
-          { id: 'edit', label: 'Edit', icon: 'I036', onSelect: () => onEdit(link) },
-          {
-            id: 'delete',
-            label: 'Delete',
-            icon: 'I061',
-            destructive: true,
-            separatorBefore: true,
-            onSelect: () => onDelete(link),
-          },
-        ] satisfies MenuAction[])
-      : []),
-  ]
-}
-
-interface RowActions {
-  onCopy: (name: string) => Promise<void>
-  onEdit: (link: SimLink) => void
-  onDelete: (link: SimLink) => void
-}
-
-interface LinkRowContextMenuProps extends RowActions {
-  links: readonly SimLink[]
-  children: ReactNode
-}
-
-/**
- * One context menu serves the whole table, so the row under the pointer decides its actions. Off a
- * row, the event stops here: the browser keeps its own menu, as it does for a touch and hold. The
- * selection lives here so a touch on the table does not re-render its rows.
- */
-function LinkRowContextMenu({ links, children, ...actions }: LinkRowContextMenuProps) {
-  const [menuLinkId, setMenuLinkId] = useState<string | null>(null)
-  const menuLink = links.find((link) => link.id === menuLinkId)
-
-  const selectRowUnderPointer = (event: MouseEvent<HTMLElement> | TouchEvent<HTMLElement>) => {
-    const row =
-      event.target instanceof Element ? event.target.closest<HTMLElement>('tr[data-index]') : null
-    const link = row ? links[Number(row.dataset.index)] : undefined
-    if (link) setMenuLinkId(link.id)
-    else event.stopPropagation()
-  }
-
-  return (
-    <div onContextMenuCapture={selectRowUnderPointer} onTouchStartCapture={selectRowUnderPointer}>
-      <ContextActionMenu
-        label='Link actions'
-        actions={menuLink ? linkActions(menuLink, actions) : []}
-      >
-        {children}
-      </ContextActionMenu>
-    </div>
-  )
-}
-
-interface LinksTableProps extends RowActions {
-  links: readonly SimLink[]
-  loadMore: LoadMoreState
-  /** The instant "Updated" counts back from. The rows render on the server, so it can't be the clock. */
-  asOf: number | undefined
-}
-
-/** Memoized so a keystroke in the search field does not re-render every visible row. */
-const LinksTable = memo(function LinksTable({
-  links,
-  loadMore,
-  asOf,
-  onCopy,
-  onEdit,
-  onDelete,
-}: LinksTableProps) {
-  const rows = useMemo(() => {
-    const now = asOf ?? Date.now()
-    return links.map((link) => {
-      const origin = simLinkOrigin(link.url)
-      return {
-        id: link.id,
-        values: {
-          access: accessLabel(link),
-          updated: formatRelativeTime(new Date(link.updatedAt).getTime(), now),
-        },
-        cells: {
-          name: (
-            <TableLabel
-              leading={
-                <Favicon
-                  host={origin ? new URL(origin).hostname : null}
-                  fallback={<Icon name='I041' />}
-                  className={styles.favicon}
-                />
-              }
-            >
-              <OverflowText text={link.name}>{link.name}</OverflowText>
-            </TableLabel>
-          ),
-          destination: <OverflowText text={link.url}>{link.url}</OverflowText>,
-          description: link.description ? (
-            <OverflowText text={link.description}>{link.description}</OverflowText>
-          ) : undefined,
-          owner: link.createdBy ? (
-            <TableLabel
-              leading={
-                <Avatar
-                  size='inline'
-                  name={link.createdBy.name}
-                  src={link.createdBy.image ?? undefined}
-                />
-              }
-            >
-              <OverflowText text={link.createdBy.name}>{link.createdBy.name}</OverflowText>
-            </TableLabel>
-          ) : undefined,
-        },
-        onOpen: () => openLink(link.name),
-        action: (
-          <ActionMenu
-            label={`${link.name} actions`}
-            icon='I108'
-            align='end'
-            actions={linkActions(link, { onCopy, onEdit, onDelete })}
-          />
-        ),
-      }
-    })
-  }, [links, asOf, onCopy, onEdit, onDelete])
-
-  return (
-    <LinkRowContextMenu links={links} onCopy={onCopy} onEdit={onEdit} onDelete={onDelete}>
-      <DataTable
-        title='Links'
-        titleHidden
-        virtualized
-        columns={COLUMNS}
-        loadMore={loadMore}
-        rows={rows}
-      />
-    </LinkRowContextMenu>
-  )
-})
-
-interface LinksPageProps {
-  organizationId: string
-}
-
-export function LinksPage({ organizationId }: LinksPageProps) {
-  const links = useLinksPage(organizationId)
-  const [editing, setEditing] = useState<SimLink | null>(null)
-  const [deleting, setDeleting] = useState<SimLink | null>(null)
-
-  return (
-    <LinksFrame
-      search={links.search}
-      onSearch={links.setSearch}
-      onCreate={links.startCreate}
-      sortLabel={links.sortLabel}
-      sortActions={links.sortActions}
-    >
-      {links.status === 'error' ? (
-        <FailureNotice message={links.error ?? 'Failed to load links'} onRetry={links.retry} />
-      ) : links.status === 'pending' || (links.isPlaceholder && links.rows.length === 0) ? (
-        <LinkRowsSkeleton />
-      ) : links.rows.length === 0 ? (
-        links.term ? (
-          <EmptyState
-            title={`No results for “${links.term}”`}
-            description='Searched every link you can see.'
-            action={<Button onClick={() => links.setSearch('')}>Clear search</Button>}
-          />
-        ) : (
-          <EmptyState
-            graphic={<Icon name='I041' />}
-            title='Links'
-            description='Create short links like handbook for the pages your team opens most.'
-            action={
-              <Button variant='primary' onClick={links.startCreate}>
-                New link
-              </Button>
-            }
-          />
-        )
-      ) : (
-        <LinksTable
-          links={links.rows}
-          loadMore={links.loadMore}
-          asOf={links.asOf}
-          onCopy={links.copy}
-          onEdit={setEditing}
-          onDelete={setDeleting}
-        />
-      )}
-      {links.createName !== null && (
-        <LinkEditor
-          key={links.createName}
-          organizationId={organizationId}
-          initialName={links.createName}
-          onClose={links.closeCreate}
-        />
-      )}
-      {editing && (
-        <LinkEditor
-          key={editing.id}
-          organizationId={organizationId}
-          link={editing}
-          onClose={() => setEditing(null)}
-        />
-      )}
-      <Modal
-        open={deleting !== null}
-        onOpenChange={(open) => {
-          if (!open) setDeleting(null)
-        }}
-        variant='confirm'
-        destructive
-        title='Delete link'
-        confirmLabel='Delete'
-        description={`${deleting?.name ?? 'This link'} will stop working for everyone in your organization.`}
-        onConfirm={() => (deleting ? links.remove(deleting.id) : undefined)}
-      />
-    </LinksFrame>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/directory-sync/connect-modal.tsx b/apps/sim/platform/app/(shell)/people/_components/directory-sync/connect-modal.tsx
deleted file mode 100644
index 4251f9828bd..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/directory-sync/connect-modal.tsx
+++ /dev/null
@@ -1,185 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import Link from 'next/link'
-import styles from '@/platform/app/(shell)/people/_components/directory-sync/directory-sync.module.css'
-import { ExternalLink } from '@/platform/app/(shell)/people/_components/external-link/external-link'
-import {
-  Button,
-  InlineNotice,
-  Modal,
-  SecretField,
-  TextField,
-} from '@/platform/design-system/components'
-import {
-  SYNC_SOURCE_NAMES,
-  type SyncDraft,
-  type SyncFieldErrors,
-  type SyncSource,
-  useDirectorySync,
-  usePeopleViewer,
-  useProvisioningConnection,
-} from '@/platform/lib/data/people'
-
-const SOURCE_DESCRIPTIONS: Record<SyncSource, string> = {
-  okta: 'Keep your org chart current with an hourly directory sync. You can disconnect at any time.',
-  entra:
-    'Register an app in your Microsoft Entra tenant and grant administrator consent for the Microsoft Graph User.Read.All application permission. Use the client secret value.',
-  scim: 'Use profiles from your organization’s existing SCIM provisioning connection.',
-}
-
-interface ConnectModalProps {
-  organizationId: string
-  source: SyncSource
-  onClose: () => void
-  onConnected: () => void
-}
-
-/**
- * Connects a directory, or replaces a connected one's credentials. Credentials stay in this
- * component's state; the action hook keeps them out of the mutation cache. A status poll that fails
- * keeps the draft, and one that says the viewer lost access takes the form away.
- */
-export function ConnectModal({ organizationId, source, onClose, onConnected }: ConnectModalProps) {
-  const { canOpenProvisioningSettings, provisioningSettingsHref } = usePeopleViewer()
-  const directory = useDirectorySync(organizationId)
-  const { sync } = directory
-  const current = sync?.source === source ? sync : null
-  const provisioning = useProvisioningConnection(organizationId, source === 'scim')
-  const [draft, setDraft] = useState<SyncDraft>({
-    domain: current?.domain ?? '',
-    token: '',
-    tenantId: current?.tenantId ?? '',
-    clientId: current?.clientId ?? '',
-    clientSecret: '',
-  })
-  const [errors, setErrors] = useState<SyncFieldErrors>({})
-  const change = (next: Partial<SyncDraft>) => setDraft((previous) => ({ ...previous, ...next }))
-  const name = SYNC_SOURCE_NAMES[source]
-  const disabled = directory.pending
-  const canConnect =
-    source === 'scim'
-      ? provisioning.ready
-      : source === 'okta'
-        ? Boolean(draft.token.trim() && draft.domain.trim())
-        : Boolean(draft.clientSecret.trim() && draft.tenantId.trim() && draft.clientId.trim())
-
-  if (directory.denied) return null
-
-  return (
-    <Modal
-      open
-      onOpenChange={onClose}
-      title={current ? `Update ${name} credentials` : `Connect ${name}`}
-      confirmLabel={disabled ? 'Syncing…' : current ? 'Save and sync' : 'Connect and sync'}
-      confirmDisabled={disabled || !canConnect}
-      onConfirm={() => {
-        setErrors(directory.connect(source, draft, onConnected) ?? {})
-        return false
-      }}
-    >
-      <p className={styles.secondary} data-type='T060'>
-        {SOURCE_DESCRIPTIONS[source]}
-      </p>
-      {source === 'okta' && (
-        <>
-          <TextField
-            label='Okta domain'
-            placeholder='company.okta.com'
-            hint='Your organization’s Okta domain.'
-            autoComplete='off'
-            value={draft.domain}
-            error={errors.domain}
-            disabled={disabled || Boolean(current?.domain)}
-            onChange={(domain) => change({ domain })}
-          />
-          <SecretField
-            label='API token'
-            placeholder='Paste your API token'
-            hint='Use a token with permission to read directory users.'
-            value={draft.token}
-            error={errors.token}
-            disabled={disabled}
-            onChange={(token) => change({ token })}
-          />
-          <ExternalLink href='https://developer.okta.com/docs/guides/create-an-api-token/main/'>
-            Create an Okta API token
-          </ExternalLink>
-        </>
-      )}
-      {source === 'entra' && (
-        <>
-          <TextField
-            label='Tenant ID'
-            placeholder='Directory (tenant) ID'
-            autoComplete='off'
-            value={draft.tenantId}
-            error={errors.tenantId}
-            disabled={disabled || Boolean(current?.tenantId)}
-            onChange={(tenantId) => change({ tenantId })}
-          />
-          <TextField
-            label='Client ID'
-            placeholder='Application (client) ID'
-            autoComplete='off'
-            value={draft.clientId}
-            error={errors.clientId}
-            disabled={disabled}
-            onChange={(clientId) => change({ clientId })}
-          />
-          <SecretField
-            label='Client secret'
-            placeholder='Client secret value'
-            value={draft.clientSecret}
-            error={errors.clientSecret}
-            disabled={disabled}
-            onChange={(clientSecret) => change({ clientSecret })}
-          />
-          <ExternalLink href='https://learn.microsoft.com/en-us/entra/identity-platform/quickstart-register-app'>
-            Register an application
-          </ExternalLink>
-        </>
-      )}
-      {source === 'scim' && (
-        <div className={styles.provisioning} aria-live='polite'>
-          <p data-type='T060'>
-            {provisioning.loading
-              ? 'Checking provisioning…'
-              : provisioning.failed
-                ? 'Could not read the provisioning connection.'
-                : provisioning.ready
-                  ? 'Active'
-                  : 'Enable provisioning before connecting this source.'}
-          </p>
-          <div className={styles.quietActions}>
-            {canOpenProvisioningSettings && (
-              <Button
-                variant='quiet'
-                size='compact'
-                render={<Link href={provisioningSettingsHref} />}
-              >
-                Manage provisioning
-              </Button>
-            )}
-            {!provisioning.fetching && !provisioning.ready && (
-              <Button variant='quiet' size='compact' onClick={provisioning.refresh}>
-                Check again
-              </Button>
-            )}
-          </div>
-        </div>
-      )}
-      <InlineNotice
-        message={`Profiles and managers will be managed by ${name}. People without Sim accounts are included without granting them access.${source === 'scim' ? '' : ' Sim stores these credentials encrypted for scheduled syncs.'}`}
-      />
-      {disabled && (
-        <p className={styles.secondary} data-type='T060'>
-          Sync is running. You can close this window and return for the result.
-        </p>
-      )}
-      {directory.actionError && (
-        <InlineNotice intent='danger' message={directory.actionError.message} />
-      )}
-    </Modal>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/directory-sync/directory-sources.tsx b/apps/sim/platform/app/(shell)/people/_components/directory-sync/directory-sources.tsx
deleted file mode 100644
index 7c26e751a9c..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/directory-sync/directory-sources.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import styles from '@/platform/app/(shell)/people/_components/directory-sync/directory-sync.module.css'
-import { Icon } from '@/platform/design-system/components'
-import { SYNC_SOURCE_NAMES, type SyncSource } from '@/platform/lib/data/people'
-
-export const SOURCE_MARKS: Record<SyncSource, string> = { okta: 'O', entra: 'E', scim: 'S' }
-
-const SOURCES = [
-  { source: 'okta', hint: 'Sync your Okta directory' },
-  { source: 'entra', hint: 'Sync your Entra directory' },
-  { source: 'scim', hint: 'Use existing provisioning' },
-] as const
-
-interface DirectorySourcesProps {
-  canProvision: boolean
-  onConnect: (source: SyncSource) => void
-}
-
-/** The directories an organization can connect, shared by first use and the sync page. */
-export function DirectorySources({ canProvision, onConnect }: DirectorySourcesProps) {
-  return (
-    <div className={styles.sources}>
-      {SOURCES.filter(({ source }) => source !== 'scim' || canProvision).map(({ source, hint }) => (
-        <button
-          key={source}
-          type='button'
-          className={styles.source}
-          aria-label={`Connect ${SYNC_SOURCE_NAMES[source]}`}
-          onClick={() => onConnect(source)}
-        >
-          <span className={styles.mark} aria-hidden='true' data-type='T042'>
-            {SOURCE_MARKS[source]}
-          </span>
-          <span className={styles.sourceCopy}>
-            <span data-type='T042'>{source === 'scim' ? 'SCIM' : SYNC_SOURCE_NAMES[source]}</span>
-            <span className={styles.secondary} data-type='T050'>
-              {hint}
-            </span>
-          </span>
-          <span className={styles.sourceAction} data-type='T043'>
-            Connect
-            <Icon name='I032' />
-          </span>
-        </button>
-      ))}
-    </div>
-  )
-}
-
-interface ImportPromptProps {
-  onImport: () => void
-}
-
-export function ImportPrompt({ onImport }: ImportPromptProps) {
-  return (
-    <p className={styles.importPrompt} data-type='T043'>
-      Need a one-time update?
-      <button type='button' className={styles.importLink} onClick={onImport}>
-        Import profiles
-      </button>
-    </p>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/directory-sync/directory-sync-page.tsx b/apps/sim/platform/app/(shell)/people/_components/directory-sync/directory-sync-page.tsx
deleted file mode 100644
index 718910c8298..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/directory-sync/directory-sync-page.tsx
+++ /dev/null
@@ -1,303 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { formatDateTime } from '@sim/utils/formatting'
-import {
-  DirectorySources,
-  ImportPrompt,
-  SOURCE_MARKS,
-} from '@/platform/app/(shell)/people/_components/directory-sync/directory-sources'
-import styles from '@/platform/app/(shell)/people/_components/directory-sync/directory-sync.module.css'
-import { PeopleStatus } from '@/platform/app/(shell)/people/_components/people-page/people-status'
-import {
-  Button,
-  FailureNotice,
-  InlineNotice,
-  Modal,
-  StatusTag,
-} from '@/platform/design-system/components'
-import {
-  SYNC_SOURCE_NAMES,
-  type SyncSource,
-  type SyncStatus,
-  useDirectorySync,
-  usePeopleViewer,
-} from '@/platform/lib/data/people'
-
-const PHASE_TITLES = {
-  users: 'Reading people',
-  relationships: 'Reading reporting lines',
-  publish: 'Validating and publishing',
-} as const
-
-type SyncIntent = 'info' | 'success' | 'warning' | 'danger'
-
-/** What the card says about a connection: a heading for its state, and its tag. */
-function describeSync(sync: SyncStatus): { title: string; tag: string; intent: SyncIntent } {
-  if (sync.state === 'paused')
-    return { title: 'SCIM provisioning is disabled', tag: 'Paused', intent: 'warning' }
-  if (sync.retryBlocked && sync.state !== 'syncing')
-    return {
-      title: `${SYNC_SOURCE_NAMES[sync.source]} asked us to slow down`,
-      tag: 'Waiting to retry',
-      intent: 'warning',
-    }
-  if (sync.state === 'failed')
-    return { title: 'Couldn’t refresh the directory', tag: 'Sync failed', intent: 'danger' }
-  if (sync.progress?.phase === 'publish')
-    return { title: 'Finishing your refresh', tag: 'Publishing', intent: 'info' }
-  if (sync.state === 'syncing')
-    return {
-      title: sync.lastSuccessAt ? 'Refreshing your directory' : 'Reading your directory',
-      tag: sync.lastSuccessAt ? 'Syncing' : 'First sync',
-      intent: 'info',
-    }
-  if (sync.state === 'queued')
-    return {
-      title: sync.progress ? 'Refresh in progress' : 'Sync queued',
-      tag: sync.progress ? 'Refresh in progress' : 'Queued',
-      intent: 'info',
-    }
-  return { title: 'Directory is up to date', tag: 'Connected', intent: 'success' }
-}
-
-function syncActionLabel(sync: SyncStatus, syncing: boolean): string {
-  if (sync.state === 'paused') return 'Sync paused'
-  if (syncing) return 'Sync in progress'
-  if (sync.retryBlocked) return 'Waiting to retry'
-  if (sync.state === 'failed') return 'Retry sync'
-  return sync.progress ? 'Continue sync' : 'Sync now'
-}
-
-function formatInstant(value: string | null): string {
-  return value ? formatDateTime(new Date(value)) : '—'
-}
-
-interface SyncCardProps {
-  sync: SyncStatus
-  syncing: boolean
-  running: boolean
-  onUpdate: () => void
-  onRun: () => void
-}
-
-function SyncCard({ sync, syncing, running, onUpdate, onRun }: SyncCardProps) {
-  const paused = sync.state === 'paused'
-  const { title, tag, intent } = describeSync(sync)
-  const { progress } = sync
-  const facts: [label: string, value: string | null][] = [
-    ['Last successful sync', sync.lastSuccessAt],
-    [syncing ? 'Current attempt started' : 'Last attempted', sync.lastAttemptAt],
-  ]
-  if (sync.lastFailedAt) facts.push(['Last failed sync', sync.lastFailedAt])
-  if (!paused)
-    facts.push(
-      sync.retryAt ? ['Next retry', sync.retryAt] : ['Next scheduled sync', sync.nextSyncAt]
-    )
-  return (
-    <section className={styles.card} aria-label='Directory connection'>
-      <header className={styles.cardHeader}>
-        <span className={styles.mark} aria-hidden='true' data-type='T023'>
-          {SOURCE_MARKS[sync.source]}
-        </span>
-        <span className={styles.sourceCopy}>
-          <span data-type='T042'>{SYNC_SOURCE_NAMES[sync.source]}</span>
-          {sync.domain && (
-            <span className={styles.secondary} data-type='T050'>
-              {sync.domain}
-            </span>
-          )}
-        </span>
-        <StatusTag label={tag} intent={intent} live />
-      </header>
-      <div className={styles.summary}>
-        <h2 data-type='T042'>{title}</h2>
-        {paused && (
-          <p className={styles.secondary} data-type='T043'>
-            Re-enable provisioning in organization settings to resume. Your last published chart
-            remains available.
-          </p>
-        )}
-      </div>
-      {progress && !paused && (
-        <InlineNotice
-          title={PHASE_TITLES[progress.phase]}
-          message={
-            sync.lastSuccessAt
-              ? 'Your current chart stays available until this refresh is complete.'
-              : 'Your chart will appear when the first sync finishes.'
-          }
-          action={
-            <span aria-live='polite' data-type='T005'>
-              {progress.usersRead.toLocaleString()} read
-            </span>
-          }
-        />
-      )}
-      {sync.lastError &&
-        (paused ? (
-          <p className={styles.secondary} data-type='T043'>
-            Last sync error: {sync.lastError}
-          </p>
-        ) : (
-          <InlineNotice
-            intent='danger'
-            message={
-              sync.lastSuccessAt
-                ? `${sync.lastError} Your last published chart remains available.`
-                : sync.lastError
-            }
-          />
-        ))}
-      <dl className={styles.facts}>
-        {facts.map(([label, value]) => (
-          <div key={label} className={styles.fact}>
-            <dt className={styles.secondary} data-type='T043'>
-              {label}
-            </dt>
-            <dd data-type='T043'>{formatInstant(value)}</dd>
-          </div>
-        ))}
-      </dl>
-      {running && !paused && (
-        <p className={styles.secondary} data-type='T043'>
-          Sync is running. You can leave this page and return for the result.
-        </p>
-      )}
-      <footer className={styles.cardFooter}>
-        {sync.source !== 'scim' && (
-          <Button disabled={syncing} onClick={onUpdate}>
-            Update connection
-          </Button>
-        )}
-        <div className={styles.run}>
-          <Button disabled={paused || syncing || sync.retryBlocked} onClick={onRun}>
-            {syncActionLabel(sync, syncing)}
-          </Button>
-        </div>
-      </footer>
-    </section>
-  )
-}
-
-interface DirectorySyncPageProps {
-  organizationId: string
-  onBack: () => void
-  onConnect: (source: SyncSource) => void
-  onImport: () => void
-}
-
-/**
- * The connection's status and its administration. A sync can outlast this page, so nothing here
- * holds it open: the actions report through the hook's state, and status polling shows the result.
- */
-export function DirectorySyncPage({
-  organizationId,
-  onBack,
-  onConnect,
-  onImport,
-}: DirectorySyncPageProps) {
-  const { canProvision } = usePeopleViewer()
-  const directory = useDirectorySync(organizationId)
-  const { sync } = directory
-  const [disconnecting, setDisconnecting] = useState(false)
-  const syncing = sync?.state === 'syncing' || directory.pending
-  return (
-    <main className={styles.page}>
-      <div className={styles.back}>
-        <Button variant='quiet' icon='I093' onClick={onBack}>
-          Back to people
-        </Button>
-      </div>
-      <header className={styles.heading}>
-        <h1 data-type='T076'>Directory sync</h1>
-        <p className={styles.secondary} data-type='T043'>
-          Keep people, roles, and reporting lines up to date from your identity provider.
-        </p>
-      </header>
-      {directory.loading ? (
-        <PeopleStatus>Loading directory connection…</PeopleStatus>
-      ) : directory.loadError ? (
-        <FailureNotice
-          message={directory.loadError.message}
-          retrying={directory.fetching}
-          onRetry={directory.retry}
-        />
-      ) : sync ? (
-        <div className={styles.columns}>
-          <div className={styles.main}>
-            <SyncCard
-              sync={sync}
-              syncing={syncing}
-              running={directory.running}
-              onUpdate={() => {
-                directory.reset()
-                onConnect(sync.source)
-              }}
-              onRun={directory.run}
-            />
-            {directory.actionError && !disconnecting && (
-              <InlineNotice intent='danger' message={directory.actionError.message} />
-            )}
-            <section className={styles.disconnect} aria-labelledby='directory-disconnect'>
-              <h2 id='directory-disconnect' data-type='T042'>
-                Disconnect directory
-              </h2>
-              <p className={styles.secondary} data-type='T043'>
-                Remove synced profiles and reporting lines. Existing Sim memberships stay unchanged.
-              </p>
-              <div>
-                <Button
-                  variant='destructive'
-                  disabled={directory.pending}
-                  onClick={() => {
-                    directory.reset()
-                    setDisconnecting(true)
-                  }}
-                >
-                  {`Disconnect ${SYNC_SOURCE_NAMES[sync.source]}`}
-                </Button>
-              </div>
-            </section>
-          </div>
-          <aside className={styles.notes}>
-            <div className={styles.note}>
-              <h2 data-type='T042'>One directory for your organization</h2>
-              <p className={styles.secondary} data-type='T043'>
-                Names, titles, departments, locations, and managers come from{' '}
-                {SYNC_SOURCE_NAMES[sync.source]}. Update these details at the source.
-              </p>
-            </div>
-            <div className={styles.note}>
-              <h2 data-type='T042'>Include everyone</h2>
-              <p className={styles.secondary} data-type='T043'>
-                People can appear before they have a Sim account. Directory sync does not grant
-                access or assign a seat.
-              </p>
-            </div>
-          </aside>
-          {disconnecting && (
-            <Modal
-              open
-              onOpenChange={() => setDisconnecting(false)}
-              title='Disconnect directory'
-              confirmLabel='Disconnect'
-              destructive
-              onConfirm={directory.disconnect}
-            >
-              <p data-type='T060'>
-                Disconnecting removes the profile details and reporting lines supplied by this
-                directory. Sim keeps organization memberships and manually recorded profiles.
-              </p>
-            </Modal>
-          )}
-        </div>
-      ) : (
-        <div className={styles.unconnected}>
-          <DirectorySources canProvision={canProvision} onConnect={onConnect} />
-          <ImportPrompt onImport={onImport} />
-        </div>
-      )}
-    </main>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/directory-sync/directory-sync.module.css b/apps/sim/platform/app/(shell)/people/_components/directory-sync/directory-sync.module.css
deleted file mode 100644
index 8743cb24280..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/directory-sync/directory-sync.module.css
+++ /dev/null
@@ -1,202 +0,0 @@
-.page {
-  display: flex;
-  flex-direction: column;
-  min-block-size: 100%;
-  padding: var(--shell-home-row-start) var(--ui-page-inline-gutter) var(--ui-page-inset-block);
-  gap: var(--spacing-32);
-}
-
-.back {
-  margin-inline-start: calc(-1 * var(--spacing-control-inline));
-}
-
-.heading {
-  display: grid;
-  gap: var(--spacing-8);
-}
-
-.secondary {
-  color: var(--ui-secondary);
-}
-
-.columns {
-  display: grid;
-  grid-template-columns: minmax(0, calc(2 * var(--spacing-320))) minmax(
-      0,
-      calc(var(--spacing-320) + var(--spacing-64))
-    );
-  align-items: start;
-  gap: var(--spacing-32) var(--spacing-64);
-}
-
-.main,
-.notes {
-  display: flex;
-  flex-direction: column;
-  min-inline-size: 0;
-  gap: var(--spacing-32);
-}
-
-.notes {
-  gap: var(--spacing-24);
-  padding-block-start: var(--spacing-8);
-}
-
-.note {
-  display: grid;
-  gap: var(--spacing-8);
-}
-
-.disconnect {
-  display: grid;
-  gap: var(--spacing-12);
-  padding-block-start: var(--spacing-8);
-}
-
-.card {
-  display: flex;
-  flex-direction: column;
-  gap: var(--spacing-24);
-  padding: var(--spacing-24);
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-12);
-}
-
-.cardHeader {
-  display: flex;
-  align-items: center;
-  gap: var(--spacing-12);
-}
-
-.cardHeader .sourceCopy {
-  flex: 1;
-}
-
-.summary {
-  display: grid;
-  gap: var(--spacing-4);
-}
-
-.mark {
-  display: inline-flex;
-  flex: none;
-  align-items: center;
-  justify-content: center;
-  inline-size: var(--spacing-32);
-  block-size: var(--spacing-32);
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--ui-control-radius);
-}
-
-.sourceCopy {
-  display: grid;
-  min-inline-size: 0;
-  gap: var(--ui-stack-gap);
-  overflow-wrap: anywhere;
-}
-
-.facts {
-  display: grid;
-  gap: var(--spacing-16);
-}
-
-.fact {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-  gap: var(--spacing-4) var(--spacing-12);
-}
-
-.cardHeader .mark {
-  inline-size: var(--spacing-40);
-  block-size: var(--spacing-40);
-}
-
-.run {
-  margin-inline-start: auto;
-}
-
-.cardFooter {
-  display: flex;
-  flex-wrap: wrap;
-  gap: var(--spacing-8);
-  padding-block-start: var(--spacing-16);
-  border-block-start: var(--spacing-stroke-default) solid var(--ui-divider);
-}
-
-.sources {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(min(100%, 13rem), 16rem));
-  justify-content: center;
-  inline-size: 100%;
-  gap: var(--spacing-16);
-}
-
-.source {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  gap: var(--spacing-16);
-  padding: var(--spacing-20);
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-12);
-  background: var(--ui-canvas);
-  color: var(--ui-ink);
-  text-align: start;
-  cursor: pointer;
-}
-
-.source:hover {
-  background: var(--ui-hover);
-}
-
-.sourceAction {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  align-self: stretch;
-  margin-block-start: var(--spacing-4);
-}
-
-.unconnected {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  gap: var(--spacing-24);
-}
-
-.unconnected .sources {
-  justify-content: start;
-}
-
-.importPrompt {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-  margin-block-start: var(--spacing-8);
-  gap: var(--spacing-8);
-  color: var(--ui-secondary);
-}
-
-.importLink {
-  color: var(--ui-ink);
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.provisioning {
-  display: grid;
-  gap: var(--ui-stack-gap);
-}
-
-.quietActions {
-  display: flex;
-  flex-wrap: wrap;
-  gap: var(--ui-action-gap);
-}
-
-@media (width < 64rem) {
-  .columns {
-    grid-template-columns: minmax(0, 1fr);
-  }
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/directory/directory.module.css b/apps/sim/platform/app/(shell)/people/_components/directory/directory.module.css
deleted file mode 100644
index fa20c43d1fd..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/directory/directory.module.css
+++ /dev/null
@@ -1,45 +0,0 @@
-.directory {
-  /* Everything above and below the table's own scroller, so the page itself stays still. */
-  --ui-table-viewport-offset: calc(
-    var(--shell-home-row-start) +
-    2 *
-    var(--spacing-app-control-md) +
-    2 *
-    var(--spacing-48) +
-    var(--spacing-48)
-  );
-  display: flex;
-  flex-direction: column;
-  gap: var(--spacing-24);
-  padding-inline: var(--ui-page-inline-gutter);
-}
-
-.filters {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: var(--spacing-12);
-}
-
-.search {
-  flex: 0 1 var(--spacing-320);
-  min-inline-size: var(--spacing-192);
-}
-
-.department {
-  flex: 0 1 var(--spacing-192);
-  min-inline-size: var(--spacing-128);
-}
-
-.scope {
-  flex: 1;
-  color: var(--ui-secondary);
-  text-align: end;
-  white-space: nowrap;
-}
-
-@media (width < 48rem) {
-  .scope {
-    display: none;
-  }
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/directory/directory.tsx b/apps/sim/platform/app/(shell)/people/_components/directory/directory.tsx
deleted file mode 100644
index 566842df7bc..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/directory/directory.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-'use client'
-
-import { useMemo } from 'react'
-import styles from '@/platform/app/(shell)/people/_components/directory/directory.module.css'
-import { PeopleStatus } from '@/platform/app/(shell)/people/_components/people-page/people-status'
-import { PersonIdentity } from '@/platform/app/(shell)/people/_components/person-identity/person-identity'
-import {
-  Button,
-  DataTable,
-  EmptyState,
-  FailureNotice,
-  SearchableSelect,
-  SearchField,
-} from '@/platform/design-system/components'
-import { personHref, useDepartmentOptions, usePeopleDirectory } from '@/platform/lib/data/people'
-
-const COLUMNS = [
-  { key: 'person', label: 'Person', kind: 'text', primary: true },
-  { key: 'department', label: 'Department', kind: 'text', showFrom: 'compact' },
-  { key: 'location', label: 'Location', kind: 'text', showFrom: 'wide' },
-  { key: 'manager', label: 'Manager', kind: 'text', showFrom: 'wide' },
-] as const
-
-interface DirectoryCellProps {
-  value: string | null | undefined
-}
-
-function DirectoryCell({ value }: DirectoryCellProps) {
-  return <span data-type='T043'>{value || '—'}</span>
-}
-
-interface PeopleDirectoryProps {
-  organizationId: string
-}
-
-export function PeopleDirectory({ organizationId }: PeopleDirectoryProps) {
-  const directory = usePeopleDirectory(organizationId)
-  const departments = useDepartmentOptions(organizationId, directory.origin)
-  const { originQuery } = directory
-  const rows = useMemo(
-    () =>
-      directory.rows.map((person) => ({
-        id: person.memberId,
-        values: {},
-        cells: {
-          person: <PersonIdentity person={person} />,
-          department: <DirectoryCell value={person.department} />,
-          location: <DirectoryCell value={person.location} />,
-          manager: <DirectoryCell value={person.manager?.name} />,
-        },
-        href: personHref(organizationId, person.memberId, originQuery),
-      })),
-    [directory.rows, organizationId, originQuery]
-  )
-  return (
-    <section className={styles.directory} aria-label='Directory'>
-      <div className={styles.filters}>
-        <div className={styles.search}>
-          <SearchField
-            label='Search people'
-            placeholder='Search name, role, or location'
-            value={directory.search}
-            onValueChange={directory.setSearch}
-          />
-        </div>
-        <div className={styles.department}>
-          <SearchableSelect
-            label='Department'
-            labelHidden
-            searchLabel='Search departments'
-            options={departments.options}
-            value={departments.value}
-            selectedLabel={directory.departmentLabel || 'All departments'}
-            search={departments.search}
-            onOpenChange={departments.onOpenChange}
-            onValueChange={(next) => directory.setDepartment(departments.parse(next))}
-          />
-        </div>
-        <span className={styles.scope} data-type='T050'>
-          People in your organization
-        </span>
-      </div>
-      {directory.loading ? (
-        <PeopleStatus>Loading people…</PeopleStatus>
-      ) : directory.error ? (
-        <FailureNotice
-          title='Could not load people'
-          message={directory.error.message}
-          onRetry={directory.retry}
-        />
-      ) : rows.length === 0 ? (
-        !directory.query && !directory.hasDepartment ? (
-          <EmptyState
-            title='No people to show'
-            description='Organization members and people from a connected directory appear here.'
-          />
-        ) : (
-          <EmptyState
-            title='No people found'
-            description='Try another name, title, email address, or department.'
-            action={<Button onClick={directory.clearFilters}>Clear search</Button>}
-          />
-        )
-      ) : (
-        <DataTable
-          title='People'
-          titleHidden
-          virtualized
-          rowChevron
-          columns={COLUMNS}
-          rows={rows}
-          loadMore={directory.loadMore}
-        />
-      )}
-    </section>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/external-link/external-link.tsx b/apps/sim/platform/app/(shell)/people/_components/external-link/external-link.tsx
deleted file mode 100644
index 6c3268689ed..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/external-link/external-link.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import Link from 'next/link'
-import { Button } from '@/platform/design-system/components'
-
-interface ExternalLinkProps {
-  href: string
-  children: string
-}
-
-export function ExternalLink({ href, children }: ExternalLinkProps) {
-  return (
-    <div>
-      <Button
-        variant='quiet'
-        size='compact'
-        render={<Link href={href} target='_blank' rel='noreferrer' />}
-      >
-        {children}
-      </Button>
-    </div>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/import/import-modal.tsx b/apps/sim/platform/app/(shell)/people/_components/import/import-modal.tsx
deleted file mode 100644
index bc5c26f15fd..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/import/import-modal.tsx
+++ /dev/null
@@ -1,319 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { toast } from '@sim/emcn'
-import { getErrorMessage } from '@sim/utils/errors'
-import Link from 'next/link'
-import { ExternalLink } from '@/platform/app/(shell)/people/_components/external-link/external-link'
-import styles from '@/platform/app/(shell)/people/_components/import/import.module.css'
-import {
-  Button,
-  FileField,
-  InlineNotice,
-  MetricGroup,
-  Modal,
-  SecretField,
-  SelectField,
-  TextField,
-} from '@/platform/design-system/components'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-import {
-  downloadImportTemplate,
-  type ImportBody,
-  isApiConflict,
-  type PeopleImportResult,
-  usePeopleImport,
-  usePeopleViewer,
-  useProvisioningConnection,
-} from '@/platform/lib/data/people'
-import { plural } from '@/platform/lib/plural'
-
-const ACCEPTED_FILES = '.csv,.tsv,.xlsx,.xls'
-
-const SOURCES = {
-  file: { name: 'Spreadsheet', description: 'Upload a CSV or Excel file' },
-  okta: { name: 'Okta', description: 'Read profiles from your Okta directory' },
-  entra: { name: 'Microsoft Entra ID', description: 'Read profiles from Microsoft Graph' },
-  directory: {
-    name: 'SCIM provisioning',
-    description: 'Use directory data already provisioned to Sim',
-  },
-} as const
-
-type ImportSource = keyof typeof SOURCES
-
-const TOKEN_SOURCES = {
-  okta: {
-    instructions: 'Use an Okta API token that can read users in your organization.',
-    tokenLabel: 'API token',
-    tokenPlaceholder: 'Paste your token without SSWS',
-    helpHref: 'https://developer.okta.com/docs/guides/create-an-api-token/main/',
-    helpLabel: 'Create an Okta API token',
-  },
-  entra: {
-    instructions:
-      'In Graph Explorer, sign in with your work or school account, grant delegated User.Read.All permission, and copy your access token. Microsoft commercial cloud is supported.',
-    tokenLabel: 'Access token',
-    tokenPlaceholder: 'Paste your token without Bearer',
-    helpHref: 'https://developer.microsoft.com/en-us/graph/graph-explorer',
-    helpLabel: 'Open Graph Explorer',
-  },
-} as const
-
-interface IssueListProps {
-  result: PeopleImportResult
-  spreadsheet: boolean
-}
-
-function IssueList({ result, spreadsheet }: IssueListProps) {
-  const unlisted = result.skipped + result.warnings - result.issues.length
-  const issueEdges = useScrollEdges<HTMLUListElement>()
-  return (
-    <section className={styles.attention} aria-labelledby='import-attention'>
-      <h3 id='import-attention' className={styles.attentionTitle} data-type='T042'>
-        {`${plural(result.skipped + result.warnings, 'row')} need${result.skipped + result.warnings === 1 ? 's' : ''} attention`}
-      </h3>
-      <ul ref={issueEdges} className={styles.issues} data-type='T060'>
-        {result.issues.map((issue) => (
-          <li key={`${issue.row}-${issue.message}`} className={styles.issue}>
-            {spreadsheet && <span className={styles.secondary}>Row {issue.row}</span>}
-            <span className={styles.issueMessage}>
-              {issue.email ? `${issue.email}: ` : ''}
-              {issue.message}
-            </span>
-            <span className={styles.secondary}>
-              {issue.severity === 'skipped' ? 'Skipped' : 'Warning'}
-            </span>
-          </li>
-        ))}
-        {unlisted > 0 && <li className={styles.secondary}>and {plural(unlisted, 'more issue')}</li>}
-      </ul>
-    </section>
-  )
-}
-
-interface ImportModalProps {
-  organizationId: string
-  onClose: () => void
-  onOpenSync: () => void
-}
-
-/**
- * One-time import: choose a source, preview, then apply exactly what was previewed. A directory
- * that moved after its preview answers 409 and returns here for a new one. Tokens stay in this
- * component's state and reach the request through the mutation that keeps them out of the cache.
- */
-export function ImportModal({ organizationId, onClose, onOpenSync }: ImportModalProps) {
-  const { canProvision, canOpenProvisioningSettings, provisioningSettingsHref } = usePeopleViewer()
-  const importPeople = usePeopleImport(organizationId)
-  const [source, setSource] = useState<ImportSource>('file')
-  const connection = useProvisioningConnection(organizationId, source === 'directory')
-  const [domain, setDomain] = useState('')
-  const [token, setToken] = useState('')
-  const [sheet, setSheet] = useState<Awaited<ReturnType<typeof importPeople.readSheet>> | null>(
-    null
-  )
-  const [reading, setReading] = useState(false)
-  const [fileError, setFileError] = useState<string | undefined>()
-  const [preview, setPreview] = useState<PeopleImportResult | null>(null)
-  const pending = reading || importPeople.pending
-  const done = preview?.updated === 0
-  const spreadsheet = source === 'file'
-  const ready = spreadsheet
-    ? Boolean(sheet)
-    : source === 'directory'
-      ? connection.ready && connection.userCount > 0
-      : Boolean(token.trim() && (source !== 'okta' || domain.trim()))
-
-  function requestBody(apply: boolean): ImportBody | null {
-    const previewDigest = apply ? preview?.previewDigest : undefined
-    if (source === 'file') return sheet ? { headers: sheet.headers, rows: sheet.rows, apply } : null
-    if (source === 'okta')
-      return { source, domain: domain.trim(), token: token.trim(), apply, previewDigest }
-    if (source === 'entra') return { source, token: token.trim(), apply, previewDigest }
-    return { source, apply, previewDigest }
-  }
-
-  async function chooseFile(file: File) {
-    setFileError(undefined)
-    setReading(true)
-    setSheet(null)
-    try {
-      const selected = await importPeople.readSheet(file)
-      setSheet(selected)
-      setPreview(
-        await importPeople.submit({ headers: selected.headers, rows: selected.rows, apply: false })
-      )
-    } catch (error) {
-      setFileError(getErrorMessage(error, 'Could not import people data'))
-    } finally {
-      setReading(false)
-    }
-  }
-
-  return (
-    <Modal
-      open
-      onOpenChange={onClose}
-      title={preview ? 'Review profile import' : 'Import profiles'}
-      confirmLabel={
-        done ? 'Done' : preview ? `Import ${plural(preview.updated, 'profile')}` : 'Preview import'
-      }
-      confirmDisabled={pending || (!preview && !ready)}
-      onBack={preview ? () => setPreview(null) : undefined}
-      onConfirm={
-        done
-          ? undefined
-          : async () => {
-              const body = requestBody(Boolean(preview))
-              if (!body) return
-              try {
-                const result = await importPeople.submit(body)
-                if (preview) {
-                  toast.success(`Updated ${plural(result.updated, 'profile')}`)
-                  return
-                }
-                setPreview(result)
-                return false
-              } catch (error) {
-                if (!spreadsheet && preview && isApiConflict(error)) setPreview(null)
-                throw error
-              }
-            }
-      }
-    >
-      {preview ? (
-        <>
-          <p className={styles.secondary} data-type='T060'>
-            {spreadsheet
-              ? `${sheet?.fileName} updates profiles for existing organization members. It does not create accounts or an ongoing connection.`
-              : `${SOURCES[source].name} updates profiles for existing organization members. If the directory changes, you’ll be asked to preview it again.`}
-          </p>
-          <MetricGroup
-            metrics={[
-              { label: 'To update', value: preview.updated },
-              { label: 'Unchanged', value: preview.unchanged },
-              { label: 'Skipped', value: preview.skipped },
-            ]}
-          />
-          {preview.issues.length > 0 && <IssueList result={preview} spreadsheet={spreadsheet} />}
-          {spreadsheet && (
-            <p className={styles.secondary} data-type='T060'>
-              To include people without Sim accounts and keep profiles current, connect Okta or
-              Microsoft Entra ID through{' '}
-              <button type='button' className={styles.inlineLink} onClick={onOpenSync}>
-                Directory sync
-              </button>
-              .
-            </p>
-          )}
-        </>
-      ) : (
-        <>
-          <SelectField
-            label='Source'
-            options={(Object.keys(SOURCES) as ImportSource[])
-              .filter((key) => key !== 'directory' || canProvision)
-              .map((key) => ({ value: key, label: SOURCES[key].name }))}
-            value={source}
-            hint={SOURCES[source].description}
-            disabled={pending}
-            onValueChange={(next) => {
-              setSource(next as ImportSource)
-              setToken('')
-            }}
-          />
-          {(source === 'okta' || source === 'entra') && (
-            <>
-              <p className={styles.secondary} data-type='T060'>
-                {TOKEN_SOURCES[source].instructions} Sim uses the token for this import only.
-              </p>
-              {source === 'okta' && (
-                <TextField
-                  label='Okta domain'
-                  placeholder='company.okta.com'
-                  autoComplete='off'
-                  value={domain}
-                  disabled={pending}
-                  onChange={setDomain}
-                />
-              )}
-              <SecretField
-                label={TOKEN_SOURCES[source].tokenLabel}
-                placeholder={TOKEN_SOURCES[source].tokenPlaceholder}
-                value={token}
-                disabled={pending}
-                onChange={setToken}
-              />
-              <ExternalLink href={TOKEN_SOURCES[source].helpHref}>
-                {TOKEN_SOURCES[source].helpLabel}
-              </ExternalLink>
-            </>
-          )}
-          {source === 'directory' && (
-            <>
-              <p className={styles.secondary} data-type='T060'>
-                {connection.loading
-                  ? 'Checking your provisioning connection…'
-                  : connection.failed
-                    ? 'Could not load your provisioning connection.'
-                    : !connection.active
-                      ? 'Enable SCIM provisioning and assign accounts in your provider to import their profiles.'
-                      : connection.userCount === 0
-                        ? 'Your connection is active. Assign accounts to Sim in your identity provider, then refresh here.'
-                        : `Your connection has ${plural(connection.userCount, 'provisioned account')}. Preview the profile fields and reporting lines sent by your provider.`}
-              </p>
-              {!connection.loading && (
-                <div className={styles.links}>
-                  {canOpenProvisioningSettings && !connection.failed && (
-                    <Button
-                      variant='quiet'
-                      size='compact'
-                      render={<Link href={provisioningSettingsHref} />}
-                    >
-                      {connection.active ? 'Manage provisioning' : 'Set up provisioning'}
-                    </Button>
-                  )}
-                  {!connection.active && (
-                    <ExternalLink href='https://docs.sim.ai/platform/enterprise/scim'>
-                      Provisioning guide
-                    </ExternalLink>
-                  )}
-                  <Button
-                    variant='quiet'
-                    size='compact'
-                    disabled={connection.fetching}
-                    onClick={connection.refresh}
-                  >
-                    {connection.failed ? 'Retry connection' : 'Refresh'}
-                  </Button>
-                </div>
-              )}
-            </>
-          )}
-          {source === 'file' && (
-            <>
-              <FileField
-                label='File'
-                accept={ACCEPTED_FILES}
-                prompt='Drop a file here or click to browse'
-                selection={sheet ? { name: sheet.fileName } : undefined}
-                onClear={() => setSheet(null)}
-                onFileChange={(file) => void chooseFile(file)}
-                disabled={pending}
-                error={fileError}
-                hint='CSV or Excel with an email column, plus any of title, department, location, start date, and manager email.'
-              />
-              {reading && <InlineNotice message='Reading…' />}
-              <div>
-                <Button variant='quiet' size='compact' onClick={downloadImportTemplate}>
-                  Download template
-                </Button>
-              </div>
-            </>
-          )}
-        </>
-      )}
-    </Modal>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/import/import.module.css b/apps/sim/platform/app/(shell)/people/_components/import/import.module.css
deleted file mode 100644
index d3fd69ccc23..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/import/import.module.css
+++ /dev/null
@@ -1,44 +0,0 @@
-.secondary {
-  color: var(--ui-secondary);
-}
-
-.links {
-  display: flex;
-  flex-wrap: wrap;
-  gap: var(--ui-action-gap);
-}
-
-.attention {
-  display: grid;
-  gap: var(--spacing-8);
-}
-
-.attentionTitle {
-  color: var(--status-warning);
-}
-
-.issues {
-  display: grid;
-  gap: var(--spacing-8);
-  max-block-size: var(--spacing-192);
-  overflow-y: auto;
-  overflow-wrap: anywhere;
-}
-
-.issue {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: baseline;
-  gap: var(--spacing-4) var(--spacing-12);
-}
-
-.issueMessage {
-  flex: 1;
-  min-inline-size: var(--spacing-128);
-}
-
-.inlineLink {
-  color: var(--ui-ink);
-  text-decoration: underline;
-  cursor: pointer;
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/org-chart/chart-canvas.tsx b/apps/sim/platform/app/(shell)/people/_components/org-chart/chart-canvas.tsx
deleted file mode 100644
index 62bb3a46fdb..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/org-chart/chart-canvas.tsx
+++ /dev/null
@@ -1,295 +0,0 @@
-'use client'
-
-import { type MouseEvent, type ReactNode, useMemo } from 'react'
-import {
-  BaseEdge,
-  type Edge,
-  type EdgeProps,
-  Handle,
-  type Node,
-  type NodeProps,
-  Position,
-  ReactFlow,
-  ReactFlowProvider,
-  useReactFlow,
-  useStore,
-} from '@xyflow/react'
-import Link from 'next/link'
-import styles from '@/platform/app/(shell)/people/_components/org-chart/org-chart.module.css'
-import { Avatar, Icon, IconButton, OverflowText } from '@/platform/design-system/components'
-import { type ChartBranch, type PersonSummary, personHref } from '@/platform/lib/data/people'
-import { plural } from '@/platform/lib/plural'
-
-import '@xyflow/react/dist/style.css'
-
-type ChartFocus = (memberId: string, event: MouseEvent<HTMLButtonElement>) => void
-
-interface PersonCardData extends Record<string, unknown> {
-  person: PersonSummary
-  footer: string
-  focused: boolean
-  compact: boolean
-  hasManagerLine: boolean
-  hasReportLine: boolean
-  profileHref: string
-  onFocus: ChartFocus
-}
-
-type PersonCardNode = Node<PersonCardData, 'person'>
-
-const CARD_WIDTH = 224
-const CARD_HEIGHT = 184
-const COMPACT_WIDTH = 310
-const COMPACT_HEIGHT = 76
-const COLUMN_STEP = 240
-const MANAGER_GAP = 32
-const REPORT_GAP = 52
-const REPORT_BUS_DROP = 28
-const LINE_RADIUS = 8
-const MIN_ZOOM = 0.35
-const MAX_ZOOM = 1.6
-const FIT = { padding: 0.08, minZoom: 0.45, maxZoom: 1 }
-
-function PersonCard({ data }: NodeProps<PersonCardNode>) {
-  const { person, footer, focused, compact, hasManagerLine, hasReportLine } = data
-  const copy = (
-    <span className={styles.names}>
-      <span data-type='T042'>
-        <OverflowText text={person.name}>{person.name}</OverflowText>
-      </span>
-      <span className={styles.secondary} data-type={compact ? 'T050' : 'T043'}>
-        <OverflowText text={person.title || person.email}>
-          {person.title || person.email}
-        </OverflowText>
-      </span>
-    </span>
-  )
-  const lines = (
-    <>
-      {hasManagerLine && <Handle type='target' position={Position.Top} className={styles.port} />}
-      {hasReportLine && <Handle type='source' position={Position.Bottom} className={styles.port} />}
-    </>
-  )
-  const explore = {
-    type: 'button',
-    'aria-label': `Explore ${person.name}`,
-    onClick: (event: MouseEvent<HTMLButtonElement>) => data.onFocus(person.memberId, event),
-  } as const
-  if (compact)
-    return (
-      <>
-        {lines}
-        <button {...explore} className={`${styles.compactCard} nodrag nopan`}>
-          <Avatar name={person.name} src={person.image ?? undefined} size='row' />
-          {copy}
-          <Icon name='I032' />
-        </button>
-      </>
-    )
-  const body = (
-    <>
-      <Avatar name={person.name} src={person.image ?? undefined} size='card' />
-      {copy}
-    </>
-  )
-  return (
-    <div className={styles.card} data-focused={focused || undefined}>
-      {lines}
-      {focused ? (
-        <div className={styles.cardBody}>{body}</div>
-      ) : (
-        <button {...explore} className={`${styles.cardBody} nodrag nopan`}>
-          {body}
-        </button>
-      )}
-      <div className={styles.cardFooter} data-type='T050'>
-        <span className={styles.cardMeta}>
-          <Icon name='I133' />
-          {footer}
-        </span>
-        <Link
-          href={data.profileHref}
-          prefetch={false}
-          className={`${styles.profileLink} nodrag nopan`}
-          aria-label={`View profile for ${person.name}`}
-        >
-          Profile
-          <Icon name='I032' />
-        </Link>
-      </div>
-    </div>
-  )
-}
-
-function ReportingLine({ sourceX, sourceY, targetX, targetY }: EdgeProps) {
-  const direction = Math.sign(targetX - sourceX)
-  const busY = sourceY + REPORT_BUS_DROP
-  const path =
-    direction === 0
-      ? `M ${sourceX} ${sourceY} V ${targetY}`
-      : `M ${sourceX} ${sourceY} V ${busY - LINE_RADIUS} Q ${sourceX} ${busY} ${sourceX + direction * LINE_RADIUS} ${busY} H ${targetX - direction * LINE_RADIUS} Q ${targetX} ${busY} ${targetX} ${busY + LINE_RADIUS} V ${targetY}`
-  return <BaseEdge path={path} interactionWidth={0} />
-}
-
-const NODE_TYPES = { person: PersonCard }
-const EDGE_TYPES = { reporting: ReportingLine }
-
-interface ChartControlsProps {
-  compact: boolean
-}
-
-function ChartControls({ compact }: ChartControlsProps) {
-  const { zoomIn, zoomOut, fitView } = useReactFlow()
-  const zoom = useStore((state) => state.transform[2])
-  return (
-    <div className={styles.controls} data-material='floating' data-elevation='control'>
-      {!compact && (
-        <>
-          <IconButton
-            label='Zoom out'
-            icon='I134'
-            disabled={zoom <= MIN_ZOOM}
-            onClick={() => void zoomOut()}
-          />
-          <span className={styles.zoomLevel} data-type='T005'>
-            {Math.round(zoom * 100)}%
-          </span>
-          <IconButton
-            label='Zoom in'
-            icon='I074'
-            disabled={zoom >= MAX_ZOOM}
-            onClick={() => void zoomIn()}
-          />
-          <span className={styles.controlsRule} aria-hidden='true' />
-        </>
-      )}
-      <IconButton label='Fit chart' icon='I060' onClick={() => void fitView(FIT)} />
-    </div>
-  )
-}
-
-function chartGraph(
-  { person, chain, reports, totalReports }: ChartBranch,
-  organizationId: string,
-  profileQuery: string,
-  compact: boolean,
-  onFocus: ChartFocus
-) {
-  const nodes: PersonCardNode[] = []
-  const edges: Edge[] = []
-  const add = (
-    member: PersonSummary,
-    footer: string,
-    x: number,
-    y: number,
-    lines: Pick<PersonCardData, 'focused' | 'compact' | 'hasManagerLine' | 'hasReportLine'>
-  ) => {
-    const width = lines.compact ? COMPACT_WIDTH : CARD_WIDTH
-    nodes.push({
-      id: member.memberId,
-      type: 'person',
-      position: { x: x - width / 2, y },
-      width,
-      height: lines.compact ? COMPACT_HEIGHT : CARD_HEIGHT,
-      data: {
-        person: member,
-        footer,
-        ...lines,
-        profileHref: personHref(organizationId, member.memberId, profileQuery),
-        onFocus,
-      },
-    })
-  }
-  const connect = (source: string, target: string) =>
-    edges.push({ id: `${source}/${target}`, source, target, type: 'reporting' })
-
-  const [manager] = chain
-  if (manager) {
-    const height = compact ? COMPACT_HEIGHT : CARD_HEIGHT
-    add(manager, 'Manager', 0, -(height + MANAGER_GAP), {
-      focused: false,
-      compact,
-      hasManagerLine: false,
-      hasReportLine: true,
-    })
-    connect(manager.memberId, person.memberId)
-  }
-  add(person, totalReports ? plural(totalReports, 'report') : 'No reports', 0, 0, {
-    focused: true,
-    compact: false,
-    hasManagerLine: Boolean(manager),
-    hasReportLine: reports.length > 0,
-  })
-  reports.forEach((report, index) => {
-    add(
-      report,
-      report.reportCount ? plural(report.reportCount, 'report') : 'No reports',
-      (index - (reports.length - 1) / 2) * COLUMN_STEP,
-      CARD_HEIGHT + REPORT_GAP,
-      { focused: false, compact: false, hasManagerLine: true, hasReportLine: false }
-    )
-    connect(person.memberId, report.memberId)
-  })
-  return { nodes, edges }
-}
-
-interface ChartCanvasProps {
-  organizationId: string
-  branch: ChartBranch
-  profileQuery: string
-  compact: boolean
-  onFocus: ChartFocus
-  /** The report pager, between the canvas and its controls. */
-  pager?: ReactNode
-}
-
-/**
- * The manager, the person in focus and a page of their reports, on a canvas a viewer can pan and
- * zoom. Remount it per branch: the first fit is what centers each new set of cards.
- */
-export function ChartCanvas({
-  organizationId,
-  branch,
-  profileQuery,
-  compact,
-  onFocus,
-  pager,
-}: ChartCanvasProps) {
-  const { nodes, edges } = useMemo(
-    () => chartGraph(branch, organizationId, profileQuery, compact, onFocus),
-    [branch, organizationId, profileQuery, compact, onFocus]
-  )
-  return (
-    <ReactFlowProvider>
-      <div className={styles.canvas}>
-        <div className={styles.flowFrame}>
-          <ReactFlow
-            className={styles.flow}
-            aria-label='Organization chart'
-            nodes={nodes}
-            edges={edges}
-            nodeTypes={NODE_TYPES}
-            edgeTypes={EDGE_TYPES}
-            proOptions={{ hideAttribution: true }}
-            minZoom={MIN_ZOOM}
-            maxZoom={MAX_ZOOM}
-            fitView
-            fitViewOptions={FIT}
-            panOnScroll
-            nodesDraggable={false}
-            nodesConnectable={false}
-            elementsSelectable={false}
-            nodesFocusable={false}
-            edgesFocusable={false}
-            zoomOnDoubleClick={false}
-            deleteKeyCode={null}
-          />
-        </div>
-      </div>
-      <div className={styles.footer}>
-        {pager}
-        <ChartControls compact={compact} />
-      </div>
-    </ReactFlowProvider>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/org-chart/chart-empty-state.tsx b/apps/sim/platform/app/(shell)/people/_components/org-chart/chart-empty-state.tsx
deleted file mode 100644
index d8f4b6ba9f8..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/org-chart/chart-empty-state.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import type { MouseEvent, RefCallback } from 'react'
-import Link from 'next/link'
-import { Button, EmptyState } from '@/platform/design-system/components'
-import { type PersonSummary, personHref, useChartRoots } from '@/platform/lib/data/people'
-
-interface ChartEmptyStateProps {
-  organizationId: string
-  person: PersonSummary
-  profileQuery: string
-  onFocus: (memberId: string, event: MouseEvent<HTMLButtonElement>) => void
-  onBrowseDirectory: () => void
-  currentPersonRef: RefCallback<HTMLElement>
-  /** Present for an administrator, whose connection is what a first chart waits on. */
-  onSync?: () => void
-}
-
-export function ChartEmptyState({
-  organizationId,
-  person,
-  profileQuery,
-  onFocus,
-  onBrowseDirectory,
-  currentPersonRef,
-  onSync,
-}: ChartEmptyStateProps) {
-  const { firstTeam, emptyOrganization } = useChartRoots(organizationId)
-  if (emptyOrganization)
-    return (
-      <EmptyState
-        title='Reporting lines aren’t available yet'
-        description={
-          onSync
-            ? 'Your chart appears once your directory’s first sync finishes. You can still browse people in the directory.'
-            : 'You can still browse people in the directory. An organization admin can connect your directory or add reporting lines.'
-        }
-        action={
-          <>
-            <Button onClick={onBrowseDirectory}>Browse directory</Button>
-            {onSync && <Button onClick={onSync}>Directory sync</Button>}
-          </>
-        }
-      />
-    )
-  return (
-    <EmptyState
-      title={`No reporting lines for ${person.name}`}
-      description='This person is still part of your organization. Their reporting line appears when it is provided.'
-      action={
-        <>
-          {firstTeam && (
-            <Button variant='primary' onClick={(event) => onFocus(firstTeam.memberId, event)}>
-              Explore a team
-            </Button>
-          )}
-          <Button
-            render={
-              <Link
-                ref={currentPersonRef}
-                href={personHref(organizationId, person.memberId, profileQuery)}
-              />
-            }
-          >
-            View profile
-          </Button>
-        </>
-      }
-    />
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/org-chart/org-chart.module.css b/apps/sim/platform/app/(shell)/people/_components/org-chart/org-chart.module.css
deleted file mode 100644
index f9e51661c72..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/org-chart/org-chart.module.css
+++ /dev/null
@@ -1,272 +0,0 @@
-.chart {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  min-block-size: 0;
-  gap: var(--spacing-12);
-}
-
-.toolbar {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: var(--spacing-8) var(--spacing-16);
-  padding-inline: var(--ui-page-inline-gutter);
-}
-
-.search {
-  flex: 0 1 calc(var(--spacing-320) - var(--spacing-32));
-  min-inline-size: var(--spacing-128);
-}
-
-.pathNav {
-  flex: 1;
-  min-inline-size: 0;
-}
-
-.path {
-  display: flex;
-  align-items: center;
-  gap: var(--spacing-4);
-  overflow-x: auto;
-  scrollbar-width: none;
-  white-space: nowrap;
-  color: var(--ui-secondary);
-}
-
-.crumb {
-  flex: none;
-  padding-inline: var(--spacing-4);
-  border-radius: var(--ui-control-radius);
-  cursor: pointer;
-}
-
-.crumb:hover {
-  color: var(--ui-ink);
-}
-
-.current {
-  flex: none;
-  padding-inline: var(--spacing-4);
-  color: var(--ui-ink);
-}
-
-.canvas {
-  position: relative;
-  flex: 1;
-  min-block-size: calc(var(--spacing-320) + 2 * var(--spacing-80));
-}
-
-.flowFrame {
-  position: absolute;
-  inset: 0;
-}
-
-.flow {
-  --xy-background-color: transparent;
-  --xy-edge-stroke: var(--ui-border);
-}
-
-.port {
-  visibility: hidden;
-  inline-size: 0;
-  min-inline-size: 0;
-  block-size: 0;
-  min-block-size: 0;
-  border: 0;
-}
-
-.card,
-.compactCard {
-  position: relative;
-  block-size: 100%;
-  inline-size: 100%;
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-12);
-  background: var(--ui-canvas);
-  color: var(--ui-ink);
-  pointer-events: auto;
-}
-
-.card {
-  display: flex;
-  flex-direction: column;
-}
-
-button.cardBody:hover,
-.compactCard:hover {
-  background: var(--ui-hover);
-}
-
-.card[data-focused] {
-  border-color: var(--status-info);
-  box-shadow: 0 0 0 var(--spacing-stroke-focus) var(--status-info-soft);
-}
-
-.compactCard {
-  display: flex;
-  align-items: center;
-  gap: var(--spacing-12);
-  padding-inline: var(--spacing-16);
-  text-align: start;
-  cursor: pointer;
-}
-
-.cardBody {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  gap: var(--spacing-16);
-  min-block-size: 0;
-  padding: var(--spacing-20);
-  text-align: start;
-}
-
-button.cardBody {
-  border-start-start-radius: inherit;
-  border-start-end-radius: inherit;
-  cursor: pointer;
-}
-
-.names {
-  display: grid;
-  flex: 1;
-  grid-template-columns: minmax(0, 1fr);
-  min-inline-size: 0;
-  gap: var(--spacing-4);
-}
-
-.secondary {
-  color: var(--ui-secondary);
-}
-
-.cardFooter {
-  position: relative;
-  display: flex;
-  flex: none;
-  align-items: center;
-  justify-content: space-between;
-  min-block-size: var(--spacing-40);
-  padding-inline: var(--spacing-20);
-  border-block-start: var(--spacing-stroke-default) solid var(--ui-divider);
-  color: var(--ui-secondary);
-}
-
-.cardMeta,
-.profileLink {
-  display: inline-flex;
-  align-items: center;
-  gap: var(--spacing-8);
-  min-inline-size: 0;
-}
-
-.profileLink {
-  gap: var(--spacing-4);
-  color: var(--ui-ink);
-  border-radius: var(--ui-control-radius);
-}
-
-.profileLink:hover {
-  text-decoration: underline;
-}
-
-.footer {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
-  align-items: center;
-  min-block-size: var(--spacing-app-control-md);
-  gap: var(--spacing-8);
-  padding: var(--spacing-8) var(--ui-page-inline-gutter) var(--spacing-16);
-}
-
-.pager {
-  grid-column: 2;
-  display: flex;
-  align-items: center;
-  gap: var(--spacing-8);
-  color: var(--ui-secondary);
-  font-variant-numeric: tabular-nums;
-}
-
-.pagerLabel {
-  white-space: nowrap;
-}
-
-.controls {
-  grid-column: 3;
-  display: inline-flex;
-  align-items: center;
-  justify-self: end;
-  gap: var(--spacing-4);
-  padding: var(--spacing-4);
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--ui-control-radius);
-}
-
-.zoomLevel {
-  min-inline-size: var(--spacing-40);
-  text-align: center;
-  font-variant-numeric: tabular-nums;
-}
-
-.controlsRule {
-  block-size: var(--spacing-16);
-  border-inline-start: var(--spacing-stroke-default) solid var(--ui-border);
-}
-
-.inset {
-  padding-inline: var(--ui-page-inline-gutter);
-}
-
-.firstUse {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  align-items: center;
-  padding: calc(var(--spacing-96) - var(--spacing-20)) var(--ui-page-inline-gutter);
-  gap: var(--spacing-24);
-  text-align: center;
-}
-
-.firstUseHeading {
-  display: grid;
-  justify-items: center;
-  gap: var(--spacing-12);
-  margin-block-end: var(--spacing-8);
-}
-
-.firstUseCopy {
-  max-inline-size: var(--container-app-panel-start);
-  color: var(--ui-secondary);
-  text-wrap: balance;
-}
-
-.graphic {
-  inline-size: calc(var(--spacing-96) + var(--spacing-16));
-  fill: none;
-  stroke: var(--ui-border);
-  stroke-width: var(--spacing-stroke-default);
-}
-
-.graphic [data-root] {
-  fill: var(--ui-hover);
-}
-
-@media (width < 48rem) {
-  .search {
-    flex-basis: 100%;
-  }
-
-  .position {
-    order: 1;
-  }
-
-  .pathNav {
-    flex-basis: 100%;
-    order: 2;
-  }
-
-  .canvas {
-    min-block-size: calc(var(--spacing-320) + var(--spacing-80));
-  }
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/org-chart/org-chart.tsx b/apps/sim/platform/app/(shell)/people/_components/org-chart/org-chart.tsx
deleted file mode 100644
index 7469cbbfd82..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/org-chart/org-chart.tsx
+++ /dev/null
@@ -1,315 +0,0 @@
-'use client'
-
-import { Fragment, type MouseEvent, useCallback, useLayoutEffect, useMemo, useRef } from 'react'
-import {
-  DirectorySources,
-  ImportPrompt,
-} from '@/platform/app/(shell)/people/_components/directory-sync/directory-sources'
-import { ChartCanvas } from '@/platform/app/(shell)/people/_components/org-chart/chart-canvas'
-import { ChartEmptyState } from '@/platform/app/(shell)/people/_components/org-chart/chart-empty-state'
-import styles from '@/platform/app/(shell)/people/_components/org-chart/org-chart.module.css'
-import { PeopleStatus } from '@/platform/app/(shell)/people/_components/people-page/people-status'
-import { ProfileUnavailable } from '@/platform/app/(shell)/people/_components/people-page/profile-unavailable'
-import {
-  Avatar,
-  Button,
-  FailureNotice,
-  Icon,
-  IconButton,
-  SearchableSelect,
-  SearchCombobox,
-} from '@/platform/design-system/components'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-import {
-  isRefusal,
-  type SyncSource,
-  useOrgChart,
-  usePeoplePicker,
-  usePeopleViewer,
-} from '@/platform/lib/data/people'
-
-function ReportingLinesGraphic() {
-  return (
-    <svg className={styles.graphic} viewBox='0 0 112 72' role='img' aria-label='Reporting lines'>
-      <path d='M56 24v16M16 48v-2a6 6 0 0 1 6-6h68a6 6 0 0 1 6 6v2' />
-      <rect x='40' y='0.5' width='32' height='24' rx='6' data-root='true' />
-      <rect x='0.5' y='48' width='32' height='23.5' rx='6' />
-      <rect x='79.5' y='48' width='32' height='23.5' rx='6' />
-    </svg>
-  )
-}
-
-interface FindPersonProps {
-  organizationId: string
-  onSelect: (memberId: string) => void
-}
-
-function FindPerson({ organizationId, onSelect }: FindPersonProps) {
-  const picker = usePeoplePicker(organizationId)
-  const options = useMemo(
-    () =>
-      picker.people.map((person) => ({
-        value: person.memberId,
-        label: person.name,
-        leading: <Avatar name={person.name} src={person.image ?? undefined} size='row' />,
-        details: [person.title || person.email, person.department].filter(
-          (detail): detail is string => Boolean(detail)
-        ),
-      })),
-    [picker.people]
-  )
-  return (
-    <SearchCombobox
-      label='Find a person'
-      placeholder='Find a person'
-      heading='People'
-      emptyLabel='No people found'
-      enterHint='Enter to view in chart'
-      options={options}
-      search={picker.search}
-      onOpenChange={picker.onOpenChange}
-      onSelect={onSelect}
-    />
-  )
-}
-
-interface BrowseTeamsProps {
-  organizationId: string
-  organizationName: string
-  onSelect: (memberId: string) => void
-}
-
-function BrowseTeams({ organizationId, organizationName, onSelect }: BrowseTeamsProps) {
-  const picker = usePeoplePicker(organizationId, 'roots')
-  return (
-    <SearchableSelect
-      label='Browse top-level teams'
-      labelHidden
-      variant='text'
-      searchLabel='Search team leads'
-      placeholder={organizationName}
-      options={picker.options}
-      value={null}
-      search={picker.search}
-      onOpenChange={picker.onOpenChange}
-      onValueChange={(next) => {
-        if (next) onSelect(next)
-      }}
-    />
-  )
-}
-
-type FocusTarget = 'person' | 'previous' | 'next'
-
-interface OrgChartProps {
-  organizationId: string
-  /** An administrator with no reporting lines and no connection: the chart offers to start one. */
-  firstUse: boolean
-  onConnect: (source: SyncSource) => void
-  onImport: () => void
-  onSync?: () => void
-}
-
-export function OrgChart({ organizationId, firstUse, onConnect, onImport, onSync }: OrgChartProps) {
-  const { organizationName, canProvision } = usePeopleViewer()
-  const chart = useOrgChart(organizationId)
-  const { branch, focus, page, size, compact, setView, profileQuery } = chart
-  const pathEdges = useScrollEdges<HTMLDivElement>('horizontal')
-  const currentPerson = useRef<HTMLElement | null>(null)
-  const previousReports = useRef<HTMLSpanElement>(null)
-  const nextReports = useRef<HTMLSpanElement>(null)
-  const pendingFocus = useRef<{
-    focus: string
-    page: number
-    trigger: HTMLElement
-    target: FocusTarget
-  } | null>(null)
-  const focusPerson = useCallback(
-    (id: string, event?: MouseEvent<HTMLButtonElement>) => {
-      // `detail === 0` is a keyboard click: focus follows the navigation instead of being lost.
-      pendingFocus.current =
-        event?.detail === 0
-          ? { focus: id, page: 1, trigger: event.currentTarget, target: 'person' }
-          : null
-      void setView({ focus: id, page: 1, view: 'chart' }, { history: 'push' })
-    },
-    [setView]
-  )
-  const changePage = (
-    value: number,
-    target: 'previous' | 'next',
-    event: MouseEvent<HTMLButtonElement>
-  ) => {
-    pendingFocus.current =
-      event.detail === 0 ? { focus, page: value, trigger: event.currentTarget, target } : null
-    void setView({ page: value })
-  }
-  useLayoutEffect(() => {
-    const pending = pendingFocus.current
-    if (!branch || !pending || pending.focus !== focus || pending.page !== page) return
-    pendingFocus.current = null
-    const active = document.activeElement
-    if (active !== document.body && active !== pending.trigger) return
-    const pagers = [previousReports.current, nextReports.current].map((slot) =>
-      slot?.querySelector('button')
-    )
-    const controls = pending.target === 'next' ? pagers.reverse() : pagers
-    const target =
-      pending.target === 'person'
-        ? currentPerson.current
-        : (controls.find((button) => button && !button.disabled) ?? currentPerson.current)
-    target?.focus()
-  }, [branch, focus, page])
-  const setCurrentPerson = useCallback((element: HTMLElement | null) => {
-    currentPerson.current = element
-  }, [])
-  const browseDirectory = () => void setView({ view: 'directory' }, { history: 'push' })
-  const noLines = branch && !branch.chain.length && !branch.totalReports
-
-  if (noLines && firstUse)
-    return (
-      <section className={styles.firstUse} aria-label='Org chart'>
-        <ReportingLinesGraphic />
-        <div className={styles.firstUseHeading}>
-          <h2 data-type='T076'>Bring your organization into view</h2>
-          <p className={styles.firstUseCopy} data-type='T043'>
-            Connect your identity provider to keep people and reporting lines current, including
-            people who haven’t joined Sim.
-          </p>
-        </div>
-        <DirectorySources canProvision={canProvision} onConnect={onConnect} />
-        <ImportPrompt onImport={onImport} />
-        <p className={styles.secondary} data-type='T050'>
-          You can also edit an existing member’s profile to add their manager.
-        </p>
-      </section>
-    )
-
-  return (
-    <section className={styles.chart} aria-label='Org chart'>
-      <div className={styles.toolbar}>
-        <div className={styles.search}>
-          <FindPerson organizationId={organizationId} onSelect={focusPerson} />
-        </div>
-        {branch && !noLines && (
-          <nav aria-label='Reporting path' className={styles.pathNav}>
-            <div ref={pathEdges} className={styles.path}>
-              <BrowseTeams
-                organizationId={organizationId}
-                organizationName={organizationName}
-                onSelect={focusPerson}
-              />
-              {branch.chain
-                .slice()
-                .reverse()
-                .map((manager) => (
-                  <Fragment key={manager.memberId}>
-                    <Icon name='I032' />
-                    <button
-                      type='button'
-                      className={styles.crumb}
-                      data-type='T043'
-                      onClick={(event) => focusPerson(manager.memberId, event)}
-                    >
-                      {manager.name}
-                    </button>
-                  </Fragment>
-                ))}
-              <Icon name='I032' />
-              <h2
-                ref={setCurrentPerson}
-                className={styles.current}
-                tabIndex={-1}
-                aria-current='page'
-                data-type='T043'
-              >
-                {branch.person.name}
-              </h2>
-            </div>
-          </nav>
-        )}
-        <div className={styles.position}>
-          <Button
-            icon='I133'
-            disabled={!focus && page === 1}
-            onClick={(event) => focusPerson('', event)}
-          >
-            My position
-          </Button>
-        </div>
-      </div>
-      {noLines ? (
-        <div className={styles.inset}>
-          <ChartEmptyState
-            organizationId={organizationId}
-            person={branch.person}
-            profileQuery={profileQuery}
-            onFocus={focusPerson}
-            onBrowseDirectory={browseDirectory}
-            currentPersonRef={setCurrentPerson}
-            onSync={onSync}
-          />
-        </div>
-      ) : branch ? (
-        <ChartCanvas
-          key={`${branch.person.memberId}/${branch.page}/${size}`}
-          organizationId={organizationId}
-          branch={branch}
-          profileQuery={profileQuery}
-          compact={compact}
-          onFocus={focusPerson}
-          pager={
-            branch.totalReports > size && (
-              <div className={styles.pager} aria-live='polite'>
-                <span ref={previousReports}>
-                  <IconButton
-                    label='Previous reports'
-                    icon='I093'
-                    disabled={branch.page === 1}
-                    onClick={(event) => changePage(branch.page - 1, 'previous', event)}
-                  />
-                </span>
-                <span className={styles.pagerLabel} data-type='T050'>
-                  {size === 1
-                    ? branch.page
-                    : `${(branch.page - 1) * size + 1}–${(branch.page - 1) * size + branch.reports.length}`}{' '}
-                  of {branch.totalReports} direct reports
-                </span>
-                <span ref={nextReports}>
-                  <IconButton
-                    label='Next reports'
-                    icon='I032'
-                    disabled={branch.page * size >= branch.totalReports}
-                    onClick={(event) => changePage(branch.page + 1, 'next', event)}
-                  />
-                </span>
-              </div>
-            )
-          }
-        />
-      ) : chart.error ? (
-        <div className={styles.inset}>
-          {isRefusal(chart.error) ? (
-            <ProfileUnavailable
-              action={
-                focus ? (
-                  <Button onClick={(event) => focusPerson('', event)}>My position</Button>
-                ) : (
-                  <Button onClick={browseDirectory}>Back to directory</Button>
-                )
-              }
-            />
-          ) : (
-            <FailureNotice
-              title='Could not load the org chart'
-              message={chart.error.message}
-              onRetry={chart.retry}
-            />
-          )}
-        </div>
-      ) : (
-        <PeopleStatus>Loading org chart…</PeopleStatus>
-      )}
-    </section>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/people-page/people-frame.tsx b/apps/sim/platform/app/(shell)/people/_components/people-page/people-frame.tsx
deleted file mode 100644
index 1f707deb947..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/people-page/people-frame.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-'use client'
-
-import type { ReactNode } from 'react'
-import styles from '@/platform/app/(shell)/people/_components/people-page/people-page.module.css'
-
-type PeopleView = 'chart' | 'directory'
-
-const VIEWS = [
-  { value: 'chart', label: 'Org chart' },
-  { value: 'directory', label: 'Directory' },
-] as const
-
-interface PeopleFrameProps {
-  actions?: ReactNode
-  view?: PeopleView
-  onViewChange?: (view: PeopleView) => void
-  children: ReactNode
-}
-
-/** The title, its actions and the view tabs, shared with the loading state so nothing shifts. */
-export function PeopleFrame({ actions, view, onViewChange, children }: PeopleFrameProps) {
-  return (
-    <main className={styles.page}>
-      <header className={styles.header}>
-        <h1 data-type='T076'>People</h1>
-        {actions && <div className={styles.actions}>{actions}</div>}
-      </header>
-      <nav className={styles.tabs} aria-label='People view'>
-        {VIEWS.map(({ value, label }) => (
-          <button
-            key={value}
-            type='button'
-            className={styles.tab}
-            data-type={view === value ? 'T042' : 'T043'}
-            aria-current={view === value ? 'page' : undefined}
-            disabled={!onViewChange}
-            onClick={() => onViewChange?.(value)}
-          >
-            {label}
-          </button>
-        ))}
-      </nav>
-      <div className={styles.body}>{children}</div>
-    </main>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/people-page/people-page.module.css b/apps/sim/platform/app/(shell)/people/_components/people-page/people-page.module.css
deleted file mode 100644
index ea76ea1df46..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/people-page/people-page.module.css
+++ /dev/null
@@ -1,70 +0,0 @@
-.page {
-  display: flex;
-  flex-direction: column;
-  min-block-size: 100%;
-  padding-block-start: var(--shell-home-row-start);
-}
-
-.header {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--spacing-8) var(--spacing-16);
-  padding-inline: var(--ui-page-inline-gutter);
-}
-
-.actions {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: var(--spacing-8);
-}
-
-.updated {
-  color: var(--ui-secondary);
-  margin-inline-end: var(--spacing-8);
-}
-
-.tabs {
-  display: flex;
-  gap: var(--spacing-24);
-  margin-block-start: var(--spacing-24);
-  padding-inline: var(--ui-page-inline-gutter);
-  border-block-end: var(--spacing-stroke-default) solid var(--ui-divider);
-}
-
-.tab {
-  margin-block-end: calc(-1 * var(--spacing-stroke-default));
-  min-block-size: var(--spacing-40);
-  border-block-end: var(--spacing-stroke-focus) solid transparent;
-  color: var(--ui-secondary);
-  cursor: pointer;
-}
-
-.tab:hover:enabled {
-  color: var(--ui-ink);
-}
-
-.tab[aria-current="page"] {
-  border-block-end-color: var(--ui-ink);
-  color: var(--ui-ink);
-}
-
-.tab:disabled {
-  cursor: default;
-}
-
-.body {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  min-block-size: 0;
-  padding-block-start: var(--spacing-20);
-}
-
-.status {
-  color: var(--ui-secondary);
-  padding-block: var(--spacing-48);
-  text-align: center;
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/people-page/people-page.tsx b/apps/sim/platform/app/(shell)/people/_components/people-page/people-page.tsx
deleted file mode 100644
index cdb9ad18ed6..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/people-page/people-page.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import dynamic from 'next/dynamic'
-import { PeopleDirectory } from '@/platform/app/(shell)/people/_components/directory/directory'
-import { PeopleFrame } from '@/platform/app/(shell)/people/_components/people-page/people-frame'
-import styles from '@/platform/app/(shell)/people/_components/people-page/people-page.module.css'
-import { Button } from '@/platform/design-system/components'
-import {
-  type SyncSource,
-  useChartRoots,
-  useDirectorySyncStatus,
-  usePeopleUrl,
-  usePeopleViewer,
-} from '@/platform/lib/data/people'
-import { formatRelativeTime } from '@/platform/lib/time'
-
-const OrgChart = dynamic(() =>
-  import('@/platform/app/(shell)/people/_components/org-chart/org-chart').then(
-    (module) => module.OrgChart
-  )
-)
-const ImportModal = dynamic(() =>
-  import('@/platform/app/(shell)/people/_components/import/import-modal').then(
-    (module) => module.ImportModal
-  )
-)
-const DirectorySyncPage = dynamic(() =>
-  import('@/platform/app/(shell)/people/_components/directory-sync/directory-sync-page').then(
-    (module) => module.DirectorySyncPage
-  )
-)
-const ConnectModal = dynamic(() =>
-  import('@/platform/app/(shell)/people/_components/directory-sync/connect-modal').then(
-    (module) => module.ConnectModal
-  )
-)
-
-interface PeoplePageProps {
-  organizationId: string
-}
-
-export function PeoplePage({ organizationId }: PeoplePageProps) {
-  const { isAdmin } = usePeopleViewer()
-  const [{ view, search, department, departmentKey, panel }, setView] = usePeopleUrl()
-  const [importing, setImporting] = useState(false)
-  const [connecting, setConnecting] = useState<SyncSource | null>(null)
-  const currentView = view ?? (search || department || departmentKey ? 'directory' : 'chart')
-  const status = useDirectorySyncStatus(organizationId, isAdmin)
-  const roots = useChartRoots(organizationId, isAdmin && currentView === 'chart')
-  const openSync = () => void setView({ panel: 'sync' }, { history: 'push' })
-  const openImport = () => setImporting(true)
-  const firstUse = isAdmin && roots.emptyOrganization && status.loaded && !status.sync
-  // First use has no header actions, so they wait for the reads that decide it rather than flash.
-  const showActions =
-    isAdmin && (currentView !== 'chart' || (roots.settled && status.settled && !firstUse))
-  const lastSuccessAt = status.sync?.lastSuccessAt
-  const modals = (
-    <>
-      {importing && isAdmin && (
-        <ImportModal
-          organizationId={organizationId}
-          onClose={() => setImporting(false)}
-          onOpenSync={() => {
-            setImporting(false)
-            openSync()
-          }}
-        />
-      )}
-      {connecting && isAdmin && (
-        <ConnectModal
-          organizationId={organizationId}
-          source={connecting}
-          onClose={() => setConnecting(null)}
-          onConnected={() => {
-            setConnecting(null)
-            openSync()
-          }}
-        />
-      )}
-    </>
-  )
-
-  if (panel === 'sync' && isAdmin)
-    return (
-      <>
-        <DirectorySyncPage
-          organizationId={organizationId}
-          onBack={() => void setView({ panel: null }, { history: 'push' })}
-          onConnect={setConnecting}
-          onImport={openImport}
-        />
-        {modals}
-      </>
-    )
-
-  return (
-    <PeopleFrame
-      view={currentView}
-      onViewChange={(next) => void setView({ view: next }, { history: 'push' })}
-      actions={
-        showActions ? (
-          <>
-            {lastSuccessAt && (
-              <span className={styles.updated} data-type='T050'>
-                Updated {formatRelativeTime(Date.parse(lastSuccessAt), Date.now())}
-              </span>
-            )}
-            <Button icon='I065' onClick={openSync}>
-              Directory sync
-            </Button>
-            <Button icon='I117' onClick={openImport}>
-              Import
-            </Button>
-          </>
-        ) : undefined
-      }
-    >
-      {currentView === 'chart' ? (
-        <OrgChart
-          organizationId={organizationId}
-          firstUse={firstUse}
-          onConnect={setConnecting}
-          onImport={openImport}
-          onSync={isAdmin ? openSync : undefined}
-        />
-      ) : (
-        <PeopleDirectory organizationId={organizationId} />
-      )}
-      {modals}
-    </PeopleFrame>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/people-page/people-skeleton.tsx b/apps/sim/platform/app/(shell)/people/_components/people-page/people-skeleton.tsx
deleted file mode 100644
index a26e6165ef6..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/people-page/people-skeleton.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { PeopleFrame } from '@/platform/app/(shell)/people/_components/people-page/people-frame'
-import { PeopleStatus } from '@/platform/app/(shell)/people/_components/people-page/people-status'
-
-export function PeopleSkeleton() {
-  return (
-    <PeopleFrame>
-      <PeopleStatus>Loading people…</PeopleStatus>
-    </PeopleFrame>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/people-page/people-status.tsx b/apps/sim/platform/app/(shell)/people/_components/people-page/people-status.tsx
deleted file mode 100644
index 294efbefe98..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/people-page/people-status.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import styles from '@/platform/app/(shell)/people/_components/people-page/people-page.module.css'
-
-interface PeopleStatusProps {
-  children: string
-}
-
-/** The body of a People view while its first read is pending, the same size in every view. */
-export function PeopleStatus({ children }: PeopleStatusProps) {
-  return (
-    <p className={styles.status} role='status' data-type='T060'>
-      {children}
-    </p>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/people-page/profile-unavailable.tsx b/apps/sim/platform/app/(shell)/people/_components/people-page/profile-unavailable.tsx
deleted file mode 100644
index 275f1722ae1..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/people-page/profile-unavailable.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { ReactNode } from 'react'
-import { EmptyState } from '@/platform/design-system/components'
-
-interface ProfileUnavailableProps {
-  action: ReactNode
-}
-
-/** The neutral answer for a person this viewer can't reach, whether gone or refused. */
-export function ProfileUnavailable({ action }: ProfileUnavailableProps) {
-  return (
-    <EmptyState
-      title='This profile is unavailable'
-      description='It may have changed, or you may no longer have access. Return to the directory to find someone else.'
-      action={action}
-    />
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/person-identity/person-identity.module.css b/apps/sim/platform/app/(shell)/people/_components/person-identity/person-identity.module.css
deleted file mode 100644
index 11d185b820c..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/person-identity/person-identity.module.css
+++ /dev/null
@@ -1,17 +0,0 @@
-.identity {
-  display: flex;
-  align-items: center;
-  min-inline-size: 0;
-  gap: var(--spacing-12);
-}
-
-.copy {
-  display: grid;
-  min-inline-size: 0;
-  gap: var(--ui-stack-gap);
-  overflow-wrap: anywhere;
-}
-
-.detail {
-  color: var(--ui-secondary);
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/person-identity/person-identity.tsx b/apps/sim/platform/app/(shell)/people/_components/person-identity/person-identity.tsx
deleted file mode 100644
index a053d435883..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/person-identity/person-identity.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import styles from '@/platform/app/(shell)/people/_components/person-identity/person-identity.module.css'
-import { Avatar } from '@/platform/design-system/components'
-import type { PersonSummary } from '@/platform/lib/data/people'
-
-interface PersonIdentityProps {
-  person: Pick<PersonSummary, 'name' | 'email' | 'image' | 'title'>
-}
-
-/** A person's avatar, name and what they do: the row that directory and profile lists share. */
-export function PersonIdentity({ person }: PersonIdentityProps) {
-  return (
-    <span className={styles.identity}>
-      <Avatar name={person.name} src={person.image ?? undefined} size='row' />
-      <span className={styles.copy}>
-        <span data-type='T042'>{person.name}</span>
-        <span className={styles.detail} data-type='T043'>
-          {person.title || person.email}
-        </span>
-      </span>
-    </span>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/person/person-modal.tsx b/apps/sim/platform/app/(shell)/people/_components/person/person-modal.tsx
deleted file mode 100644
index b754bd45ce3..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/person/person-modal.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-'use client'
-
-import { useMemo, useState } from 'react'
-import { DatePicker, Modal, SearchableSelect, TextField } from '@/platform/design-system/components'
-import {
-  type Person,
-  type PersonDraft,
-  useEditPerson,
-  usePeoplePicker,
-} from '@/platform/lib/data/people'
-
-/** Profile text's server bound; a longer draft would only come back refused. */
-const PROFILE_TEXT_MAX_LENGTH = 200
-
-/** The picker's value for no manager; membership ids are never this. */
-const NO_MANAGER = 'no-manager'
-
-const TEXT_FIELDS = [
-  { field: 'title', label: 'Title', placeholder: 'Staff Engineer' },
-  { field: 'department', label: 'Department', placeholder: 'Engineering' },
-  { field: 'location', label: 'Location', placeholder: 'San Francisco' },
-] as const
-
-interface PersonModalProps {
-  organizationId: string
-  person: Person
-  onClose: () => void
-}
-
-/** A validation problem keeps the dialog open like a refused save, with its message on the field. */
-class FieldProblems extends Error {}
-
-export function PersonModal({ organizationId, person, onClose }: PersonModalProps) {
-  const edit = useEditPerson(organizationId, person.memberId)
-  const picker = usePeoplePicker(organizationId, 'members', person.memberId)
-  const [draft, setDraft] = useState<PersonDraft>({
-    title: person.title,
-    department: person.department,
-    location: person.location,
-    startDate: person.startDate,
-    managerMemberId: person.managerMemberId,
-  })
-  const [saving, setSaving] = useState(false)
-  const [errors, setErrors] = useState<Partial<Record<keyof PersonDraft, string>>>({})
-  // The chosen manager's name, kept with the choice: the search results may no longer include them.
-  // Only a stored manager who is suspended has an id and no name.
-  const [managerName, setManagerName] = useState(person.manager?.name ?? null)
-  const managerOptions = useMemo(
-    () => [{ value: NO_MANAGER, label: 'No manager' }, ...picker.options],
-    [picker.options]
-  )
-  const change = <Key extends keyof PersonDraft>(field: Key, value: PersonDraft[Key]) => {
-    setDraft((current) => ({ ...current, [field]: value }))
-    setErrors((current) => ({ ...current, [field]: undefined }))
-  }
-  return (
-    <Modal
-      open
-      onOpenChange={(open) => !open && onClose()}
-      title={`Edit ${person.name}`}
-      confirmLabel='Save'
-      onConfirm={async () => {
-        setSaving(true)
-        try {
-          const problems = await edit.save(draft)
-          if (problems) {
-            setErrors(problems)
-            throw new FieldProblems('Check the highlighted fields.')
-          }
-        } finally {
-          setSaving(false)
-        }
-      }}
-    >
-      {TEXT_FIELDS.map(({ field, label, placeholder }) => (
-        <TextField
-          key={field}
-          label={label}
-          placeholder={placeholder}
-          maxLength={PROFILE_TEXT_MAX_LENGTH}
-          value={draft[field] ?? ''}
-          onChange={(value) => change(field, value || null)}
-          error={errors[field]}
-          disabled={saving}
-        />
-      ))}
-      <DatePicker
-        label='Start date'
-        placeholder='Not recorded'
-        clearable
-        value={draft.startDate ?? null}
-        onValueChange={(value) => change('startDate', value)}
-        error={errors.startDate}
-        disabled={saving}
-      />
-      <SearchableSelect
-        label='Manager'
-        searchLabel='Search people'
-        options={managerOptions}
-        value={draft.managerMemberId ?? NO_MANAGER}
-        selectedLabel={draft.managerMemberId ? (managerName ?? 'Suspended member') : 'No manager'}
-        search={picker.search}
-        onOpenChange={picker.onOpenChange}
-        error={errors.managerMemberId}
-        disabled={saving}
-        onValueChange={(value) => {
-          const manager = picker.people.find((candidate) => candidate.memberId === value)
-          setManagerName(manager?.name ?? null)
-          change('managerMemberId', manager?.memberId ?? null)
-        }}
-      />
-    </Modal>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/person/person-skeleton.tsx b/apps/sim/platform/app/(shell)/people/_components/person/person-skeleton.tsx
deleted file mode 100644
index c73e5347d07..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/person/person-skeleton.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { PeopleStatus } from '@/platform/app/(shell)/people/_components/people-page/people-status'
-import styles from '@/platform/app/(shell)/people/_components/person/person.module.css'
-
-/** A profile's frame while the route loads, with room where its way back will appear. */
-export function PersonSkeleton() {
-  return (
-    <main className={styles.page}>
-      <div className={styles.nav} />
-      <PeopleStatus>Loading profile…</PeopleStatus>
-    </main>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/person/person.module.css b/apps/sim/platform/app/(shell)/people/_components/person/person.module.css
deleted file mode 100644
index 7cd69ffe8d5..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/person/person.module.css
+++ /dev/null
@@ -1,136 +0,0 @@
-.page {
-  display: flex;
-  flex-direction: column;
-  min-block-size: 100%;
-  padding: var(--shell-home-row-start) var(--ui-page-inline-gutter) var(--ui-page-inset-block);
-  gap: var(--spacing-32);
-}
-
-.nav,
-.heading {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--spacing-12);
-}
-
-.nav {
-  min-block-size: var(--spacing-app-chip);
-}
-
-.back {
-  margin-inline-start: calc(-1 * var(--spacing-control-inline));
-}
-
-.heading {
-  padding-block: var(--spacing-16) var(--spacing-8);
-}
-
-.identity {
-  display: flex;
-  align-items: center;
-  min-inline-size: 0;
-  gap: var(--spacing-24);
-}
-
-.titles {
-  display: grid;
-  min-inline-size: 0;
-  gap: var(--spacing-8);
-  overflow-wrap: anywhere;
-}
-
-.actions {
-  display: flex;
-  flex-wrap: wrap;
-  gap: var(--spacing-8);
-}
-
-.secondary {
-  color: var(--ui-secondary);
-}
-
-.columns {
-  display: grid;
-  grid-template-columns: minmax(0, var(--spacing-320)) minmax(0, 1fr);
-  gap: var(--spacing-32) var(--spacing-64);
-}
-
-.about,
-.facts,
-.lines,
-.lineSection {
-  display: flex;
-  flex-direction: column;
-  min-inline-size: 0;
-}
-
-.about,
-.lineSection,
-.facts {
-  gap: var(--spacing-24);
-}
-
-.lineSection {
-  gap: var(--spacing-16);
-}
-
-.fact {
-  display: grid;
-  gap: var(--spacing-6);
-  overflow-wrap: anywhere;
-}
-
-.factLink:hover {
-  text-decoration: underline;
-}
-
-.managed {
-  display: grid;
-  gap: var(--spacing-8);
-  padding-block-start: var(--spacing-16);
-}
-
-.managedBy {
-  display: flex;
-  align-items: center;
-  gap: var(--spacing-8);
-  color: var(--ui-secondary);
-}
-
-.lines {
-  gap: var(--spacing-32);
-}
-
-.lineHeading {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--spacing-8);
-}
-
-.list {
-  display: grid;
-  gap: var(--ui-list-gap);
-  margin-inline: calc(-1 * var(--ui-row-inset));
-}
-
-.row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--spacing-12);
-  padding: var(--spacing-12) var(--ui-row-inset);
-  border-radius: var(--ui-control-radius);
-}
-
-.row:hover {
-  background: var(--ui-hover);
-}
-
-@media (width < 48rem) {
-  .columns {
-    grid-template-columns: minmax(0, 1fr);
-  }
-}
diff --git a/apps/sim/platform/app/(shell)/people/_components/person/person.tsx b/apps/sim/platform/app/(shell)/people/_components/person/person.tsx
deleted file mode 100644
index 9789b2ffd2b..00000000000
--- a/apps/sim/platform/app/(shell)/people/_components/person/person.tsx
+++ /dev/null
@@ -1,263 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import Link from 'next/link'
-import { PeopleStatus } from '@/platform/app/(shell)/people/_components/people-page/people-status'
-import { ProfileUnavailable } from '@/platform/app/(shell)/people/_components/people-page/profile-unavailable'
-import styles from '@/platform/app/(shell)/people/_components/person/person.module.css'
-import { PersonModal } from '@/platform/app/(shell)/people/_components/person/person-modal'
-import { PersonIdentity } from '@/platform/app/(shell)/people/_components/person-identity/person-identity'
-import { Avatar, Button, FailureNotice, Icon } from '@/platform/design-system/components'
-import { useClipboard } from '@/platform/design-system/components/feedback/use-clipboard'
-import {
-  isRefusal,
-  type Person,
-  type PersonSummary,
-  personHref,
-  SYNC_SOURCE_NAMES,
-  usePeopleViewer,
-  usePersonProfile,
-} from '@/platform/lib/data/people'
-import { formatCalendarDate } from '@/platform/lib/time'
-
-const NOT_PROVIDED = 'Not provided'
-
-/** `2024-01-31` as a calendar day, with how long ago it was: "Jan 31, 2024 · 2 yrs". */
-function describeStartDate(startDate: string): string {
-  const start = new Date(`${startDate}T00:00:00Z`)
-  const now = new Date()
-  const months =
-    (now.getUTCFullYear() - start.getUTCFullYear()) * 12 +
-    now.getUTCMonth() -
-    start.getUTCMonth() -
-    (now.getUTCDate() < start.getUTCDate() ? 1 : 0)
-  const tenure =
-    months < 0
-      ? 'starts soon'
-      : months < 1
-        ? 'new'
-        : months < 12
-          ? `${months} mo`
-          : `${Math.floor(months / 12)} yr${months >= 24 ? 's' : ''}`
-  return `${formatCalendarDate(startDate, 'full')} · ${tenure}`
-}
-
-interface AboutProps {
-  person: Person
-  departmentHref: string
-}
-
-function About({ person, departmentHref }: AboutProps) {
-  const facts: { label: string; value: string; href?: string }[] = [
-    { label: 'Email', value: person.email, href: `mailto:${person.email}` },
-    {
-      label: 'Department',
-      value: person.department ?? NOT_PROVIDED,
-      href: person.department ? departmentHref : undefined,
-    },
-    { label: 'Location', value: person.location ?? NOT_PROVIDED },
-    {
-      label: 'Start date',
-      value: person.startDate ? describeStartDate(person.startDate) : NOT_PROVIDED,
-    },
-  ]
-  return (
-    <section className={styles.about} aria-labelledby='person-about'>
-      <h2 id='person-about' data-type='T081'>
-        About
-      </h2>
-      <dl className={styles.facts}>
-        {facts.map(({ label, value, href }) => (
-          <div key={label} className={styles.fact}>
-            <dt className={styles.secondary} data-type='T050'>
-              {label}
-            </dt>
-            <dd data-type='T043'>
-              {href ? (
-                <Link href={href} className={styles.factLink}>
-                  {value}
-                </Link>
-              ) : (
-                value
-              )}
-            </dd>
-          </div>
-        ))}
-      </dl>
-      {person.directorySource && (
-        <div className={styles.managed}>
-          <p className={styles.managedBy} data-type='T050'>
-            <Icon name='I065' />
-            Managed by {SYNC_SOURCE_NAMES[person.directorySource]}
-          </p>
-          <p className={styles.secondary} data-type='T050'>
-            Profile details update from your directory. Contact an admin to make a correction.
-          </p>
-        </div>
-      )}
-    </section>
-  )
-}
-
-interface PersonRowsProps {
-  organizationId: string
-  originQuery: string
-  people: readonly PersonSummary[]
-}
-
-function PersonRows({ organizationId, originQuery, people }: PersonRowsProps) {
-  return (
-    <ul className={styles.list}>
-      {people.map((person) => (
-        <li key={person.memberId}>
-          <Link
-            href={personHref(organizationId, person.memberId, originQuery)}
-            className={styles.row}
-            aria-label={`Open ${person.name}`}
-          >
-            <PersonIdentity person={person} />
-            <Icon name='I032' />
-          </Link>
-        </li>
-      ))}
-    </ul>
-  )
-}
-
-interface PersonProfileProps {
-  organizationId: string
-  memberId: string
-}
-
-export function PersonProfile({ organizationId, memberId }: PersonProfileProps) {
-  const { isAdmin } = usePeopleViewer()
-  const profile = usePersonProfile(organizationId, memberId)
-  const { copied, copy } = useClipboard()
-  const [editing, setEditing] = useState(false)
-  const { data } = profile
-  const canEdit = isAdmin && Boolean(data) && !data?.person.directorySource
-  const unavailable = isRefusal(profile.error)
-  return (
-    <main className={styles.page}>
-      <div className={styles.nav}>
-        {!unavailable && (
-          <div className={styles.back}>
-            <Button variant='quiet' icon='I093' render={<Link href={profile.backHref} />}>
-              {profile.originView === 'chart' ? 'Back to org chart' : 'Back to directory'}
-            </Button>
-          </div>
-        )}
-        {data && (
-          <Button
-            icon={copied ? 'I072' : 'I006'}
-            onClick={() =>
-              void copy(`${window.location.origin}${personHref(organizationId, memberId)}`)
-            }
-          >
-            {copied ? 'Copied' : 'Copy profile link'}
-          </Button>
-        )}
-      </div>
-      {profile.error ? (
-        unavailable ? (
-          <ProfileUnavailable
-            action={
-              <Button render={<Link href={profile.directoryHref} />}>Back to directory</Button>
-            }
-          />
-        ) : (
-          <FailureNotice
-            title='Could not load this person'
-            message={profile.error.message}
-            retrying={profile.retrying}
-            onRetry={profile.retry}
-          />
-        )
-      ) : !data ? (
-        <PeopleStatus>Loading profile…</PeopleStatus>
-      ) : (
-        <>
-          <header className={styles.heading}>
-            <div className={styles.identity}>
-              <Avatar name={data.person.name} src={data.person.image ?? undefined} size='hero' />
-              <div className={styles.titles}>
-                <h1 data-type='T102'>{data.person.name}</h1>
-                {data.person.title && (
-                  <p className={styles.secondary} data-type='T106'>
-                    {data.person.title}
-                  </p>
-                )}
-              </div>
-            </div>
-            <div className={styles.actions}>
-              <Button icon='I133' render={<Link href={profile.chartHref} />}>
-                View in org chart
-              </Button>
-              {canEdit && <Button onClick={() => setEditing(true)}>Edit</Button>}
-            </div>
-          </header>
-          <div className={styles.columns}>
-            <About person={data.person} departmentHref={profile.departmentHref} />
-            <div className={styles.lines}>
-              <section className={styles.lineSection} aria-labelledby='person-manager'>
-                <h2 id='person-manager' data-type='T081'>
-                  Reports to
-                </h2>
-                {data.chain.length > 0 ? (
-                  <PersonRows
-                    organizationId={organizationId}
-                    originQuery={profile.originQuery}
-                    people={data.chain.slice(0, 1)}
-                  />
-                ) : (
-                  <p className={styles.secondary} data-type='T043'>
-                    {data.person.managerMemberId
-                      ? 'Their manager is suspended.'
-                      : 'No manager listed. This person is still part of your organization, and their reporting line will appear when it is provided.'}
-                  </p>
-                )}
-              </section>
-              <section className={styles.lineSection} aria-labelledby='person-reports'>
-                <div className={styles.lineHeading}>
-                  <h2 id='person-reports' data-type='T081'>
-                    Direct reports
-                  </h2>
-                  {data.totalReports > 0 && (
-                    <span className={styles.secondary} data-type='T050'>
-                      {data.totalReports === 1 ? '1 person' : `${data.totalReports} people`}
-                    </span>
-                  )}
-                </div>
-                {data.reports.length > 0 ? (
-                  <PersonRows
-                    organizationId={organizationId}
-                    originQuery={profile.originQuery}
-                    people={data.reports}
-                  />
-                ) : (
-                  <p className={styles.secondary} data-type='T043'>
-                    No one reports to this person.
-                  </p>
-                )}
-                {data.totalReports > data.reports.length && (
-                  <div>
-                    <Button render={<Link href={profile.chartHref} />}>
-                      {`Browse all ${data.totalReports} reports`}
-                    </Button>
-                  </div>
-                )}
-              </section>
-            </div>
-          </div>
-          {editing && canEdit && (
-            <PersonModal
-              organizationId={organizationId}
-              person={data.person}
-              onClose={() => setEditing(false)}
-            />
-          )}
-        </>
-      )}
-    </main>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/search/_components/search-surface/search-history.tsx b/apps/sim/platform/app/(shell)/search/_components/search-surface/search-history.tsx
deleted file mode 100644
index e63b5c41ebe..00000000000
--- a/apps/sim/platform/app/(shell)/search/_components/search-surface/search-history.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-'use client'
-
-import { type ReactNode, useState } from 'react'
-import { toast } from '@sim/emcn'
-import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import { useClearSearchHistory, useSearchHistory } from '@/hooks/queries/search-history'
-import { CompactSourceRow } from '@/platform/app/(shell)/_components/search/source-row'
-import styles from '@/platform/app/(shell)/search/_components/search-surface/search-surface.module.css'
-import { Button, Chip } from '@/platform/design-system/components/button/button'
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-import { InlineNotice } from '@/platform/design-system/components/status/status'
-
-const HISTORY_RECENT_LIMIT = 5
-
-/** The viewer's private recent activity, and which list is showing. A failed read hides stale rows. */
-function useSearchLandingHistory(organizationId: string, userId: string) {
-  const history = useSearchHistory(organizationId, userId)
-  const clearHistory = useClearSearchHistory(organizationId, userId)
-  const [selection, setSelection] = useState<'sources' | 'queries' | null>(null)
-  const data = history.isError ? undefined : history.data
-  const sources = data?.sources.slice(0, HISTORY_RECENT_LIMIT) ?? []
-  const queries = data?.queries.slice(0, HISTORY_RECENT_LIMIT) ?? []
-  return {
-    failed: history.isError,
-    retrying: history.isFetching,
-    retry: () => void history.refetch(),
-    sources,
-    queries,
-    selected: selection ?? (sources.length > 0 ? 'sources' : 'queries'),
-    setSelection,
-    isClearing: clearHistory.isPending,
-    clear: () => clearHistory.mutate(undefined, { onError: (error) => toast.error(error.message) }),
-  }
-}
-
-interface HistoryPaneProps {
-  hidden: boolean
-  isEmpty: boolean
-  /** Shown when this list has nothing while the other one does. */
-  emptyText: string
-  children: ReactNode
-}
-
-/** Both panes keep their place in one grid cell, so switching lists never moves the layout. */
-function HistoryPane({ hidden, isEmpty, emptyText, children }: HistoryPaneProps) {
-  return (
-    <div className={styles.historyList} inert={hidden}>
-      {isEmpty ? (
-        <p className={styles.historyEmpty} data-type='T060'>
-          {emptyText}
-        </p>
-      ) : (
-        children
-      )}
-    </div>
-  )
-}
-
-interface SearchHistoryProps {
-  userId: string
-  onSearch: (query: string) => void
-  children: ReactNode
-}
-
-/** The viewer's private shortcuts under the field, which stays centered whatever they contain. */
-export function SearchHistory({ userId, onSearch, children }: SearchHistoryProps) {
-  const { organization } = useOrganizationContext()
-  const { failed, retrying, retry, sources, queries, selected, setSelection, clear, isClearing } =
-    useSearchLandingHistory(organization.id, userId)
-  return (
-    <div className={styles.historyAnchor}>
-      {children}
-      <div className={styles.historyPanel}>
-        {(sources.length > 0 || queries.length > 0) && (
-          <section aria-label='Recent activity' className={styles.history}>
-            <div className={styles.historyBar}>
-              <div role='group' aria-label='History type' className={styles.historyTypes}>
-                <Chip selected={selected === 'sources'} onClick={() => setSelection('sources')}>
-                  Recently viewed
-                </Chip>
-                <Chip selected={selected === 'queries'} onClick={() => setSelection('queries')}>
-                  Recent searches
-                </Chip>
-              </div>
-              <Button variant='quiet' size='compact' disabled={isClearing} onClick={clear}>
-                Clear history
-              </Button>
-            </div>
-            <div className={styles.historyLists}>
-              <HistoryPane
-                hidden={selected !== 'sources'}
-                isEmpty={sources.length === 0}
-                emptyText='Sources you open will appear here.'
-              >
-                {sources.map((source) => (
-                  <CompactSourceRow key={source.url} source={source} />
-                ))}
-              </HistoryPane>
-              <HistoryPane
-                hidden={selected !== 'queries'}
-                isEmpty={queries.length === 0}
-                emptyText='Your recent searches will appear here.'
-              >
-                {queries.map(({ query }) => (
-                  <ControlRow
-                    key={query}
-                    label={query}
-                    icon='I046'
-                    render={<button type='button' onClick={() => onSearch(query)} />}
-                  />
-                ))}
-              </HistoryPane>
-            </div>
-          </section>
-        )}
-        {failed && (
-          <div className={styles.historyError}>
-            <InlineNotice
-              message='Recent activity couldn’t load.'
-              action={
-                <Button variant='quiet' size='compact' disabled={retrying} onClick={retry}>
-                  Try again
-                </Button>
-              }
-            />
-          </div>
-        )}
-      </div>
-    </div>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/search/_components/search-surface/search-surface-header.tsx b/apps/sim/platform/app/(shell)/search/_components/search-surface/search-surface-header.tsx
deleted file mode 100644
index 89f9f7f0562..00000000000
--- a/apps/sim/platform/app/(shell)/search/_components/search-surface/search-surface-header.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-'use client'
-
-import { RedesignSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
-import type { OrganizationSearchState } from '@/app/o/[organizationId]/search/use-organization-search'
-import styles from '@/platform/app/(shell)/search/_components/search-surface/search-surface.module.css'
-import { Button } from '@/platform/design-system/components/button/button'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-
-const SEARCH_MODE_ICONS = { search: 'I089', assistant: 'I073' } as const
-
-export type SearchHeaderState = Pick<
-  OrganizationSearchState,
-  'activeMode' | 'modes' | 'changeMode' | 'newLabel' | 'canStartNew' | 'isStartingNew' | 'startNew'
->
-
-/**
- * A `nav` of buttons rather than `SegmentedControl`: its radios would flip on reselect, and each
- * view here is a history entry with `aria-current`.
- */
-export function SearchSurfaceHeader({ search }: { search: SearchHeaderState }) {
-  const { activeMode, newLabel } = search
-  return (
-    <div className={styles.transparentSurface}>
-      <RedesignSurface>
-        <div className={styles.header}>
-          <nav aria-label='Search views' className={styles.views}>
-            {search.modes.map((entry) => (
-              <button
-                key={entry.value}
-                type='button'
-                className={styles.view}
-                data-type='T056'
-                aria-current={activeMode === entry.value ? 'page' : undefined}
-                onClick={() => search.changeMode(entry.value)}
-              >
-                <Icon name={SEARCH_MODE_ICONS[entry.value]} />
-                {entry.label}
-              </button>
-            ))}
-          </nav>
-          {search.canStartNew && (
-            <>
-              <span className={styles.newFull}>
-                <Button
-                  variant='quiet'
-                  size='compact'
-                  icon='I074'
-                  disabled={search.isStartingNew}
-                  onClick={search.startNew}
-                  render={<button type='button' className={styles.newButton} />}
-                >
-                  {newLabel}
-                </Button>
-              </span>
-              <span className={styles.newShort}>
-                <Button
-                  variant='quiet'
-                  size='compact'
-                  icon='I074'
-                  disabled={search.isStartingNew}
-                  onClick={search.startNew}
-                  render={
-                    <button type='button' className={styles.newButton} aria-label={newLabel} />
-                  }
-                >
-                  New
-                </Button>
-              </span>
-            </>
-          )}
-        </div>
-      </RedesignSurface>
-    </div>
-  )
-}
diff --git a/apps/sim/platform/app/(shell)/search/_components/search-surface/search-surface.module.css b/apps/sim/platform/app/(shell)/search/_components/search-surface/search-surface.module.css
deleted file mode 100644
index 4a0c56dd6ab..00000000000
--- a/apps/sim/platform/app/(shell)/search/_components/search-surface/search-surface.module.css
+++ /dev/null
@@ -1,224 +0,0 @@
-.body,
-.transparentSurface {
-  min-inline-size: 0;
-}
-.body,
-.body > [data-platform-ui],
-.docked {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  min-block-size: 0;
-}
-.body > [data-platform-ui],
-.transparentSurface > [data-platform-ui] {
-  background: transparent;
-}
-.header {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: var(--spacing-4);
-  min-inline-size: 0;
-}
-.views {
-  display: inline-flex;
-  align-items: stretch;
-  max-inline-size: 100%;
-  min-block-size: var(--spacing-app-control-sm);
-  gap: var(--spacing-1);
-  border-radius: var(--radius-full);
-  background: var(--choice-track);
-}
-.view {
-  position: relative;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: var(--spacing-6);
-  min-inline-size: 0;
-  padding-inline: var(--spacing-8);
-  border: var(--spacing-stroke-default) solid transparent;
-  border-radius: var(--radius-full);
-  background: transparent;
-  color: var(--ui-secondary);
-  cursor: pointer;
-}
-.view:hover {
-  color: var(--ui-ink);
-}
-.view[aria-current="page"] {
-  border-color: var(--choice-edge);
-  background: var(--choice-selected);
-  box-shadow: var(--choice-shadow);
-  color: var(--ui-ink);
-}
-.views .view:focus-visible {
-  outline: var(--spacing-stroke-default) solid var(--ui-secondary);
-}
-.newShort {
-  display: none;
-}
-@media (width < 48rem) {
-  .newFull {
-    display: none;
-  }
-  .newShort {
-    display: inline;
-  }
-}
-.newButton {
-  position: relative;
-}
-@media (pointer: coarse) {
-  .view::after,
-  .newButton::after {
-    content: "";
-    position: absolute;
-    inset-inline: 0;
-    inset-block: calc((var(--spacing-app-control-sm) - var(--spacing-app-touch-target)) / 2);
-  }
-}
-.field {
-  display: flex;
-  align-items: flex-end;
-  gap: var(--spacing-6);
-  inline-size: 100%;
-  min-inline-size: 0;
-  padding: var(--spacing-8) var(--spacing-10);
-  border: var(--spacing-stroke-default) solid var(--ui-divider);
-  border-radius: var(--radius-composer);
-}
-.field:has(textarea:focus-visible) {
-  border-color: var(--ui-secondary);
-}
-.fieldMark {
-  display: inline-flex;
-  flex: none;
-  align-self: flex-start;
-  align-items: center;
-  block-size: var(--spacing-app-control-sm);
-  color: var(--ui-secondary);
-}
-.input {
-  flex: 1;
-  display: block;
-  min-inline-size: 0;
-  padding-block: calc((var(--spacing-app-control-sm) - var(--leading-22)) / 2);
-  padding-inline: 0;
-  border: 0;
-  background: transparent;
-  color: var(--ui-ink);
-  overflow-wrap: anywhere;
-}
-.input::placeholder {
-  color: var(--ui-muted);
-  opacity: 1;
-}
-.input:disabled {
-  cursor: default;
-}
-@media (pointer: coarse) {
-  .field {
-    padding-block: var(--spacing-2);
-  }
-  .fieldMark {
-    block-size: var(--spacing-app-touch-target);
-  }
-  .input {
-    padding-block: calc((var(--spacing-app-touch-target) - var(--leading-22)) / 2);
-  }
-}
-.dockedField,
-.resultsColumn {
-  inline-size: 100%;
-  max-inline-size: calc(var(--container-chat) + 2 * var(--spacing-24));
-  margin-inline: auto;
-}
-.dockedField {
-  flex: none;
-  padding: var(--spacing-32) var(--spacing-24) var(--spacing-12);
-}
-.scroll {
-  flex: 1;
-  min-block-size: 0;
-  overflow-y: auto;
-  scrollbar-gutter: stable both-edges;
-}
-.resultsColumn {
-  padding: var(--spacing-4) var(--spacing-24) var(--spacing-24);
-}
-.landing {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  min-block-size: 100%;
-  padding: var(--spacing-56) var(--spacing-12) var(--spacing-32);
-}
-@media (width >= 48rem) {
-  .landing {
-    padding: 2vh var(--spacing-24) 22vh;
-  }
-}
-.heading {
-  max-inline-size: var(--container-chat);
-  margin-block-end: var(--spacing-28);
-  text-align: center;
-  text-wrap: balance;
-}
-.landingField {
-  inline-size: 100%;
-  max-inline-size: var(--container-chat);
-}
-.historyAnchor {
-  position: relative;
-  inline-size: 100%;
-  min-inline-size: 0;
-}
-@media (width >= 48rem) {
-  .historyPanel {
-    position: absolute;
-    inset-inline: 0;
-    inset-block-start: 100%;
-  }
-}
-.history {
-  margin-block-start: var(--spacing-24);
-  padding-inline: var(--spacing-8);
-}
-.historyBar {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--spacing-8);
-  margin-block-end: var(--spacing-8);
-}
-.historyTypes {
-  display: flex;
-  align-items: center;
-  gap: var(--spacing-4);
-}
-.historyLists {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr);
-}
-.historyList {
-  display: grid;
-  grid-column: 1;
-  grid-row: 1;
-  align-content: start;
-  gap: var(--spacing-2);
-  min-inline-size: 0;
-}
-.historyList[inert] {
-  visibility: hidden;
-}
-.historyEmpty {
-  padding: var(--spacing-8);
-  color: var(--ui-secondary);
-}
-.historyError {
-  margin-block-start: var(--spacing-24);
-}
diff --git a/apps/sim/platform/app/(shell)/search/_components/search-surface/search-surface.tsx b/apps/sim/platform/app/(shell)/search/_components/search-surface/search-surface.tsx
deleted file mode 100644
index 7b3103995c2..00000000000
--- a/apps/sim/platform/app/(shell)/search/_components/search-surface/search-surface.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-'use client'
-
-import { useRef } from 'react'
-import { RedesignSurface } from '@/app/o/[organizationId]/_redesign/redesign-host'
-import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import { SearchFrame } from '@/app/o/[organizationId]/search/search-frame'
-import {
-  useOrganizationSearch,
-  useSearchFieldDraft,
-} from '@/app/o/[organizationId]/search/use-organization-search'
-import { VoiceWaveform } from '@/app/workspace/[workspaceId]/home/components/user-input/components/mic-button/mic-button'
-import { MicrophonePermissionHelp } from '@/app/workspace/[workspaceId]/home/components/user-input/components/microphone-permission-help/microphone-permission-help'
-import { useAutoSizeTextarea } from '@/hooks/use-auto-size-textarea'
-import { SearchResults } from '@/platform/app/(shell)/_components/search/search-results'
-import { SearchHistory } from '@/platform/app/(shell)/search/_components/search-surface/search-history'
-import styles from '@/platform/app/(shell)/search/_components/search-surface/search-surface.module.css'
-import { SearchSurfaceHeader } from '@/platform/app/(shell)/search/_components/search-surface/search-surface-header'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-const FIELD_MAX_HEIGHT_PX = 200
-
-interface SearchFieldProps {
-  userId: string
-  initialValue: string
-  onSubmit: (value: string) => void
-}
-
-function SearchField({ userId, initialValue, onSubmit }: SearchFieldProps) {
-  const fieldRef = useRef<HTMLDivElement>(null)
-  const {
-    inputRef,
-    hydrated,
-    value,
-    setValue,
-    submit,
-    voice,
-    isSearching,
-    canSubmit,
-    submitOrStop,
-  } = useSearchFieldDraft({ userId, initialValue, onSubmit })
-  useAutoSizeTextarea({
-    textareaRef: inputRef,
-    scrollerRef: fieldRef,
-    value,
-    maxHeight: FIELD_MAX_HEIGHT_PX,
-  })
-  const landing = !initialValue.trim()
-  const voiceLabel = voice.isListening ? 'Stop listening' : 'Voice input'
-  const field = (
-    <div
-      ref={fieldRef}
-      className={styles.field}
-      data-material='reading'
-      data-elevation={landing ? 'composer' : undefined}
-    >
-      <span className={styles.fieldMark}>
-        <Icon name='I089' />
-      </span>
-      <textarea
-        ref={inputRef}
-        className={styles.input}
-        data-type='T048'
-        rows={1}
-        value={value}
-        disabled={!hydrated}
-        placeholder='Search your sources'
-        aria-label='Search your sources'
-        autoComplete='off'
-        spellCheck={false}
-        onChange={(event) => setValue(event.target.value)}
-        onKeyDown={(event) => {
-          if (event.key === 'Enter' && !event.shiftKey && !event.nativeEvent.isComposing) {
-            event.preventDefault()
-            submit()
-          }
-        }}
-      />
-      {voice.isSupported && (
-        <IconButton
-          tooltip
-          label={voiceLabel}
-          icon='I083'
-          onClick={voice.toggleListening}
-          render={
-            voice.isListening ? (
-              <button type='button' aria-pressed>
-                <VoiceWaveform audioLevels={voice.audioLevels} isListening />
-              </button>
-            ) : (
-              <button type='button' aria-pressed={false} />
-            )
-          }
-        />
-      )}
-      <IconButton
-        variant='solid'
-        label={isSearching ? 'Stop search' : 'Search'}
-        icon={isSearching ? 'I035' : 'I023'}
-        disabled={!canSubmit && !isSearching}
-        render={<button type='button' aria-busy={isSearching} />}
-        onClick={submitOrStop}
-      />
-    </div>
-  )
-  return (
-    <>
-      {landing ? (
-        <SearchHistory userId={userId} onSearch={(query) => submit(query)}>
-          {field}
-        </SearchHistory>
-      ) : (
-        field
-      )}
-      <MicrophonePermissionHelp
-        open={voice.permissionHelpOpen}
-        onOpenChange={voice.setPermissionHelpOpen}
-      />
-    </>
-  )
-}
-
-interface OrganizationSearchSurfaceProps {
-  userId: string
-  chatId?: string
-}
-
-function OrganizationSearchSurfaceContent({ userId, chatId }: OrganizationSearchSurfaceProps) {
-  const { organization } = useOrganizationContext()
-  const search = useOrganizationSearch({ userId, chatId })
-  const query = search.query.trim()
-  const resultsScroll = useScrollEdges<HTMLDivElement>()
-  const field = (
-    <SearchField
-      key={search.query}
-      userId={userId}
-      initialValue={search.query}
-      onSubmit={search.submit}
-    />
-  )
-  return (
-    <SearchFrame search={search} header={<SearchSurfaceHeader search={search} />}>
-      <div className={styles.body}>
-        <RedesignSurface>
-          {query ? (
-            <div className={styles.docked}>
-              <div className={styles.dockedField}>{field}</div>
-              <div ref={resultsScroll} className={styles.scroll}>
-                <div className={styles.resultsColumn}>
-                  <SearchResults
-                    scope={{ kind: 'organization', organizationId: organization.id }}
-                    query={query}
-                    onSummarize={search.summarize}
-                  />
-                </div>
-              </div>
-            </div>
-          ) : (
-            <div className={styles.scroll}>
-              <div className={styles.landing}>
-                <h1 className={styles.heading} data-type='T076'>
-                  Search {organization.name}
-                </h1>
-                <div className={styles.landingField}>{field}</div>
-              </div>
-            </div>
-          )}
-        </RedesignSurface>
-      </div>
-    </SearchFrame>
-  )
-}
-
-/** Organization Search in the design system. The Assistant conversation renders beside it. */
-export function OrganizationSearchSurface(props: OrganizationSearchSurfaceProps) {
-  const { searchAccess } = useOrganizationContext()
-  if (!searchAccess.memberScoped) return null
-  return <OrganizationSearchSurfaceContent {...props} />
-}
diff --git a/apps/sim/platform/design-system/catalog/icon-geometry.tsx b/apps/sim/platform/design-system/catalog/icon-geometry.tsx
deleted file mode 100644
index aab76568475..00000000000
--- a/apps/sim/platform/design-system/catalog/icon-geometry.tsx
+++ /dev/null
@@ -1,879 +0,0 @@
-import type { ReactNode } from 'react'
-
-/** SVG paths and view boxes from the registered Shared icon masters. */
-export const glyphs = {
-  I001: {
-    label: 'Chart/Grid',
-    artwork: true,
-    viewBox: '0 0 472 128',
-    draw: (id: string): ReactNode => (
-      <>
-        <defs>
-          <linearGradient id={`${id}-0`} x1='0' y1='0' x2='0' y2='1'>
-            <stop offset='0%' stopColor='currentColor' />
-            <stop offset='100%' stopColor='currentColor' stopOpacity='0' />
-          </linearGradient>
-        </defs>
-        <path
-          d='M1 81.1 L79.33 61.15 L157.67 69.7 L236 41.2 L314.33 55.45 L392.67 24.1 L471 35.5 L471 121 L1 121 Z'
-          fill={`url(#${id}-0)`}
-          opacity='var(--opacity-chart-area)'
-        />
-        <path
-          d='M1 81.1 L79.33 61.15 L157.67 69.7 L236 41.2 L314.33 55.45 L392.67 24.1 L471 35.5'
-          vectorEffect='non-scaling-stroke'
-          fill='none'
-          stroke='var(--color-chart-series)'
-          strokeWidth='1.5'
-          strokeLinecap='round'
-          strokeLinejoin='round'
-        />
-      </>
-    ),
-  },
-  I003: {
-    label: 'Chart/Series/zero',
-    artwork: true,
-    viewBox: '0 0 472 128',
-    draw: (): ReactNode => (
-      <>
-        <path
-          d='M1 121H471'
-          vectorEffect='non-scaling-stroke'
-          fill='none'
-          stroke='var(--color-chart-series)'
-          strokeWidth='1.5'
-          strokeLinecap='round'
-        />
-      </>
-    ),
-  },
-  I004: {
-    label: 'database',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <>
-        <ellipse cx='10.25' cy='4.25' rx='7.5' ry='3.25' />
-        <path d='M2.75 4.25V15.25C2.75 17.05 6.11 18.5 10.25 18.5C14.39 18.5 17.75 17.05 17.75 15.25V4.25 M2.75 9.75C2.75 11.55 6.11 13 10.25 13C14.39 13 17.75 11.55 17.75 9.75' />
-      </>
-    ),
-  },
-  I005: {
-    label: 'provider-gmail',
-    artwork: true,
-    viewBox: '0 0 48 48',
-    draw: (): ReactNode => (
-      <>
-        <path d='M45,16.2l-5,2.75l-5,4.75L35,40h7c1.66,0,3-1.34,3-3V16.2z' fill='#4CAF50' />
-        <path d='M3,16.2l3.61,1.71L13,23.7V40H6c-1.66,0-3-1.34-3-3V16.2z' fill='#1E88E5' />
-        <polygon
-          points='35,11.2 24,19.45 13,11.2 12,17 13,23.7 24,31.95 35,23.7 36,17'
-          fill='#E53935'
-        />
-        <path
-          d='M3,12.3V16.2l10,7.5V11.2L9.88,8.86C9.13,8.3,8.23,8,7.3,8h0C4.92,8,3,9.92,3,12.3z'
-          fill='#C62828'
-        />
-        <path
-          d='M45,12.3V16.2l-10,7.5V11.2l3.12-2.34C38.87,8.3,39.77,8,40.7,8h0 C43.08,8,45,9.92,45,12.3z'
-          fill='#FBC02D'
-        />
-      </>
-    ),
-  },
-  I006: {
-    label: 'copy',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <>
-        <rect x='8' y='8' width='12' height='12' rx='2' />
-        <path d='M16 8V5a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h3' />
-      </>
-    ),
-  },
-  I007: {
-    label: 'Brand/linear',
-    artwork: true,
-    viewBox: '0 0 100 100',
-    draw: (): ReactNode => (
-      <>
-        <path
-          d='M1.23 61.52c-.223-.949.91-1.55 1.6-.857L39.33 97.18c.689.69.09 1.82-.857 1.6C20.05 94.45 5.55 79.95 1.23 61.52ZM.002 46.89c-.176.28.89.56.29.76L52.35 99.71c.201.2.48.31.76.29 2.37-.148 4.69-.46 6.96-.926.76-.157 1.03-1.1.48-1.65L2.58 39.45c-.552-.552-1.49-.286-1.65.48-.466 2.27-.778 4.59-.926 6.96ZM4.21 29.71c-.166.37-.817.81.21 1.1l64.78 64.78c.289.29.73.37 1.1.21 1.79-.796 3.52-1.69 5.19-2.68.55-.328.64-1.9.18-1.54L8.44 24.34c-.454-.454-1.21-.369-1.54.18-.991 1.67-1.89 3.4-2.68 5.19ZM12.66 18.07c-.37-.37-.393-.964-.044-1.35C21.78 6.46 35.11 0 49.95 0 77.59 0 100 22.41 100 50.05c0 14.84-6.46 28.17-16.72 37.34-.39.35-.984.33-1.35-.044L12.66 18.07Z'
-          fill='currentColor'
-        />
-      </>
-    ),
-  },
-  I008: {
-    label: 'thumbs-down',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='M17 14V3h4v11h-4Zm0 0-5 8c-2 0-3-1.5-2.5-3.5L10 15H5a2 2 0 0 1-2-2.4l1.4-8A2 2 0 0 1 6.4 3H17' />
-    ),
-  },
-  I014: {
-    label: 'loader',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74 M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74' />
-    ),
-  },
-  I015: {
-    label: 'file',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <path d='M12.25 0.75H5.25C4.15 0.75 3.25 1.65 3.25 2.75V16.75C3.25 17.85 4.15 18.75 5.25 18.75H15.25C16.35 18.75 17.25 17.85 17.25 16.75V5.75L12.25 0.75Z M12.25 0.75V5.75H17.25' />
-    ),
-  },
-  I017: {
-    label: 'thumbs-up',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='M7 10v11H3V10h4Zm0 0 5-8c2 0 3 1.5 2.5 3.5L14 9h5a2 2 0 0 1 2 2.4l-1.4 8A2 2 0 0 1 17.6 21H7' />
-    ),
-  },
-  I022: {
-    label: 'Brand/notion',
-    artwork: true,
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <>
-        <path
-          d='M4.459 4.208c.746.606 1.026.56 2.428.466l13.215-.793c.28 0 .047-.28-.046-.326L17.86 1.968c-.42-.326-.981-.7-2.055-.607L3.01 2.295c-.466.046-.56.28-.374.466zm.793 3.08v13.904c0 .747.373 1.027 1.214.98l14.523-.84c.841-.046.935-.56.935-1.167V6.354c0-.606-.233-.933-.748-.887l-15.177.887c-.56.047-.747.327-.747.933zm14.337.745c.093.42 0 .84-.42.888l-.7.14v10.264c-.608.327-1.168.514-1.635.514-.748 0-.935-.234-1.495-.933l-4.577-7.186v6.952L12.21 19s0 .84-1.168.84l-3.222.186c-.093-.186 0-.653.327-.746l.84-.233V9.854L7.822 9.76c-.094-.42.14-1.026.793-1.073l3.456-.233 4.764 7.279v-6.44l-1.215-.139c-.093-.514.28-.887.747-.933zM1.936 1.035l13.31-.98c1.634-.14 2.055-.047 3.082.7l4.249 2.986c.7.513.934.653.934 1.213v16.378c0 1.026-.373 1.634-1.68 1.726l-15.458.934c-.98.047-1.448-.093-1.962-.747l-3.129-4.06c-.56-.747-.793-1.306-.793-1.96V2.667c0-.839.374-1.54 1.447-1.632z'
-          fill='currentColor'
-        />
-      </>
-    ),
-  },
-  I023: {
-    label: 'arrow-up',
-    viewBox: '-1.75 -1.75 24 24',
-    draw: (): ReactNode => <path d='M4 9.25L10.25 3L16.5 9.25 M10.25 3V17.5' />,
-  },
-  I025: {
-    label: 'workspace',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <>
-        <rect x='3' y='3' width='18' height='7' rx='1.75' />
-        <rect x='3' y='14' width='18' height='7' rx='1.75' />
-        <path d='M7 6.5h.01M7 17.5h.01M11 6.5h6M11 17.5h6' />
-      </>
-    ),
-  },
-  I030: {
-    label: 'arrow-up-right',
-    viewBox: '0 0 16 16',
-    draw: (): ReactNode => <path d='m5 11 6-6H6.5M11 5v4.5' />,
-  },
-  I032: {
-    label: 'chevron-right',
-    viewBox: '-2.25 -1.75 24 24',
-    draw: (): ReactNode => <path d='M6.25 3L13.25 10.25L6.25 17.5' />,
-  },
-  I033: {
-    label: 'table',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <path d='M0.75 3.25C0.75 1.87 1.87 0.75 3.25 0.75H17.25C18.63 0.75 19.75 1.87 19.75 3.25V16.25C19.75 17.63 18.63 18.75 17.25 18.75H3.25C1.87 18.75 0.75 17.63 0.75 16.25V3.25Z M0.75 6.75H19.75 M0.75 12.75H19.75 M10.25 6.75V18.75' />
-    ),
-  },
-  I035: {
-    label: 'stop',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <>
-        <rect x='6' y='6' width='12' height='12' rx='2' />
-      </>
-    ),
-  },
-  I036: {
-    label: 'pencil',
-    viewBox: '-2 -2 24 24',
-    draw: (): ReactNode => (
-      <path d='M14.25 0.75L19.25 5.75L5.75 19.25H0.75V14.25L14.25 0.75Z M10.75 4.25L15.75 9.25' />
-    ),
-  },
-  I037: {
-    label: 'external-link',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='M15 3h6v6M10 14 21 3M21 14v5a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5' />
-    ),
-  },
-  I038: {
-    label: 'panel',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <>
-        <rect x='3' y='3' width='18' height='18' rx='2.5' />
-        <path d='M15 3v18' />
-      </>
-    ),
-  },
-  I041: {
-    label: 'globe',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <>
-        <circle cx='10.25' cy='9.75' r='8' />
-        <ellipse cx='10.25' cy='9.75' rx='3.4' ry='8' />
-        <path d='M3.32 5.75H17.18M3.32 13.75H17.18' />
-      </>
-    ),
-  },
-  I044: {
-    label: 'slash',
-    viewBox: '-1.75 -1.75 24 24',
-    draw: (): ReactNode => <path d='M14 3L6.5 17.5' />,
-  },
-  I045: {
-    label: 'Brand/GitHub',
-    artwork: true,
-    viewBox: '0 0 26 26',
-    draw: (): ReactNode => (
-      <>
-        <path
-          d='M13 0C11.29 0 9.6 0.34 8.03 0.99C6.45 1.64 5.01 2.6 3.81 3.81C1.37 6.25 0 9.55 0 13C0 18.75 3.73 23.62 8.89 25.35C9.54 25.45 9.75 25.05 9.75 24.7V22.5C6.15 23.28 5.38 20.76 5.38 20.76C4.78 19.25 3.94 18.85 3.94 18.85C2.76 18.04 4.03 18.07 4.03 18.07C5.33 18.16 6.02 19.41 6.02 19.41C7.15 21.39 9.06 20.8 9.8 20.49C9.92 19.64 10.26 19.07 10.62 18.75C7.74 18.42 4.71 17.3 4.71 12.35C4.71 10.91 5.2 9.75 6.05 8.83C5.92 8.5 5.46 7.15 6.18 5.4C6.18 5.4 7.27 5.04 9.75 6.72C10.78 6.44 11.9 6.29 13 6.29C14.11 6.29 15.22 6.44 16.25 6.72C18.73 5.04 19.83 5.4 19.83 5.4C20.54 7.15 20.09 8.5 19.95 8.83C20.8 9.75 21.29 10.91 21.29 12.35C21.29 17.32 18.25 18.41 15.35 18.73C15.82 19.14 16.25 19.93 16.25 21.14V24.7C16.25 25.05 16.46 25.47 17.12 25.35C22.28 23.61 26 18.75 26 13C26 11.29 25.66 9.6 25.01 8.03C24.36 6.45 23.4 5.01 22.19 3.81C20.99 2.6 19.55 1.64 17.97 0.99C16.4 0.34 14.71 0 13 0Z'
-          fill='currentColor'
-        />
-      </>
-    ),
-  },
-  I046: {
-    label: 'clock',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <>
-        <circle cx='10.25' cy='9.75' r='9' />
-        <path d='M10.25 4.75V9.75L13.75 12.25' />
-      </>
-    ),
-  },
-  I047: {
-    label: 'help-circle',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <>
-        <circle cx='10.25' cy='9.75' r='9' />
-        <path d='M7.5 7.25C7.5 5.73 8.73 4.5 10.25 4.5C11.77 4.5 13 5.73 13 7.25C13 8.68 11.75 9.05 10.95 9.85C10.5 10.3 10.25 10.75 10.25 11.5 M10.25 14.5L10.26 14.5' />
-      </>
-    ),
-  },
-  I049: {
-    label: 'download',
-    viewBox: '0 0 16 16',
-    draw: (): ReactNode => <path d='M8 2.5v8m-3-3 3 3 3-3M4 13h8' />,
-  },
-  I050: {
-    label: 'sliders-vertical',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <>
-        <path d='M8 4.8v2.4m0 3.2v8.8m8-14.4v8.8m0 3.2v2.4' />
-        <circle cx='8' cy='8.8' r='1.6' />
-        <circle cx='16' cy='15.2' r='1.6' />
-      </>
-    ),
-  },
-  I051: {
-    label: 'chevron-down',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => <path d='M3 6.25L10.25 13.25L17.5 6.25' />,
-  },
-  I053: {
-    label: 'restore',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => <path d='M21 3l-7 7M14 4v6h6M3 21l7-7M4 14h6v6' />,
-  },
-  I055: {
-    label: 'retry',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => <path d='M3 10a9 9 0 1 1 2.5 8M3 4v6h6' />,
-  },
-  I056: {
-    label: 'Chart/Series',
-    artwork: true,
-    viewBox: '0 0 472 128',
-    draw: (id: string): ReactNode => (
-      <>
-        <defs>
-          <linearGradient id={`${id}-0`} x1='0' y1='0' x2='0' y2='1'>
-            <stop offset='0%' stopColor='var(--color-chart-area)' />
-            <stop offset='100%' stopColor='var(--color-chart-area)' stopOpacity='0' />
-          </linearGradient>
-        </defs>
-        <path
-          d='M1 81.1 L79.33 61.15 L157.67 69.7 L236 41.2 L314.33 55.45 L392.67 24.1 L471 35.5 L471 121 L1 121 Z'
-          fill={`url(#${id}-0)`}
-          opacity='var(--opacity-chart-area)'
-        />
-        <path
-          d='M1 81.1 L79.33 61.15 L157.67 69.7 L236 41.2 L314.33 55.45 L392.67 24.1 L471 35.5'
-          vectorEffect='non-scaling-stroke'
-          fill='none'
-          stroke='var(--color-chart-series)'
-          strokeWidth='1.5'
-          strokeLinecap='round'
-          strokeLinejoin='round'
-        />
-      </>
-    ),
-  },
-  I057: {
-    label: 'App-icon-/-check',
-    viewBox: '-2 -2.75 24 24',
-    draw: (): ReactNode => <path d='M18.25 2.75L7.25 15.75L1.75 10.25' />,
-  },
-  I059: {
-    label: 'image',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <>
-        <rect x='3' y='3' width='18' height='18' rx='3' />
-        <circle cx='8.5' cy='8.5' r='1.5' />
-        <path d='m21 15-5-5L5 21' />
-      </>
-    ),
-  },
-  I060: {
-    label: 'expand',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => <path d='M14 4h6v6M20 4l-7 7M10 20H4v-6M4 20l7-7' />,
-  },
-  I061: {
-    label: 'archive',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <g>
-        <rect x='3' y='3' width='18' height='4' rx='1' />
-        <path d='M5 7v13h14V7M10 11h4' />
-      </g>
-    ),
-  },
-  I064: {
-    label: 'chevron-down',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => <path d='M3 6.25L10.25 13.25L17.5 6.25' />,
-  },
-  I065: {
-    label: 'reload',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => <path d='M20 6v5h-5M20 11a8 8 0 1 0-1 6' />,
-  },
-  I066: {
-    label: 'panel-left',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <path d='M0.75 3.25C0.75 1.87 1.87 0.75 3.25 0.75H17.25C18.63 0.75 19.75 1.87 19.75 3.25V16.25C19.75 17.63 18.63 18.75 17.25 18.75H3.25C1.87 18.75 0.75 17.63 0.75 16.25V3.25Z M8.25 0.75V18.75' />
-    ),
-  },
-  I069: {
-    label: 'rate-response',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='M2 7h3v9H2zM5 8l3-6c.5-1 2-.5 2 1v4h3a1.4 1.4 0 0 1 1.4 1.7l-1 5A2 2 0 0 1 11.4 16H5M22 17h-3V8h3zM19 16l-3 6c-.5 1-2 .5-2-1v-3M18 8h-1' />
-    ),
-  },
-  I070: {
-    label: 'integration',
-    viewBox: '-1 -1.5 24 24',
-    draw: (): ReactNode => (
-      <>
-        <rect x='1.5' y='1' width='12' height='12' rx='2' />
-        <rect x='8.5' y='8' width='12' height='12' rx='2' />
-      </>
-    ),
-  },
-  I072: {
-    label: 'check',
-    viewBox: '-2 -2.75 24 24',
-    draw: (): ReactNode => <path d='M18.25 2.75L7.25 15.75L1.75 10.25' />,
-  },
-  I073: {
-    label: 'message-square-text',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <path d='M17.99 12.33A1.72 1.72 0 0 1 16.27 14.05H5.95L2.51 17.49V3.73A1.72 1.72 0 0 1 4.23 2.01H16.27A1.72 1.72 0 0 1 17.99 3.73Z M5.95 6.31H11.11 M5.95 9.75H14.55' />
-    ),
-  },
-  I074: {
-    label: 'plus',
-    viewBox: '-1.75 -1.75 24 24',
-    draw: (): ReactNode => <path d='M10.25 3V17.5 M3 10.25H17.5' />,
-  },
-  I075: {
-    label: 'file-text',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='M14 3H6a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9Z M14 3v6h6M8 13h8M8 17h6' />
-    ),
-  },
-  I079: {
-    label: 'book-open',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <path d='M0.75 2.75C0.75 2.75 3.25 0.75 6.25 0.75C9.25 0.75 10.25 2.75 10.25 2.75V18.75C10.25 18.75 9.25 17.25 6.25 17.25C3.25 17.25 0.75 18.75 0.75 18.75V2.75Z M10.25 2.75C10.25 2.75 11.25 0.75 14.25 0.75C17.25 0.75 19.75 2.75 19.75 2.75V18.75C19.75 18.75 17.25 17.25 14.25 17.25C11.25 17.25 10.25 18.75 10.25 18.75' />
-    ),
-  },
-  I080: {
-    label: 'RangeControl/default',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => <path d='m8 10 4 4 4-4' />,
-  },
-  I082: {
-    label: 'book-open',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='M12 6.5C9.7 4.4 6.5 4 3 4.5V19C6.5 18.5 9.7 19 12 21C14.3 19 17.5 18.5 21 19V4.5C17.5 4 14.3 4.4 12 6.5Z M12 6.5V21' />
-    ),
-  },
-  I083: {
-    label: 'mic',
-    viewBox: '-1.75 -2 24 24',
-    draw: (): ReactNode => (
-      <>
-        <rect x='7.25' y='0.75' width='6' height='12' rx='3' />
-        <path d='M3.75 9.25V10.25C3.75 13.84 6.66 16.75 10.25 16.75C13.84 16.75 16.75 13.84 16.75 10.25V9.25 M10.25 16.75V19.25' />
-      </>
-    ),
-  },
-  I084: {
-    label: 'provider-salesforce',
-    artwork: true,
-    viewBox: '0 0 273 191',
-    draw: (): ReactNode => (
-      <>
-        <path
-          d='M113 21.3c8.78-9.14 21-14.8 34.5-14.8 18 0 33.6 10 42 24.9a58 58 0 0 1 23.7-5.05c32.4 0 58.7 26.5 58.7 59.2s-26.3 59.2-58.7 59.2c-3.96 0-7.82-0.4-11.6-1.15-7.35 13.1-21.4 22-37.4 22a42.7 42.7 0 0 1-18.8-4.32c-7.45 17.5-24.8 29.8-45 29.8-21.1 0-39-13.3-45.9-32a45.1 45.1 0 0 1-9.34 0.97c-25.1 0-45.4-20.6-45.4-45.9 0-17 9.14-31.8 22.7-39.8a52.6 52.6 0 0 1-4.35-21c0-29.2 23.7-52.8 52.9-52.8 17.1 0 32.4 8.15 42 20.8'
-          fill='#00A1E0'
-        />
-        <path
-          d='M39.4 99.3c-0.17 0.45 0.06 0.54 0.12 0.62 0.51 0.37 1.03 0.64 1.55 0.94 2.78 1.47 5.4 1.9 8.14 1.9 5.58 0 9.05-2.97 9.05-7.75v-0.09c0-4.42-3.92-6.03-7.58-7.18l-0.48-0.15c-2.77-0.9-5.16-1.68-5.16-3.5v-0.09c0-1.56 1.4-2.71 3.56-2.71 2.4 0 5.26 0.8 7.09 1.81 0 0 0.54 0.35 0.74-0.17 0.11-0.28 1.04-2.78 1.14-3.06 0.11-0.29-0.08-0.51-0.27-0.63-2.1-1.28-5-2.15-8-2.15l-0.56 2e-3c-5.11 0-8.68 3.09-8.68 7.51v0.1c0 4.66 3.94 6.18 7.62 7.23l0.59 0.18c2.68 0.82 5 1.54 5 3.42v0.09c0 1.73-1.51 3.02-3.93 3.02-0.94 0-3.94-0.02-7.19-2.07-0.39-0.23-0.62-0.39-0.92-0.58-0.16-0.1-0.56-0.27-0.73 0.25l-1.1 3.06zm81.7 0c-0.17 0.45 0.06 0.54 0.12 0.62 0.51 0.37 1.03 0.64 1.55 0.94 2.78 1.47 5.4 1.9 8.14 1.9 5.58 0 9.05-2.97 9.05-7.75v-0.09c0-4.42-3.91-6.03-7.58-7.18l-0.48-0.15c-2.77-0.9-5.16-1.68-5.16-3.5v-0.09c0-1.56 1.4-2.71 3.56-2.71 2.4 0 5.25 0.8 7.09 1.81 0 0 0.54 0.35 0.74-0.17 0.11-0.28 1.04-2.78 1.13-3.06 0.11-0.29-0.08-0.51-0.27-0.63-2.1-1.28-5-2.15-8-2.15l-0.56 2e-3c-5.11 0-8.68 3.09-8.68 7.51v0.1c0 4.66 3.94 6.18 7.62 7.23l0.59 0.18c2.69 0.82 5 1.54 5 3.42v0.09c0 1.73-1.51 3.02-3.93 3.02-0.94 0-3.95-0.02-7.19-2.07-0.39-0.23-0.62-0.39-0.92-0.58-0.1-0.06-0.57-0.25-0.73 0.25l-1.1 3.06zm55.8-9.36c0 2.7-0.5 4.83-1.49 6.34-0.98 1.49-2.47 2.22-4.54 2.22s-3.55-0.72-4.52-2.21c-0.98-1.5-1.47-3.64-1.47-6.34 0-2.7 0.5-4.82 1.47-6.31 0.97-1.48 2.44-2.19 4.52-2.19s3.56 0.72 4.54 2.19c0.99 1.49 1.49 3.61 1.49 6.31zm4.66-5.01c-0.46-1.55-1.17-2.91-2.12-4.05-0.95-1.14-2.15-2.06-3.58-2.72-1.42-0.66-3.1-1-5-1s-3.57 0.34-5 1c-1.42 0.66-2.63 1.58-3.58 2.72-0.95 1.14-1.66 2.5-2.12 4.05-0.45 1.54-0.69 3.22-0.69 5.01 0 1.79 0.23 3.47 0.69 5.01 0.46 1.55 1.17 2.91 2.12 4.05 0.95 1.14 2.16 2.05 3.58 2.7 1.43 0.65 3.11 0.98 5 0.98 1.89 0 3.57-0.33 4.99-0.98 1.42-0.65 2.63-1.56 3.58-2.7 0.95-1.14 1.66-2.5 2.12-4.05 0.45-1.54 0.69-3.22 0.69-5.01 0-1.78-0.23-3.47-0.68-5.01zm38.3 12.8c-0.15-0.45-0.59-0.28-0.59-0.28-0.68 0.26-1.4 0.5-2.17 0.62-0.78 0.12-1.64 0.18-2.55 0.18-2.25 0-4.05-0.67-5.33-2-1.29-1.33-2.01-3.47-2-6.37 7e-3 -2.64 0.65-4.62 1.79-6.14 1.13-1.5 2.87-2.28 5.17-2.28 1.92 0 3.39 0.22 4.93 0.71 0 0 0.37 0.16 0.54-0.32 0.41-1.13 0.71-1.94 1.15-3.18 0.12-0.35-0.18-0.5-0.29-0.55-0.6-0.24-2.03-0.62-3.11-0.79-1.01-0.15-2.18-0.23-3.5-0.23-1.96 0-3.7 0.34-5.19 1-1.49 0.66-2.75 1.58-3.75 2.72-1 1.14-1.76 2.5-2.27 4.05-0.5 1.54-0.76 3.23-0.76 5.02 0 3.86 1.04 6.99 3.1 9.28 2.06 2.3 5.16 3.46 9.2 3.46 2.39 0 4.84-0.48 6.6-1.18 0 0 0.34-0.16 0.19-0.55l-1.15-3.16zm8.15-10.4c0.22-1.5 0.63-2.75 1.28-3.72 0.97-1.48 2.44-2.29 4.51-2.29 2.07 0 3.44 0.81 4.42 2.29 0.65 0.98 0.93 2.27 1.04 3.72l-11.3-2e-3zm15.7-3.3c-0.4-1.49-1.38-3-2.02-3.69-1.02-1.09-2.01-1.86-3-2.28a11.5 11.5 0 0 0-4.52-0.92c-1.97 0-3.76 0.33-5.21 1.01-1.45 0.68-2.67 1.61-3.63 2.77-0.96 1.16-1.68 2.53-2.14 4.1-0.46 1.55-0.69 3.25-0.69 5.03 0 1.82 0.24 3.51 0.72 5.04 0.48 1.54 1.25 2.89 2.29 4.01 1.04 1.13 2.37 2.01 3.97 2.63 1.59 0.62 3.52 0.93 5.73 0.93 4.56-0.01 6.96-1.03 7.94-1.58 0.18-0.1 0.34-0.27 0.13-0.75l-1.03-2.89c-0.16-0.43-0.59-0.28-0.59-0.28-1.13 0.42-2.73 1.18-6.48 1.17-2.45-4e-3 -4.26-0.73-5.4-1.86-1.16-1.16-1.74-2.85-1.83-5.25l15.8 0.01s0.42-4e-3 0.46-0.41c0.02-0.17 0.54-3.24-0.47-6.79zm-142 3.3c0.22-1.5 0.64-2.75 1.28-3.72 0.97-1.48 2.44-2.29 4.51-2.29 2.07 0 3.44 0.81 4.42 2.29 0.65 0.98 0.93 2.27 1.04 3.72l-11.3-2e-3zm15.7-3.3c-0.4-1.49-1.38-3-2.02-3.69-1.02-1.09-2.01-1.86-3-2.28a11.5 11.5 0 0 0-4.52-0.92c-1.97 0-3.76 0.33-5.21 1.01-1.45 0.68-2.67 1.61-3.63 2.77-0.96 1.16-1.68 2.53-2.14 4.1-0.46 1.55-0.69 3.25-0.69 5.03 0 1.82 0.24 3.51 0.72 5.04 0.48 1.54 1.25 2.89 2.28 4.01 1.04 1.13 2.37 2.01 3.97 2.63 1.59 0.62 3.51 0.93 5.73 0.93 4.56-0.01 6.96-1.03 7.94-1.58 0.17-0.1 0.34-0.27 0.13-0.75l-1.03-2.89c-0.16-0.43-0.59-0.28-0.59-0.28-1.13 0.42-2.73 1.18-6.48 1.17-2.44-4e-3 -4.26-0.73-5.4-1.86-1.16-1.16-1.74-2.85-1.83-5.25l15.8 0.01s0.42-4e-3 0.46-0.41c0.02-0.17 0.54-3.24-0.47-6.79zm-49.8 13.6c-0.62-0.49-0.7-0.61-0.91-0.94-0.31-0.48-0.47-1.17-0.47-2.05 0-1.38 0.46-2.38 1.41-3.05-0.01 2e-3 1.36-1.18 4.58-1.14a32 32 0 0 1 4.28 0.37v7.17h2e-3s-2 0.43-4.26 0.57c-3.21 0.19-4.63-0.92-4.62-0.92zm6.28-11.1c-0.64-0.05-1.47-0.07-2.46-0.07-1.35 0-2.66 0.17-3.88 0.5-1.23 0.33-2.34 0.85-3.29 1.53a7.63 7.63 0 0 0-2.29 2.6c-0.56 1.04-0.84 2.26-0.84 3.64 0 1.4 0.24 2.61 0.72 3.6a6.54 6.54 0 0 0 2.06 2.47c0.88 0.64 1.96 1.11 3.21 1.39 1.24 0.28 2.64 0.43 4.18 0.43 1.62 0 3.23-0.14 4.79-0.4a95.1 95.1 0 0 0 3.97-0.77c0.53-0.12 1.11-0.28 1.11-0.28 0.39-0.1 0.36-0.52 0.36-0.52l-9e-3 -14.4c0-3.16-0.84-5.51-2.51-6.96-1.66-1.45-4.09-2.18-7.24-2.18-1.18 0-3.09 0.16-4.23 0.39 0 0-3.44 0.67-4.86 1.78 0 0-0.31 0.19-0.14 0.63l1.12 3c0.14 0.39 0.52 0.26 0.52 0.26s0.12-0.05 0.26-0.13c3.03-1.65 6.87-1.6 6.87-1.6 1.7 0 3.02 0.35 3.9 1.02 0.86 0.66 1.3 1.66 1.3 3.76v0.67c-1.35-0.2-2.6-0.31-2.6-0.31zm127-8.13a0.43 0.43 0 0 0-0.24-0.57c-0.27-0.1-1.61-0.38-2.64-0.45-1.98-0.12-3.08 0.21-4.07 0.65-0.98 0.44-2.06 1.15-2.66 1.97l-2e-3 -1.92c0-0.26-0.19-0.48-0.45-0.48h-4.04c-0.26 0-0.45 0.21-0.45 0.48v23.5a0.48 0.48 0 0 0 0.48 0.48h4.14a0.48 0.48 0 0 0 0.48-0.48v-11.8c0-1.58 0.17-3.15 0.52-4.14 0.34-0.98 0.81-1.76 1.38-2.32a4.79 4.79 0 0 1 1.95-1.17 7.68 7.68 0 0 1 2.12-0.3c0.83 0 1.73 0.21 1.73 0.21 0.3 0.03 0.47-0.15 0.58-0.43 0.27-0.72 1.04-2.88 1.19-3.31'
-          fill='#FFFFFF'
-        />
-        <path
-          d='M162.2 67.55a13.26 13.26 0 0 0-1.56-.37 12.22 12.22 0 0 0-2.14-.166c-2.85 0-5.1.806-6.68 2.4-1.57 1.58-2.63 3.99-3.17 7.15l-.193 1.07h-3.58s-.437-.018-.529.46l-.588 3.28c-.41.31.094.51.51.508h3.49l-3.54 19.74c-.277 1.59-.594 2.9-.945 3.89-.346.98-.684 1.71-1.1 2.24-.403.52-.785.89-1.44 1.12-.544.18-1.17.27-1.86.267-.382 0-.89-.064-1.26-.139-.375-.074-.57-.158-.851-.276 0 0-.409-.156-.57.25-.131.34-1.06 2.89-1.17 3.21-.112.31.45.56.243.63.464.17.809.27 1.44.421.88.207 1.62.22 2.31.22 1.45 0 2.78-.204 3.87-.6 1.1-.399 2.07-1.09 2.92-2.03.919-1.01 1.5-2.08 2.05-3.53.547-1.44 1.01-3.22 1.39-5.3l3.55-20.11h5.2s.438.02.529-.459l.588-3.28c.041-.314-.093-.51-.515-.508h-5.04c.025-.114.25-1.89.833-3.56.247-.713.71-1.29 1.11-1.68a3.27 3.27 0 0 1 1.32-.822 5.48 5.48 0 0 1 1.69-.244c.475 0 .941.06 1.3.131.49.104.68.159.81.197.51.157.58.5.68-.244l1.21-3.31c.124-.356-.178-.506-.29-.55zm-70.47 34.12c0 .264-.188.48-.452.48h-4.18c-.265 0-.453-.215-.453-.479V68c0-.263.19-.476.45-.476h4.18c.264 0 .452.21.452.48v33.67'
-          fill='#FFFFFF'
-        />
-      </>
-    ),
-  },
-  I085: {
-    label: 'provider-microsoft',
-    artwork: true,
-    viewBox: '0 0 109 109',
-    draw: (): ReactNode => (
-      <>
-        <polygon points='51.9,51.9 0,51.9 0,0 51.9,0' fill='#F1511B' />
-        <polygon points='109.3,51.9 57.3,51.9 57.3,0 109.3,0' fill='#80CC28' />
-        <polygon points='51.9,109.3 0,109.3 0,57.4 51.9,57.4' fill='#00ADEF' />
-        <polygon points='109.3,109.3 57.3,109.3 57.3,57.4 109.3,57.4' fill='#FBBC09' />
-      </>
-    ),
-  },
-  I088: {
-    label: 'provider-google-calenda',
-    artwork: true,
-    viewBox: '0 0 200 200',
-    draw: (): ReactNode => (
-      <>
-        <g>
-          <g transform='translate(3.75 3.75)'>
-            <path
-              d='M148.88,43.62l-47.37-5.26l-57.89,5.26L38.35,96.25l5.26,52.63l52.63,6.58l52.63-6.58 l5.26-53.95L148.88,43.62z'
-              fill='#FFFFFF'
-            />
-            <path
-              d='M65.21,125.28c-3.93-2.66-6.66-6.54-8.14-11.67l9.13-3.76c0.83,3.16,2.28,5.61,4.34,7.34 c2.05,1.74,4.55,2.59,7.47,2.59c2.99,0,5.55-0.91,7.7-2.72s3.22-4.13,3.22-6.93c0-2.87-1.13-5.21-3.39-7.03 s-5.11-2.72-8.5-2.72h-5.28v-9.04H76.5c2.92,0,5.38-0.79,7.38-2.37c2-1.58,3-3.74,3-6.49 c0-2.45-0.89-4.39-2.68-5.85s-4.05-2.2-6.8-2.2c-2.68,0-4.82,0.71-6.39,2.15s-2.72,3.2-3.45,5.28 l-9.04-3.76c1.2-3.39,3.4-6.39,6.62-8.99c3.22-2.59,7.34-3.89,12.34-3.89c3.7,0,7.03,0.71,9.97,2.15 c2.95,1.43,5.26,3.42,6.93,5.95c1.67,2.54,2.5,5.38,2.5,8.54c0,3.22-0.78,5.95-2.33,8.18 c-1.55,2.24-3.46,3.95-5.72,5.15v0.54c2.99,1.25,5.42,3.16,7.34,5.72c1.91,2.57,2.87,5.63,2.87,9.21 s-0.91,6.78-2.72,9.58c-1.82,2.8-4.33,5.01-7.51,6.62c-3.2,1.61-6.79,2.42-10.78,2.42 C73.41,129.26,69.15,127.93,65.21,125.28z'
-              fill='#1A73E8'
-            />
-            <path
-              d='M121.25,79.96l-9.97,7.25l-5.01-7.6l17.99-12.97h6.9v61.2h-9.89L121.25,79.96z'
-              fill='#1A73E8'
-            />
-            <path
-              d='M148.88,196.25l47.37-47.37l-23.68-10.53l-23.68,10.53l-10.53,23.68L148.88,196.25z'
-              fill='#EA4335'
-            />
-            <path d='M33.09,172.57l10.53,23.68h105.26v-47.37H43.62L33.09,172.57z' fill='#34A853' />
-            <path
-              d='M12.04-3.75C3.32-3.75-3.75,3.32-3.75,12.04v136.84l23.68,10.53l23.68-10.53V43.62h105.26 l10.53-23.68L148.88-3.75H12.04z'
-              fill='#4285F4'
-            />
-            <path
-              d='M-3.75,148.88v31.58c0,8.72,7.07,15.79,15.79,15.79h31.58v-47.37H-3.75z'
-              fill='#188038'
-            />
-            <path d='M148.88,43.62v105.26h47.37V43.62l-23.68-10.53L148.88,43.62z' fill='#FBBC04' />
-            <path
-              d='M196.25,43.62V12.04c0-8.72-7.07-15.79-15.79-15.79h-31.58v47.37H196.25z'
-              fill='#1967D2'
-            />
-          </g>
-        </g>
-      </>
-    ),
-  },
-  I089: {
-    label: 'search',
-    viewBox: '-2.5 -2.5 24 24',
-    draw: (): ReactNode => (
-      <>
-        <circle cx='8.5' cy='8.5' r='7.5' />
-        <path d='M14 14L18 18' />
-      </>
-    ),
-  },
-  I090: {
-    label: 'disclosure-chevron-righ',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => <path d='M6.75 2.5L13.75 9.75L6.75 17' />,
-  },
-  I093: {
-    label: 'arrow-left',
-    viewBox: '-1.75 -1.75 24 24',
-    draw: (): ReactNode => <path d='M9.25 4L3 10.25L9.25 16.5 M3 10.25H17.5' />,
-  },
-  I100: {
-    label: 'folder',
-    viewBox: '-3 -2.25 24 24',
-    draw: (): ReactNode => (
-      <path d='M3 18.25A2.25 2.25 0 0 1 0.75 16V3.5A2.25 2.25 0 0 1 3 1.25H6.5L9.5 4.75H15A2.25 2.25 0 0 1 17.25 7V16A2.25 2.25 0 0 1 15 18.25Z' />
-    ),
-  },
-  I102: {
-    label: 'arrow-down',
-    viewBox: '-1.75 -1.75 24 24',
-    draw: (): ReactNode => <path d='M4 11.25L10.25 17.5L16.5 11.25 M10.25 3V17.5' />,
-  },
-  I104: {
-    label: 'home',
-    viewBox: '-1.75 -2.13 24 24',
-    draw: (): ReactNode => (
-      <path d='M0.75 9.5L10.25 1L19.75 9.5V16.25C19.75 17.63 18.63 18.75 17.25 18.75H3.25C1.87 18.75 0.75 17.63 0.75 16.25V9.5Z M7.25 18.75V13C7.25 12.45 7.7 12 8.25 12H12.25C12.8 12 13.25 12.45 13.25 13V18.75' />
-    ),
-  },
-  I105: {
-    label: 'x',
-    viewBox: '-2 -2 24 24',
-    draw: (): ReactNode => <path d='M15.25 4.75L4.75 15.25 M4.75 4.75L15.25 15.25' />,
-  },
-  I106: {
-    label: 'bell',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='M6 8a6 6 0 0 1 12 0c0 7 3 9 3 9H3s3-2 3-9 M10.3 21a1.94 1.94 0 0 0 3.4 0' />
-    ),
-  },
-  I107: {
-    label: 'terminal-window',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <>
-        <path d='M3.75 2.75H16.75A2 2 0 0 1 18.75 4.75V14.75A2 2 0 0 1 16.75 16.75H3.75A2 2 0 0 1 1.75 14.75V4.75A2 2 0 0 1 3.75 2.75Z M1.75 6.75H18.75' />
-        <circle cx='4.5' cy='4.75' r='0.5' />
-        <circle cx='7' cy='4.75' r='0.5' />
-        <circle cx='9.5' cy='4.75' r='0.5' />
-      </>
-    ),
-  },
-  I108: {
-    label: 'more-horizontal',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <>
-        <circle fill='currentColor' cx='4.25' cy='9.75' r='0.75' />
-        <circle fill='currentColor' cx='10.25' cy='9.75' r='0.75' />
-        <circle fill='currentColor' cx='16.25' cy='9.75' r='0.75' />
-      </>
-    ),
-  },
-  I113: {
-    label: 'simLogotype',
-    artwork: true,
-    viewBox: '0 0 40 19.22',
-    draw: (): ReactNode => (
-      <>
-        <path
-          d='M0.000 14.584C0.000 14.584 2.677 14.584 2.677 14.584C2.677 15.326 2.945 15.917 3.480 16.358C4.015 16.779 4.739 16.990 5.651 16.990C6.643 16.990 7.406 16.799 7.942 16.418C8.477 16.017 8.745 15.486 8.745 14.824C8.745 14.343 8.596 13.942 8.298 13.621C8.021 13.300 7.505 13.040 6.752 12.839C6.752 12.839 4.194 12.238 4.194 12.238C2.905 11.917 1.943 11.425 1.309 10.764C0.694 10.102 0.387 9.230 0.387 8.147C0.387 7.245 0.615 6.463 1.071 5.801C1.547 5.139 2.191 4.628 3.004 4.267C3.837 3.906 4.789 3.725 5.860 3.725C6.930 3.725 7.852 3.916 8.626 4.297C9.419 4.678 10.034 5.209 10.470 5.891C10.926 6.573 11.164 7.385 11.184 8.327C11.184 8.327 8.507 8.327 8.507 8.327C8.487 7.565 8.239 6.974 7.763 6.553C7.287 6.132 6.623 5.921 5.770 5.921C4.898 5.921 4.224 6.112 3.748 6.493C3.272 6.874 3.034 7.395 3.034 8.057C3.034 9.039 3.748 9.711 5.175 10.072C5.175 10.072 7.733 10.704 7.733 10.704C8.963 10.984 9.885 11.446 10.500 12.087C11.114 12.709 11.422 13.561 11.422 14.644C11.422 15.566 11.174 16.378 10.678 17.080C10.182 17.762 9.498 18.293 8.626 18.674C7.773 19.035 6.762 19.216 5.592 19.216C3.887 19.216 2.528 18.795 1.517 17.952C0.506 17.110 0.000 15.987 0.000 14.584Z'
-          fillRule='nonzero'
-          fill='currentColor'
-        />
-        <path
-          d='M21.116 19.216C21.116 19.216 18.333 19.216 18.333 19.216C18.333 19.216 18.333 4.510 18.333 4.510C18.333 4.510 20.820 4.510 20.820 4.510C20.820 4.510 20.820 7.014 20.820 7.014C21.116 6.194 21.688 5.498 22.477 4.958C23.286 4.398 24.263 4.118 25.408 4.118C26.690 4.118 27.756 4.468 28.604 5.168C29.453 5.869 30.005 6.799 30.262 7.960C30.262 7.960 29.759 7.960 29.759 7.960C29.956 6.799 30.499 5.869 31.387 5.168C32.275 4.468 33.370 4.118 34.672 4.118C36.330 4.118 37.632 4.608 38.579 5.588C39.526 6.569 40.000 7.910 40.000 9.611C40.000 9.611 40.000 19.216 40.000 19.216C40.000 19.216 37.277 19.216 37.277 19.216C37.277 19.216 37.277 10.301 37.277 10.301C37.277 9.140 36.981 8.250 36.389 7.630C35.817 6.989 35.037 6.669 34.051 6.669C33.360 6.669 32.748 6.829 32.215 7.149C31.702 7.449 31.298 7.890 31.002 8.470C30.706 9.050 30.558 9.731 30.558 10.511C30.558 10.511 30.558 19.216 30.558 19.216C30.558 19.216 27.805 19.216 27.805 19.216C27.805 19.216 27.805 10.271 27.805 10.271C27.805 9.110 27.519 8.230 26.947 7.630C26.374 7.009 25.595 6.699 24.608 6.699C23.918 6.699 23.306 6.859 22.773 7.179C22.260 7.479 21.856 7.920 21.560 8.500C21.264 9.060 21.116 9.731 21.116 10.511C21.116 10.511 21.116 19.216 21.116 19.216Z'
-          fillRule='nonzero'
-          fill='currentColor'
-        />
-        <path
-          d='M16.765 1.863C16.765 2.892 15.931 3.725 14.902 3.725C13.873 3.725 13.039 2.892 13.039 1.863C13.039 0.834 13.873 0.000 14.902 0.000C15.931 0.000 16.765 0.834 16.765 1.863Z'
-          fillRule='nonzero'
-          fill='currentColor'
-        />
-        <path
-          d='M16.275 19.216C16.275 19.216 13.529 19.216 13.529 19.216C13.529 19.216 13.529 4.510 13.529 4.510C13.946 4.705 14.411 4.815 14.902 4.815C15.393 4.815 15.858 4.705 16.275 4.510C16.275 4.510 16.275 19.216 16.275 19.216Z'
-          fillRule='nonzero'
-          fill='currentColor'
-        />
-      </>
-    ),
-  },
-  I116: {
-    label: 'settings',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <>
-        <path d='M18.66 7.34A8.75 8.75 0 0 1 18.66 12.16L15.96 12.29A6.25 6.25 0 0 1 15.31 13.42L16.54 15.83A8.75 8.75 0 0 1 12.37 18.24L10.9 15.97A6.25 6.25 0 0 1 9.6 15.97L8.13 18.24A8.75 8.75 0 0 1 3.96 15.83L5.19 13.42A6.25 6.25 0 0 1 4.54 12.29L1.84 12.16A8.75 8.75 0 0 1 1.84 7.34L4.54 7.21A6.25 6.25 0 0 1 5.19 6.08L3.96 3.67A8.75 8.75 0 0 1 8.13 1.26L9.6 3.53A6.25 6.25 0 0 1 10.9 3.53L12.37 1.26A8.75 8.75 0 0 1 16.54 3.67L15.31 6.08A6.25 6.25 0 0 1 15.96 7.21Z' />
-        <circle cx='10.25' cy='9.75' r='3' />
-      </>
-    ),
-  },
-  I117: {
-    label: 'upload',
-    viewBox: '-1.75 -1.75 24 24',
-    draw: (): ReactNode => (
-      <path d='M0.75 12.75V16.75C0.75 17.85 1.65 18.75 2.75 18.75H17.75C18.85 18.75 19.75 17.85 19.75 16.75V12.75 M10.25 14.75V1.75 M5.25 6.75L10.25 1.75L15.25 6.75' />
-    ),
-  },
-  I118: {
-    label: 'workflow',
-    viewBox: '-1.75 -2.25 24 24',
-    draw: (): ReactNode => (
-      <>
-        <rect x='0.75' y='0.75' width='7.5' height='7.5' rx='2' />
-        <rect x='12.25' y='11.25' width='7.5' height='7.5' rx='2' />
-        <path d='M8.25 4.5H14C15.1 4.5 16 5.4 16 6.5V11.25' />
-      </>
-    ),
-  },
-  I120: {
-    label: 'provider-outlook',
-    artwork: true,
-    viewBox: '0 0 1831.09 1703.34',
-    draw: (id: string): ReactNode => (
-      <>
-        <linearGradient
-          id={`${id}-0`}
-          gradientUnits='userSpaceOnUse'
-          x1='1128.46'
-          y1='811.08'
-          x2='1128.46'
-          y2='2'
-          gradientTransform='matrix(1 0 0 -1 0 1705.33)'
-        >
-          <stop offset='0' stopColor='#35B8F1' />
-          <stop offset='1' stopColor='#28A8EA' />
-        </linearGradient>
-        <linearGradient
-          id={`${id}-1`}
-          gradientUnits='userSpaceOnUse'
-          x1='162.75'
-          y1='1383.07'
-          x2='774.09'
-          y2='324.26'
-          gradientTransform='matrix(1 0 0 -1 0 1705.33)'
-        >
-          <stop offset='0' stopColor='#1784D9' />
-          <stop offset='0.5' stopColor='#107AD5' />
-          <stop offset='1' stopColor='#0A63C9' />
-        </linearGradient>
-        <path
-          d='M1831.08,894.25c0.1-14.32-7.3-27.64-19.5-35.13h-0.21l-0.77-0.43l-634.49-375.58 c-2.74-1.85-5.58-3.54-8.52-5.07c-24.5-12.64-53.6-12.64-78.1,0c-2.93,1.53-5.78,3.22-8.52,5.07L446.49,858.69 l-0.77,0.43c-19.39,12.06-25.34,37.56-13.28,56.95c3.55,5.71,8.45,10.47,14.26,13.87l634.49,375.59 c2.75,1.84,5.59,3.53,8.52,5.07c24.5,12.64,53.6,12.64,78.1,0c2.93-1.54,5.77-3.23,8.52-5.07l634.49-375.58 C1823.49,922.55,1831.23,908.92,1831.08,894.25z'
-          fill='#0A2767'
-        />
-        <path
-          d='M520.45,643.48h416.38v381.67h-416.38V643.48z M1745.92,255.5V80.91 c1-43.65-33.55-79.86-77.2-80.91H588.2C544.55,1.05,510,37.26,511,80.91V255.5l638.75,170.33L1745.92,255.5z'
-          fill='#0364B8'
-        />
-        <path d='M511,255.5h425.83v383.25H511V255.5z' fill='#0078D4' />
-        <path
-          d='M1362.67,255.5H936.83v383.25L1362.67,1022h383.25V638.75L1362.67,255.5z'
-          fill='#28A8EA'
-        />
-        <path d='M936.83,638.75h425.83V1022H936.83V638.75z' fill='#0078D4' />
-        <path d='M936.83,1022h425.83v383.25H936.83V1022z' fill='#0364B8' />
-        <path d='M520.45,1025.15h416.38v346.97h-416.38V1025.15z' fill='#14447D' />
-        <path d='M1362.67,1022h383.25v383.25h-383.25V1022z' fill='#0078D4' />
-        <path
-          d='M1811.58,927.59l-0.81,0.43l-634.49,356.85c-2.77,1.7-5.58,3.32-8.52,4.77 c-10.78,5.13-22.48,8.03-34.41,8.52l-34.66-20.27c-2.93-1.47-5.77-3.1-8.52-4.9L447.17,906h-0.3 l-21.04-11.75v722.38c0.33,48.2,39.65,87.01,87.85,86.7h1230.91c0.72,0,1.36-0.34,2.13-0.34 c10.18-0.65,20.22-2.74,29.81-6.22c4.14-1.76,8.15-3.83,11.97-6.22c2.85-1.62,7.75-5.15,7.75-5.15 c21.81-16.14,34.73-41.63,34.83-68.77V894.25C1831.07,908.07,1823.62,920.81,1811.58,927.59z'
-          fill={`url(#${id}-0)`}
-        />
-        <path
-          d='M1797.02,891.4v44.29l-663.45,456.79L446.7,906.3 c0-0.23-0.19-0.43-0.43-0.43l0,0l-63.02-37.9v-31.94l25.98-0.43l54.93,31.51l1.28,0.43l4.68,2.98 c0,0,645.56,368.35,647.27,369.2l24.7,14.48c2.13-0.85,4.26-1.7,6.81-2.56 c1.28-0.85,640.88-360.68,640.88-360.68L1797.02,891.4z'
-          fill='#0A2767'
-          opacity='0.5'
-        />
-        <path
-          d='M1811.58,927.59l-0.81,0.47l-634.49,356.85c-2.77,1.7-5.58,3.32-8.52,4.77 c-24.64,12.04-53.46,12.04-78.1,0c-2.92-1.44-5.76-3.04-8.52-4.77L446.66,928.06l-0.77-0.47 c-12.25-6.64-19.93-19.41-20.06-33.34v722.38c0.31,48.19,39.62,87,87.8,86.7c0,0,0,0,0,0h1229.64 c48.19,0.31,87.5-38.51,87.81-86.7c0-0.001,0-0.002,0-0.004V894.25C1831.07,908.07,1823.62,920.81,1811.58,927.59z'
-          fill='#1490DF'
-        />
-        <path
-          d='M1185.52,1279.63l-9.5,5.32c-2.75,1.75-5.59,3.36-8.52,4.81 c-10.46,5.14-21.84,8.15-33.47,8.86l241.41,285.48l421.11,101.48c11.54-8.72,20.72-20.18,26.7-33.34L1185.52,1279.63 z'
-          fill='#000000'
-          opacity='0.1'
-        />
-        <path
-          d='M1228.53,1255.44l-52.5,29.51c-2.75,1.75-5.59,3.36-8.52,4.81 c-10.46,5.14-21.84,8.15-33.47,8.86l113.1,311.84l549.54,74.99c21.65-16.25,34.39-41.74,34.41-68.81v-9.33 L1228.53,1255.44z'
-          fill='#000000'
-          opacity='0.05'
-        />
-        <path
-          d='M514.83,1703.33h1228.32c18.9,0.1,37.34-5.87,52.59-17.03l-697.09-408.33 c-2.93-1.47-5.77-3.1-8.52-4.9L447.13,906.09h-0.3l-20.99-11.84v719.91 C425.79,1663.36,465.63,1703.29,514.83,1703.33C514.83,1703.33,514.83,1703.33,514.83,1703.33z'
-          fill='#28A8EA'
-        />
-        <path
-          d='M1022,418.72v908.3c-0.08,31.85-19.44,60.47-48.97,72.39 c-9.15,3.93-19,5.96-28.96,5.96H425.83V383.25H511v-42.58h433.07C987.09,340.83,1021.91,375.7,1022,418.72z'
-          fill='#000000'
-          opacity='0.1'
-        />
-        <path
-          d='M979.42,461.31v908.3c0.11,10.29-2.07,20.47-6.39,29.81 c-11.83,29.15-40.08,48.27-71.54,48.42H425.83V383.25h475.66c12.36-0.12,24.53,2.96,35.34,8.94 C962.94,405.34,979.41,432.08,979.42,461.31z'
-          fill='#000000'
-          opacity='0.2'
-        />
-        <path
-          d='M979.42,461.31v823.14c-0.21,43-34.93,77.85-77.93,78.22H425.83V383.25 h475.66c12.36-0.12,24.53,2.96,35.34,8.94C962.94,405.34,979.41,432.08,979.42,461.31z'
-          fill='#000000'
-          opacity='0.2'
-        />
-        <path
-          d='M936.83,461.31v823.14c-0.05,43.07-34.86,78.02-77.93,78.22H425.83 V383.25h433.07c43.06,0.02,77.95,34.95,77.93,78.01C936.83,461.28,936.83,461.29,936.83,461.31z'
-          fill='#000000'
-          opacity='0.2'
-        />
-        <path
-          d='M78.06,383.25h780.72c43.11,0,78.06,34.95,78.06,78.06v780.72 c0,43.11-34.95,78.06-78.06,78.06H78.06c-43.11,0-78.06-34.95-78.06-78.06V461.31 C0,418.2,34.95,383.25,78.06,383.25z'
-          fill={`url(#${id}-1)`}
-        />
-        <path
-          d='M243.96,710.63c19.24-40.99,50.29-75.29,89.17-98.49c43.06-24.65,92.08-36.94,141.68-35.51 c45.97-1,91.32,10.66,131.11,33.68c37.41,22.31,67.55,55,86.74,94.11c20.9,43.09,31.32,90.51,30.41,138.4 c1.01,50.04-9.71,99.63-31.3,144.78c-19.65,40.5-50.74,74.36-89.42,97.39c-41.33,23.73-88.37,35.69-136.01,34.58 c-46.95,1.13-93.3-10.65-134.01-34.07c-37.74-22.34-68.25-55.07-87.89-94.28c-21.03-42.47-31.57-89.35-30.74-136.74 C212.81,804.86,223.16,755.69,243.96,710.63z M339.01,941.86c10.26,25.91,27.65,48.39,50.16,64.81 c22.93,16.03,50.39,24.29,78.35,23.59c29.78,1.18,59.14-7.37,83.63-24.36c22.23-16.37,39.16-38.91,48.72-64.81 c10.68-28.93,15.95-59.57,15.54-90.4c0.33-31.13-4.62-62.08-14.65-91.55c-8.85-26.61-25.25-50.07-47.18-67.54 c-23.88-17.79-53.16-26.81-82.91-25.55c-28.57-0.74-56.64,7.59-80.18,23.8c-22.89,16.5-40.62,39.17-51.1,65.36 c-23.25,60.05-23.38,126.6-0.34,186.73L339.01,941.86z'
-          fill='#FFFFFF'
-        />
-        <path d='M1362.67,255.5h383.25v383.25h-383.25V255.5z' fill='#50D9FF' />
-      </>
-    ),
-  },
-  I123: {
-    label: 'Slack',
-    artwork: true,
-    viewBox: '0 0 256 256',
-    draw: (): ReactNode => (
-      <>
-        <g>
-          <path
-            d='M53.84,161.32 C53.84,176.15 41.85,188.14 27.02,188.14 C12.19,188.14 0.2,176.15 0.2,161.32 C0.2,146.49 12.19,134.5 27.02,134.5 L53.84,134.5 L53.84,161.32 Z M67.25,161.32 C67.25,146.49 79.24,134.5 94.07,134.5 C108.9,134.5 120.89,146.49 120.89,161.32 L120.89,228.37 C120.89,243.2 108.9,255.19 94.07,255.19 C79.24,255.19 67.25,243.2 67.25,228.37 L67.25,161.32 Z'
-            fill='#E01E5A'
-          />
-          <path
-            d='M94.07,53.64 C79.24,53.64 67.25,41.65 67.25,26.82 C67.25,11.99 79.24,0 94.07,0 C108.9,0 120.89,11.99 120.89,26.82 L120.89,53.64 L94.07,53.64 Z M94.07,67.25 C108.9,67.25 120.89,79.24 120.89,94.07 C120.89,108.9 108.9,120.89 94.07,120.89 L26.82,120.89 C11.99,120.89 0,108.9 0,94.07 C0,79.24 11.99,67.25 26.82,67.25 L94.07,67.25 Z'
-            fill='#36C5F0'
-          />
-          <path
-            d='M201.55,94.07 C201.55,79.24 213.54,67.25 228.37,67.25 C243.2,67.25 255.19,79.24 255.19,94.07 C255.19,108.9 243.2,120.89 228.37,120.89 L201.55,120.89 L201.55,94.07 Z M188.14,94.07 C188.14,108.9 176.15,120.89 161.32,120.89 C146.49,120.89 134.5,108.9 134.5,94.07 L134.5,26.82 C134.5,11.99 146.49,0 161.32,0 C176.15,0 188.14,11.99 188.14,26.82 L188.14,94.07 Z'
-            fill='#2EB67D'
-          />
-          <path
-            d='M161.32,201.55 C176.15,201.55 188.14,213.54 188.14,228.37 C188.14,243.2 176.15,255.19 161.32,255.19 C146.49,255.19 134.5,243.2 134.5,228.37 L134.5,201.55 L161.32,201.55 Z M161.32,188.14 C146.49,188.14 134.5,176.15 134.5,161.32 C134.5,146.49 146.49,134.5 161.32,134.5 L228.57,134.5 C243.4,134.5 255.39,146.49 255.39,161.32 C255.39,176.15 243.4,188.14 228.57,188.14 L161.32,188.14 Z'
-            fill='#ECB22E'
-          />
-        </g>
-      </>
-    ),
-  },
-  I124: {
-    label: 'OpenAI',
-    artwork: true,
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <>
-        <path
-          d='M22.28 9.82a5.98 5.98 0 0 0-.516-4.91 6.05 6.05 0 0 0-6.51-2.9A6.07 6.07 0 0 0 4.98 4.18a5.98 5.98 0 0 0-4 2.9 6.05 6.05 0 0 0 .743 7.1 5.98 5.98 0 0 0 .511 4.91 6.05 6.05 0 0 0 6.51 2.9A5.98 5.98 0 0 0 13.26 24a6.06 6.06 0 0 0 5.77-4.21 5.99 5.99 0 0 0 4-2.9 6.06 6.06 0 0 0-.748-7.07zm-9.02 12.61a4.48 4.48 0 0 1-2.88-1.04l.142-.08 4.78-2.76a.795.79 0 0 0 .393-.681v-6.74l2.02 1.17a.71.07 0 0 1 .38.05v5.58a4.5 4.5 0 0 1-4.49 4.49zm-9.66-4.13a4.47 4.47 0 0 1-.535-3.01l.142.09 4.78 2.76a.771.77 0 0 0 .781 0l5.84-3.37v2.33a.804.08 0 0 1-.332.06L9.74 19.95a4.5 4.5 0 0 1-6.14-1.65zM2.34 7.9a4.49 4.49 0 0 1 2.37-1.97V11.6a.766.77 0 0 0 .388.68l5.81 3.35-2.02 1.17a.757.08 0 0 1-.071 0l-4.83-2.79A4.5 4.5 0 0 1 2.34 7.87zm16.6 3.86L13.1 8.36 15.12 7.2a.757.08 0 0 1 .071 0l4.83 2.79a4.49 4.49 0 0 1-.676 8.1v-5.68a.79.79 0 0 0-.407-.667zm2.01-3.02l-.142-.085-4.77-2.78a.776.78 0 0 0-.785 0L9.41 9.23V6.9a.662.07 0 0 1 .028-.061l4.83-2.79a4.5 4.5 0 0 1 6.68 4.66zM8.31 12.86l-2.02-1.16a.804.08 0 0 1-.038-.057V6.07a4.5 4.5 0 0 1 7.38-3.45l-.142.08L8.7 5.46a.795.79 0 0 0-.393.68zm1.1-2.37l2.6-1.5 2.61 1.5v3l-2.6 1.5-2.61-1.5Z'
-          fill='currentColor'
-        />
-      </>
-    ),
-  },
-  I126: {
-    label: 'MCP',
-    artwork: true,
-    viewBox: '0 0 16 16',
-    draw: (): ReactNode => (
-      <>
-        <g>
-          <path
-            fillRule='evenodd'
-            clipRule='evenodd'
-            d='M14.56 7.88L14.5 7.93L8.7 13.62C8.68 13.64 8.67 13.66 8.66 13.68C8.65 13.7 8.64 13.72 8.64 13.75C8.64 13.77 8.65 13.8 8.66 13.82C8.67 13.84 8.68 13.86 8.7 13.88L8.7 13.88L9.89 15.05C9.99 15.15 10.05 15.29 10.06 15.44C10.06 15.58 10 15.72 9.9 15.83L9.89 15.84C9.78 15.94 9.64 16 9.49 16C9.34 16 9.2 15.94 9.09 15.84L7.9 14.67C7.77 14.55 7.68 14.41 7.61 14.25C7.54 14.09 7.51 13.92 7.51 13.75C7.51 13.58 7.54 13.41 7.61 13.25C7.68 13.1 7.77 12.95 7.9 12.83L13.7 7.14C14.01 6.84 14.19 6.42 14.2 5.98C14.2 5.55 14.04 5.13 13.73 4.81L13.7 4.78L13.67 4.75C13.35 4.44 12.91 4.26 12.47 4.26C12.02 4.26 11.58 4.44 11.26 4.75L6.48 9.44H6.48L6.41 9.5C6.31 9.61 6.16 9.67 6.01 9.67C5.86 9.67 5.72 9.61 5.61 9.5C5.51 9.4 5.45 9.26 5.45 9.12C5.44 8.97 5.5 8.83 5.6 8.73L5.61 8.72L10.46 3.96C11.11 3.32 11.12 2.28 10.49 1.63L10.46 1.6C10.14 1.29 9.7 1.11 9.25 1.11C8.81 1.11 8.37 1.29 8.05 1.6L1.64 7.9C1.53 8 1.38 8.06 1.23 8.06C1.08 8.06 0.94 8 0.83 7.9C0.73 7.79 0.67 7.66 0.67 7.51C0.67 7.36 0.72 7.22 0.82 7.12L0.83 7.11L7.25 0.81C7.79 0.29 8.51 0 9.26 0C10 0 10.72 0.29 11.26 0.81C11.89 1.43 12.19 2.3 12.06 3.17C12.94 3.05 13.83 3.34 14.47 3.96L14.5 3.99C14.76 4.25 14.97 4.54 15.11 4.88C15.25 5.21 15.33 5.56 15.33 5.92C15.34 6.28 15.27 6.64 15.14 6.98C15.01 7.31 14.81 7.62 14.56 7.87M12.87 6.32C12.97 6.22 13.03 6.08 13.03 5.94C13.03 5.79 12.98 5.65 12.88 5.55L12.87 5.54C12.76 5.43 12.61 5.37 12.46 5.37C12.31 5.37 12.17 5.43 12.06 5.54L7.32 10.19C7 10.5 6.56 10.68 6.11 10.68C5.66 10.68 5.23 10.5 4.91 10.19C4.76 10.04 4.63 9.86 4.55 9.66C4.46 9.46 4.42 9.25 4.41 9.03C4.41 8.81 4.45 8.6 4.53 8.4C4.61 8.2 4.73 8.01 4.88 7.86L4.91 7.83L9.66 3.17C9.76 3.07 9.82 2.93 9.82 2.79C9.83 2.64 9.77 2.5 9.67 2.4L9.66 2.39C9.55 2.28 9.41 2.22 9.26 2.22C9.11 2.22 8.96 2.28 8.86 2.39L4.11 7.04C3.85 7.3 3.64 7.6 3.49 7.94C3.35 8.28 3.28 8.64 3.28 9.01C3.28 9.38 3.35 9.74 3.49 10.08C3.64 10.41 3.85 10.72 4.11 10.98C4.65 11.5 5.36 11.79 6.11 11.79C6.86 11.79 7.58 11.5 8.12 10.98L12.87 6.32Z'
-            fill='currentColor'
-          />
-        </g>
-      </>
-    ),
-  },
-  I127: {
-    label: 'Tool',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-7.91 7.91a2.12 2.12 0 0 1-3-3l7.91-7.91a6 6 0 0 1 7.94-7.94z' />
-    ),
-  },
-  I128: {
-    label: 'Agent',
-    viewBox: '0 0 16 16',
-    draw: (): ReactNode => (
-      <>
-        <rect x='2.5' y='4' width='11' height='8' rx='2.5' />
-        <path d='M6 7.25V8.75M10 7.25V8.75' />
-      </>
-    ),
-  },
-  I129: {
-    label: 'Parallel',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <>
-        <path d='M12 3v6M6 13V9h12v4M6 17v4M18 17v4' />
-        <rect x='3.5' y='13' width='5' height='4' rx='1' />
-        <rect x='15.5' y='13' width='5' height='4' rx='1' />
-      </>
-    ),
-  },
-  I130: {
-    label: 'Loop',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='m17 2 4 4-4 4M3 11V9a3 3 0 0 1 3-3h15M7 22l-4-4 4-4M21 13v2a3 3 0 0 1-3 3H3' />
-    ),
-  },
-  I131: {
-    label: 'pin',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='M12 17v5M9 10.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24V16a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-.76a2 2 0 0 0-1.11-1.79l-1.78-.9A2 2 0 0 1 15 10.76V7a1 1 0 0 1 1-1 2 2 0 0 0 0-4H8a2 2 0 0 0 0 4 1 1 0 0 1 1 1z' />
-    ),
-  },
-  I132: {
-    label: 'log-out',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <path d='m16 17 5-5-5-5M21 12H9M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4' />
-    ),
-  },
-  I133: {
-    label: 'users',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => (
-      <>
-        <path d='M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2M22 21v-2a4 4 0 0 0-3-3.9M16 3a4 4 0 0 1 0 8' />
-        <circle cx='9' cy='7' r='4' />
-      </>
-    ),
-  },
-  I134: {
-    label: 'minus',
-    viewBox: '0 0 24 24',
-    draw: (): ReactNode => <path d='M5 12h14' />,
-  },
-} as const
-
-export type IconName = keyof typeof glyphs
diff --git a/apps/sim/platform/design-system/catalog/plots.module.css b/apps/sim/platform/design-system/catalog/plots.module.css
deleted file mode 100644
index 8ddcda89018..00000000000
--- a/apps/sim/platform/design-system/catalog/plots.module.css
+++ /dev/null
@@ -1,80 +0,0 @@
-.plot,
-.trend {
-  display: block;
-  inline-size: 100%;
-  block-size: 100%;
-}
-.area {
-  stop-color: var(--plot-gradient-ink);
-}
-.area:first-child {
-  stop-opacity: var(--ui-plot-area-opacity);
-}
-.line {
-  fill: none;
-  stroke: var(--ui-plot-primary);
-  stroke-width: var(--plot-stroke-width);
-  stroke-linecap: round;
-  stroke-linejoin: round;
-}
-.stackLayer[data-layer="0"] {
-  fill: var(--ui-plot-primary);
-}
-.stackLayer[data-layer="1"] {
-  fill: var(--ui-plot-secondary);
-}
-.stackLayer[data-layer="2"] {
-  fill: var(--ui-plot-violet-1);
-}
-.stackLayer[data-layer="3"] {
-  fill: var(--ui-plot-violet-2);
-}
-.stackLayer[data-layer="4"] {
-  fill: var(--ui-plot-violet-3);
-}
-.stackLayer[data-layer="5"] {
-  fill: var(--ui-plot-violet-4);
-}
-.arc[data-series="0"] {
-  stroke: var(--ui-plot-violet-1);
-}
-.arc[data-series="1"] {
-  stroke: var(--ui-plot-violet-2);
-}
-.arc[data-series="2"] {
-  stroke: var(--ui-plot-violet-3);
-}
-.arc[data-series="3"] {
-  stroke: var(--ui-plot-violet-4);
-}
-
-.guide {
-  stroke: var(--ui-border);
-  stroke-width: var(--spacing-stroke-default);
-}
-.trend {
-  padding-inline: var(--spacing-4);
-  overflow: visible;
-}
-.point {
-  r: var(--spacing-3);
-  fill: var(--ui-plot-primary);
-  stroke: none;
-}
-
-.columns {
-  display: flex;
-  inline-size: 100%;
-  block-size: 100%;
-  padding-block: var(--spacing-8);
-}
-.column {
-  flex: 1;
-  min-inline-size: 0;
-  display: flex;
-  justify-content: center;
-}
-.bar {
-  inline-size: min(80%, var(--spacing-32));
-  block-size: 100%;
-}
diff --git a/apps/sim/platform/design-system/catalog/plots.tsx b/apps/sim/platform/design-system/catalog/plots.tsx
deleted file mode 100644
index c32def9efba..00000000000
--- a/apps/sim/platform/design-system/catalog/plots.tsx
+++ /dev/null
@@ -1,166 +0,0 @@
-import { memo, useId } from 'react'
-import { area, curveLinear, curveMonotoneX, line } from 'd3-shape'
-import styles from '@/platform/design-system/catalog/plots.module.css'
-
-interface TrendPlotProps {
-  label: string
-  values: readonly number[]
-  maximum: number
-  straight?: boolean
-  active?: number
-}
-
-export function TrendPlot({ label, values, maximum, active, straight }: TrendPlotProps) {
-  const gradient = useId()
-  const x = (_value: number, index: number) =>
-    values.length === 1 ? 240 : (480 * index) / (values.length - 1)
-  const y = (value: number) => 144 - Math.max(0, Math.min(1, value / maximum)) * 136
-  const curve = straight ? curveLinear : curveMonotoneX
-  const stroke = line<number>().x(x).y(y).curve(curve)(values)
-  const fill = area<number>().x(x).y0(152).y1(y).curve(curve)(values)
-  const point =
-    active !== undefined && values[active] !== undefined
-      ? active
-      : values.length === 1
-        ? 0
-        : undefined
-  return (
-    <svg className={styles.trend} role='img' aria-label={label}>
-      <svg
-        width='100%'
-        height='100%'
-        viewBox='0 0 480 152'
-        preserveAspectRatio='none'
-        aria-hidden='true'
-      >
-        <defs>
-          <linearGradient
-            id={gradient}
-            x1='0'
-            y1='0'
-            x2='0'
-            y2='1'
-            gradientUnits='objectBoundingBox'
-          >
-            <stop className={styles.area} offset='0%' />
-            <stop className={styles.area} offset='100%' stopOpacity='0' />
-          </linearGradient>
-        </defs>
-        {values.length > 1 && fill && <path fill={`url(#${gradient})`} d={fill} />}
-        {stroke && <path className={styles.line} d={stroke} vectorEffect='non-scaling-stroke' />}
-        {active !== undefined && values[active] !== undefined && (
-          <line
-            className={styles.guide}
-            x1={x(0, active)}
-            x2={x(0, active)}
-            y1='0'
-            y2='152'
-            vectorEffect='non-scaling-stroke'
-          />
-        )}
-      </svg>
-      {point !== undefined && (
-        <circle
-          data-plot-marker=''
-          className={styles.point}
-          cx={`${(x(0, point) / 480) * 100}%`}
-          cy={`${(y(values[point]) / 152) * 100}%`}
-        />
-      )}
-    </svg>
-  )
-}
-
-interface StackPlotProps {
-  label: string
-  /** Each column's layers, bottom-up. */
-  values: readonly (readonly number[])[]
-  maximum: number
-}
-
-export const StackPlot = memo(function StackPlot({ label, values, maximum }: StackPlotProps) {
-  return (
-    <div className={styles.columns} role='img' aria-label={label}>
-      {values.map((layers, index) => {
-        let height = 0
-        const tops = layers.map((value) => {
-          height = Math.min(136, height + Math.max(0, (136 * value) / maximum))
-          return height
-        })
-        const total = tops.at(-1) ?? 0
-        const topLayer = layers.reduce((top, value, layer) => (value > 0 ? layer : top), 0)
-        const y = 136 - total
-        const radius = Math.min(4, total)
-        const outline = `M0 136V${y + radius}Q0 ${y} ${radius} ${y}H${32 - radius}Q32 ${y} 32 ${y + radius}V136Z`
-        return (
-          <div className={styles.column} key={index}>
-            <svg
-              className={styles.bar}
-              aria-hidden='true'
-              viewBox='0 0 32 136'
-              preserveAspectRatio='none'
-            >
-              <path className={styles.stackLayer} data-layer={topLayer} d={outline} />
-              {tops
-                .slice(0, topLayer)
-                .map((top, layer) => ({ top, layer }))
-                .reverse()
-                .map(({ top, layer }) => (
-                  <rect
-                    key={layer}
-                    className={styles.stackLayer}
-                    data-layer={layer}
-                    x='0'
-                    y={136 - top}
-                    width='32'
-                    height={top}
-                  />
-                ))}
-            </svg>
-          </div>
-        )
-      })}
-    </div>
-  )
-})
-
-interface DonutPlotProps {
-  label: string
-  values: readonly number[]
-  onInspect?: (index: number | null) => void
-}
-
-export function DonutPlot({ label, values, onInspect }: DonutPlotProps) {
-  const total = values.reduce((sum, v) => sum + Math.max(0, v), 0)
-  const arcs = values.map((value) => (total ? (100 * Math.max(0, value)) / total : 0))
-  let offset = 0
-  return (
-    <svg className={styles.plot} role='img' aria-label={label} viewBox='0 0 160 160'>
-      {arcs.map((length, index) => {
-        const start = offset
-        offset += length
-        const stroke = Math.max(0, length - 0.833)
-        return (
-          stroke > 0 && (
-            <circle
-              key={start}
-              onPointerEnter={onInspect && (() => onInspect(index))}
-              onPointerLeave={onInspect && (() => onInspect(null))}
-              className={styles.arc}
-              data-series={index % 4}
-              cx='80'
-              cy='80'
-              r='60'
-              fill='none'
-              strokeWidth='16'
-              pathLength='100'
-              strokeDasharray={`${stroke} ${100 - stroke}`}
-              strokeDashoffset={-start - 0.416}
-              transform='rotate(-90 80 80)'
-            />
-          )
-        )
-      })}
-    </svg>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/activity-row/activity-body.tsx b/apps/sim/platform/design-system/components/activity-row/activity-body.tsx
deleted file mode 100644
index d677563a51e..00000000000
--- a/apps/sim/platform/design-system/components/activity-row/activity-body.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { ReactNode } from 'react'
-import styles from '@/platform/design-system/components/activity-row/activity-row.module.css'
-
-interface ActivityBodyProps {
-  children: ReactNode
-  leading?: ReactNode
-  decorativeLeading?: boolean
-}
-
-export function ActivityBody({ children, leading, decorativeLeading }: ActivityBodyProps) {
-  return (
-    <span className={styles.body}>
-      {leading && (
-        <span className={styles.leading} aria-hidden={decorativeLeading}>
-          {leading}
-        </span>
-      )}
-      <span className={styles.copy}>{children}</span>
-    </span>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/activity-row/activity-row.module.css b/apps/sim/platform/design-system/components/activity-row/activity-row.module.css
deleted file mode 100644
index 0afc80787e2..00000000000
--- a/apps/sim/platform/design-system/components/activity-row/activity-row.module.css
+++ /dev/null
@@ -1,76 +0,0 @@
-.entry {
-  min-inline-size: 0;
-  container: activity-row / inline-size;
-}
-.row {
-  display: flex;
-  align-items: center;
-  gap: var(--ui-row-gap);
-  inline-size: 100%;
-  padding: var(--ui-row-block) var(--ui-row-inset);
-  border-radius: var(--ui-control-radius);
-  text-align: start;
-  cursor: pointer;
-}
-
-@container activity-row (max-width: 19rem) {
-  .row:has(.metaLabel) {
-    display: grid;
-    grid-template-columns: minmax(0, 1fr) auto;
-    gap: var(--ui-stack-gap) var(--ui-row-gap);
-  }
-  .row:has(.metaLabel) .meta {
-    display: contents;
-  }
-  .metaLabel {
-    grid-column: 1;
-    grid-row: 2;
-  }
-  .row:has(.leading) .metaLabel {
-    margin-inline-start: calc(var(--ui-icon-size) + var(--ui-row-gap));
-  }
-  .row:has(.metaLabel) .meta > svg {
-    grid-column: 2;
-    grid-row: 1 / span 2;
-  }
-}
-.row:hover {
-  background: var(--ui-hover);
-}
-.body {
-  display: flex;
-  align-items: start;
-  flex: 1;
-  gap: var(--ui-row-gap);
-  min-inline-size: 0;
-}
-.leading {
-  display: grid;
-  grid-template: minmax(0, 1fr) / minmax(0, 1fr);
-  place-items: center;
-  flex: none;
-  inline-size: var(--ui-icon-size);
-  block-size: var(--leading-app-control);
-}
-.copy {
-  display: grid;
-  flex: 1;
-  grid-template-columns: minmax(0, 1fr);
-  min-inline-size: 0;
-  gap: var(--ui-stack-gap);
-}
-.detail,
-.meta {
-  color: var(--ui-secondary);
-}
-.detail strong {
-  color: var(--ui-ink);
-}
-.meta {
-  display: inline-flex;
-  align-items: center;
-  gap: var(--ui-popup-padding);
-  min-block-size: var(--leading-app-control);
-  max-inline-size: 45%;
-  overflow-wrap: anywhere;
-}
diff --git a/apps/sim/platform/design-system/components/activity-row/activity-row.tsx b/apps/sim/platform/design-system/components/activity-row/activity-row.tsx
deleted file mode 100644
index e09fe9c443c..00000000000
--- a/apps/sim/platform/design-system/components/activity-row/activity-row.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import type { ReactNode } from 'react'
-import Link from 'next/link'
-import { ActivityBody } from '@/platform/design-system/components/activity-row/activity-body'
-import styles from '@/platform/design-system/components/activity-row/activity-row.module.css'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import { CountedLabel } from '@/platform/design-system/components/overflow-text/counted-label'
-import { OverflowText } from '@/platform/design-system/components/overflow-text/overflow-text'
-
-interface ActivityRowProps {
-  leading?: ReactNode
-  title: string
-  count?: number
-  detail: string
-  detailLead?: string
-  metadata?: string
-  showChevron?: boolean
-}
-
-type ActivityTarget = { href: string; onOpen?: never } | { href?: never; onOpen: () => void }
-
-export function ActivityRow({
-  leading,
-  title,
-  count,
-  detail,
-  detailLead,
-  metadata,
-  showChevron = true,
-  onOpen,
-  href,
-}: ActivityRowProps & ActivityTarget) {
-  const content = (
-    <>
-      <ActivityBody leading={leading} decorativeLeading>
-        <span data-type='T059'>
-          <CountedLabel label={title} count={count} />
-        </span>
-        <span className={styles.detail} data-type='T050'>
-          <OverflowText text={detailLead ? `${detailLead} ${detail}` : detail}>
-            {detailLead && (
-              <>
-                <strong data-type='T051'>{detailLead}</strong>{' '}
-              </>
-            )}
-            {detail}
-          </OverflowText>
-        </span>
-      </ActivityBody>
-      {(metadata || showChevron) && (
-        <span className={styles.meta} data-type='T052'>
-          {metadata && <span className={styles.metaLabel}>{metadata}</span>}
-          {showChevron && <Icon name='I032' />}
-        </span>
-      )}
-    </>
-  )
-  return (
-    <li className={styles.entry}>
-      {href !== undefined ? (
-        <Link href={href} className={styles.row}>
-          {content}
-        </Link>
-      ) : (
-        <button type='button' className={styles.row} onClick={onOpen}>
-          {content}
-        </button>
-      )}
-    </li>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/attachments/attachment-grid.tsx b/apps/sim/platform/design-system/components/attachments/attachment-grid.tsx
deleted file mode 100644
index b95881311ab..00000000000
--- a/apps/sim/platform/design-system/components/attachments/attachment-grid.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import {
-  type AttachmentItem,
-  AttachmentTile,
-} from '@/platform/design-system/components/attachments/attachment-tile'
-import styles from '@/platform/design-system/components/attachments/attachments.module.css'
-import { ScrollArea } from '@/platform/design-system/components/scroll-area/scroll-area'
-
-interface AttachmentGridProps {
-  label: string
-  attachments: readonly AttachmentItem[]
-  layout?: 'grid' | 'list'
-  onPreview?: (id: string) => void
-  onRemove?: (id: string) => void
-}
-
-export function AttachmentGrid({
-  label,
-  attachments,
-  onPreview,
-  onRemove,
-  layout = 'grid',
-}: AttachmentGridProps) {
-  const content = (
-    <ul className={styles.attachmentItems} aria-label={label} data-layout={layout}>
-      {attachments.map((item) => (
-        <AttachmentTile key={item.id} item={item} onPreview={onPreview} onRemove={onRemove} />
-      ))}
-    </ul>
-  )
-  return layout === 'list' ? (
-    <div className={styles.attachmentViewport}>
-      <ScrollArea label={label}>{content}</ScrollArea>
-    </div>
-  ) : (
-    content
-  )
-}
diff --git a/apps/sim/platform/design-system/components/attachments/attachment-tile.tsx b/apps/sim/platform/design-system/components/attachments/attachment-tile.tsx
deleted file mode 100644
index 2f5308897ba..00000000000
--- a/apps/sim/platform/design-system/components/attachments/attachment-tile.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import styles from '@/platform/design-system/components/attachments/attachments.module.css'
-import { FileThumbnail } from '@/platform/design-system/components/attachments/file-thumbnail'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-
-export type AttachmentItem = {
-  id: string
-  name: string
-  description: string
-  previewFile?: File
-} & ({ kind: 'image'; preview?: string } | { kind: 'paste' | 'pdf' })
-
-interface AttachmentTileProps {
-  item: AttachmentItem
-  onPreview?: (id: string) => void
-  onRemove?: (id: string) => void
-}
-
-export function AttachmentTile({ item, onPreview, onRemove }: AttachmentTileProps) {
-  const hasImage = item.kind === 'image' && (item.preview || item.previewFile)
-  return (
-    <li className={styles.attachmentItem}>
-      <ControlRow
-        label={item.name}
-        accessibleLabel={onPreview ? `Preview ${item.name}` : undefined}
-        icon={item.kind === 'paste' ? 'I075' : 'I015'}
-        leading={
-          hasImage ? <FileThumbnail src={item.preview} file={item.previewFile} /> : undefined
-        }
-        render={
-          onPreview ? (
-            <button
-              type='button'
-              aria-description={item.description}
-              onClick={() => onPreview(item.id)}
-            />
-          ) : (
-            <span aria-description={item.description} />
-          )
-        }
-        action={
-          onRemove && (
-            <IconButton
-              icon='I105'
-              size='compact'
-              label={`Remove ${item.name}`}
-              onClick={() => onRemove(item.id)}
-            />
-          )
-        }
-      />
-    </li>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/attachments/attachments.module.css b/apps/sim/platform/design-system/components/attachments/attachments.module.css
deleted file mode 100644
index df65866ea02..00000000000
--- a/apps/sim/platform/design-system/components/attachments/attachments.module.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.attachmentItems {
-  display: flex;
-  flex-wrap: wrap;
-  gap: var(--ui-action-gap);
-}
-.attachmentItems[data-layout="list"] {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr);
-  justify-items: start;
-  gap: var(--ui-list-gap);
-}
-.attachmentItem {
-  min-inline-size: 0;
-  max-inline-size: 100%;
-}
-.attachmentViewport {
-  display: grid;
-  grid-template-rows: minmax(0, 1fr);
-  max-block-size: var(--container-216);
-  max-inline-size: min(100%, var(--container-560));
-}
-.thumbnail {
-  flex: none;
-  inline-size: var(--spacing-20);
-  block-size: var(--spacing-20);
-  border-radius: var(--radius-item);
-  object-fit: cover;
-}
diff --git a/apps/sim/platform/design-system/components/attachments/file-thumbnail.tsx b/apps/sim/platform/design-system/components/attachments/file-thumbnail.tsx
deleted file mode 100644
index bb6faca3de4..00000000000
--- a/apps/sim/platform/design-system/components/attachments/file-thumbnail.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-'use client'
-
-import styles from '@/platform/design-system/components/attachments/attachments.module.css'
-import { useFileUrl } from '@/platform/design-system/components/attachments/use-file-url'
-
-interface FileThumbnailProps {
-  src?: string
-  file?: File
-}
-export function FileThumbnail({ src, file }: FileThumbnailProps) {
-  const local = useFileUrl(file)
-  const image = src ?? local
-  return image ? <img className={styles.thumbnail} src={image} loading='lazy' alt='' /> : null
-}
diff --git a/apps/sim/platform/design-system/components/attachments/use-file-url.ts b/apps/sim/platform/design-system/components/attachments/use-file-url.ts
deleted file mode 100644
index 7f90b91ee86..00000000000
--- a/apps/sim/platform/design-system/components/attachments/use-file-url.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-'use client'
-import { useEffect, useState } from 'react'
-
-export function useFileUrl(file?: File) {
-  const [resource, setResource] = useState<{ file: File; url: string }>()
-  useEffect(() => {
-    if (!file) return
-    const url = URL.createObjectURL(file)
-    setResource({ file, url })
-    return () => URL.revokeObjectURL(url)
-  }, [file])
-  return resource?.file === file ? resource?.url : undefined
-}
diff --git a/apps/sim/platform/design-system/components/avatar/avatar.module.css b/apps/sim/platform/design-system/components/avatar/avatar.module.css
deleted file mode 100644
index 18c02db66b3..00000000000
--- a/apps/sim/platform/design-system/components/avatar/avatar.module.css
+++ /dev/null
@@ -1,84 +0,0 @@
-.avatar {
-  display: inline-flex;
-  flex: none;
-  align-items: center;
-  justify-content: center;
-  width: var(--spacing-24);
-  height: var(--spacing-24);
-  overflow: hidden;
-  border-radius: var(--radius-full);
-  background: var(--control-avatar);
-  color: var(--ui-ink);
-}
-
-.avatar[data-organization] {
-  width: var(--spacing-20);
-  height: var(--spacing-20);
-  border-radius: var(--radius-4);
-}
-
-.avatar[data-size="inline"] {
-  width: var(--ui-icon-size);
-  height: var(--ui-icon-size);
-}
-
-.avatar[data-size="row"] {
-  width: var(--spacing-36);
-  height: var(--spacing-36);
-}
-
-.avatar[data-size="card"] {
-  width: var(--spacing-40);
-  height: var(--spacing-40);
-}
-
-.avatar[data-size="hero"] {
-  width: var(--spacing-80);
-  height: var(--spacing-80);
-}
-
-.avatarImage {
-  display: block;
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-}
-
-.avatarGroup {
-  display: inline-flex;
-  align-items: center;
-}
-
-.avatarGroup > :nth-child(2) {
-  margin-inline-start: calc(-1 * var(--spacing-4));
-}
-
-.avatarGroup > :nth-child(3) {
-  margin-inline-start: var(--spacing-4);
-}
-
-.peoplePopover {
-  display: flex;
-  flex-direction: column;
-  width: min(var(--control-people-width), 100vw);
-  max-height: 100dvh;
-  overflow-y: auto;
-  padding: var(--ui-popup-padding);
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-menu-shared);
-  color: var(--ui-ink);
-}
-
-.peopleHeading {
-  padding: var(--ui-row-block) var(--ui-row-inset);
-  color: var(--ui-secondary);
-}
-
-.personRow {
-  display: flex;
-  align-items: center;
-  gap: var(--ui-row-gap);
-  min-height: var(--spacing-app-chip);
-  padding: var(--ui-row-block) var(--ui-row-inset);
-  overflow-wrap: anywhere;
-}
diff --git a/apps/sim/platform/design-system/components/avatar/avatar.tsx b/apps/sim/platform/design-system/components/avatar/avatar.tsx
deleted file mode 100644
index 8b064f7e938..00000000000
--- a/apps/sim/platform/design-system/components/avatar/avatar.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-'use client'
-
-import styles from '@/platform/design-system/components/avatar/avatar.module.css'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-import { Tooltip } from '@/platform/design-system/components/tooltip/tooltip'
-
-interface AvatarImageProps {
-  src: string
-  name?: string
-}
-
-export function AvatarImage({ src, name = '' }: AvatarImageProps) {
-  return <img className={styles.avatarImage} alt={name} src={src} />
-}
-
-const AVATAR_TYPE = { inline: 'T021', row: 'T050', card: 'T042', hero: 'T076' } as const
-
-interface AvatarProps {
-  name: string
-  src?: string
-  organization?: boolean
-  size?: 'inline' | 'row' | 'card' | 'hero'
-}
-
-export function Avatar({ name, src, organization, size }: AvatarProps) {
-  return (
-    <span
-      className={styles.avatar}
-      data-organization={organization || undefined}
-      data-size={size}
-      role='img'
-      aria-label={name}
-      data-type={size ? AVATAR_TYPE[size] : organization ? 'T034' : 'T050'}
-    >
-      {src ? <AvatarImage src={src} /> : Array.from(name.trim().toUpperCase())[0]}
-    </span>
-  )
-}
-
-interface Person {
-  name: string
-  src?: string
-}
-
-interface PersonRowProps {
-  name: string
-  src?: string
-}
-
-export function PersonRow({ name, src }: PersonRowProps) {
-  return (
-    <span className={styles.personRow}>
-      <Avatar name={name} src={src} size='inline' />
-      <span data-type='T060'>{name}</span>
-    </span>
-  )
-}
-
-interface PeoplePopoverProps {
-  title: string
-  people: readonly Person[]
-}
-
-export function PeoplePopover({ title, people }: PeoplePopoverProps) {
-  const scrollRef = useScrollEdges<HTMLSpanElement>()
-  return (
-    <span
-      ref={scrollRef}
-      className={styles.peoplePopover}
-      data-material='floating'
-      data-elevation='menu'
-    >
-      <span className={styles.peopleHeading} data-type='T052'>
-        {title}
-      </span>
-      {people.map((person, index) => (
-        <PersonRow key={`${person.name}-${index}`} name={person.name} src={person.src} />
-      ))}
-    </span>
-  )
-}
-
-interface AvatarOverflowProps {
-  people: readonly Person[]
-  label?: string
-  visibleCount?: number
-}
-
-export function AvatarOverflow({
-  people,
-  label = 'People',
-  visibleCount = 0,
-}: AvatarOverflowProps) {
-  if (people.length <= visibleCount) return null
-  return (
-    <Tooltip label={label} panel={<PeoplePopover title={label} people={people} />}>
-      <IconButton label={`Show ${people.length - visibleCount} more people`} icon='I108' />
-    </Tooltip>
-  )
-}
-
-interface AvatarGroupProps {
-  people: readonly Person[]
-  label?: string
-}
-
-export function AvatarGroup({ people, label }: AvatarGroupProps) {
-  return (
-    <span className={styles.avatarGroup}>
-      {people.slice(0, 2).map((person, index) => (
-        <Tooltip key={`${person.name}-${index}`} label={person.name}>
-          <Avatar name={person.name} src={person.src} />
-        </Tooltip>
-      ))}
-      <AvatarOverflow people={people} visibleCount={2} label={label} />
-    </span>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/button/button.shared.module.css b/apps/sim/platform/design-system/components/button/button.shared.module.css
deleted file mode 100644
index 95975bc5de0..00000000000
--- a/apps/sim/platform/design-system/components/button/button.shared.module.css
+++ /dev/null
@@ -1,198 +0,0 @@
-@reference "../../styles/theme.css";
-
-.button,
-.iconButton,
-.chip {
-  @apply inline-flex items-center justify-center gap-control-gap;
-  border: 0;
-  background: transparent;
-  color: var(--ui-ink);
-  cursor: pointer;
-  border-radius: var(--ui-control-radius);
-}
-
-.button,
-.chip {
-  max-inline-size: 100%;
-  min-inline-size: 0;
-}
-
-.button {
-  min-height: var(--spacing-app-control-md);
-  padding-inline: var(--spacing-control-inline);
-}
-
-.button[data-variant="secondary"] {
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  background: var(--ui-reading);
-}
-
-.iconButton {
-  flex: none;
-  width: var(--spacing-app-control-sm);
-  height: var(--spacing-app-control-sm);
-  padding: 0;
-}
-
-.iconButton[data-size="row"] {
-  width: var(--spacing-app-chip);
-  height: var(--spacing-app-chip);
-}
-
-.iconButton[data-size="compact"] {
-  width: var(--spacing-24);
-  height: var(--spacing-24);
-}
-.iconButton[data-size="inline"] {
-  inline-size: var(--spacing-16);
-  block-size: var(--spacing-16);
-}
-.iconButton[data-size="inline"] > svg {
-  width: var(--spacing-14);
-  height: var(--spacing-14);
-}
-
-.chip {
-  min-height: var(--spacing-app-chip);
-  padding-inline: var(--ui-row-inset);
-  gap: var(--ui-row-gap);
-  justify-content: start;
-  text-align: start;
-}
-.wrappedLabel {
-  overflow-wrap: anywhere;
-}
-
-.button[data-size="compact"] {
-  min-height: var(--spacing-28);
-  padding-inline: var(--spacing-8);
-}
-
-:is(.button, .iconButton):is(:enabled, a[href]):hover {
-  background: var(--ui-hover);
-}
-
-:is(.button, .iconButton):is(:enabled, a[href]):active {
-  background: var(--ui-selected);
-}
-
-.button[data-variant="muted"] {
-  background: var(--control-muted-fill);
-}
-.button[data-variant="muted"]:is(:enabled, a[href]):hover {
-  background: var(--control-muted-hover);
-}
-.button[data-variant="muted"]:is(:enabled, a[href]):active {
-  background: var(--control-muted-pressed);
-}
-
-:is(.button, .iconButton)[data-solid] {
-  background: var(--control-solid-fill);
-  color: var(--control-on-solid);
-}
-
-:is(.button, .iconButton)[data-solid]:is(:enabled, a[href]):hover {
-  background: var(--control-solid-hover);
-}
-
-:is(.button, .iconButton)[data-solid]:is(:enabled, a[href]):active {
-  background: var(--control-solid-pressed);
-}
-
-.button:disabled,
-.iconButton:disabled {
-  opacity: var(--opacity-disabled);
-  cursor: default;
-}
-
-@media (pointer: coarse) {
-  .iconButton[data-size="inline"] {
-    inline-size: var(--spacing-20);
-    block-size: var(--spacing-20);
-  }
-  .iconButton[data-size="small"] {
-    inline-size: var(--spacing-app-touch-target);
-    block-size: var(--spacing-app-touch-target);
-  }
-}
-
-.chip:where(a[href], :enabled):hover,
-.chipRow:where(:hover, :has([aria-expanded="true"])) > .chip {
-  background: var(--ui-hover);
-}
-.chip:where(a[href], :enabled):active,
-.chip:is(
-    [aria-pressed="true"],
-    [aria-expanded="true"],
-    [aria-current="page"],
-    [aria-selected="true"]
-  ) {
-  background: var(--ui-selected);
-}
-.chipRow {
-  display: grid;
-  grid-template-areas: "row";
-  min-inline-size: 0;
-  align-items: center;
-}
-.chipRow > .chip,
-.chipAction,
-.chipStatus {
-  grid-area: row;
-}
-.chipRow[data-action-side="end"] > .chip {
-  padding-inline-end: var(--spacing-app-chip);
-}
-.chipAction {
-  display: flex;
-  justify-self: end;
-  margin-inline: calc((var(--spacing-app-chip) - var(--spacing-24)) / 2);
-  opacity: 0;
-}
-.chipRow[data-action-side="start"] > .chipAction {
-  justify-self: start;
-}
-.chipRow:hover .chipAction,
-.chipRow:has(:focus-visible) .chipAction,
-.chipRow:has([role="tab"]) .chipAction,
-.chipAction:has([aria-expanded="true"]) {
-  opacity: 1;
-}
-.chipRow[data-action-side="start"]:is(:hover, :has(:focus-visible)) > .chip > svg {
-  visibility: hidden;
-}
-
-.chipStatus {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  justify-self: end;
-  inline-size: var(--spacing-app-chip);
-  color: var(--ui-secondary);
-  pointer-events: none;
-}
-.chipRow:has([aria-expanded="true"]) .chipStatus,
-.chipRow:has(:focus-visible):has(.chipAction) .chipStatus {
-  visibility: hidden;
-}
-@media (hover: hover) {
-  .chipRow:hover:has(.chipAction) .chipStatus {
-    visibility: hidden;
-  }
-}
-
-@media (hover: none) {
-  .chipAction {
-    opacity: 1;
-  }
-  .chipRow[data-status] > .chip {
-    padding-inline-end: calc(2 * var(--spacing-app-chip));
-  }
-  .chipRow[data-status] > .chipStatus {
-    margin-inline-end: var(--spacing-app-chip);
-    visibility: visible;
-  }
-  .chipRow[data-action-side="start"] > .chip > svg {
-    visibility: hidden;
-  }
-}
diff --git a/apps/sim/platform/design-system/components/button/button.tsx b/apps/sim/platform/design-system/components/button/button.tsx
deleted file mode 100644
index 4888c46c5ec..00000000000
--- a/apps/sim/platform/design-system/components/button/button.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-'use client'
-
-import type { MouseEventHandler, ReactElement, ReactNode } from 'react'
-import { useRender } from '@base-ui/react/use-render'
-import Link from 'next/link'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import styles from '@/platform/design-system/components/button/button.shared.module.css'
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import { CountedLabel } from '@/platform/design-system/components/overflow-text/counted-label'
-import { Tooltip } from '@/platform/design-system/components/tooltip/tooltip'
-import { isAbsoluteHref } from '@/platform/design-system/navigation'
-
-interface ButtonProps {
-  render?: ReactElement
-  children: string
-  count?: number
-  variant?: 'primary' | 'secondary' | 'quiet' | 'destructive' | 'muted'
-  size?: 'regular' | 'compact'
-  submit?: boolean
-  icon?: IconName | { providerId: string }
-  trailingIcon?: IconName
-  disabled?: boolean
-  /** Names the action when several identical buttons sit side by side. */
-  'aria-label'?: string
-  onClick?: MouseEventHandler<HTMLButtonElement>
-}
-
-export function Button({
-  render,
-  children,
-  count,
-  variant = 'secondary',
-  size = 'regular',
-  submit,
-  icon,
-  trailingIcon,
-  disabled,
-  'aria-label': ariaLabel,
-  onClick,
-}: ButtonProps) {
-  return useRender({
-    defaultTagName: 'button',
-    render,
-    props: {
-      type: submit ? 'submit' : 'button',
-      className: styles.button,
-      'data-variant': variant,
-      'data-solid': variant === 'primary' || variant === 'destructive' || undefined,
-      'data-size': size,
-      'data-elevation': variant === 'secondary' ? 'control' : undefined,
-      'data-type': 'T060',
-      disabled,
-      'aria-label': ariaLabel,
-      onClick,
-      children: (
-        <>
-          {icon &&
-            (typeof icon === 'string' ? (
-              <Icon name={icon} />
-            ) : (
-              <Icon providerId={icon.providerId} />
-            ))}
-          <CountedLabel label={children} count={count} />
-          {trailingIcon && <Icon name={trailingIcon} />}
-        </>
-      ),
-    },
-  })
-}
-
-interface IconButtonProps {
-  render?: ReactElement
-  label: string
-  icon: IconName
-  size?: 'small' | 'row' | 'compact' | 'inline'
-  variant?: 'quiet' | 'solid' | 'floating'
-  disabled?: boolean
-  onClick?: MouseEventHandler<HTMLButtonElement>
-  tooltip?: boolean
-  'aria-describedby'?: string
-}
-
-export function IconButton({
-  render,
-  label,
-  icon,
-  size = 'small',
-  variant = 'quiet',
-  disabled,
-  onClick,
-  tooltip,
-  'aria-describedby': describedBy,
-}: IconButtonProps) {
-  const button = useRender({
-    defaultTagName: 'button',
-    render,
-    props: {
-      type: 'button',
-      className: styles.iconButton,
-      'aria-label': label,
-      'aria-describedby': describedBy,
-      'data-type': 'T060',
-      'data-size': size,
-      'data-variant': variant,
-      'data-solid': variant === 'solid' || undefined,
-      'data-material': variant === 'floating' ? 'reading' : undefined,
-      'data-elevation': variant === 'floating' ? 'composer' : undefined,
-      disabled,
-      onClick,
-      children: <Icon name={icon} />,
-    },
-  })
-  return tooltip ? <Tooltip label={label}>{button}</Tooltip> : button
-}
-
-type ChipProps = {
-  children: string
-  icon?: IconName
-  selected?: boolean
-} & (
-  | { href: string; onClick?: never; action?: ReactNode; status?: ReactNode }
-  | { href?: never; onClick?: MouseEventHandler<HTMLButtonElement>; action?: never; status?: never }
-)
-
-export function Chip({
-  children,
-  icon,
-  selected = false,
-  onClick,
-  href,
-  action,
-  status,
-}: ChipProps) {
-  const LinkElement = href && isAbsoluteHref(href) ? 'a' : Link
-  return (
-    <ControlRow
-      label={children}
-      icon={icon}
-      action={action}
-      status={status}
-      render={
-        href ? (
-          <LinkElement href={href} aria-current={selected ? 'page' : undefined} />
-        ) : (
-          <button type='button' aria-pressed={selected} onClick={onClick} />
-        )
-      }
-    />
-  )
-}
diff --git a/apps/sim/platform/design-system/components/button/control-row.tsx b/apps/sim/platform/design-system/components/button/control-row.tsx
deleted file mode 100644
index 33543511397..00000000000
--- a/apps/sim/platform/design-system/components/button/control-row.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-'use client'
-
-import type { ReactElement, ReactNode } from 'react'
-import { useRender } from '@base-ui/react/use-render'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import styles from '@/platform/design-system/components/button/button.shared.module.css'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import { OverflowText } from '@/platform/design-system/components/overflow-text/overflow-text'
-
-interface ControlRowProps {
-  render: ReactElement
-  label?: string
-  accessibleLabel?: string
-  leading?: ReactNode
-  trailingIcon?: IconName
-  onClick?: () => void
-  icon?: IconName
-  wrap?: boolean
-  action?: ReactNode
-  actionSide?: 'start' | 'end'
-  /** A read-only state at the row's end. It yields to `action` where a pointer can reveal it. */
-  status?: ReactNode
-}
-
-export function ControlRow({
-  render,
-  label,
-  accessibleLabel,
-  leading,
-  trailingIcon,
-  onClick,
-  icon,
-  wrap,
-  action,
-  actionSide = 'end',
-  status,
-}: ControlRowProps) {
-  const control = useRender({
-    render,
-    props: {
-      className: styles.chip,
-      'data-type': 'T043',
-      'aria-label': accessibleLabel,
-      onClick,
-      children: (
-        <>
-          {leading ?? (icon && <Icon name={icon} />)}
-          {label &&
-            (wrap ? (
-              <span className={styles.wrappedLabel}>{label}</span>
-            ) : (
-              <OverflowText text={label}>{label}</OverflowText>
-            ))}
-          {trailingIcon && <Icon name={trailingIcon} />}
-        </>
-      ),
-    },
-  })
-  if (!action && !status) return control
-  return (
-    <div
-      className={styles.chipRow}
-      data-action-side={actionSide}
-      data-status={status ? true : undefined}
-    >
-      {control}
-      {status && <span className={styles.chipStatus}>{status}</span>}
-      {action && <span className={styles.chipAction}>{action}</span>}
-    </div>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/button/copy-button.tsx b/apps/sim/platform/design-system/components/button/copy-button.tsx
deleted file mode 100644
index 8c75c8342d1..00000000000
--- a/apps/sim/platform/design-system/components/button/copy-button.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client'
-
-import { IconButton } from '@/platform/design-system/components/button/button'
-import { useClipboard } from '@/platform/design-system/components/feedback/use-clipboard'
-
-interface CopyButtonProps {
-  label: string
-  text: string
-}
-
-export function CopyButton({ label, text }: CopyButtonProps) {
-  const { copied, copy } = useClipboard()
-  return (
-    <IconButton
-      tooltip
-      label={copied ? 'Copied' : label}
-      icon={copied ? 'I072' : 'I006'}
-      onClick={() => void copy(text)}
-    />
-  )
-}
diff --git a/apps/sim/platform/design-system/components/chart/chart-format.ts b/apps/sim/platform/design-system/components/chart/chart-format.ts
deleted file mode 100644
index f9b805df1b8..00000000000
--- a/apps/sim/platform/design-system/components/chart/chart-format.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const chartNumber = new Intl.NumberFormat('en-US')
-const compact = new Intl.NumberFormat('en-US', { notation: 'compact', maximumFractionDigits: 1 })
-
-export function chartTick(value: number) {
-  return compact.format(value).replace(/K$/, 'k')
-}
diff --git a/apps/sim/platform/design-system/components/chart/chart-tooltip.module.css b/apps/sim/platform/design-system/components/chart/chart-tooltip.module.css
deleted file mode 100644
index 55367c47e25..00000000000
--- a/apps/sim/platform/design-system/components/chart/chart-tooltip.module.css
+++ /dev/null
@@ -1,29 +0,0 @@
-.tooltip {
-  display: grid;
-  gap: var(--ui-stack-gap);
-  inline-size: var(--chart-tooltip-width);
-  max-inline-size: 100%;
-  padding: var(--ui-row-block) var(--ui-row-inset);
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-menu-shared);
-  color: var(--ui-ink);
-  background: var(--chart-tooltip-fill);
-  backdrop-filter: var(--chart-tooltip-blur);
-  box-shadow: var(--chart-tooltip-shadow);
-}
-
-.tooltip > span,
-.detail > span:first-child {
-  color: var(--ui-secondary);
-}
-
-.detail > span {
-  min-inline-size: 0;
-  overflow-wrap: anywhere;
-}
-
-.detail {
-  display: flex;
-  justify-content: space-between;
-  gap: var(--spacing-8);
-}
diff --git a/apps/sim/platform/design-system/components/chart/chart-tooltip.tsx b/apps/sim/platform/design-system/components/chart/chart-tooltip.tsx
deleted file mode 100644
index 419514e5214..00000000000
--- a/apps/sim/platform/design-system/components/chart/chart-tooltip.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { chartNumber } from '@/platform/design-system/components/chart/chart-format'
-import styles from '@/platform/design-system/components/chart/chart-tooltip.module.css'
-
-interface ChartTooltipProps {
-  id?: string
-  heading: string
-  entries: readonly { label: string; value: string | number }[]
-}
-
-export function ChartTooltip({ id, heading, entries }: ChartTooltipProps) {
-  return (
-    <div id={id} role='tooltip' className={styles.tooltip}>
-      <span data-type='T052'>{heading}</span>
-      {entries.map((entry) => (
-        <div key={entry.label} className={styles.detail}>
-          <span data-type='T052'>{entry.label}</span>
-          <span data-type='T051'>
-            {typeof entry.value === 'number' ? chartNumber.format(entry.value) : entry.value}
-          </span>
-        </div>
-      ))}
-    </div>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/chart/charts.module.css b/apps/sim/platform/design-system/components/chart/charts.module.css
deleted file mode 100644
index 671f755ba18..00000000000
--- a/apps/sim/platform/design-system/components/chart/charts.module.css
+++ /dev/null
@@ -1,189 +0,0 @@
-.chart {
-  color: var(--ui-strong);
-  container-type: inline-size;
-  display: grid;
-  align-content: start;
-  gap: var(--spacing-16);
-  min-inline-size: 0;
-}
-.header,
-.series,
-.series li,
-.legendItem,
-.ticks {
-  display: flex;
-  align-items: center;
-}
-.header {
-  margin-inline-end: calc(-1 * var(--spacing-8));
-  justify-content: space-between;
-  min-block-size: var(--spacing-28);
-  gap: var(--spacing-16);
-}
-.coordinates {
-  display: grid;
-  grid-template-columns: var(--spacing-32) minmax(0, 1fr);
-  gap: var(--spacing-8);
-}
-.scale,
-.total {
-  display: flex;
-  flex-direction: column;
-}
-.scale {
-  justify-content: space-between;
-  color: var(--ui-secondary);
-  font-variant-numeric: tabular-nums;
-}
-.canvas {
-  position: relative;
-  min-inline-size: 0;
-  block-size: var(--chart-plot-height);
-}
-.ticks {
-  grid-column: 2;
-  min-width: 0;
-  justify-content: space-between;
-  color: var(--ui-secondary);
-}
-.ticks li {
-  overflow: hidden;
-  white-space: nowrap;
-}
-.ticks[data-band] li {
-  flex: 1;
-  min-inline-size: 0;
-  text-align: center;
-}
-.series {
-  flex-wrap: wrap;
-  gap: var(--spacing-16);
-  color: var(--ui-secondary);
-}
-.series li {
-  gap: var(--spacing-6);
-}
-.swatch {
-  display: inline-block;
-  flex: none;
-  width: var(--spacing-8);
-  height: var(--spacing-8);
-  border-radius: var(--radius-full);
-}
-.swatch[data-bar] {
-  width: var(--spacing-6);
-  height: var(--spacing-6);
-  background: var(--ui-plot-primary);
-}
-.swatch[data-bar="1"] {
-  background: var(--ui-plot-secondary);
-}
-.swatch[data-bar="2"] {
-  background: var(--ui-plot-violet-1);
-}
-.swatch[data-bar="3"] {
-  background: var(--ui-plot-violet-2);
-}
-.swatch[data-bar="4"] {
-  background: var(--ui-plot-violet-3);
-}
-.swatch[data-bar="5"] {
-  background: var(--ui-plot-violet-4);
-}
-.swatch[data-palette] {
-  border-radius: var(--radius-2);
-}
-.swatch[data-palette="0"] {
-  background: var(--ui-plot-violet-1);
-}
-.swatch[data-palette="1"] {
-  background: var(--ui-plot-violet-2);
-}
-.swatch[data-palette="2"] {
-  background: var(--ui-plot-violet-3);
-}
-.swatch[data-palette="3"] {
-  background: var(--ui-plot-violet-4);
-}
-.distribution {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  min-block-size: var(--chart-donut-block);
-  gap: var(--spacing-24);
-}
-.ring {
-  position: relative;
-  flex: 0 1 var(--chart-ring-size);
-  max-inline-size: 100%;
-  aspect-ratio: 1;
-}
-.total {
-  position: absolute;
-  inset: 0;
-  align-items: center;
-  justify-content: center;
-  pointer-events: none;
-}
-.total > :last-child {
-  color: var(--ui-secondary);
-}
-.legend {
-  display: grid;
-  gap: var(--spacing-8);
-  flex: 1 1 var(--spacing-128);
-  min-inline-size: 0;
-}
-.legendItem {
-  width: calc(100% + var(--spacing-16));
-  margin-inline: calc(-1 * var(--spacing-8));
-  color: var(--ui-secondary);
-  gap: var(--spacing-8);
-  padding-inline: var(--spacing-8);
-  min-height: var(--spacing-28);
-  border-radius: var(--radius-item);
-  text-align: start;
-  overflow-wrap: anywhere;
-}
-.legendItem[data-active] {
-  background: var(--ui-hover);
-}
-.share {
-  margin-inline-start: auto;
-  min-width: var(--spacing-44);
-  text-align: end;
-  color: var(--ui-strong);
-  font-variant-numeric: tabular-nums;
-}
-.tooltip {
-  column-gap: var(--spacing-12);
-  inline-size: min(100%, var(--chart-tooltip-width));
-  position: absolute;
-  inset-block-start: 0;
-  inset-inline-start: 0;
-  max-inline-size: 100%;
-  pointer-events: none;
-}
-@container (width < 25rem) {
-  .distribution {
-    flex-direction: column;
-  }
-  .ring {
-    flex: none;
-    inline-size: min(100%, var(--chart-ring-size));
-  }
-  .legend {
-    flex: none;
-    inline-size: 100%;
-  }
-  .legendItem {
-    min-height: var(--spacing-app-touch-target);
-  }
-}
-
-@media (pointer: coarse) {
-  .header,
-  .legendItem {
-    min-height: var(--spacing-app-touch-target);
-  }
-}
diff --git a/apps/sim/platform/design-system/components/chart/charts.tsx b/apps/sim/platform/design-system/components/chart/charts.tsx
deleted file mode 100644
index 2804aac1864..00000000000
--- a/apps/sim/platform/design-system/components/chart/charts.tsx
+++ /dev/null
@@ -1,253 +0,0 @@
-'use client'
-
-import { type ReactNode, useId, useState } from 'react'
-import { DonutPlot, StackPlot, TrendPlot } from '@/platform/design-system/catalog/plots'
-import { chartNumber, chartTick } from '@/platform/design-system/components/chart/chart-format'
-import { ChartTooltip } from '@/platform/design-system/components/chart/chart-tooltip'
-import styles from '@/platform/design-system/components/chart/charts.module.css'
-import { usePlotInspection } from '@/platform/design-system/components/chart/use-plot-inspection'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-interface ChartFrameProps {
-  title: string
-  control?: ReactNode
-  children: ReactNode
-}
-
-function ChartFrame({ title, control, children }: ChartFrameProps) {
-  return (
-    <section aria-label={title} className={styles.chart}>
-      <header className={styles.header}>
-        <h2 data-type='T042'>{title}</h2>
-        {control}
-      </header>
-      {children}
-    </section>
-  )
-}
-
-interface Point {
-  label: string
-  value: number
-}
-interface Bar {
-  label: string
-  values: readonly number[]
-}
-
-/** Past this many columns a label per column no longer fits, so the axis marks its span instead. */
-const BAND_TICK_LIMIT = 12
-
-interface SeriesFrameProps extends Omit<ChartFrameProps, 'children'> {
-  labels: string[]
-  maximum: number
-  band?: boolean
-  render: (active: number | undefined) => ReactNode
-  detail: (index: number) => readonly { label: string; value: number }[]
-  legend?: ReactNode
-}
-
-function SeriesFrame({
-  title,
-  control,
-  labels,
-  maximum,
-  band,
-  render,
-  detail,
-  legend,
-}: SeriesFrameProps) {
-  const tickEdges = useScrollEdges<HTMLLIElement>('horizontal')
-  const inspection = usePlotInspection(labels.length, { band })
-  const { active, tooltipId } = inspection
-  const bandTicks = band && labels.length <= BAND_TICK_LIMIT
-  const ticks = bandTicks
-    ? labels
-    : labels.filter(
-        (_, i) => i === 0 || i === Math.floor((labels.length - 1) / 2) || i === labels.length - 1
-      )
-  return (
-    <ChartFrame title={title} control={control}>
-      <div className={styles.coordinates}>
-        <div className={styles.scale} aria-hidden='true' data-type='T050'>
-          {[maximum, maximum / 2, 0].map((n, i) => (
-            <span key={i}>{labels.length ? chartTick(n) : ''}</span>
-          ))}
-        </div>
-        <div
-          className={styles.canvas}
-          role='group'
-          aria-label={`${title} data`}
-          aria-describedby={active === undefined ? undefined : tooltipId}
-          tabIndex={labels.length ? 0 : undefined}
-          onKeyDown={inspection.onKeyDown}
-          onFocus={inspection.onFocus}
-          onBlur={inspection.onBlur}
-          onPointerLeave={inspection.onPointerLeave}
-          onPointerMove={inspection.onPointerMove}
-        >
-          {render(active)}
-          {active !== undefined && (
-            <div ref={inspection.tooltipAnchor} className={styles.tooltip}>
-              <ChartTooltip id={tooltipId} heading={labels[active]} entries={detail(active)} />
-            </div>
-          )}
-        </div>
-        <ul
-          className={styles.ticks}
-          aria-label='Chart periods'
-          data-band={bandTicks || undefined}
-          data-type='T050'
-        >
-          {ticks.map((tick, i) => (
-            <li ref={tickEdges} key={i} title={tick}>
-              {tick}
-            </li>
-          ))}
-        </ul>
-      </div>
-      {legend}
-    </ChartFrame>
-  )
-}
-
-interface TrendChartProps extends Omit<ChartFrameProps, 'children'> {
-  points: readonly Point[]
-  maximum?: number
-}
-
-export function TrendChart({ title, control, points, maximum = 0 }: TrendChartProps) {
-  const data = points.filter((point) => Number.isFinite(point.value) && point.value >= 0)
-  const values = data.map((point) => point.value)
-  const peak = values.reduce((a, b) => Math.max(a, b), Math.max(1, maximum || 0))
-  return (
-    <SeriesFrame
-      title={title}
-      control={control}
-      labels={data.map((p) => p.label)}
-      maximum={peak}
-      detail={(i) => [{ label: title, value: values[i] }]}
-      render={(active) => (
-        <TrendPlot label={title} values={values} maximum={peak} active={active} />
-      )}
-    />
-  )
-}
-
-interface BarChartProps extends Omit<ChartFrameProps, 'children'> {
-  bars: readonly Bar[]
-  /** Layer names, bottom-up, up to six. A series keeps its color by position. */
-  series: readonly string[]
-  maximum?: number
-  /** Leave a layer with no values out of the legend and the tooltip. */
-  hideEmptySeries?: boolean
-}
-
-export function BarChart({
-  title,
-  control,
-  bars,
-  series,
-  maximum = 0,
-  hideEmptySeries,
-}: BarChartProps) {
-  const data = bars.filter((bar) => bar.values.every((n) => Number.isFinite(n) && n >= 0))
-  const values = data.map((bar) => bar.values)
-  const peak = values.reduce(
-    (n, layers) =>
-      Math.max(
-        n,
-        layers.reduce((sum, value) => sum + value, 0)
-      ),
-    Math.max(1, maximum || 0)
-  )
-  return (
-    <SeriesFrame
-      title={title}
-      control={control}
-      labels={data.map((b) => b.label)}
-      maximum={peak}
-      band
-      detail={(i) =>
-        series
-          .map((label, j) => ({ label, value: values[i][j] }))
-          .filter((entry) => !hideEmptySeries || entry.value > 0)
-      }
-      legend={
-        <ul className={styles.series} aria-label='Bar series'>
-          {series.map(
-            (text, i) =>
-              (!hideEmptySeries || values.some((layers) => layers[i] > 0)) && (
-                <li key={text} data-type='T052'>
-                  <i className={styles.swatch} data-bar={i} />
-                  {text}
-                </li>
-              )
-          )}
-        </ul>
-      }
-      render={() => <StackPlot label={title} values={values} maximum={peak} />}
-    />
-  )
-}
-
-interface DonutChartProps extends Omit<ChartFrameProps, 'children'> {
-  segments: readonly Point[]
-  totalLabel: string
-}
-
-export function DonutChart({ title, control, segments, totalLabel }: DonutChartProps) {
-  const [active, setActive] = useState<number | null>(null)
-  const id = useId()
-  const data = segments.filter((entry) => Number.isFinite(entry.value) && entry.value >= 0)
-  const total = data.reduce((sum, p) => sum + p.value, 0)
-  const selected = active === null ? undefined : data[active]
-  return (
-    <ChartFrame title={title} control={control}>
-      <div className={styles.distribution}>
-        <div className={styles.ring}>
-          <DonutPlot label={title} values={data.map((d) => d.value)} onInspect={setActive} />
-          <div className={styles.total}>
-            <span data-type='T024'>{data.length ? chartNumber.format(total) : '—'}</span>
-            <span data-type='T050'>{totalLabel}</span>
-          </div>
-          {selected && (
-            <div className={styles.tooltip}>
-              <ChartTooltip
-                id={id}
-                heading={selected.label}
-                entries={[{ label: totalLabel, value: selected.value }]}
-              />
-            </div>
-          )}
-        </div>
-        <ul className={styles.legend} aria-label='Distribution legend'>
-          {data.map(({ label, value }, i) => (
-            <li key={label}>
-              <button
-                type='button'
-                className={styles.legendItem}
-                data-active={i === active || undefined}
-                aria-describedby={i === active ? id : undefined}
-                onFocus={() => setActive(i)}
-                onBlur={() => setActive(null)}
-                onPointerEnter={() => setActive(i)}
-                onPointerLeave={() => setActive(null)}
-                onClick={() => setActive(i)}
-                onKeyDown={(e) => {
-                  if (e.key === 'Escape') setActive(null)
-                }}
-              >
-                <i className={styles.swatch} data-palette={i % 4} />
-                <span data-type='T060'>{label}</span>
-                <span className={styles.share} data-type='T050'>
-                  {(total ? (100 * value) / total : 0).toFixed(1)}%
-                </span>
-              </button>
-            </li>
-          ))}
-        </ul>
-      </div>
-    </ChartFrame>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/chart/use-plot-inspection.ts b/apps/sim/platform/design-system/components/chart/use-plot-inspection.ts
deleted file mode 100644
index c6d29587dc3..00000000000
--- a/apps/sim/platform/design-system/components/chart/use-plot-inspection.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-'use client'
-
-import {
-  type KeyboardEvent,
-  type PointerEvent,
-  useId,
-  useLayoutEffect,
-  useRef,
-  useState,
-} from 'react'
-
-interface InspectionOptions {
-  band?: boolean
-  initialIndex?: number
-}
-
-export function usePlotInspection(
-  count: number,
-  { band = false, initialIndex }: InspectionOptions = {}
-) {
-  const [index, setIndex] = useState(initialIndex)
-  const active = index !== undefined && index >= 0 && index < count ? index : undefined
-  const tooltipId = useId()
-  const tooltipAnchor = useRef<HTMLDivElement>(null)
-  useLayoutEffect(() => {
-    const tip = tooltipAnchor.current
-    const plot = tip?.parentElement
-    if (!tip || !plot || active === undefined) return
-    const ratio = band ? (active + 0.5) / count : count === 1 ? 0.5 : active / (count - 1)
-    const place = () => {
-      const box = plot.getBoundingClientRect()
-      const marker = plot.querySelector('[data-plot-marker]')?.getBoundingClientRect()
-      const x = marker ? marker.left + marker.width / 2 - box.left : ratio * box.width
-      const width = tip.offsetWidth
-      const gap = Number.parseFloat(getComputedStyle(tip).columnGap)
-      const left = x + gap + width <= box.width ? x + gap : x - gap - width
-      tip.style.left = `${Math.max(0, Math.min(box.width - width, left))}px`
-    }
-    const observer = new ResizeObserver(place)
-    observer.observe(plot)
-    observer.observe(tip)
-    place()
-    return () => observer.disconnect()
-  }, [active, count, band])
-  function clear() {
-    setIndex(undefined)
-  }
-  function onKeyDown(event: KeyboardEvent<HTMLElement>) {
-    if (event.key === 'Escape') {
-      clear()
-      return
-    }
-    const next = {
-      Home: 0,
-      End: count - 1,
-      ArrowLeft: Math.max(0, (active ?? 1) - 1),
-      ArrowRight: Math.min(count - 1, (active ?? -1) + 1),
-    }[event.key]
-    if (next !== undefined && count) {
-      event.preventDefault()
-      setIndex(next)
-    }
-  }
-  function onPointerMove(event: PointerEvent<HTMLElement>) {
-    const bounds = event.currentTarget.getBoundingClientRect()
-    if (!count || !bounds.width) return
-    const position = Math.max(0, Math.min(1, (event.clientX - bounds.left) / bounds.width))
-    setIndex(
-      band ? Math.min(count - 1, Math.floor(position * count)) : Math.round(position * (count - 1))
-    )
-  }
-  return {
-    active,
-    tooltipId,
-    tooltipAnchor,
-    onKeyDown,
-    onFocus: () => {
-      if (count && active === undefined) setIndex(0)
-    },
-    onBlur: clear,
-    onPointerMove,
-    onPointerLeave: clear,
-  }
-}
diff --git a/apps/sim/platform/design-system/components/checkbox/checkbox.module.css b/apps/sim/platform/design-system/components/checkbox/checkbox.module.css
deleted file mode 100644
index 6d41c7d5f88..00000000000
--- a/apps/sim/platform/design-system/components/checkbox/checkbox.module.css
+++ /dev/null
@@ -1,56 +0,0 @@
-.checkbox {
-  display: inline-flex;
-  align-items: flex-start;
-  min-inline-size: 0;
-  gap: var(--ui-row-gap);
-  color: var(--ui-ink);
-  cursor: pointer;
-}
-
-.checkbox[data-disabled] {
-  opacity: var(--opacity-disabled);
-  cursor: default;
-}
-
-.box {
-  display: inline-grid;
-  flex: none;
-  place-items: center;
-  inline-size: var(--spacing-16);
-  block-size: var(--spacing-16);
-  margin-block-start: var(--spacing-2);
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-4);
-  background: var(--ui-reading);
-}
-
-.checkbox:not([data-disabled]):hover .box:not([data-checked], [data-indeterminate]) {
-  border-color: var(--control-hover-border);
-}
-
-.box:is([data-checked], [data-indeterminate]) {
-  border-color: var(--control-primary-fill);
-  background: var(--control-primary-fill);
-}
-
-.indicator {
-  display: inline-grid;
-  place-items: center;
-}
-
-.dash {
-  inline-size: var(--spacing-8);
-  block-size: var(--spacing-stroke-default);
-  background: var(--control-on-solid);
-}
-
-.copy {
-  display: grid;
-  min-inline-size: 0;
-  gap: var(--ui-stack-gap);
-  overflow-wrap: anywhere;
-}
-
-.description {
-  color: var(--ui-secondary);
-}
diff --git a/apps/sim/platform/design-system/components/checkbox/checkbox.tsx b/apps/sim/platform/design-system/components/checkbox/checkbox.tsx
deleted file mode 100644
index ab456dbfd56..00000000000
--- a/apps/sim/platform/design-system/components/checkbox/checkbox.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-'use client'
-
-import { useId } from 'react'
-import { Checkbox as BaseCheckbox } from '@base-ui/react/checkbox'
-import styles from '@/platform/design-system/components/checkbox/checkbox.module.css'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-
-interface CheckboxProps {
-  label: string
-  description?: string
-  /** Name the box for assistive technology only, for a grid or table that labels it visually. */
-  labelHidden?: boolean
-  checked?: boolean
-  defaultChecked?: boolean
-  indeterminate?: boolean
-  disabled?: boolean
-  name?: string
-  value?: string
-  onCheckedChange?: (checked: boolean) => void
-}
-
-export function Checkbox({
-  label,
-  description,
-  labelHidden,
-  checked,
-  defaultChecked,
-  indeterminate,
-  disabled,
-  name,
-  value,
-  onCheckedChange,
-}: CheckboxProps) {
-  const id = useId()
-  return (
-    <label htmlFor={id} className={styles.checkbox} data-disabled={disabled || undefined}>
-      <BaseCheckbox.Root
-        id={id}
-        className={styles.box}
-        checked={checked}
-        defaultChecked={defaultChecked}
-        indeterminate={indeterminate}
-        disabled={disabled}
-        name={name}
-        value={value}
-        onCheckedChange={onCheckedChange}
-      >
-        <BaseCheckbox.Indicator className={styles.indicator} data-solid data-type='T050'>
-          {indeterminate ? <span className={styles.dash} /> : <Icon name='I072' />}
-        </BaseCheckbox.Indicator>
-      </BaseCheckbox.Root>
-      <span className={styles.copy} data-visually-hidden={labelHidden || undefined}>
-        <span data-type='T043'>{label}</span>
-        {description && (
-          <span className={styles.description} data-type='T060'>
-            {description}
-          </span>
-        )}
-      </span>
-    </label>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/command-palette/command-palette.module.css b/apps/sim/platform/design-system/components/command-palette/command-palette.module.css
deleted file mode 100644
index b7c9999ab62..00000000000
--- a/apps/sim/platform/design-system/components/command-palette/command-palette.module.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.field,
-.footer,
-.footer > span {
-  display: flex;
-  align-items: center;
-}
-.field {
-  flex: none;
-  gap: var(--ui-row-gap);
-  min-block-size: var(--spacing-44);
-  padding-inline: var(--ui-dialog-inset);
-}
-.field input {
-  flex: 1;
-  min-inline-size: 0;
-  color: var(--ui-ink);
-}
-.results {
-  min-block-size: 0;
-  max-block-size: 50dvh;
-  padding-inline: var(--ui-row-inset);
-  overflow: auto;
-  overscroll-behavior: contain;
-}
-.results:empty {
-  display: none;
-}
-.group {
-  display: grid;
-  gap: var(--ui-list-gap);
-}
-.group + .group {
-  padding-block-start: var(--ui-section-gap);
-}
-.empty:not(:empty) {
-  padding: var(--ui-section-gap) var(--ui-dialog-inset);
-  color: var(--ui-secondary);
-}
-.footer {
-  flex: none;
-  flex-wrap: wrap;
-  min-block-size: var(--spacing-40);
-  padding: var(--ui-row-block) var(--ui-dialog-inset);
-  color: var(--ui-secondary);
-  gap: var(--ui-list-gap) var(--ui-section-gap);
-}
-.footer > span {
-  gap: var(--spacing-4);
-}
-.footer > span:last-child {
-  margin-inline-start: auto;
-}
-.footer kbd {
-  font: inherit;
-}
diff --git a/apps/sim/platform/design-system/components/command-palette/command-palette.tsx b/apps/sim/platform/design-system/components/command-palette/command-palette.tsx
deleted file mode 100644
index 758f94edc5c..00000000000
--- a/apps/sim/platform/design-system/components/command-palette/command-palette.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-'use client'
-
-import { Autocomplete } from '@base-ui/react/autocomplete'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import styles from '@/platform/design-system/components/command-palette/command-palette.module.css'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import popup from '@/platform/design-system/components/menu/popup.shared.module.css'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-interface Command {
-  id: string
-  label: string
-  icon?: IconName
-  value: string
-}
-
-interface CommandGroup {
-  label?: string
-  items: readonly Command[]
-}
-
-interface CommandPaletteProps {
-  groups: readonly CommandGroup[]
-  label: string
-  onSelect: (value: string) => void
-}
-
-export function CommandPalette({ groups, label, onSelect }: CommandPaletteProps) {
-  const scrollEdges = useScrollEdges<HTMLDivElement>()
-  const queryEdges = useScrollEdges<HTMLInputElement>('horizontal')
-  return (
-    <Autocomplete.Root
-      items={groups.filter((group) => group.items.length > 0)}
-      inline
-      open
-      autoHighlight='always'
-      itemToStringValue={(item) => item.label}
-    >
-      <div className={styles.field} data-type='T094'>
-        <Icon name='I089' />
-        <Autocomplete.Input ref={queryEdges} aria-label={label} placeholder={`${label}…`} />
-      </div>
-      <Autocomplete.Empty className={styles.empty} data-type='T052'>
-        No results found
-      </Autocomplete.Empty>
-      <Autocomplete.List ref={scrollEdges} aria-label='Search results' className={styles.results}>
-        {(group: CommandGroup) => (
-          <Autocomplete.Group key={group.label ?? ''} items={group.items} className={styles.group}>
-            {group.label && (
-              <Autocomplete.GroupLabel className={popup.heading} data-type='T052'>
-                {group.label}
-              </Autocomplete.GroupLabel>
-            )}
-            <Autocomplete.Collection>
-              {(item: Command) => (
-                <Autocomplete.Item
-                  key={item.id}
-                  value={item}
-                  className={popup.item}
-                  data-type='T060'
-                  onClick={() => onSelect(item.value)}
-                >
-                  {item.icon && <Icon name={item.icon} />}
-                  <span className={popup.label}>{item.label}</span>
-                </Autocomplete.Item>
-              )}
-            </Autocomplete.Collection>
-          </Autocomplete.Group>
-        )}
-      </Autocomplete.List>
-      <footer className={styles.footer} data-type='T052'>
-        <span>
-          <kbd>↑</kbd>
-          <kbd>↓</kbd> Navigate
-        </span>
-        <span>
-          <kbd>esc</kbd> Close
-        </span>
-        <span>
-          <kbd>↵</kbd> Select
-        </span>
-      </footer>
-    </Autocomplete.Root>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/composer-input/composer-input.module.css b/apps/sim/platform/design-system/components/composer-input/composer-input.module.css
deleted file mode 100644
index 1558bb4698a..00000000000
--- a/apps/sim/platform/design-system/components/composer-input/composer-input.module.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.composerInput {
-  display: block;
-  inline-size: 100%;
-  min-inline-size: 0;
-  min-block-size: var(--spacing-48);
-  padding: 0 var(--spacing-4);
-  border: 0;
-  background: transparent;
-  color: var(--ui-ink);
-  field-sizing: content;
-  overflow-wrap: anywhere;
-}
-
-.composerInput[data-density="compact"] {
-  min-block-size: var(--spacing-40);
-}
-
-.composerInput::placeholder {
-  color: var(--ui-muted);
-  opacity: 1;
-}
diff --git a/apps/sim/platform/design-system/components/composer-input/composer-input.tsx b/apps/sim/platform/design-system/components/composer-input/composer-input.tsx
deleted file mode 100644
index aa0e7a533cb..00000000000
--- a/apps/sim/platform/design-system/components/composer-input/composer-input.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-'use client'
-
-import type { RefObject } from 'react'
-import styles from '@/platform/design-system/components/composer-input/composer-input.module.css'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-interface ComposerInputProps {
-  inputRef?: RefObject<HTMLTextAreaElement | null>
-  value?: string
-  onValueChange?: (text: string) => void
-  onSubmit?: () => void
-  onPasteFiles?: (items: File[]) => void
-  onPasteText?: (text: string) => void
-  label: string
-  placeholder?: string
-  defaultValue?: string
-  density?: 'standard' | 'compact'
-}
-
-export function ComposerInput({
-  label,
-  inputRef,
-  value,
-  onValueChange,
-  onSubmit,
-  onPasteFiles,
-  onPasteText,
-  placeholder,
-  defaultValue,
-  density = 'standard',
-}: ComposerInputProps) {
-  const scrollRef = useScrollEdges<HTMLTextAreaElement>('vertical', { viewport: inputRef })
-  return (
-    <textarea
-      ref={scrollRef}
-      value={value}
-      onChange={onValueChange && ((e) => onValueChange(e.currentTarget.value))}
-      onKeyDown={
-        onSubmit &&
-        ((e) => {
-          if (
-            e.key === 'Enter' &&
-            !e.shiftKey &&
-            !e.nativeEvent.isComposing &&
-            !window.matchMedia('(width < 48rem) and (pointer: coarse)').matches
-          ) {
-            e.preventDefault()
-            onSubmit()
-          }
-        })
-      }
-      onPaste={
-        (onPasteFiles || onPasteText) &&
-        ((e) => {
-          const files = Array.from(e.clipboardData.files)
-          if (files.length && onPasteFiles) {
-            e.preventDefault()
-            onPasteFiles(files)
-            return
-          }
-          const text = e.clipboardData.getData('text/plain')
-          if (text.length > 2000 && onPasteText) {
-            e.preventDefault()
-            onPasteText(text)
-          }
-        })
-      }
-      aria-label={label}
-      className={styles.composerInput}
-      data-density={density}
-      data-type='T048'
-      rows={1}
-      placeholder={placeholder}
-      defaultValue={defaultValue}
-    />
-  )
-}
diff --git a/apps/sim/platform/design-system/components/connection-prompt/connection-prompt.module.css b/apps/sim/platform/design-system/components/connection-prompt/connection-prompt.module.css
deleted file mode 100644
index 6621925e809..00000000000
--- a/apps/sim/platform/design-system/components/connection-prompt/connection-prompt.module.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.prompt {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: var(--ui-section-gap);
-  min-block-size: var(--spacing-132);
-  padding: var(--ui-dialog-inset);
-  border: var(--spacing-stroke-default) solid var(--ui-divider);
-  border-radius: var(--radius-menu-shared);
-  text-align: center;
-}
-.prompt p {
-  color: var(--ui-secondary);
-}
-.providers {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-  gap: var(--ui-row-gap);
-}
diff --git a/apps/sim/platform/design-system/components/connection-prompt/connection-prompt.tsx b/apps/sim/platform/design-system/components/connection-prompt/connection-prompt.tsx
deleted file mode 100644
index 6a40f00abb5..00000000000
--- a/apps/sim/platform/design-system/components/connection-prompt/connection-prompt.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import Link from 'next/link'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { Button } from '@/platform/design-system/components/button/button'
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-import styles from '@/platform/design-system/components/connection-prompt/connection-prompt.module.css'
-
-interface ConnectionPromptProps {
-  title: string
-  setupGuideUrl?: string
-  options: readonly {
-    label: string
-    icon: IconName | { providerId: string }
-    onConnect?: () => void
-  }[]
-}
-
-export function ConnectionPrompt({ title, options, setupGuideUrl }: ConnectionPromptProps) {
-  return (
-    <div className={styles.prompt} data-material='shell'>
-      <p data-type='T060'>{title}</p>
-      <div className={styles.providers}>
-        {setupGuideUrl && (
-          <ControlRow
-            render={<Link href={setupGuideUrl} target='_blank' rel='noopener noreferrer' />}
-            icon='I079'
-            label='Docs'
-            accessibleLabel='Docs (opens in a new tab)'
-          />
-        )}
-        {options.map(({ label, icon, onConnect }) => (
-          <Button key={label} icon={icon} onClick={onConnect} disabled={!onConnect}>
-            {label}
-          </Button>
-        ))}
-      </div>
-    </div>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/data-display/data-display.module.css b/apps/sim/platform/design-system/components/data-display/data-display.module.css
deleted file mode 100644
index 67a58d8f8a6..00000000000
--- a/apps/sim/platform/design-system/components/data-display/data-display.module.css
+++ /dev/null
@@ -1,172 +0,0 @@
-@reference "../../styles/theme.css";
-
-.section,
-.metric {
-  min-inline-size: 0;
-}
-.metrics {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(min(100%, var(--spacing-128)), 1fr));
-  gap: var(--spacing-32);
-}
-.metric {
-  display: grid;
-  align-content: start;
-  gap: var(--spacing-4);
-  overflow-wrap: anywhere;
-}
-.metric dt {
-  color: var(--ui-secondary);
-}
-.metric dd,
-.header,
-.table td[data-kind="text"] {
-  color: var(--ui-strong);
-}
-.metric dd,
-.table {
-  font-variant-numeric: tabular-nums;
-}
-.section {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr);
-  gap: var(--spacing-16);
-  container-type: inline-size;
-}
-.header {
-  @apply flex items-center justify-between;
-  gap: var(--spacing-16);
-  min-block-size: var(--spacing-28);
-  margin-inline-end: calc(-1 * var(--spacing-8));
-}
-.tableViewport {
-  margin-inline: calc(-1 * var(--spacing-8));
-}
-.table {
-  inline-size: calc(100cqi + var(--spacing-16));
-  table-layout: fixed;
-  border-spacing: 0;
-  border-collapse: separate;
-}
-.table th,
-.table td {
-  padding-inline: var(--spacing-8);
-  text-align: start;
-  color: var(--ui-secondary);
-  overflow-wrap: anywhere;
-}
-.table [data-primary] {
-  inline-size: 32%;
-}
-.table [data-numeric="true"] {
-  inline-size: calc(var(--ui-table-compact) + var(--spacing-16));
-  text-align: end;
-}
-.table [data-kind="number"] {
-  inline-size: calc(var(--ui-table-number) + var(--spacing-16));
-}
-.table :is([data-kind="status"], [data-kind="percent"]) {
-  inline-size: calc(var(--ui-table-wide) + var(--spacing-16));
-}
-.table th {
-  height: var(--ui-table-head);
-}
-.table td {
-  height: var(--spacing-40);
-  padding-block: var(--spacing-8);
-}
-.table tbody tr:hover {
-  background: var(--ui-hover);
-  clip-path: inset(0 round var(--radius-item));
-}
-.table tbody tr.spacer:hover {
-  background: transparent;
-}
-.table .spacer td {
-  height: auto;
-  padding: 0;
-}
-.table tr[data-openable] {
-  position: relative;
-  cursor: pointer;
-}
-.rowTarget {
-  display: block;
-  inline-size: 100%;
-  color: inherit;
-  text-align: inherit;
-  cursor: pointer;
-}
-.rowTarget::after {
-  position: absolute;
-  inset: 0;
-  content: "";
-}
-.table [data-kind="action"] {
-  position: relative;
-  inline-size: calc(var(--spacing-app-control-sm) + var(--spacing-16));
-  padding-inline: 0;
-  text-align: end;
-}
-.table [data-kind="action"][data-passive] {
-  padding-inline-end: var(--spacing-8);
-  pointer-events: none;
-}
-.sort {
-  display: inline-flex;
-  align-items: center;
-  gap: var(--ui-action-gap);
-  color: inherit;
-  cursor: pointer;
-}
-.virtualViewport {
-  max-block-size: calc(100dvh - var(--ui-table-viewport-offset));
-  overflow: auto;
-  overscroll-behavior: contain;
-}
-.virtualViewport .table {
-  inline-size: 100%;
-}
-.virtualViewport th {
-  position: sticky;
-  inset-block-start: 0;
-  z-index: 1;
-  background: var(--ui-canvas);
-}
-@container (width < 48rem) {
-  .table [data-from="wide"] {
-    display: none;
-  }
-  .table [data-kind="number"] {
-    inline-size: calc(var(--ui-table-compact) + var(--spacing-16));
-  }
-  .table [data-kind="status"] {
-    inline-size: calc(var(--spacing-96) + var(--spacing-16));
-  }
-}
-@container (width < 30rem) {
-  .table [data-from="compact"] {
-    display: none;
-  }
-  .table [data-kind="number"] {
-    inline-size: calc(var(--spacing-76) + var(--spacing-16));
-  }
-  .table [data-kind="duration"] {
-    inline-size: calc(var(--spacing-72) + var(--spacing-16));
-  }
-}
-@media (pointer: coarse) {
-  .header {
-    min-block-size: var(--spacing-app-touch-target);
-  }
-  .table td {
-    height: var(--spacing-app-touch-target);
-  }
-}
-.label {
-  display: inline-flex;
-  align-items: center;
-  gap: var(--ui-row-gap);
-  min-inline-size: 0;
-  max-inline-size: 100%;
-}
diff --git a/apps/sim/platform/design-system/components/data-display/data-display.tsx b/apps/sim/platform/design-system/components/data-display/data-display.tsx
deleted file mode 100644
index e8e2107e038..00000000000
--- a/apps/sim/platform/design-system/components/data-display/data-display.tsx
+++ /dev/null
@@ -1,399 +0,0 @@
-'use client'
-
-import { memo, type ReactNode, type Ref, useCallback, useRef } from 'react'
-import { useVirtualizer } from '@tanstack/react-virtual'
-import Link from 'next/link'
-import styles from '@/platform/design-system/components/data-display/data-display.module.css'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import { LoadMoreFooter } from '@/platform/design-system/components/scroll-area/load-more-footer'
-import { ScrollArea } from '@/platform/design-system/components/scroll-area/scroll-area'
-import type { LoadMoreState } from '@/platform/design-system/components/scroll-area/use-load-more'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-interface MetricGroupProps {
-  metrics: readonly { label: string; value: string | number }[]
-}
-
-export function MetricGroup({ metrics }: MetricGroupProps) {
-  return (
-    <dl className={styles.metrics}>
-      {metrics.map(({ label, value }) => (
-        <div className={styles.metric} key={label}>
-          <dt data-type='T050'>{label}</dt>
-          <dd data-type='T102'>{value}</dd>
-        </div>
-      ))}
-    </dl>
-  )
-}
-
-interface TableLabelProps {
-  leading?: ReactNode
-  children: ReactNode
-}
-
-/** A table cell's name with its avatar, favicon or provider mark. */
-export function TableLabel({ leading, children }: TableLabelProps) {
-  return (
-    <span className={styles.label}>
-      {leading}
-      {children}
-    </span>
-  )
-}
-
-type TableColumn = {
-  key: string
-  label: string
-  showFrom?: 'compact' | 'wide'
-  /** The column a row is read by, wider than the columns that share the rest. */
-  primary?: boolean
-  /** Offer this column to `onSortChange`. The caller owns the order of `rows`. */
-  sortable?: boolean
-} & (
-  | { kind: 'text' | 'status' | 'number' | 'percent' }
-  | { kind: 'duration'; unit: 'millisecond' | 'second' | 'minute' | 'hour' | 'day' }
-  | { kind: 'currency'; currency: string }
-)
-
-interface TableRow {
-  id: string
-  values: Readonly<Partial<Record<string, string | number | null>>>
-  /** Content for a column in place of its formatted value. Interactive content goes in `action`. */
-  cells?: Readonly<Partial<Record<string, ReactNode>>>
-  /** Make the whole row open this destination, through a link on its first cell. */
-  href?: string
-  /** Make the whole row run this, through a button on its first cell. */
-  onOpen?: () => void
-  /** A control beside the row's target, in a trailing column. */
-  action?: ReactNode
-}
-
-interface TableSort {
-  column: string
-  direction: 'asc' | 'desc'
-}
-
-interface DataTableProps {
-  title: string
-  /** Name the table for assistive technology only, where the page already titles it. */
-  titleHidden?: boolean
-  control?: ReactNode
-  locale?: string
-  columns: readonly TableColumn[]
-  rows: readonly TableRow[]
-  sort?: TableSort
-  onSortChange?: (sort: TableSort) => void
-  loadMore?: LoadMoreState
-  /** Window a long list inside a bounded scroller with a sticky header. */
-  virtualized?: boolean
-  /** Mark rows that open a destination with a trailing chevron, at every width. */
-  rowChevron?: boolean
-}
-
-function columnFormat(column: TableColumn, locale: string) {
-  switch (column.kind) {
-    case 'percent':
-      return new Intl.NumberFormat(locale, {
-        style: 'percent',
-        minimumFractionDigits: 1,
-        maximumFractionDigits: 1,
-      })
-    case 'currency':
-      return new Intl.NumberFormat(locale, {
-        style: 'currency',
-        currency: column.currency,
-        minimumFractionDigits: 0,
-      })
-    case 'duration':
-      return new Intl.NumberFormat(locale, { style: 'unit', unit: column.unit })
-    case 'number':
-      return new Intl.NumberFormat(locale)
-    default:
-      return null
-  }
-}
-
-function cellText(value: string | number | null | undefined, format: Intl.NumberFormat | null) {
-  if (format)
-    return typeof value === 'number' && Number.isFinite(value) ? format.format(value) : '—'
-  return value === '' || value == null ? '—' : value
-}
-
-type TableField = TableColumn & { format: Intl.NumberFormat | null }
-
-interface TableRowViewProps {
-  row: TableRow
-  fields: readonly TableField[]
-  actionColumn: boolean
-  rowChevron?: boolean
-  index?: number
-  rowRef?: Ref<HTMLTableRowElement>
-}
-
-const TableRowView = memo(function TableRowView({
-  row,
-  fields,
-  actionColumn,
-  rowChevron,
-  index,
-  rowRef,
-}: TableRowViewProps) {
-  return (
-    <tr
-      ref={rowRef}
-      data-index={index}
-      aria-rowindex={index === undefined ? undefined : index + 2}
-      data-openable={row.href || row.onOpen ? true : undefined}
-    >
-      {fields.map((column, position) => {
-        const custom = row.cells?.[column.key]
-        const content =
-          custom === undefined ? cellText(row.values[column.key], column.format) : custom
-        return (
-          <td
-            key={column.key}
-            data-kind={column.kind}
-            data-from={column.showFrom}
-            data-primary={column.primary || undefined}
-            data-numeric={Boolean(column.format)}
-            data-type={column.kind === 'text' ? 'T059' : 'T060'}
-          >
-            {position === 0 && row.href ? (
-              <Link href={row.href} className={styles.rowTarget}>
-                {content}
-              </Link>
-            ) : position === 0 && row.onOpen ? (
-              <button type='button' className={styles.rowTarget} onClick={row.onOpen}>
-                {content}
-              </button>
-            ) : (
-              content
-            )}
-          </td>
-        )
-      })}
-      {actionColumn && (
-        <td data-kind='action' data-passive={row.action ? undefined : true}>
-          {row.action ?? (rowChevron && <Icon name='I032' />)}
-        </td>
-      )}
-    </tr>
-  )
-})
-
-interface TableHeadProps {
-  fields: readonly TableField[]
-  actionColumn: boolean
-  sort?: TableSort
-  onSortChange?: (sort: TableSort) => void
-}
-
-const ARIA_SORT = { asc: 'ascending', desc: 'descending', none: 'none' } as const
-
-function TableHead({ fields, actionColumn, sort, onSortChange }: TableHeadProps) {
-  return (
-    <thead>
-      <tr>
-        {fields.map((column) => {
-          const sortable = column.sortable && onSortChange
-          const direction = sort?.column === column.key ? sort.direction : undefined
-          return (
-            <th
-              key={column.key}
-              scope='col'
-              aria-sort={sortable ? ARIA_SORT[direction ?? 'none'] : undefined}
-              data-kind={column.kind}
-              data-from={column.showFrom}
-              data-primary={column.primary || undefined}
-              data-numeric={Boolean(column.format)}
-              data-type='T050'
-            >
-              {sortable ? (
-                <button
-                  type='button'
-                  className={styles.sort}
-                  onClick={() =>
-                    onSortChange({
-                      column: column.key,
-                      direction: direction === 'asc' ? 'desc' : 'asc',
-                    })
-                  }
-                >
-                  {column.label}
-                  {direction && <Icon name={direction === 'asc' ? 'I023' : 'I102'} />}
-                </button>
-              ) : (
-                column.label
-              )}
-            </th>
-          )
-        })}
-        {actionColumn && (
-          <th scope='col' data-kind='action' data-type='T050'>
-            <span data-visually-hidden>Actions</span>
-          </th>
-        )}
-      </tr>
-    </thead>
-  )
-}
-
-const ROW_HEIGHT_ESTIMATE = 40
-const ROW_OVERSCAN = 8
-/** First-paint window, so a server render holds rows rather than an empty table. */
-const INITIAL_VIEWPORT = { width: 0, height: 640 }
-
-interface VirtualTableProps extends TableHeadProps {
-  title: string
-  rows: readonly TableRow[]
-  loadMore?: LoadMoreState
-  rowChevron?: boolean
-}
-
-function VirtualTable({
-  title,
-  rows,
-  fields,
-  actionColumn,
-  sort,
-  onSortChange,
-  loadMore,
-  rowChevron,
-}: VirtualTableProps) {
-  const viewport = useRef<HTMLDivElement>(null)
-  const scrollRef = useScrollEdges('vertical', { viewport, tabStop: true })
-  const getItemKey = useCallback((index: number) => rows[index].id, [rows])
-  const virtualizer = useVirtualizer({
-    count: rows.length,
-    getScrollElement: () => viewport.current,
-    estimateSize: () => ROW_HEIGHT_ESTIMATE,
-    overscan: ROW_OVERSCAN,
-    getItemKey,
-    initialRect: INITIAL_VIEWPORT,
-  })
-  const items = virtualizer.getVirtualItems()
-  const before = items[0]?.start ?? 0
-  const after = virtualizer.getTotalSize() - (items[items.length - 1]?.end ?? 0)
-  const columnCount = fields.length + (actionColumn ? 1 : 0)
-  return (
-    <div
-      ref={scrollRef}
-      className={styles.virtualViewport}
-      data-sticky-head
-      role='region'
-      aria-label={title}
-    >
-      <table className={styles.table} aria-label={title} aria-rowcount={rows.length + 1}>
-        <TableHead
-          fields={fields}
-          actionColumn={actionColumn}
-          sort={sort}
-          onSortChange={onSortChange}
-        />
-        <tbody>
-          <VirtualSpacer blockSize={before} columnCount={columnCount} />
-          {items.map((item) => (
-            <TableRowView
-              key={item.key}
-              row={rows[item.index]}
-              fields={fields}
-              actionColumn={actionColumn}
-              rowChevron={rowChevron}
-              index={item.index}
-              rowRef={virtualizer.measureElement}
-            />
-          ))}
-          <VirtualSpacer blockSize={after} columnCount={columnCount} />
-        </tbody>
-      </table>
-      {loadMore && <LoadMoreFooter state={loadMore} />}
-    </div>
-  )
-}
-
-interface VirtualSpacerProps {
-  blockSize: number
-  columnCount: number
-}
-
-/** Stands in for rows outside the window, keeping the native table's scroll height. */
-function VirtualSpacer({ blockSize, columnCount }: VirtualSpacerProps) {
-  if (blockSize <= 0) return null
-  return (
-    <tr
-      className={styles.spacer}
-      ref={(row) => {
-        row?.style.setProperty('block-size', `${blockSize}px`)
-      }}
-    >
-      <td colSpan={columnCount} />
-    </tr>
-  )
-}
-
-export function DataTable({
-  title,
-  titleHidden,
-  control,
-  locale = 'en-US',
-  columns,
-  rows,
-  sort,
-  onSortChange,
-  loadMore,
-  virtualized,
-  rowChevron,
-}: DataTableProps) {
-  const fields = columns.map((column) => ({ ...column, format: columnFormat(column, locale) }))
-  const actionColumn = Boolean(rowChevron) || rows.some((row) => row.action)
-  return (
-    <section className={styles.section}>
-      {(!titleHidden || control) && (
-        <header className={styles.header}>
-          {!titleHidden && <h2 data-type='T042'>{title}</h2>}
-          {control}
-        </header>
-      )}
-      <div className={styles.tableViewport}>
-        {virtualized ? (
-          <VirtualTable
-            title={title}
-            rows={rows}
-            fields={fields}
-            actionColumn={actionColumn}
-            sort={sort}
-            onSortChange={onSortChange}
-            loadMore={loadMore}
-            rowChevron={rowChevron}
-          />
-        ) : (
-          <>
-            <ScrollArea label={title} axis='horizontal'>
-              <table className={styles.table} aria-label={title}>
-                <TableHead
-                  fields={fields}
-                  actionColumn={actionColumn}
-                  sort={sort}
-                  onSortChange={onSortChange}
-                />
-                <tbody>
-                  {rows.map((row) => (
-                    <TableRowView
-                      key={row.id}
-                      row={row}
-                      fields={fields}
-                      actionColumn={actionColumn}
-                      rowChevron={rowChevron}
-                    />
-                  ))}
-                </tbody>
-              </table>
-            </ScrollArea>
-            {loadMore && <LoadMoreFooter state={loadMore} />}
-          </>
-        )}
-      </div>
-    </section>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/destination-tabs/destination-tabs.module.css b/apps/sim/platform/design-system/components/destination-tabs/destination-tabs.module.css
deleted file mode 100644
index cd66b612077..00000000000
--- a/apps/sim/platform/design-system/components/destination-tabs/destination-tabs.module.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.destinations {
-  min-inline-size: 0;
-}
-.lane {
-  display: flex;
-  align-items: center;
-  gap: var(--spacing-8);
-  min-height: var(--spacing-app-touch-target);
-  inline-size: max-content;
-}
diff --git a/apps/sim/platform/design-system/components/destination-tabs/destination-tabs.tsx b/apps/sim/platform/design-system/components/destination-tabs/destination-tabs.tsx
deleted file mode 100644
index 2a7fb3a47f8..00000000000
--- a/apps/sim/platform/design-system/components/destination-tabs/destination-tabs.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import Link from 'next/link'
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-import styles from '@/platform/design-system/components/destination-tabs/destination-tabs.module.css'
-import { ScrollArea } from '@/platform/design-system/components/scroll-area/scroll-area'
-
-interface DestinationTabsProps {
-  label: string
-  destinations: readonly { label: string; href: string }[]
-  currentHref: string
-}
-
-export function DestinationTabs({ label, destinations, currentHref }: DestinationTabsProps) {
-  return (
-    <nav aria-label={label} className={styles.destinations}>
-      <ScrollArea label={label} axis='horizontal' arrows>
-        <div className={styles.lane}>
-          {destinations.map(({ label: text, href }) => (
-            <ControlRow
-              key={href}
-              label={text}
-              render={
-                <Link
-                  href={href}
-                  scroll={false}
-                  aria-current={href === currentHref ? 'page' : undefined}
-                />
-              }
-            />
-          ))}
-        </div>
-      </ScrollArea>
-    </nav>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/disclosure/disclosure.module.css b/apps/sim/platform/design-system/components/disclosure/disclosure.module.css
deleted file mode 100644
index 2ffdd97bf74..00000000000
--- a/apps/sim/platform/design-system/components/disclosure/disclosure.module.css
+++ /dev/null
@@ -1,71 +0,0 @@
-.disclosure {
-  min-inline-size: 0;
-}
-.summary {
-  display: flex;
-  align-items: center;
-  inline-size: fit-content;
-  max-inline-size: 100%;
-  gap: var(--spacing-8);
-  min-height: var(--spacing-18);
-  list-style: none;
-  cursor: pointer;
-  overflow-wrap: anywhere;
-}
-.summary::-webkit-details-marker {
-  display: none;
-}
-.expanded,
-:is(.disclosure[open], .activity[data-open]) > .summary .collapsed {
-  display: none;
-}
-:is(.disclosure[open], .activity[data-open]) > .summary .expanded {
-  display: inline-flex;
-}
-.collapsed {
-  display: inline-flex;
-}
-
-.activity {
-  display: grid;
-  min-inline-size: 0;
-  gap: var(--ui-section-gap);
-}
-.activity > .summary {
-  color: var(--ui-secondary);
-}
-.activity > .summary:hover {
-  color: var(--ui-ink);
-}
-.summary:not(:hover) svg {
-  visibility: hidden;
-}
-
-.collection {
-  position: relative;
-}
-.collection > .disclosure > .summary {
-  min-block-size: var(--spacing-28);
-  inline-size: 100%;
-  padding-inline: var(--ui-row-inset);
-  gap: var(--spacing-4);
-  color: var(--ui-secondary);
-}
-.collection:has(> .collectionActions:hover) > .disclosure > .summary svg {
-  visibility: visible;
-}
-.collection > .disclosure > .summary:hover {
-  color: var(--ui-ink);
-}
-.collectionActions {
-  position: absolute;
-  inset-block-start: 0;
-  inset-inline-end: 0;
-  min-block-size: var(--spacing-28);
-  display: flex;
-  align-items: center;
-}
-
-.collection > .disclosure[open] > .summary {
-  margin-block-end: var(--ui-list-gap);
-}
diff --git a/apps/sim/platform/design-system/components/disclosure/disclosure.tsx b/apps/sim/platform/design-system/components/disclosure/disclosure.tsx
deleted file mode 100644
index 70b8206aff8..00000000000
--- a/apps/sim/platform/design-system/components/disclosure/disclosure.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import type { ReactNode } from 'react'
-import { Collapsible } from '@base-ui/react/collapsible'
-import styles from '@/platform/design-system/components/disclosure/disclosure.module.css'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-
-type DisclosureProps = {
-  label: string
-  initiallyOpen?: boolean
-  open?: boolean
-  onOpenChange?: (open: boolean) => void
-  children: ReactNode
-} & (
-  | { variant?: 'section'; actions?: ReactNode; introduction?: never }
-  | { variant: 'activity'; introduction?: ReactNode; actions?: never }
-)
-
-export function Disclosure({
-  label,
-  initiallyOpen,
-  open,
-  onOpenChange,
-  variant = 'section',
-  actions,
-  introduction,
-  children,
-}: DisclosureProps) {
-  const title = (
-    <>
-      {label}
-      <span className={styles.collapsed}>
-        <Icon name='I090' />
-      </span>
-      <span className={styles.expanded}>
-        <Icon name='I051' />
-      </span>
-    </>
-  )
-  if (variant === 'activity')
-    return (
-      <Collapsible.Root
-        className={styles.activity}
-        defaultOpen={initiallyOpen}
-        open={open}
-        onOpenChange={onOpenChange}
-      >
-        <Collapsible.Trigger className={styles.summary} data-type='T048'>
-          {title}
-        </Collapsible.Trigger>
-        {introduction}
-        <Collapsible.Panel>{children}</Collapsible.Panel>
-      </Collapsible.Root>
-    )
-  const disclosure = (
-    <details className={styles.disclosure} open={open ?? initiallyOpen}>
-      <summary
-        className={styles.summary}
-        data-type='T052'
-        onClick={
-          onOpenChange &&
-          ((event) => {
-            event.preventDefault()
-            onOpenChange(!open)
-          })
-        }
-      >
-        {title}
-      </summary>
-      {children}
-    </details>
-  )
-  if (!actions) return disclosure
-  return (
-    <section className={styles.collection} aria-label={label}>
-      {disclosure}
-      <div className={styles.collectionActions}>{actions}</div>
-    </section>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/empty-state/empty-state.module.css b/apps/sim/platform/design-system/components/empty-state/empty-state.module.css
deleted file mode 100644
index a8a57b15643..00000000000
--- a/apps/sim/platform/design-system/components/empty-state/empty-state.module.css
+++ /dev/null
@@ -1,39 +0,0 @@
-.empty,
-.copy {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  gap: var(--spacing-4);
-}
-
-.empty {
-  justify-content: center;
-  min-height: calc(var(--spacing-56) * 2);
-  padding: var(--spacing-16) var(--spacing-8);
-  color: var(--ui-ink);
-}
-
-.empty[data-action] {
-  min-height: var(--spacing-132);
-  gap: var(--spacing-12);
-}
-
-.actions {
-  display: flex;
-  flex-wrap: wrap;
-  gap: var(--spacing-8);
-}
-
-.empty p {
-  color: var(--ui-secondary);
-}
-
-.graphic {
-  display: inline-flex;
-  color: var(--ui-secondary);
-  margin-block-end: var(--spacing-8);
-}
-
-.empty[data-action] .graphic {
-  margin-block-end: 0;
-}
diff --git a/apps/sim/platform/design-system/components/empty-state/empty-state.tsx b/apps/sim/platform/design-system/components/empty-state/empty-state.tsx
deleted file mode 100644
index 049406b9e6e..00000000000
--- a/apps/sim/platform/design-system/components/empty-state/empty-state.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { ReactNode } from 'react'
-import styles from '@/platform/design-system/components/empty-state/empty-state.module.css'
-
-interface EmptyStateProps {
-  title: string
-  description?: string
-  action?: ReactNode
-  /** A decorative mark above the title. */
-  graphic?: ReactNode
-}
-
-export function EmptyState({ title, description, action, graphic }: EmptyStateProps) {
-  return (
-    <section className={styles.empty} data-action={action ? true : undefined}>
-      {graphic && (
-        <span className={styles.graphic} aria-hidden='true'>
-          {graphic}
-        </span>
-      )}
-      <div className={styles.copy}>
-        <h2 data-type='T042'>{title}</h2>
-        {description && <p data-type='T067'>{description}</p>}
-      </div>
-      {action && <div className={styles.actions}>{action}</div>}
-    </section>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/execution-steps/execution-steps.module.css b/apps/sim/platform/design-system/components/execution-steps/execution-steps.module.css
deleted file mode 100644
index 074651805be..00000000000
--- a/apps/sim/platform/design-system/components/execution-steps/execution-steps.module.css
+++ /dev/null
@@ -1,31 +0,0 @@
-.steps {
-  display: grid;
-  min-inline-size: 0;
-  gap: var(--spacing-8);
-}
-.stepsTitle {
-  color: var(--ui-ink);
-}
-.stepList {
-  margin-inline: calc(-1 * var(--spacing-8));
-}
-.step {
-  display: flex;
-  align-items: start;
-  gap: var(--spacing-8);
-  min-height: var(--spacing-40);
-  padding: var(--spacing-8);
-}
-.marker {
-  flex: none;
-  display: grid;
-  place-items: center;
-  inline-size: var(--spacing-20);
-  block-size: var(--spacing-20);
-  color: var(--ui-secondary);
-}
-.description {
-  white-space: pre-wrap;
-  min-inline-size: 0;
-  overflow-wrap: anywhere;
-}
diff --git a/apps/sim/platform/design-system/components/execution-steps/execution-steps.tsx b/apps/sim/platform/design-system/components/execution-steps/execution-steps.tsx
deleted file mode 100644
index 58b7a487788..00000000000
--- a/apps/sim/platform/design-system/components/execution-steps/execution-steps.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import styles from '@/platform/design-system/components/execution-steps/execution-steps.module.css'
-
-interface ExecutionStepsProps {
-  title: string
-  steps: readonly { id: string; description: string }[]
-}
-
-export function ExecutionSteps({ title, steps }: ExecutionStepsProps) {
-  return (
-    <section className={styles.steps}>
-      <h3 className={styles.stepsTitle} data-type='T042'>
-        {title}
-      </h3>
-      <ol className={styles.stepList} aria-label={title}>
-        {steps.map((step, index) => (
-          <li className={styles.step} key={step.id}>
-            <span className={styles.marker} data-type='T050' aria-hidden='true'>
-              {index + 1}
-            </span>
-            <span className={styles.description} data-type='T043'>
-              {step.description}
-            </span>
-          </li>
-        ))}
-      </ol>
-    </section>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/feedback/use-clipboard.ts b/apps/sim/platform/design-system/components/feedback/use-clipboard.ts
deleted file mode 100644
index a1e1f32d3dd..00000000000
--- a/apps/sim/platform/design-system/components/feedback/use-clipboard.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { useFeedbackExpiry } from '@/platform/design-system/components/feedback/use-feedback-expiry'
-
-export function useClipboard() {
-  const [copiedAt, setCopiedAt] = useState<number | null>(null)
-  useFeedbackExpiry(copiedAt, () => setCopiedAt(null))
-  async function copy(text: string) {
-    try {
-      await navigator.clipboard.writeText(text)
-      setCopiedAt(performance.now())
-    } catch {
-      setCopiedAt(null)
-    }
-  }
-  return { copied: copiedAt !== null, copy }
-}
diff --git a/apps/sim/platform/design-system/components/feedback/use-feedback-expiry.ts b/apps/sim/platform/design-system/components/feedback/use-feedback-expiry.ts
deleted file mode 100644
index eb6310eeeb6..00000000000
--- a/apps/sim/platform/design-system/components/feedback/use-feedback-expiry.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-'use client'
-
-import { useEffect, useEffectEvent } from 'react'
-
-const FEEDBACK_DURATION_MS = 4_000
-
-/** A new feedback event restarts the dwell; null pauses or dismisses it. */
-export function useFeedbackExpiry(event: unknown, expire: () => void) {
-  const onExpire = useEffectEvent(expire)
-  useEffect(() => {
-    if (event == null) return
-    const timer = window.setTimeout(onExpire, FEEDBACK_DURATION_MS)
-    return () => window.clearTimeout(timer)
-  }, [event])
-}
diff --git a/apps/sim/platform/design-system/components/field/field.module.css b/apps/sim/platform/design-system/components/field/field.module.css
deleted file mode 100644
index 21db87f45b9..00000000000
--- a/apps/sim/platform/design-system/components/field/field.module.css
+++ /dev/null
@@ -1,148 +0,0 @@
-.inputFrame:has(.input:disabled) {
-  opacity: var(--opacity-disabled);
-  cursor: default;
-}
-
-.optional {
-  color: var(--ui-secondary);
-}
-
-.field {
-  display: flex;
-  flex-direction: column;
-  min-width: 0;
-}
-
-.field {
-  gap: var(--spacing-field-label-gap);
-  color: var(--ui-ink);
-}
-
-.inputFrame {
-  display: grid;
-  min-width: 0;
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-control);
-  background: var(--ui-reading);
-  color: var(--ui-ink);
-}
-
-.input {
-  display: block;
-  min-width: 0;
-  width: 100%;
-  height: calc(var(--spacing-app-chip) - 2 * var(--spacing-stroke-default));
-  padding-inline: var(--spacing-8);
-  background: transparent;
-  color: inherit;
-}
-
-.input::placeholder {
-  color: var(--ui-secondary);
-  opacity: 1;
-}
-
-.inputFrame:has(.input:enabled:hover) {
-  border-color: var(--control-hover-border);
-}
-
-.inputFrame:has(.input:focus-visible) {
-  border-color: var(--ui-secondary);
-}
-
-.inputFrame:has(.input[aria-invalid="true"]) {
-  border-color: var(--control-danger);
-}
-
-.error {
-  color: var(--control-danger);
-}
-
-.hint {
-  color: var(--ui-secondary);
-}
-
-.inputFrame[data-trailing] {
-  grid-template-columns: minmax(0, 1fr) auto;
-  align-items: center;
-  gap: var(--ui-action-gap);
-  padding-inline-end: var(--spacing-1);
-}
-
-.fileDrop {
-  position: relative;
-  display: flex;
-  align-items: center;
-  min-inline-size: 0;
-  min-block-size: var(--spacing-76);
-  padding: var(--spacing-12);
-  gap: var(--ui-row-gap);
-  border: var(--spacing-stroke-default) dashed var(--ui-border);
-  border-radius: var(--radius-control);
-  background: var(--ui-reading);
-  color: var(--ui-secondary);
-  overflow-wrap: anywhere;
-}
-
-.fileDrop:where(:not([data-disabled]):is(:hover, [data-dragging])) {
-  border-color: var(--control-hover-border);
-}
-
-.fileDrop[data-dragging] {
-  background: var(--ui-hover);
-}
-
-.fileDrop[data-invalid] {
-  border-color: var(--control-danger);
-}
-
-.fileDrop[data-disabled] {
-  opacity: var(--opacity-disabled);
-}
-
-.fileInput {
-  position: absolute;
-  inset: 0;
-  inline-size: 100%;
-  block-size: 100%;
-  opacity: 0;
-  cursor: pointer;
-}
-
-.fileInput:disabled {
-  cursor: default;
-}
-
-.fileCopy {
-  display: grid;
-  flex: 1;
-  min-inline-size: 0;
-  gap: var(--ui-stack-gap);
-}
-
-.fileCopy > [data-selected] {
-  color: var(--ui-ink);
-}
-
-.filePreview {
-  flex: none;
-  inline-size: var(--spacing-48);
-  block-size: var(--spacing-48);
-  border-radius: var(--radius-item);
-  object-fit: contain;
-}
-
-.fileRemove {
-  position: relative;
-  flex: none;
-}
-
-textarea.input {
-  height: calc(var(--spacing-76) - 2 * var(--spacing-stroke-default));
-  min-height: calc(var(--spacing-76) - 2 * var(--spacing-stroke-default));
-  padding-block: var(--spacing-8);
-}
-
-textarea.input[data-density="expanded"] {
-  height: calc(2 * (var(--spacing-56) - var(--spacing-stroke-default)));
-}
diff --git a/apps/sim/platform/design-system/components/field/fields.tsx b/apps/sim/platform/design-system/components/field/fields.tsx
deleted file mode 100644
index ab41486a52e..00000000000
--- a/apps/sim/platform/design-system/components/field/fields.tsx
+++ /dev/null
@@ -1,211 +0,0 @@
-import { type ReactNode, useId } from 'react'
-import styles from '@/platform/design-system/components/field/field.module.css'
-import {
-  Input,
-  TextArea,
-  type TextEntryProps,
-  type TextValueProps,
-} from '@/platform/design-system/components/field/inputs'
-import { Select } from '@/platform/design-system/components/picker/select'
-
-interface FieldProps {
-  label: string
-  optional?: boolean
-  error?: string
-  hint?: string
-  disabled?: boolean
-  name?: string
-  defaultValue?: string
-}
-
-interface FieldFrameProps {
-  id?: string
-  label: string
-  optional?: boolean
-  error?: string
-  hint?: string
-  /** Name the control for assistive technology only, where its context labels it visually. */
-  labelHidden?: boolean
-  children: ReactNode
-}
-
-/** The `aria-describedby` for a control whose frame was given this `error` and `hint`. */
-export function fieldDescription(id: string, error?: string, hint?: string) {
-  const parts = [error && `${id}-error`, hint && `${id}-hint`].filter(Boolean)
-  return parts.length ? parts.join(' ') : undefined
-}
-
-export function FieldFrame({
-  id,
-  label,
-  optional,
-  error,
-  hint,
-  labelHidden,
-  children,
-}: FieldFrameProps) {
-  const caption = (
-    <>
-      {label}
-      {optional && (
-        <span className={styles.optional} data-type='T060'>
-          {' '}
-          (optional)
-        </span>
-      )}
-    </>
-  )
-  return (
-    <div className={styles.field}>
-      {id ? (
-        <label htmlFor={id} data-visually-hidden={labelHidden || undefined} data-type='T059'>
-          {caption}
-        </label>
-      ) : (
-        <span data-visually-hidden={labelHidden || undefined} data-type='T059'>
-          {caption}
-        </span>
-      )}
-      {children}
-      {hint && (
-        <span id={id ? `${id}-hint` : undefined} className={styles.hint} data-type='T052'>
-          {hint}
-        </span>
-      )}
-      {error && (
-        <span id={id ? `${id}-error` : undefined} className={styles.error} data-type='T052'>
-          {error}
-        </span>
-      )}
-    </div>
-  )
-}
-
-interface TextFieldProps extends FieldProps, TextValueProps, TextEntryProps {
-  required?: boolean
-  pattern?: string
-  placeholder?: string
-}
-
-export function TextField({
-  label,
-  optional,
-  error,
-  hint,
-  disabled,
-  name,
-  defaultValue,
-  value,
-  onChange,
-  placeholder,
-  required,
-  pattern,
-  type,
-  inputMode,
-  autoComplete,
-  maxLength,
-  readOnly,
-}: TextFieldProps) {
-  const id = useId()
-  return (
-    <FieldFrame id={id} label={label} optional={optional} error={error} hint={hint}>
-      <Input
-        id={id}
-        type={type}
-        inputMode={inputMode}
-        autoComplete={autoComplete}
-        maxLength={maxLength}
-        readOnly={readOnly}
-        required={required}
-        pattern={pattern}
-        label={label}
-        name={name}
-        defaultValue={defaultValue}
-        value={value}
-        onChange={onChange}
-        placeholder={placeholder}
-        disabled={disabled}
-        invalid={Boolean(error)}
-        describedBy={fieldDescription(id, error, hint)}
-      />
-    </FieldFrame>
-  )
-}
-
-interface TextAreaFieldProps extends FieldProps, TextValueProps {
-  placeholder?: string
-  required?: boolean
-  maxLength?: number
-}
-
-export function TextAreaField({
-  label,
-  optional,
-  error,
-  hint,
-  disabled,
-  name,
-  defaultValue,
-  value,
-  onChange,
-  placeholder,
-  required,
-  maxLength,
-}: TextAreaFieldProps) {
-  const id = useId()
-  return (
-    <FieldFrame id={id} label={label} optional={optional} error={error} hint={hint}>
-      <TextArea
-        id={id}
-        required={required}
-        maxLength={maxLength}
-        label={label}
-        name={name}
-        defaultValue={defaultValue}
-        value={value}
-        onChange={onChange}
-        placeholder={placeholder}
-        disabled={disabled}
-        invalid={Boolean(error)}
-        describedBy={fieldDescription(id, error, hint)}
-      />
-    </FieldFrame>
-  )
-}
-
-interface SelectFieldProps extends FieldProps {
-  options: ReadonlyArray<{ value: string; label: string }>
-  value?: string
-  onValueChange?: (value: string) => void
-}
-
-export function SelectField({
-  label,
-  optional,
-  error,
-  hint,
-  disabled,
-  name,
-  defaultValue,
-  options,
-  value,
-  onValueChange,
-}: SelectFieldProps) {
-  const id = useId()
-  return (
-    <FieldFrame id={id} label={label} optional={optional} error={error} hint={hint}>
-      <Select
-        id={id}
-        label={label}
-        name={name}
-        defaultValue={defaultValue}
-        value={value}
-        onValueChange={onValueChange}
-        options={options}
-        disabled={disabled}
-        invalid={Boolean(error)}
-        describedBy={fieldDescription(id, error, hint)}
-      />
-    </FieldFrame>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/field/file-field.tsx b/apps/sim/platform/design-system/components/field/file-field.tsx
deleted file mode 100644
index c6c82746003..00000000000
--- a/apps/sim/platform/design-system/components/field/file-field.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-'use client'
-
-import { useId, useState } from 'react'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import styles from '@/platform/design-system/components/field/field.module.css'
-import { FieldFrame, fieldDescription } from '@/platform/design-system/components/field/fields'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-
-interface FileFieldProps {
-  label: string
-  /** Called with what was chosen or dropped. `accept` is only a hint, so validate the file here. */
-  onFileChange: (file: File) => void
-  accept?: string
-  prompt?: string
-  selection?: { name: string; detail?: string; previewSrc?: string }
-  onClear?: () => void
-  optional?: boolean
-  disabled?: boolean
-  error?: string
-  hint?: string
-}
-
-/** Choose or drop one file. The caller owns reading and uploading it. */
-export function FileField({
-  label,
-  onFileChange,
-  accept,
-  prompt = 'Choose a file or drag it here',
-  selection,
-  onClear,
-  optional,
-  disabled,
-  error,
-  hint,
-}: FileFieldProps) {
-  const id = useId()
-  const [dragging, setDragging] = useState(false)
-  return (
-    <FieldFrame id={id} label={label} optional={optional} error={error} hint={hint}>
-      <div
-        className={styles.fileDrop}
-        data-dragging={dragging || undefined}
-        data-invalid={error ? true : undefined}
-        data-disabled={disabled || undefined}
-      >
-        {selection?.previewSrc ? (
-          <img className={styles.filePreview} alt='' src={selection.previewSrc} />
-        ) : (
-          <Icon name='I117' />
-        )}
-        <span className={styles.fileCopy}>
-          <span data-selected={selection ? true : undefined} data-type='T060'>
-            {selection?.name ?? prompt}
-          </span>
-          {selection?.detail && <span data-type='T052'>{selection.detail}</span>}
-        </span>
-        <input
-          id={id}
-          className={styles.fileInput}
-          type='file'
-          accept={accept}
-          disabled={disabled}
-          aria-invalid={error ? true : undefined}
-          aria-describedby={fieldDescription(id, error, hint)}
-          onDragEnter={() => setDragging(true)}
-          onDragLeave={() => setDragging(false)}
-          onDrop={() => setDragging(false)}
-          onChange={(event) => {
-            const file = event.currentTarget.files?.[0]
-            event.currentTarget.value = ''
-            if (file) onFileChange(file)
-          }}
-        />
-        {selection && onClear && (
-          <span className={styles.fileRemove}>
-            <IconButton
-              label={`Remove ${selection.name}`}
-              icon='I105'
-              disabled={disabled}
-              onClick={onClear}
-            />
-          </span>
-        )}
-      </div>
-    </FieldFrame>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/field/inputs.tsx b/apps/sim/platform/design-system/components/field/inputs.tsx
deleted file mode 100644
index 301dd106874..00000000000
--- a/apps/sim/platform/design-system/components/field/inputs.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-'use client'
-
-import type { ReactNode } from 'react'
-import styles from '@/platform/design-system/components/field/field.module.css'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-export interface ControlProps {
-  id?: string
-  label: string
-  name?: string
-  defaultValue?: string
-  disabled?: boolean
-  invalid?: boolean
-  describedBy?: string
-}
-
-export interface TextValueProps {
-  /** Controlled text. Leave it out and `defaultValue` keeps the draft in the DOM. */
-  value?: string
-  onChange?: (value: string) => void
-}
-
-/** Native text-entry attributes, passed through as written. */
-export interface TextEntryProps {
-  type?: 'text' | 'email' | 'url' | 'tel' | 'number' | 'password' | 'time'
-  inputMode?: 'text' | 'email' | 'url' | 'tel' | 'numeric' | 'decimal' | 'search'
-  autoComplete?: string
-  maxLength?: number
-  readOnly?: boolean
-}
-
-interface InputProps extends ControlProps, TextValueProps, TextEntryProps {
-  required?: boolean
-  pattern?: string
-  placeholder?: string
-  spellCheck?: boolean
-  /** An action inside the frame, after the text. */
-  trailing?: ReactNode
-}
-
-export function Input({
-  id,
-  label,
-  name,
-  defaultValue,
-  value,
-  onChange,
-  disabled,
-  invalid,
-  describedBy,
-  placeholder,
-  required,
-  pattern,
-  type,
-  inputMode,
-  autoComplete,
-  maxLength,
-  readOnly,
-  spellCheck,
-  trailing,
-}: InputProps) {
-  const scrollRef = useScrollEdges<HTMLInputElement>('horizontal')
-  return (
-    <span className={styles.inputFrame} data-trailing={trailing ? true : undefined}>
-      <input
-        ref={scrollRef}
-        id={id}
-        type={type}
-        inputMode={inputMode}
-        autoComplete={autoComplete}
-        maxLength={maxLength}
-        readOnly={readOnly}
-        spellCheck={spellCheck}
-        required={required}
-        pattern={pattern}
-        aria-label={label}
-        className={styles.input}
-        data-type='T043'
-        name={name}
-        defaultValue={defaultValue}
-        value={value}
-        onChange={onChange && ((event) => onChange(event.target.value))}
-        placeholder={placeholder}
-        disabled={disabled}
-        aria-invalid={invalid || undefined}
-        aria-describedby={describedBy}
-      />
-      {trailing}
-    </span>
-  )
-}
-
-interface TextAreaProps
-  extends Omit<InputProps, 'pattern' | 'type' | 'inputMode' | 'spellCheck' | 'trailing'> {
-  density?: 'expanded'
-}
-
-export function TextArea({
-  id,
-  label,
-  name,
-  defaultValue,
-  value,
-  onChange,
-  disabled,
-  invalid,
-  describedBy,
-  placeholder,
-  density,
-  required,
-  autoComplete,
-  maxLength,
-  readOnly,
-}: TextAreaProps) {
-  const scrollRef = useScrollEdges<HTMLTextAreaElement>()
-  return (
-    <span className={styles.inputFrame}>
-      <textarea
-        ref={scrollRef}
-        id={id}
-        autoComplete={autoComplete}
-        maxLength={maxLength}
-        readOnly={readOnly}
-        required={required}
-        aria-label={label}
-        className={styles.input}
-        data-type='T043'
-        name={name}
-        data-density={density}
-        defaultValue={defaultValue}
-        value={value}
-        onChange={onChange && ((event) => onChange(event.target.value))}
-        placeholder={placeholder}
-        disabled={disabled}
-        aria-invalid={invalid || undefined}
-        aria-describedby={describedBy}
-      />
-    </span>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/field/value-fields.tsx b/apps/sim/platform/design-system/components/field/value-fields.tsx
deleted file mode 100644
index f8be17e271c..00000000000
--- a/apps/sim/platform/design-system/components/field/value-fields.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-'use client'
-
-import { useId, useState } from 'react'
-import { Button } from '@/platform/design-system/components/button/button'
-import { CopyButton } from '@/platform/design-system/components/button/copy-button'
-import { FieldFrame, fieldDescription } from '@/platform/design-system/components/field/fields'
-import { Input, type TextValueProps } from '@/platform/design-system/components/field/inputs'
-
-interface CopyFieldProps {
-  label: string
-  value: string
-  hint?: string
-}
-
-/** A value the viewer reads and copies, such as an endpoint or verification record. */
-export function CopyField({ label, value, hint }: CopyFieldProps) {
-  const id = useId()
-  return (
-    <FieldFrame id={id} label={label} hint={hint}>
-      <Input
-        id={id}
-        label={label}
-        value={value}
-        readOnly
-        spellCheck={false}
-        describedBy={fieldDescription(id, undefined, hint)}
-        trailing={<CopyButton label={`Copy ${label}`} text={value} />}
-      />
-    </FieldFrame>
-  )
-}
-
-interface SecretFieldProps extends TextValueProps {
-  label: string
-  defaultValue?: string
-  name?: string
-  placeholder?: string
-  optional?: boolean
-  required?: boolean
-  disabled?: boolean
-  readOnly?: boolean
-  error?: string
-  hint?: string
-  autoComplete?: string
-  /** Offer a copy action while the field holds a controlled value. */
-  copyable?: boolean
-}
-
-/** A masked credential the viewer can reveal, for entry or for one-time display. */
-export function SecretField({
-  label,
-  value,
-  defaultValue,
-  onChange,
-  name,
-  placeholder,
-  optional,
-  required,
-  disabled,
-  readOnly,
-  error,
-  hint,
-  autoComplete = 'off',
-  copyable,
-}: SecretFieldProps) {
-  const id = useId()
-  const [revealed, setRevealed] = useState(false)
-  return (
-    <FieldFrame id={id} label={label} optional={optional} error={error} hint={hint}>
-      <Input
-        id={id}
-        label={label}
-        type={revealed ? 'text' : 'password'}
-        value={value}
-        defaultValue={defaultValue}
-        onChange={onChange}
-        name={name}
-        placeholder={placeholder}
-        required={required}
-        disabled={disabled}
-        readOnly={readOnly}
-        autoComplete={autoComplete}
-        spellCheck={false}
-        invalid={Boolean(error)}
-        describedBy={fieldDescription(id, error, hint)}
-        trailing={
-          <>
-            <Button
-              variant='quiet'
-              size='compact'
-              disabled={disabled}
-              onClick={() => setRevealed((current) => !current)}
-            >
-              {revealed ? 'Hide' : 'Show'}
-            </Button>
-            {copyable && value && <CopyButton label={`Copy ${label}`} text={value} />}
-          </>
-        }
-      />
-    </FieldFrame>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/icon/icon.module.css b/apps/sim/platform/design-system/components/icon/icon.module.css
deleted file mode 100644
index 8430d04887f..00000000000
--- a/apps/sim/platform/design-system/components/icon/icon.module.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.icon {
-  display: inline-block;
-  flex: none;
-  width: var(--ui-glyph-size);
-  height: var(--ui-glyph-size);
-}
-
-.icon[data-interface-icon] {
-  color: var(--ui-icon-ink);
-  transition: color var(--ui-motion-color) ease-out;
-  fill: none;
-  stroke: currentColor;
-  stroke-width: var(--ui-icon-stroke);
-  stroke-linecap: round;
-  stroke-linejoin: round;
-}
-.icon[data-interface-icon] :is(path, rect, circle, line, polyline, polygon, ellipse) {
-  vector-effect: non-scaling-stroke;
-}
diff --git a/apps/sim/platform/design-system/components/icon/icon.tsx b/apps/sim/platform/design-system/components/icon/icon.tsx
deleted file mode 100644
index 2accb011146..00000000000
--- a/apps/sim/platform/design-system/components/icon/icon.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useId } from 'react'
-import { glyphs, type IconName } from '@/platform/design-system/catalog/icon-geometry'
-import styles from '@/platform/design-system/components/icon/icon.module.css'
-import { providerMark } from '@/platform/design-system/components/icon/provider-marks'
-
-type IconProps = { label?: string } & (
-  | { name: IconName; providerId?: never }
-  | { providerId: string; name?: never }
-)
-
-export function Icon({ name, providerId, label }: IconProps) {
-  const id = useId()
-  const mark = name ?? providerMark(providerId)
-  const glyph = typeof mark === 'string' ? glyphs[mark] : undefined
-  return (
-    <svg
-      className={styles.icon}
-      data-interface-icon={glyph && !('artwork' in glyph) ? '' : undefined}
-      viewBox={glyph?.viewBox}
-      fill={glyph ? undefined : 'currentColor'}
-      aria-hidden={label ? undefined : true}
-      role={label ? 'img' : undefined}
-      aria-label={label}
-      focusable='false'
-    >
-      {typeof mark === 'string' ? (
-        glyphs[mark].draw(id)
-      ) : (
-        <use href={mark.href} width='100%' height='100%' />
-      )}
-    </svg>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/icon/provider-marks.ts b/apps/sim/platform/design-system/components/icon/provider-marks.ts
deleted file mode 100644
index b1b0505a4db..00000000000
--- a/apps/sim/platform/design-system/components/icon/provider-marks.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { publicAssetPath } from '@/platform/design-system/navigation'
-
-const SHARED_MARKS = new Map<string, IconName>([
-  ['gmail', 'I005'],
-  ['linear', 'I007'],
-  ['notion', 'I022'],
-  ['github', 'I045'],
-  ['salesforce', 'I084'],
-  ['google_calendar', 'I088'],
-  ['slack', 'I123'],
-])
-
-const ASSET_MARKS = new Set([
-  'coda',
-  'confluence',
-  'fireflies',
-  'gitlab',
-  'google_drive',
-  'google_meet',
-  'granola',
-  'hubspot',
-  'jira',
-  'lucid',
-  'zoom',
-])
-
-export function providerMark(providerId: string): IconName | { href: string } {
-  const shared = SHARED_MARKS.get(providerId)
-  if (shared) return shared
-  if (!ASSET_MARKS.has(providerId)) return 'I070'
-  return { href: publicAssetPath(`/provider-marks/${providerId.replaceAll('_', '-')}.svg#mark`) }
-}
diff --git a/apps/sim/platform/design-system/components/identity-button/identity-button.tsx b/apps/sim/platform/design-system/components/identity-button/identity-button.tsx
deleted file mode 100644
index bdfe4602323..00000000000
--- a/apps/sim/platform/design-system/components/identity-button/identity-button.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-'use client'
-
-import type { ReactElement, ReactNode } from 'react'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-
-interface IdentityButtonProps {
-  label: string
-  children?: string
-  leading?: ReactNode
-  trailingIcon?: IconName
-  onClick?: () => void
-  render?: ReactElement
-}
-
-export function IdentityButton({
-  label,
-  children,
-  leading,
-  trailingIcon,
-  onClick,
-  render,
-}: IdentityButtonProps) {
-  return (
-    <ControlRow
-      render={render ?? <button type='button' />}
-      accessibleLabel={label}
-      label={children}
-      leading={leading}
-      trailingIcon={trailingIcon}
-      onClick={onClick}
-    />
-  )
-}
diff --git a/apps/sim/platform/design-system/components/index.ts b/apps/sim/platform/design-system/components/index.ts
deleted file mode 100644
index a17e03fb1b1..00000000000
--- a/apps/sim/platform/design-system/components/index.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-export { ActivityRow } from './activity-row/activity-row'
-export { AttachmentGrid } from './attachments/attachment-grid'
-export {
-  Avatar,
-  AvatarGroup,
-  AvatarImage,
-  AvatarOverflow,
-  PeoplePopover,
-  PersonRow,
-} from './avatar/avatar'
-export { Button, Chip, IconButton } from './button/button'
-export { CopyButton } from './button/copy-button'
-export { ChartTooltip } from './chart/chart-tooltip'
-export { BarChart, DonutChart, TrendChart } from './chart/charts'
-export { Checkbox } from './checkbox/checkbox'
-export { ComposerInput } from './composer-input/composer-input'
-export { DataTable, MetricGroup, TableLabel } from './data-display/data-display'
-export { DestinationTabs } from './destination-tabs/destination-tabs'
-export { Disclosure } from './disclosure/disclosure'
-export { EmptyState } from './empty-state/empty-state'
-export { ExecutionSteps } from './execution-steps/execution-steps'
-export { FieldFrame, SelectField, TextAreaField, TextField } from './field/fields'
-export { FileField } from './field/file-field'
-export { Input, TextArea } from './field/inputs'
-export { CopyField, SecretField } from './field/value-fields'
-export { Icon } from './icon/icon'
-export {
-  ActionMenu,
-  BrowserActionsMenu,
-  ContextActionMenu,
-  MenuItem,
-  VisibilityMenu,
-} from './menu/action-menu'
-export { RangePicker } from './menu/range-picker'
-export { Modal, MultiStepModal } from './modal/modal'
-export { ModalBody, ModalFooter, ModalHeader } from './modal/modal-parts'
-export { OverflowText } from './overflow-text/overflow-text'
-export { Pagination } from './pagination/pagination'
-export { DatePicker, DateRangePicker } from './picker/date-picker'
-export { MultiSelect } from './picker/multi-select'
-export { SearchCombobox } from './picker/search-combobox'
-export { SearchableSelect } from './picker/searchable-select'
-export { Select } from './picker/select'
-export { PropertyList } from './property-list/property-list'
-export { RecentItems } from './recent-items/recent-items'
-export { ScrollArea } from './scroll-area/scroll-area'
-export { MenuSearchField } from './search-field/menu-search-field'
-export { SearchField } from './search-field/search-field'
-export { SegmentedControl, SelectionItem } from './segmented-control/segmented-control'
-export { FailureNotice, InlineNotice, StatusTag } from './status/status'
-export { PlatformSurface } from './surface/platform-surface'
-export { Switch } from './switch/switch'
-export { type TabItem, Tabs } from './tabs/tabs'
-export { Tooltip } from './tooltip/tooltip'
-export { TouchTarget } from './touch-target/touch-target'
-export { LogoUploadField, RecipientField, RecipientTag } from './workspace-fields/workspace-fields'
-export { SidebarWorkspaceItems, WorkspaceList } from './workspace-list/workspace-list'
diff --git a/apps/sim/platform/design-system/components/layout/use-compact-viewport.ts b/apps/sim/platform/design-system/components/layout/use-compact-viewport.ts
deleted file mode 100644
index 93a0b9dad06..00000000000
--- a/apps/sim/platform/design-system/components/layout/use-compact-viewport.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-'use client'
-
-import { useSyncExternalStore } from 'react'
-
-function breakpoint(query: string) {
-  return {
-    snapshot: () => matchMedia(query).matches,
-    subscribe(listener: () => void) {
-      const media = matchMedia(query)
-      media.addEventListener('change', listener)
-      return () => media.removeEventListener('change', listener)
-    },
-  }
-}
-const content = breakpoint('(max-width: 40rem)')
-const navigation = breakpoint('(max-width: 48rem)')
-const server = () => false
-
-export function useCompactViewport(surface: 'content' | 'navigation' = 'content') {
-  const media = surface === 'navigation' ? navigation : content
-  return useSyncExternalStore(media.subscribe, media.snapshot, server)
-}
diff --git a/apps/sim/platform/design-system/components/menu/action-menu.tsx b/apps/sim/platform/design-system/components/menu/action-menu.tsx
deleted file mode 100644
index 02af0a466ee..00000000000
--- a/apps/sim/platform/design-system/components/menu/action-menu.tsx
+++ /dev/null
@@ -1,607 +0,0 @@
-'use client'
-
-import {
-  createContext,
-  Fragment,
-  type KeyboardEvent,
-  type ReactNode,
-  type RefObject,
-  useContext,
-  useRef,
-  useState,
-} from 'react'
-import { ContextMenu } from '@base-ui/react/context-menu'
-import { Menu } from '@base-ui/react/menu'
-import { Toolbar } from '@base-ui/react/toolbar'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { Button, IconButton } from '@/platform/design-system/components/button/button'
-import { useClipboard } from '@/platform/design-system/components/feedback/use-clipboard'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import styles from '@/platform/design-system/components/menu/menu.module.css'
-import popup from '@/platform/design-system/components/menu/popup.shared.module.css'
-import { usePopoverContainer } from '@/platform/design-system/components/menu/use-popover-container'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-interface InlineSelection {
-  layout?: 'browser' | 'visibility'
-  value?: string
-  select: (value: string) => void
-}
-const InlineMenu = createContext<InlineSelection | null>(null)
-const BrowserRows = createContext(false)
-const FloatingMenu = createContext<RefObject<HTMLDivElement | null> | null>(null)
-
-export type MenuAction = {
-  id: string
-  label: string
-  icon?: IconName
-  separatorBefore?: boolean
-} & (
-  | { children: readonly [MenuAction, ...MenuAction[]]; onSelect?: never; trailingIcon?: never }
-  | {
-      children?: never
-      onSelect?: () => void
-      trailingIcon?: IconName
-      checked?: boolean
-      disabled?: boolean
-      destructive?: boolean
-      shortcut?: string
-    }
-)
-
-interface ActionMenuProps {
-  label: string
-  defaultValue?: string
-  children: ReactNode
-  actions?: never
-}
-
-interface TriggeredMenuProps {
-  label: string
-  actions: readonly MenuAction[]
-  icon?: IconName
-  open?: boolean
-  onOpenChange?: (open: boolean) => void
-  align?: 'start' | 'end'
-  heading?: string
-  triggerSize?: 'small' | 'row' | 'compact'
-  tooltip?: boolean
-  children?: never
-  defaultValue?: never
-}
-
-export function ActionMenu(props: ActionMenuProps | TriggeredMenuProps) {
-  if (props.actions)
-    return (
-      <TriggeredMenu
-        label={props.label}
-        actions={props.actions}
-        icon={props.icon}
-        open={props.open}
-        onOpenChange={props.onOpenChange}
-        align={props.align}
-        heading={props.heading}
-        triggerSize={props.triggerSize}
-        tooltip={props.tooltip}
-      />
-    )
-  return (
-    <MenuSurface label={props.label} defaultValue={props.defaultValue}>
-      {props.children}
-    </MenuSurface>
-  )
-}
-
-function actionRows(actions: readonly MenuAction[]): ReactNode {
-  return actions.map((action) => (
-    <Fragment key={action.id}>
-      {action.separatorBefore && <Menu.Separator className={styles.separator} />}
-      {action.children ? (
-        <SubmenuItem label={action.label} icon={action.icon}>
-          {actionRows(action.children)}
-        </SubmenuItem>
-      ) : (
-        <MenuItem
-          label={action.label}
-          icon={action.icon}
-          trailingIcon={action.trailingIcon}
-          checked={action.checked}
-          disabled={action.disabled}
-          destructive={action.destructive}
-          shortcut={action.shortcut}
-          onSelect={action.onSelect}
-        />
-      )}
-    </Fragment>
-  ))
-}
-
-function TriggeredMenu({
-  label,
-  actions,
-  icon,
-  open,
-  onOpenChange,
-  align,
-  heading,
-  triggerSize = 'small',
-  tooltip = true,
-}: TriggeredMenuProps) {
-  const { trigger, container, opener } = usePopoverContainer()
-  return (
-    <Menu.Root
-      modal={false}
-      open={open}
-      onOpenChange={(next, details) => {
-        if (!next && details.reason === 'item-press') opener.current?.focus({ preventScroll: true })
-        onOpenChange?.(next)
-      }}
-    >
-      {icon ? (
-        <IconButton
-          tooltip={tooltip}
-          render={<Menu.Trigger ref={trigger} />}
-          size={triggerSize}
-          label={label}
-          icon={icon}
-          disabled={!actions.length}
-        />
-      ) : (
-        <Button render={<Menu.Trigger ref={trigger} />} variant='quiet' disabled={!actions.length}>
-          {label}
-        </Button>
-      )}
-      <ActionMenuPopup label={label} container={container} align={align}>
-        {heading && (
-          <div className={popup.heading} data-type='T052'>
-            {heading}
-          </div>
-        )}
-        {actionRows(actions)}
-      </ActionMenuPopup>
-    </Menu.Root>
-  )
-}
-
-interface ContextActionMenuProps {
-  label: string
-  actions: readonly MenuAction[]
-  onOpenChange?: (open: boolean) => void
-  children: ReactNode
-}
-
-/** The same rows as `ActionMenu`, opened at the pointer by a secondary click on `children`. */
-export function ContextActionMenu({
-  label,
-  actions,
-  onOpenChange,
-  children,
-}: ContextActionMenuProps) {
-  const { trigger, container } = usePopoverContainer()
-  return (
-    <ContextMenu.Root onOpenChange={(open) => onOpenChange?.(open)}>
-      <ContextMenu.Trigger ref={trigger} className={styles.contextTrigger}>
-        {children}
-      </ContextMenu.Trigger>
-      <ActionMenuPopup label={label} container={container}>
-        {actionRows(actions)}
-      </ActionMenuPopup>
-    </ContextMenu.Root>
-  )
-}
-
-interface ActionMenuPopupProps {
-  label: string
-  container: HTMLElement | null
-  submenu?: boolean
-  browser?: boolean
-  align?: 'start' | 'end'
-  children: ReactNode
-}
-
-/** Base UI measures the submenu from its item; Paper measures the gap between panel borders. */
-function panelSpacing(panel: HTMLDivElement | null | undefined) {
-  if (!panel) return { gap: 4, edge: 0 }
-  const style = getComputedStyle(panel)
-  const gap = Number.parseFloat(style.paddingInlineStart)
-  return {
-    gap: panel.dataset.menu === 'browser' ? gap * 2 : gap,
-    edge: gap + Number.parseFloat(style.borderInlineStartWidth),
-  }
-}
-
-export function ActionMenuPopup({
-  label,
-  container,
-  submenu,
-  browser,
-  align = 'start',
-  children,
-}: ActionMenuPopupProps) {
-  const scrollEdges = useScrollEdges<HTMLDivElement>()
-  const parent = useContext(FloatingMenu)
-  const browserRows = useContext(BrowserRows) || Boolean(browser)
-  const panel = useRef<HTMLDivElement>(null)
-  if (!container) return null
-  return (
-    <FloatingMenu.Provider value={panel}>
-      <Menu.Portal container={container}>
-        <Menu.Positioner
-          className={popup.positioner}
-          side={submenu ? 'inline-end' : 'bottom'}
-          align={align}
-          sideOffset={
-            submenu
-              ? () => {
-                  const { gap, edge } = panelSpacing(parent?.current)
-                  return edge + gap
-                }
-              : browserRows
-                ? 8
-                : 4
-          }
-          alignOffset={submenu ? () => -panelSpacing(parent?.current).edge : 0}
-          collisionPadding={8}
-        >
-          <Menu.Popup
-            ref={panel}
-            data-menu={browserRows ? (submenu ? 'zoom' : 'browser') : undefined}
-            className={styles.menu}
-            data-material='floating'
-            data-elevation='menu'
-          >
-            <BrowserRows.Provider value={browserRows}>
-              <Menu.List ref={scrollEdges} className={popup.list} aria-label={label}>
-                {children}
-              </Menu.List>
-            </BrowserRows.Provider>
-          </Menu.Popup>
-        </Menu.Positioner>
-      </Menu.Portal>
-    </FloatingMenu.Provider>
-  )
-}
-
-interface SubmenuItemProps {
-  detail?: string
-  label: string
-  icon?: IconName
-  children: ReactNode
-}
-
-function SubmenuItem({ label, icon, children, detail }: SubmenuItemProps) {
-  const { trigger, container } = usePopoverContainer()
-  return (
-    <Menu.SubmenuRoot>
-      <Menu.SubmenuTrigger
-        ref={trigger}
-        render={<button type='button' />}
-        nativeButton
-        className={styles.menuItem}
-        label={label}
-        data-type='T060'
-      >
-        {icon && <Icon name={icon} />}
-        <span className={popup.label}>{label}</span>
-        {detail && (
-          <span className={styles.hint} data-type='T052'>
-            {detail}
-          </span>
-        )}
-        <span className={styles.trailing}>
-          <Icon name='I032' />
-        </span>
-      </Menu.SubmenuTrigger>
-      <ActionMenuPopup label={label} container={container} submenu>
-        {children}
-      </ActionMenuPopup>
-    </Menu.SubmenuRoot>
-  )
-}
-
-interface MenuSurfaceProps {
-  label: string
-  children: ReactNode
-  defaultValue?: string
-  layout?: InlineSelection['layout']
-}
-
-function MenuSurface({ label, children, defaultValue, layout }: MenuSurfaceProps) {
-  const [value, select] = useState(defaultValue)
-  const [navigating, setNavigating] = useState(false)
-  function navigate(event: KeyboardEvent<HTMLDivElement>) {
-    if (event.altKey || event.ctrlKey || event.metaKey) return
-    if (event.key.startsWith('Arrow')) {
-      setNavigating(true)
-      return
-    }
-    const rows = Array.from(
-      event.currentTarget.querySelectorAll<HTMLButtonElement>('[role^=menuitem]')
-    )
-    const index = rows.findIndex((row) => row === document.activeElement)
-    const next =
-      event.key === 'Home'
-        ? rows[0]
-        : event.key === 'End'
-          ? rows.at(-1)
-          : /^\S$/.test(event.key)
-            ? [...rows.slice(index + 1), ...rows.slice(0, index + 1)].find((row) =>
-                row.textContent.trim().toLowerCase().startsWith(event.key.toLowerCase())
-              )
-            : undefined
-    if (!next) return
-    event.preventDefault()
-    setNavigating(true)
-    next.focus()
-  }
-  return (
-    <InlineMenu.Provider value={{ value, select, layout }}>
-      <Toolbar.Root
-        orientation='vertical'
-        role='menu'
-        aria-label={label}
-        className={styles.menu}
-        data-menu={layout}
-        data-navigating={navigating || undefined}
-        data-material='floating'
-        data-elevation='menu'
-        onKeyDown={navigate}
-        onPointerMove={() => setNavigating(false)}
-        onBlur={(event) => {
-          if (!event.currentTarget.contains(event.relatedTarget)) setNavigating(false)
-        }}
-      >
-        {children}
-      </Toolbar.Root>
-    </InlineMenu.Provider>
-  )
-}
-
-interface MenuItemProps {
-  destructive?: boolean
-  label: string
-  icon?: IconName
-  shortcut?: string
-  detail?: string
-  trailingIcon?: IconName
-  checked?: boolean
-  disabled?: boolean
-  value?: string
-  selected?: boolean
-  onSelect?: () => void
-}
-
-export function MenuItem({
-  label,
-  icon,
-  shortcut,
-  destructive,
-  detail,
-  trailingIcon,
-  value,
-  selected,
-  checked,
-  disabled,
-  onSelect,
-}: MenuItemProps) {
-  const inline = useContext(InlineMenu)
-  const floating = useContext(FloatingMenu)
-  const choice = value !== undefined || selected !== undefined
-  const active =
-    checked ?? (inline?.value === undefined ? selected : inline.value === (value ?? label))
-  const type = 'T060'
-  const content = (
-    <>
-      {icon && <Icon name={icon} />}
-      <span className={popup.label}>{label}</span>
-      {!(choice || checked !== undefined) && shortcut && (
-        <kbd className={styles.hint} data-type={inline?.layout === 'browser' ? 'T052' : 'T001'}>
-          {shortcut}
-        </kbd>
-      )}
-      {detail && (
-        <span className={styles.hint} data-type='T052'>
-          {detail}
-        </span>
-      )}
-      {(trailingIcon ||
-        (icon && !inline?.layout && !choice && checked === undefined && !detail && !shortcut)) && (
-        <span className={styles.trailing}>{trailingIcon && <Icon name={trailingIcon} />}</span>
-      )}
-    </>
-  )
-  if (floating) {
-    if (checked !== undefined)
-      return (
-        <Menu.CheckboxItem
-          checked={checked}
-          disabled={disabled}
-          onClick={onSelect}
-          label={label}
-          className={styles.menuItem}
-          data-type={type}
-        >
-          {content}
-          <Menu.CheckboxItemIndicator className={popup.indicator}>
-            <Icon name='I072' />
-          </Menu.CheckboxItemIndicator>
-        </Menu.CheckboxItem>
-      )
-    if (choice)
-      return (
-        <Menu.RadioItem
-          value={value ?? label}
-          onClick={onSelect}
-          closeOnClick
-          label={label}
-          className={styles.menuItem}
-          data-option={value !== undefined || undefined}
-          data-type={type}
-        >
-          {content}
-          <Menu.RadioItemIndicator className={popup.indicator}>
-            <Icon name='I072' />
-          </Menu.RadioItemIndicator>
-        </Menu.RadioItem>
-      )
-    return (
-      <Menu.Item
-        data-destructive-quiet={destructive || undefined}
-        disabled={disabled}
-        className={styles.menuItem}
-        label={label}
-        data-type={type}
-        onClick={onSelect}
-      >
-        {content}
-      </Menu.Item>
-    )
-  }
-  function choose() {
-    if (choice) inline?.select(value ?? label)
-    onSelect?.()
-  }
-  const row = (
-    <>
-      {content}
-      {active && <Icon name='I072' />}
-    </>
-  )
-  if (!inline)
-    return (
-      <button
-        type='button'
-        className={styles.menuItem}
-        data-menu-row=''
-        data-destructive-quiet={destructive || undefined}
-        disabled={disabled}
-        aria-pressed={checked !== undefined || choice ? Boolean(active) : undefined}
-        data-type={type}
-        onClick={choose}
-      >
-        {row}
-      </button>
-    )
-  return (
-    <Toolbar.Button
-      data-destructive-quiet={destructive || undefined}
-      disabled={disabled}
-      className={styles.menuItem}
-      data-type={type}
-      data-option={value !== undefined || undefined}
-      role={checked !== undefined ? 'menuitemcheckbox' : choice ? 'menuitemradio' : 'menuitem'}
-      aria-checked={choice || checked !== undefined ? Boolean(active) : undefined}
-      onClick={choose}
-    >
-      {row}
-    </Toolbar.Button>
-  )
-}
-
-type BrowserAction = 'find' | 'zoom' | 'downloads'
-
-interface BrowserActionsMenuProps {
-  address?: string
-  zoomPercent?: number
-  onZoom?: (percent: number) => void
-  onAction?: (action: BrowserAction) => void
-}
-
-export function BrowserActionsMenu({
-  address,
-  zoomPercent = 100,
-  onAction,
-  onZoom,
-}: BrowserActionsMenuProps) {
-  const { copied, copy } = useClipboard()
-  const { trigger, container } = usePopoverContainer()
-  const rows = (
-    <>
-      <MenuItem
-        icon={copied ? 'I072' : 'I006'}
-        label={copied ? 'Copied' : 'Copy link'}
-        disabled={!address}
-        onSelect={() => address && void copy(address)}
-      />
-      <MenuItem icon='I037' label='Open in default browser' disabled />
-      <MenuItem
-        icon='I089'
-        label='Find on page'
-        shortcut='⌘F'
-        onSelect={() => onAction?.('find')}
-      />
-      {onZoom ? (
-        <SubmenuItem label='Zoom' icon='I089' detail={`${zoomPercent}%`}>
-          <Menu.RadioGroup
-            value={String(zoomPercent)}
-            onValueChange={(value) => onZoom(Number(value))}
-          >
-            {[75, 100, 125, 150, 200].map((percent) => (
-              <MenuItem key={percent} value={String(percent)} label={`${percent}%`} />
-            ))}
-          </Menu.RadioGroup>
-        </SubmenuItem>
-      ) : (
-        <MenuItem
-          icon='I089'
-          label='Zoom'
-          detail={`${zoomPercent}%`}
-          trailingIcon='I032'
-          onSelect={() => onAction?.('zoom')}
-        />
-      )}
-      <hr className={styles.separator} />
-      <MenuItem icon='I049' label='Downloads' onSelect={() => onAction?.('downloads')} />
-    </>
-  )
-  if (!onZoom)
-    return (
-      <MenuSurface label='Browser actions' layout='browser'>
-        {rows}
-      </MenuSurface>
-    )
-  return (
-    <Menu.Root modal={false}>
-      <IconButton
-        tooltip
-        render={<Menu.Trigger ref={trigger} />}
-        label='Browser actions'
-        icon='I108'
-      />
-      <ActionMenuPopup label='Browser actions' container={container} align='end' browser>
-        {rows}
-      </ActionMenuPopup>
-    </Menu.Root>
-  )
-}
-
-interface VisibilityMenuProps {
-  label: string
-  options: readonly { id: string; label: string; visible: boolean }[]
-  onChange?: (id: string, visible: boolean) => void
-}
-
-export function VisibilityMenu({ label, options, onChange }: VisibilityMenuProps) {
-  const [choices, setChoices] = useState<Readonly<Record<string, boolean>>>({})
-  return (
-    <MenuSurface label={label} layout='visibility'>
-      <div className={popup.heading} data-type='T052'>
-        {label}
-      </div>
-      {options.map((option) => {
-        const checked = choices[option.id] ?? option.visible
-        return (
-          <MenuItem
-            key={option.id}
-            label={option.label}
-            checked={checked}
-            onSelect={() => {
-              setChoices((current) => ({ ...current, [option.id]: !checked }))
-              onChange?.(option.id, !checked)
-            }}
-          />
-        )
-      })}
-    </MenuSurface>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/menu/anchored-popover.tsx b/apps/sim/platform/design-system/components/menu/anchored-popover.tsx
deleted file mode 100644
index d6f89c59894..00000000000
--- a/apps/sim/platform/design-system/components/menu/anchored-popover.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-'use client'
-
-import type { ReactElement, ReactNode, RefObject } from 'react'
-import { Popover } from '@base-ui/react/popover'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import popup from '@/platform/design-system/components/menu/popup.shared.module.css'
-import { usePopoverContainer } from '@/platform/design-system/components/menu/use-popover-container'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-type AnchoredPopoverProps = {
-  label: string
-  presentation: 'menu' | 'panel'
-  anchor: RefObject<HTMLElement | null>
-  children: ReactNode
-  open: boolean
-  onOpenChange: (open: boolean, trigger?: Element) => void
-} & (
-  | { trigger: (button: ReactElement) => ReactElement; icon?: never }
-  | { trigger?: never; icon: IconName }
-)
-
-export function AnchoredPopover({
-  label,
-  presentation,
-  trigger,
-  icon,
-  anchor,
-  children,
-  open,
-  onOpenChange,
-}: AnchoredPopoverProps) {
-  const scrollEdges = useScrollEdges<HTMLDivElement>()
-  const portal = usePopoverContainer()
-  return (
-    <Popover.Root open={open} onOpenChange={(next, details) => onOpenChange(next, details.trigger)}>
-      {icon ? (
-        <IconButton
-          render={<Popover.Trigger ref={portal.trigger} />}
-          tooltip
-          label={label}
-          icon={icon}
-          size='row'
-        />
-      ) : (
-        trigger(<Popover.Trigger ref={portal.trigger} aria-label={label} />)
-      )}
-      {portal.container && (
-        <Popover.Portal container={portal.container}>
-          <Popover.Positioner
-            className={popup.positioner}
-            align='start'
-            anchor={anchor}
-            sideOffset={presentation === 'panel' ? 8 : 4}
-            collisionPadding={8}
-            positionMethod='fixed'
-          >
-            <Popover.Popup
-              ref={scrollEdges}
-              className={popup.panel}
-              data-presentation={presentation}
-              aria-label={label}
-              data-material='floating'
-              data-elevation='menu'
-            >
-              {children}
-            </Popover.Popup>
-          </Popover.Positioner>
-        </Popover.Portal>
-      )}
-    </Popover.Root>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/menu/menu.module.css b/apps/sim/platform/design-system/components/menu/menu.module.css
deleted file mode 100644
index f1de95c1715..00000000000
--- a/apps/sim/platform/design-system/components/menu/menu.module.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.menu {
-  min-inline-size: 0;
-}
-.menuItem {
-  display: flex;
-  align-items: center;
-}
-
-.menu {
-  composes: popup from "./popup.shared.module.css";
-  inline-size: var(--menu-action-width);
-}
-.menu:not([data-menu]):has(.menuItem[data-option]) {
-  inline-size: var(--menu-choice-width);
-}
-.menuItem {
-  composes: item from "./popup.shared.module.css";
-}
-.contextTrigger {
-  display: grid;
-  min-inline-size: 0;
-}
-.menuItem[data-popup-open],
-.menu[data-navigating] .menuItem[tabindex="0"] {
-  background: var(--ui-hover);
-}
-.trailing {
-  display: inline-flex;
-  flex: none;
-  align-items: center;
-  justify-content: end;
-  inline-size: var(--spacing-32);
-}
-.hint {
-  min-width: var(--spacing-32);
-  text-align: end;
-  color: var(--ui-secondary);
-}
-
-.menu[data-menu="browser"] {
-  inline-size: var(--menu-browser-width);
-  gap: var(--spacing-2);
-}
-.separator {
-  composes: separator from "./popup.shared.module.css";
-}
-.menu[data-menu="zoom"] {
-  inline-size: var(--menu-zoom-width);
-}
-.menu:is([data-menu="browser"], [data-menu="zoom"]) [role="group"],
-.menu[data-menu="browser"] [aria-label="Browser actions"] {
-  display: flex;
-  flex-direction: column;
-  gap: var(--spacing-2);
-}
diff --git a/apps/sim/platform/design-system/components/menu/popup.shared.module.css b/apps/sim/platform/design-system/components/menu/popup.shared.module.css
deleted file mode 100644
index 902a55837ea..00000000000
--- a/apps/sim/platform/design-system/components/menu/popup.shared.module.css
+++ /dev/null
@@ -1,93 +0,0 @@
-.positioner {
-  z-index: 1;
-  max-inline-size: var(--available-width);
-}
-
-.anchorWidth {
-  composes: positioner;
-  inline-size: min(var(--anchor-width), var(--available-width));
-}
-
-.popup {
-  display: flex;
-  flex-direction: column;
-  min-inline-size: 0;
-  max-inline-size: 100%;
-  max-block-size: var(--available-height);
-  padding: var(--ui-popup-padding);
-  overflow: hidden;
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-menu-shared);
-  color: var(--ui-ink);
-}
-
-.list {
-  min-block-size: 0;
-  overflow-y: auto;
-  overscroll-behavior: contain;
-}
-
-.heading {
-  display: flex;
-  align-items: center;
-  min-block-size: var(--spacing-28);
-  padding-inline: var(--ui-row-inset);
-  color: var(--ui-secondary);
-}
-
-.item {
-  display: flex;
-  align-items: center;
-  inline-size: 100%;
-  min-block-size: var(--spacing-app-chip);
-  padding: var(--ui-row-block) var(--ui-row-inset);
-  gap: var(--ui-row-gap);
-  border-radius: var(--ui-control-radius);
-  color: var(--ui-ink);
-  cursor: pointer;
-  text-align: start;
-}
-
-.item:not(:disabled, [data-disabled], [aria-disabled="true"]):is(
-    [data-highlighted],
-    :hover:not([role="option"])
-  ) {
-  background: var(--ui-hover);
-}
-
-.item:is(:disabled, [data-disabled], [aria-disabled="true"]) {
-  opacity: var(--opacity-disabled);
-  cursor: default;
-}
-
-.label {
-  flex: 1;
-  min-inline-size: 0;
-  overflow-wrap: anywhere;
-}
-
-.indicator {
-  display: inline-flex;
-  flex: none;
-  align-items: center;
-  justify-content: center;
-  inline-size: var(--spacing-app-icon);
-  block-size: var(--spacing-app-icon);
-}
-
-.separator {
-  flex: none;
-  block-size: var(--ui-list-gap);
-  border: 0;
-}
-
-.panel {
-  composes: popup;
-  max-inline-size: var(--available-width);
-  overflow-y: auto;
-}
-
-.panel[data-presentation="panel"] {
-  max-block-size: min(var(--available-height), var(--ui-widget-max-size));
-  border-radius: var(--radius-panel);
-}
diff --git a/apps/sim/platform/design-system/components/menu/range-picker.tsx b/apps/sim/platform/design-system/components/menu/range-picker.tsx
deleted file mode 100644
index f946d04ee16..00000000000
--- a/apps/sim/platform/design-system/components/menu/range-picker.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { Menu } from '@base-ui/react/menu'
-import { Button } from '@/platform/design-system/components/button/button'
-import { ActionMenuPopup, MenuItem } from '@/platform/design-system/components/menu/action-menu'
-import { usePopoverContainer } from '@/platform/design-system/components/menu/use-popover-container'
-
-interface RangePickerProps {
-  label: string
-  options: readonly string[]
-  value?: string
-  defaultValue?: string
-  defaultOpen?: boolean
-  onValueChange?: (value: string) => void
-}
-
-export function RangePicker({
-  label,
-  options,
-  value: controlledValue,
-  defaultValue,
-  defaultOpen = false,
-  onValueChange,
-}: RangePickerProps) {
-  const [localValue, setLocalValue] = useState(defaultValue)
-  const selection = controlledValue ?? localValue
-  const value = selection !== undefined && options.includes(selection) ? selection : options[0]
-  const { trigger, container } = usePopoverContainer()
-  return (
-    <Menu.Root modal={false} defaultOpen={defaultOpen && options.length > 0}>
-      <Button
-        render={<Menu.Trigger ref={trigger} aria-label={value ? `${label}: ${value}` : label} />}
-        disabled={!options.length}
-        variant='quiet'
-        size='compact'
-      >
-        {value || label}
-      </Button>
-      <ActionMenuPopup label={label} container={container} align='end'>
-        <Menu.RadioGroup
-          value={value}
-          onValueChange={(next: string) => {
-            if (controlledValue === undefined) setLocalValue(next)
-            onValueChange?.(next)
-          }}
-        >
-          {options.map((option) => (
-            <MenuItem key={option} label={option} value={option} />
-          ))}
-        </Menu.RadioGroup>
-      </ActionMenuPopup>
-    </Menu.Root>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/menu/use-popover-container.ts b/apps/sim/platform/design-system/components/menu/use-popover-container.ts
deleted file mode 100644
index 56b505b5220..00000000000
--- a/apps/sim/platform/design-system/components/menu/use-popover-container.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-'use client'
-
-import { useCallback, useRef, useState } from 'react'
-
-/** Keep a floating control inside its active theme and the nearest native dialog's top layer. */
-export function usePopoverContainer() {
-  const [container, setContainer] = useState<HTMLElement | null>(null)
-  const opener = useRef<HTMLElement>(null)
-  const trigger = useCallback((node: HTMLElement | null) => {
-    opener.current = node
-    setContainer(node?.closest<HTMLElement>('dialog, [data-platform-ui]') ?? null)
-  }, [])
-  return { trigger, container, opener }
-}
diff --git a/apps/sim/platform/design-system/components/modal/modal-parts.tsx b/apps/sim/platform/design-system/components/modal/modal-parts.tsx
deleted file mode 100644
index 189cbe9d40d..00000000000
--- a/apps/sim/platform/design-system/components/modal/modal-parts.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import type { ReactNode } from 'react'
-import { Button, IconButton } from '@/platform/design-system/components/button/button'
-import styles from '@/platform/design-system/components/modal/modal.module.css'
-
-interface ModalHeaderProps {
-  title: string
-  description?: string
-  titleId?: string
-  descriptionId?: string
-  onClose?: () => void
-}
-
-export function ModalHeader({
-  title,
-  description,
-  titleId,
-  descriptionId,
-  onClose,
-}: ModalHeaderProps) {
-  return (
-    <header className={styles.modalHeader}>
-      <div className={styles.heading}>
-        <h2 id={titleId} data-type='T083'>
-          {title}
-        </h2>
-        {description && (
-          <p id={descriptionId} data-type='T048' aria-live='polite'>
-            {description}
-          </p>
-        )}
-      </div>
-      <IconButton label='Close' icon='I105' onClick={onClose} />
-    </header>
-  )
-}
-
-interface ModalBodyProps {
-  label?: string
-  inactive?: boolean
-  children: ReactNode
-}
-
-export function ModalBody({ children, label, inactive }: ModalBodyProps) {
-  return (
-    <fieldset className={styles.modalBody} hidden={inactive} disabled={inactive} aria-label={label}>
-      {children}
-    </fieldset>
-  )
-}
-
-interface ModalFooterProps {
-  confirmLabel: string
-  onPrevious?: () => void
-  cancelLabel?: string
-  destructive?: boolean
-  disabled?: boolean
-  cancelDisabled?: boolean
-  progress?: string
-}
-
-export function ModalFooter({
-  confirmLabel,
-  onPrevious,
-  cancelLabel = 'Cancel',
-  destructive,
-  disabled,
-  cancelDisabled,
-  progress,
-}: ModalFooterProps) {
-  return (
-    <footer className={styles.modalFooter}>
-      {progress && (
-        <span className={styles.progress} data-type='T052' aria-live='polite'>
-          {progress}
-        </span>
-      )}
-      <Button variant='quiet' disabled={cancelDisabled} onClick={onPrevious}>
-        {cancelLabel}
-      </Button>
-      <Button variant={destructive ? 'destructive' : 'primary'} submit disabled={disabled}>
-        {confirmLabel}
-      </Button>
-    </footer>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/modal/modal.module.css b/apps/sim/platform/design-system/components/modal/modal.module.css
deleted file mode 100644
index 603ac826cd5..00000000000
--- a/apps/sim/platform/design-system/components/modal/modal.module.css
+++ /dev/null
@@ -1,117 +0,0 @@
-.heading p,
-.progress {
-  color: var(--ui-secondary);
-}
-
-.modalBody,
-.heading,
-.modalLayout {
-  display: flex;
-  flex-direction: column;
-  min-width: 0;
-}
-
-.modal {
-  position: fixed;
-  text-align: start;
-  inset: 0;
-  width: min(var(--container-app-modal-md), calc(100% - var(--spacing-32)));
-  max-width: none;
-  max-height: calc(100dvh - var(--spacing-32));
-  margin: auto;
-  overflow: visible;
-  padding: 0;
-  border: 0;
-  border-radius: var(--radius-dialog);
-  color: var(--ui-ink);
-}
-
-.modal::backdrop {
-  background: var(--ui-scrim);
-}
-
-.modalLayout {
-  max-height: calc(100dvh - var(--spacing-32));
-  padding: var(--ui-dialog-inset);
-  overflow-y: auto;
-  gap: var(--ui-section-gap);
-}
-
-.modalHeader,
-.modalFooter {
-  display: flex;
-}
-
-.modalHeader {
-  align-items: flex-start;
-  gap: var(--spacing-16);
-}
-
-.heading {
-  flex: 1;
-  gap: var(--ui-stack-gap);
-}
-
-.modalBody {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  gap: var(--ui-section-gap);
-}
-
-.modalBody[hidden],
-.modalBody:empty {
-  display: none;
-}
-
-.modalFooter {
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: flex-end;
-  gap: var(--spacing-field-label-gap);
-}
-
-.progress {
-  flex: 1;
-}
-
-.progress ~ button:last-child {
-  min-width: min(100%, var(--spacing-96));
-}
-
-.modal[data-presentation="confirm"] {
-  width: min(var(--container-app-modal-sm), calc(100% - var(--spacing-32)));
-}
-
-@media (pointer: coarse) {
-  .modalFooter button,
-  .modalHeader button {
-    position: relative;
-  }
-}
-
-@media (pointer: coarse) {
-  .modalFooter button::after,
-  .modalHeader button::after {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: max(100%, var(--spacing-app-touch-target));
-    height: max(100%, var(--spacing-app-touch-target));
-    content: "";
-  }
-}
-
-.modal[data-presentation="command"] {
-  inline-size: min(var(--container-app-command), calc(100% - var(--spacing-32)));
-  overflow: clip;
-}
-.modal[data-presentation="command"] .modalLayout {
-  padding: 0;
-  gap: 0;
-}
-
-.error {
-  color: var(--control-danger);
-}
diff --git a/apps/sim/platform/design-system/components/modal/modal.tsx b/apps/sim/platform/design-system/components/modal/modal.tsx
deleted file mode 100644
index 30003a83eb5..00000000000
--- a/apps/sim/platform/design-system/components/modal/modal.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-'use client'
-
-import { type ReactNode, useState } from 'react'
-import { getErrorMessage } from '@sim/utils/errors'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { Button } from '@/platform/design-system/components/button/button'
-import styles from '@/platform/design-system/components/modal/modal.module.css'
-import { ModalBody, ModalFooter } from '@/platform/design-system/components/modal/modal-parts'
-import { OverlayDialog } from '@/platform/design-system/components/modal/overlay-dialog'
-
-interface ModalStep {
-  description?: string
-  content: ReactNode
-}
-
-/**
- * A synchronous confirm closes the dialog in the same update. A returned promise holds it open as
- * pending, closes it on success, and on rejection keeps the draft and shows the error's message.
- * Returning or resolving `false` keeps it open: the confirm reached the dialog's next stage, not its end.
- */
-type ConfirmHandler<Args extends unknown[]> = (...args: Args) => unknown
-
-interface ModalActions {
-  title: string
-  confirmLabel: string
-  confirmDisabled?: boolean
-  onConfirm?: ConfirmHandler<[values: FormData]>
-}
-type ModalTrigger =
-  | { triggerLabel: string; triggerIcon?: IconName; open?: never; onOpenChange?: never }
-  | {
-      open: boolean
-      onOpenChange: (open: boolean) => void
-      triggerLabel?: never
-      triggerIcon?: never
-    }
-
-interface MultiStepModalProps extends Omit<ModalActions, 'onConfirm'> {
-  onConfirm?: ConfirmHandler<[]>
-  triggerLabel: string
-  steps: readonly [ModalStep, ...ModalStep[]]
-}
-
-type ModalSurfaceProps = ModalActions & {
-  triggerLabel?: string
-  triggerIcon?: IconName
-  open?: boolean
-  onOpenChange?: (open: boolean) => void
-  steps: MultiStepModalProps['steps']
-  destructive?: boolean
-  presentation?: ModalProps['variant']
-  cancelLabel?: string
-  onBack?: () => void
-}
-
-function ModalSurface({
-  triggerLabel,
-  triggerIcon,
-  title,
-  confirmLabel,
-  confirmDisabled,
-  steps,
-  destructive,
-  presentation = 'form',
-  cancelLabel,
-  onBack,
-  onConfirm,
-  open: controlled,
-  onOpenChange,
-}: ModalSurfaceProps) {
-  const [internal, setInternal] = useState(false)
-  const [index, setIndex] = useState(0)
-  const [pending, setPending] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-  /** A step back within one step still moves focus, so a repeated Enter cannot reach Cancel. */
-  const [backs, setBacks] = useState(0)
-  const open = controlled ?? internal
-  const step = steps[index]
-  const last = index === steps.length - 1
-
-  if (!open && error) setError(null)
-
-  function close() {
-    setIndex(0)
-    if (onOpenChange) onOpenChange(false)
-    else setInternal(false)
-  }
-
-  async function confirm(values: FormData) {
-    setError(null)
-    try {
-      const result = onConfirm?.(values)
-      if (result instanceof Promise) {
-        setPending(true)
-        if ((await result) === false) return
-      } else if (result === false) return
-      close()
-    } catch (failure) {
-      setError(getErrorMessage(failure, 'Something went wrong. Please try again.'))
-    } finally {
-      setPending(false)
-    }
-  }
-
-  // The work is already underway and its outcome belongs here, so nothing dismisses it mid-flight.
-  function dismiss() {
-    if (!pending) close()
-  }
-  return (
-    <>
-      {triggerLabel && (
-        <Button variant='secondary' trailingIcon={triggerIcon} onClick={() => setInternal(true)}>
-          {triggerLabel}
-        </Button>
-      )}
-      <OverlayDialog
-        open={open}
-        title={title}
-        description={step.description}
-        step={index + backs}
-        presentation={presentation}
-        busy={pending}
-        onClose={dismiss}
-        onSubmit={(event) => {
-          event.preventDefault()
-          if (pending || (last && confirmDisabled)) return
-          if (!last) {
-            setIndex(index + 1)
-            return
-          }
-          void confirm(new FormData(event.currentTarget))
-        }}
-      >
-        {steps.map((entry, i) => (
-          <ModalBody key={i} inactive={i !== index} label={entry.description || title}>
-            {entry.content}
-          </ModalBody>
-        ))}
-        {error && (
-          <p className={styles.error} data-type='T052' role='alert'>
-            {error}
-          </p>
-        )}
-        <ModalFooter
-          confirmLabel={last ? confirmLabel : 'Continue'}
-          onPrevious={() => {
-            setError(null)
-            if (index > 0) setIndex(index - 1)
-            else if (onBack) {
-              onBack()
-              setBacks(backs + 1)
-            } else dismiss()
-          }}
-          cancelLabel={index > 0 || onBack ? 'Back' : cancelLabel}
-          disabled={pending || (last && confirmDisabled)}
-          cancelDisabled={pending}
-          destructive={destructive}
-          progress={steps.length > 1 ? `Step ${index + 1} of ${steps.length}` : undefined}
-        />
-      </OverlayDialog>
-    </>
-  )
-}
-
-type ModalProps = ModalActions &
-  ModalTrigger & {
-    variant?: 'form' | 'confirm' | 'feedback'
-    children?: ReactNode
-    description?: string
-    destructive?: boolean
-    /** Names the quiet footer action, "Cancel" by default. */
-    cancelLabel?: string
-    /** Turns the quiet footer action into Back, within the dialog. Close still closes. */
-    onBack?: () => void
-  }
-
-export function Modal({
-  triggerLabel,
-  triggerIcon,
-  open,
-  onOpenChange,
-  title,
-  confirmLabel,
-  confirmDisabled,
-  onConfirm,
-  children,
-  variant = 'form',
-  description,
-  destructive,
-  cancelLabel,
-  onBack,
-}: ModalProps) {
-  return (
-    <ModalSurface
-      triggerLabel={triggerLabel}
-      triggerIcon={triggerIcon}
-      open={open}
-      onOpenChange={onOpenChange}
-      title={title}
-      confirmLabel={confirmLabel}
-      confirmDisabled={confirmDisabled}
-      onConfirm={onConfirm}
-      steps={[{ description, content: children }]}
-      destructive={destructive}
-      presentation={variant}
-      cancelLabel={cancelLabel}
-      onBack={onBack}
-    />
-  )
-}
-
-export function MultiStepModal({
-  triggerLabel,
-  title,
-  confirmLabel,
-  confirmDisabled,
-  steps,
-  onConfirm,
-}: MultiStepModalProps) {
-  return (
-    <ModalSurface
-      triggerLabel={triggerLabel}
-      title={title}
-      confirmLabel={confirmLabel}
-      confirmDisabled={confirmDisabled}
-      steps={steps}
-      onConfirm={onConfirm}
-    />
-  )
-}
diff --git a/apps/sim/platform/design-system/components/modal/overlay-dialog.tsx b/apps/sim/platform/design-system/components/modal/overlay-dialog.tsx
deleted file mode 100644
index fcebb7bee2b..00000000000
--- a/apps/sim/platform/design-system/components/modal/overlay-dialog.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-'use client'
-
-import { type FormEventHandler, type ReactNode, useId, useLayoutEffect, useRef } from 'react'
-import styles from '@/platform/design-system/components/modal/modal.module.css'
-import { ModalHeader } from '@/platform/design-system/components/modal/modal-parts'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-interface DialogSurfaceProps {
-  open: boolean
-  onClose: () => void
-  description?: string
-  step?: number
-  busy?: boolean
-  onSubmit?: FormEventHandler<HTMLFormElement>
-  children: ReactNode
-}
-
-type OverlayDialogProps = DialogSurfaceProps &
-  (
-    | { title: string; label?: never; presentation?: 'form' | 'confirm' | 'feedback' }
-    | { title?: never; label: string; presentation: 'command' }
-  )
-
-export function OverlayDialog({
-  label,
-  open,
-  onClose,
-  title,
-  description,
-  presentation,
-  step,
-  busy,
-  onSubmit,
-  children,
-}: OverlayDialogProps) {
-  const ref = useRef<HTMLDialogElement>(null)
-  const id = useId()
-  const layout = useScrollEdges<HTMLElement>()
-  useLayoutEffect(() => {
-    const dialog = ref.current
-    if (!dialog || !open) return
-    dialog.showModal()
-    return () => dialog.close()
-  }, [open])
-  useLayoutEffect(() => {
-    const dialog = ref.current
-    if (!dialog || !open || busy) return
-    const body = step === undefined ? dialog : dialog.querySelector('fieldset:not([hidden])')
-    const field = Array.from(
-      body?.querySelectorAll<HTMLElement>(
-        'input:enabled:not([type="hidden"], [readonly]), textarea:enabled:not([readonly]), select:enabled, [role="combobox"]:not(:disabled, [aria-disabled="true"])'
-      ) ?? []
-    ).find((element) => element.tabIndex >= 0 && element.checkVisibility())
-    const target = field ?? dialog.querySelector<HTMLElement>('footer button:enabled')
-    target?.focus({ preventScroll: true })
-  }, [open, step, busy])
-  const content = (
-    <>
-      {title && (
-        <ModalHeader
-          title={title}
-          description={description}
-          titleId={`${id}-title`}
-          descriptionId={`${id}-description`}
-          onClose={onClose}
-        />
-      )}
-      {children}
-    </>
-  )
-  return (
-    <dialog
-      ref={ref}
-      className={styles.modal}
-      data-material='floating'
-      data-elevation='modal'
-      data-presentation={presentation}
-      aria-label={label}
-      aria-labelledby={title ? `${id}-title` : undefined}
-      aria-describedby={description ? `${id}-description` : undefined}
-      onKeyDown={(event) => {
-        if (
-          event.key === 'Escape' &&
-          !event.defaultPrevented &&
-          !event.nativeEvent.isComposing &&
-          event.target instanceof HTMLInputElement &&
-          event.target.type === 'search' &&
-          event.target.closest('dialog') === event.currentTarget
-        ) {
-          event.preventDefault()
-          event.stopPropagation()
-          onClose()
-        }
-      }}
-      onCancel={(event) => {
-        event.preventDefault()
-        event.stopPropagation()
-        onClose()
-      }}
-      onClick={(event) => {
-        if (event.target === event.currentTarget) onClose()
-      }}
-    >
-      {open &&
-        (onSubmit ? (
-          <form
-            ref={layout}
-            className={styles.modalLayout}
-            aria-busy={busy || undefined}
-            onSubmit={onSubmit}
-          >
-            {content}
-          </form>
-        ) : (
-          <div ref={layout} className={styles.modalLayout}>
-            {content}
-          </div>
-        ))}
-    </dialog>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/overflow-text/counted-label.tsx b/apps/sim/platform/design-system/components/overflow-text/counted-label.tsx
deleted file mode 100644
index d78f24947ba..00000000000
--- a/apps/sim/platform/design-system/components/overflow-text/counted-label.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { OverflowText } from '@/platform/design-system/components/overflow-text/overflow-text'
-import styles from '@/platform/design-system/components/overflow-text/overflow-text.module.css'
-
-interface CountedLabelProps {
-  label: string
-  count?: number
-}
-
-export function CountedLabel({ label, count }: CountedLabelProps) {
-  if (count === undefined) return <OverflowText text={label}>{label}</OverflowText>
-  return (
-    <OverflowText text={`${label} ${count}`}>
-      <span className={styles.counted}>
-        <span>{label}</span>
-        <small data-type='T036'>{count}</small>
-      </span>
-    </OverflowText>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/overflow-text/overflow-text.module.css b/apps/sim/platform/design-system/components/overflow-text/overflow-text.module.css
deleted file mode 100644
index 05004c4bc77..00000000000
--- a/apps/sim/platform/design-system/components/overflow-text/overflow-text.module.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.overflowFrame,
-.overflowFrame > span,
-.overflowText {
-  display: flex;
-  min-inline-size: 0;
-  inline-size: 100%;
-}
-
-.overflowText {
-  overflow: clip;
-}
-
-.overflowLabel {
-  flex: none;
-  inline-size: max-content;
-  white-space: pre;
-}
-
-.accessibleLabel {
-  position: absolute;
-  inline-size: var(--spacing-1);
-  block-size: var(--spacing-1);
-  clip-path: inset(50%);
-  overflow: hidden;
-}
-
-.counted {
-  display: inline-flex;
-  align-items: center;
-  gap: var(--spacing-4);
-  vertical-align: top;
-}
-.counted small {
-  color: var(--ui-secondary);
-}
diff --git a/apps/sim/platform/design-system/components/overflow-text/overflow-text.tsx b/apps/sim/platform/design-system/components/overflow-text/overflow-text.tsx
deleted file mode 100644
index 4b55867ed9d..00000000000
--- a/apps/sim/platform/design-system/components/overflow-text/overflow-text.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-'use client'
-
-import { type ReactNode, useEffect, useRef, useState } from 'react'
-import styles from '@/platform/design-system/components/overflow-text/overflow-text.module.css'
-import { Tooltip } from '@/platform/design-system/components/tooltip/tooltip'
-
-interface OverflowTextProps {
-  text: string
-  fullValue?: string
-  children?: ReactNode
-}
-
-export function OverflowText({ text, fullValue = text, children }: OverflowTextProps) {
-  const viewport = useRef<HTMLSpanElement>(null)
-  const content = useRef<HTMLSpanElement>(null)
-  const [clipped, setClipped] = useState(false)
-  const [insideControl, setInsideControl] = useState(false)
-
-  useEffect(() => {
-    const outer = viewport.current
-    const inner = content.current
-    if (!outer || !inner) return
-    setInsideControl(Boolean(outer.closest('button, a[href], [role=button], [role=tab]')))
-    const measure = () =>
-      setClipped(inner.getBoundingClientRect().width > outer.getBoundingClientRect().width)
-    const observer = new ResizeObserver(measure)
-    observer.observe(outer)
-    observer.observe(inner)
-    measure()
-    return () => observer.disconnect()
-  }, [])
-
-  const shortened = text !== fullValue
-  const showFullValue = clipped || shortened
-  return (
-    <span className={styles.overflowFrame}>
-      <Tooltip label={fullValue} enabled={showFullValue} visualOnly>
-        <span
-          ref={viewport}
-          className={styles.overflowText}
-          data-scroll-axis='horizontal'
-          data-edges={clipped ? 'end' : undefined}
-          tabIndex={showFullValue && !insideControl ? 0 : undefined}
-        >
-          <span
-            ref={content}
-            className={styles.overflowLabel}
-            data-type={children == null ? 'T059' : undefined}
-            aria-hidden={shortened || undefined}
-          >
-            {children ?? text}
-          </span>
-          {shortened && <span className={styles.accessibleLabel}>{fullValue}</span>}
-        </span>
-      </Tooltip>
-    </span>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/pagination/pagination.module.css b/apps/sim/platform/design-system/components/pagination/pagination.module.css
deleted file mode 100644
index 7235a666d7c..00000000000
--- a/apps/sim/platform/design-system/components/pagination/pagination.module.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.pagination {
-  display: flex;
-  align-items: center;
-  justify-content: end;
-  gap: var(--ui-row-gap);
-  min-inline-size: 0;
-}
-
-.position {
-  color: var(--ui-secondary);
-  font-variant-numeric: tabular-nums;
-}
diff --git a/apps/sim/platform/design-system/components/pagination/pagination.tsx b/apps/sim/platform/design-system/components/pagination/pagination.tsx
deleted file mode 100644
index 436542350e7..00000000000
--- a/apps/sim/platform/design-system/components/pagination/pagination.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-'use client'
-
-import { Button } from '@/platform/design-system/components/button/button'
-import styles from '@/platform/design-system/components/pagination/pagination.module.css'
-
-interface PaginationProps {
-  label: string
-  /** The current page, counting from 1. */
-  page: number
-  /** Leave out when the server only reports whether another page exists. */
-  pageCount?: number
-  hasNext?: boolean
-  disabled?: boolean
-  onPageChange: (page: number) => void
-}
-
-export function Pagination({
-  label,
-  page,
-  pageCount,
-  hasNext = pageCount !== undefined && page < pageCount,
-  disabled,
-  onPageChange,
-}: PaginationProps) {
-  return (
-    <nav className={styles.pagination} aria-label={label}>
-      <Button
-        variant='quiet'
-        size='compact'
-        disabled={disabled || page <= 1}
-        onClick={() => onPageChange(page - 1)}
-      >
-        Previous
-      </Button>
-      <span className={styles.position} data-type='T060' aria-live='polite'>
-        {pageCount === undefined ? `Page ${page}` : `Page ${page} of ${pageCount}`}
-      </span>
-      <Button
-        variant='quiet'
-        size='compact'
-        disabled={disabled || !hasNext}
-        onClick={() => onPageChange(page + 1)}
-      >
-        Next
-      </Button>
-    </nav>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/picker/calendar.module.css b/apps/sim/platform/design-system/components/picker/calendar.module.css
deleted file mode 100644
index b022bd51fa3..00000000000
--- a/apps/sim/platform/design-system/components/picker/calendar.module.css
+++ /dev/null
@@ -1,100 +0,0 @@
-.calendar {
-  display: grid;
-  gap: var(--spacing-4);
-  inline-size: max-content;
-  max-inline-size: 100%;
-}
-
-.header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--ui-row-gap);
-  color: var(--ui-ink);
-}
-
-.previous {
-  display: inline-flex;
-  transform: scaleX(-1);
-}
-
-.grid {
-  display: grid;
-}
-
-.week {
-  display: grid;
-  grid-template-columns: repeat(7, auto);
-}
-
-.weekday {
-  display: grid;
-  place-items: center;
-  block-size: var(--spacing-28);
-  color: var(--ui-secondary);
-}
-
-.day {
-  display: grid;
-  place-items: center;
-  inline-size: var(--spacing-32);
-  block-size: var(--spacing-32);
-  border-radius: var(--ui-control-radius);
-  color: var(--ui-ink);
-  font-variant-numeric: tabular-nums;
-  cursor: pointer;
-}
-
-.day[data-outside] {
-  color: var(--ui-secondary);
-}
-
-.day[aria-current="date"] {
-  color: var(--ui-strong);
-  font-weight: var(--font-weight-medium);
-}
-
-.day[data-in-range] {
-  background: var(--ui-selected);
-}
-
-.day:hover:not([aria-disabled="true"], [data-selected]),
-.day[data-active]:not([data-selected]) {
-  background: var(--ui-hover);
-}
-
-.day[data-selected] {
-  background: var(--control-primary-fill);
-  color: var(--control-on-solid);
-}
-
-.day[aria-disabled="true"] {
-  opacity: var(--opacity-disabled);
-  cursor: default;
-}
-
-.times {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: var(--ui-row-gap);
-}
-
-.footer {
-  display: flex;
-  align-items: center;
-  justify-content: end;
-  gap: var(--ui-action-gap);
-}
-
-.panel {
-  display: grid;
-  gap: var(--spacing-8);
-  padding: var(--spacing-4);
-}
-
-@media (pointer: coarse) {
-  .day {
-    inline-size: var(--spacing-40);
-    block-size: var(--spacing-40);
-  }
-}
diff --git a/apps/sim/platform/design-system/components/picker/calendar.tsx b/apps/sim/platform/design-system/components/picker/calendar.tsx
deleted file mode 100644
index e1814cabeed..00000000000
--- a/apps/sim/platform/design-system/components/picker/calendar.tsx
+++ /dev/null
@@ -1,194 +0,0 @@
-'use client'
-
-import { type KeyboardEvent, type RefObject, useState } from 'react'
-import { flushSync } from 'react-dom'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import styles from '@/platform/design-system/components/picker/calendar.module.css'
-
-const MONTHS = [
-  'January',
-  'February',
-  'March',
-  'April',
-  'May',
-  'June',
-  'July',
-  'August',
-  'September',
-  'October',
-  'November',
-  'December',
-] as const
-const WEEKDAYS = [
-  ['Su', 'Sunday'],
-  ['Mo', 'Monday'],
-  ['Tu', 'Tuesday'],
-  ['We', 'Wednesday'],
-  ['Th', 'Thursday'],
-  ['Fr', 'Friday'],
-  ['Sa', 'Saturday'],
-] as const
-const WEEKS_SHOWN = 6
-
-/** Calendar days stay ISO strings, computed in UTC so no viewer's zone can shift them. */
-function toDate(day: string) {
-  return new Date(`${day}T00:00:00Z`)
-}
-
-function toDay(date: Date) {
-  return date.toISOString().slice(0, 10)
-}
-
-function addDays(day: string, amount: number) {
-  const date = toDate(day)
-  date.setUTCDate(date.getUTCDate() + amount)
-  return toDay(date)
-}
-
-function addMonths(day: string, amount: number) {
-  const date = toDate(day)
-  const target = new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth() + amount, 1))
-  const lastDay = new Date(Date.UTC(target.getUTCFullYear(), target.getUTCMonth() + 1, 0))
-  target.setUTCDate(Math.min(date.getUTCDate(), lastDay.getUTCDate()))
-  return toDay(target)
-}
-
-function viewerToday() {
-  const now = new Date()
-  return toDay(new Date(Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())))
-}
-
-/** `Nov 4, 2026`, for an ISO calendar day. */
-export function formatDay(day: string) {
-  const date = toDate(day)
-  const month = MONTHS[date.getUTCMonth()].slice(0, 3)
-  return `${month} ${date.getUTCDate()}, ${date.getUTCFullYear()}`
-}
-
-interface CalendarProps {
-  label: string
-  start?: string
-  end?: string
-  min?: string
-  max?: string
-  /** Receives the day that should take focus when the popup opens. */
-  focusTarget: RefObject<HTMLButtonElement | null>
-  onSelect: (day: string) => void
-}
-
-export function Calendar({ label, start, end, min, max, focusTarget, onSelect }: CalendarProps) {
-  const today = viewerToday()
-  const clamp = (day: string) => {
-    if (min && day < min) return min
-    if (max && day > max) return max
-    return day
-  }
-  const [cursor, setCursor] = useState(() => clamp(start ?? today))
-  const [navigating, setNavigating] = useState(false)
-
-  const cursorDate = toDate(cursor)
-  const firstOfMonth = addDays(cursor, 1 - cursorDate.getUTCDate())
-  const gridStart = addDays(firstOfMonth, -toDate(firstOfMonth).getUTCDay())
-  const weeks = Array.from({ length: WEEKS_SHOWN }, (_, week) =>
-    Array.from({ length: 7 }, (_, weekday) => addDays(gridStart, week * 7 + weekday))
-  )
-  const monthTitle = `${MONTHS[cursorDate.getUTCMonth()]} ${cursorDate.getUTCFullYear()}`
-
-  function moveCursor(day: string) {
-    flushSync(() => {
-      setNavigating(true)
-      setCursor(clamp(day))
-    })
-    focusTarget.current?.focus()
-  }
-
-  function handleKeyDown(event: KeyboardEvent) {
-    const weekday = cursorDate.getUTCDay()
-    const target = {
-      ArrowLeft: addDays(cursor, -1),
-      ArrowRight: addDays(cursor, 1),
-      ArrowUp: addDays(cursor, -7),
-      ArrowDown: addDays(cursor, 7),
-      Home: addDays(cursor, -weekday),
-      End: addDays(cursor, 6 - weekday),
-      PageUp: addMonths(cursor, -1),
-      PageDown: addMonths(cursor, 1),
-    }[event.key]
-    if (!target) return
-    event.preventDefault()
-    moveCursor(target)
-  }
-
-  return (
-    <div className={styles.calendar}>
-      <div className={styles.header}>
-        <span className={styles.previous}>
-          <IconButton
-            label='Previous month'
-            icon='I032'
-            onClick={() => setCursor(clamp(addMonths(cursor, -1)))}
-          />
-        </span>
-        <span aria-live='polite' data-type='T059'>
-          {monthTitle}
-        </span>
-        <IconButton
-          label='Next month'
-          icon='I032'
-          onClick={() => setCursor(clamp(addMonths(cursor, 1)))}
-        />
-      </div>
-      <div className={styles.grid} role='grid' aria-label={`${label}, ${monthTitle}`}>
-        <div className={styles.week} role='row'>
-          {WEEKDAYS.map(([short, full]) => (
-            <span
-              key={full}
-              className={styles.weekday}
-              role='columnheader'
-              aria-label={full}
-              data-type='T052'
-            >
-              {short}
-            </span>
-          ))}
-        </div>
-        {weeks.map((week) => (
-          <div key={week[0]} className={styles.week} role='row'>
-            {week.map((day) => {
-              const unavailable = Boolean((min && day < min) || (max && day > max))
-              const selected = day === start || day === end
-              return (
-                <span key={day} role='gridcell' aria-selected={selected}>
-                  <button
-                    ref={day === cursor ? focusTarget : undefined}
-                    type='button'
-                    className={styles.day}
-                    tabIndex={day === cursor ? 0 : -1}
-                    aria-label={formatDay(day)}
-                    aria-current={day === today ? 'date' : undefined}
-                    aria-disabled={unavailable || undefined}
-                    data-selected={selected || undefined}
-                    data-in-range={(start && end && day > start && day < end) || undefined}
-                    data-outside={
-                      toDate(day).getUTCMonth() !== cursorDate.getUTCMonth() || undefined
-                    }
-                    data-active={(navigating && day === cursor) || undefined}
-                    data-type='T060'
-                    onClick={() => {
-                      if (unavailable) return
-                      setCursor(day)
-                      onSelect(day)
-                    }}
-                    onKeyDown={handleKeyDown}
-                  >
-                    {toDate(day).getUTCDate()}
-                  </button>
-                </span>
-              )
-            })}
-          </div>
-        ))}
-      </div>
-    </div>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/picker/date-picker.tsx b/apps/sim/platform/design-system/components/picker/date-picker.tsx
deleted file mode 100644
index 0eb9235bbed..00000000000
--- a/apps/sim/platform/design-system/components/picker/date-picker.tsx
+++ /dev/null
@@ -1,337 +0,0 @@
-'use client'
-
-import { type ReactNode, type RefObject, useId, useRef, useState } from 'react'
-import { Popover } from '@base-ui/react/popover'
-import { Button } from '@/platform/design-system/components/button/button'
-import { FieldFrame, fieldDescription } from '@/platform/design-system/components/field/fields'
-import { Input } from '@/platform/design-system/components/field/inputs'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import popup from '@/platform/design-system/components/menu/popup.shared.module.css'
-import { usePopoverContainer } from '@/platform/design-system/components/menu/use-popover-container'
-import { Calendar, formatDay } from '@/platform/design-system/components/picker/calendar'
-import styles from '@/platform/design-system/components/picker/calendar.module.css'
-import picker from '@/platform/design-system/components/picker/picker.module.css'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-interface DatePopoverProps {
-  label: string
-  labelHidden?: boolean
-  text: string
-  empty: boolean
-  optional?: boolean
-  disabled?: boolean
-  error?: string
-  hint?: string
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  focusTarget: RefObject<HTMLButtonElement | null>
-  children: ReactNode
-}
-
-function DatePopover({
-  label,
-  labelHidden,
-  text,
-  empty,
-  optional,
-  disabled,
-  error,
-  hint,
-  open,
-  onOpenChange,
-  focusTarget,
-  children,
-}: DatePopoverProps) {
-  const id = useId()
-  const { trigger, container } = usePopoverContainer()
-  const valueEdges = useScrollEdges<HTMLSpanElement>('horizontal')
-  return (
-    <FieldFrame
-      id={id}
-      label={label}
-      labelHidden={labelHidden}
-      optional={optional}
-      error={error}
-      hint={hint}
-    >
-      <Popover.Root open={open} onOpenChange={onOpenChange} modal={false}>
-        <Popover.Trigger
-          id={id}
-          ref={trigger}
-          disabled={disabled}
-          aria-label={`${label}: ${text}`}
-          aria-invalid={error ? true : undefined}
-          aria-describedby={fieldDescription(id, error, hint)}
-          className={picker.trigger}
-          data-empty={empty || undefined}
-          data-type='T043'
-        >
-          <span ref={valueEdges} className={picker.value}>
-            {text}
-          </span>
-          <Icon name='I051' />
-        </Popover.Trigger>
-        {container && (
-          <Popover.Portal container={container}>
-            <Popover.Positioner
-              className={popup.positioner}
-              align='start'
-              sideOffset={8}
-              collisionPadding={8}
-              positionMethod='fixed'
-            >
-              <Popover.Popup
-                className={popup.panel}
-                data-presentation='menu'
-                data-material='floating'
-                data-elevation='menu'
-                aria-label={label}
-                initialFocus={focusTarget}
-              >
-                <div className={styles.panel}>{children}</div>
-              </Popover.Popup>
-            </Popover.Positioner>
-          </Popover.Portal>
-        )}
-      </Popover.Root>
-    </FieldFrame>
-  )
-}
-
-interface DatePickerProps {
-  label: string
-  labelHidden?: boolean
-  /** Controlled ISO calendar day (`YYYY-MM-DD`), where `null` holds nothing. */
-  value?: string | null
-  defaultValue?: string
-  onValueChange?: (value: string | null) => void
-  placeholder?: string
-  /** Earliest and latest selectable ISO calendar days. */
-  min?: string
-  max?: string
-  /** Offer a way back to no date. */
-  clearable?: boolean
-  name?: string
-  optional?: boolean
-  disabled?: boolean
-  error?: string
-  hint?: string
-}
-
-export function DatePicker({
-  label,
-  labelHidden,
-  value,
-  defaultValue,
-  onValueChange,
-  placeholder = 'Select date',
-  min,
-  max,
-  clearable,
-  name,
-  optional,
-  disabled,
-  error,
-  hint,
-}: DatePickerProps) {
-  const focusTarget = useRef<HTMLButtonElement>(null)
-  const [open, setOpen] = useState(false)
-  const [local, setLocal] = useState<string | null>(defaultValue ?? null)
-  const day = value === undefined ? local : value
-
-  function commit(next: string | null) {
-    setLocal(next)
-    onValueChange?.(next)
-    setOpen(false)
-  }
-
-  return (
-    <>
-      <DatePopover
-        label={label}
-        labelHidden={labelHidden}
-        text={day ? formatDay(day) : placeholder}
-        empty={!day}
-        optional={optional}
-        disabled={disabled}
-        error={error}
-        hint={hint}
-        open={open}
-        onOpenChange={setOpen}
-        focusTarget={focusTarget}
-      >
-        <Calendar
-          label={label}
-          start={day ?? undefined}
-          min={min}
-          max={max}
-          focusTarget={focusTarget}
-          onSelect={commit}
-        />
-        {clearable && day && (
-          <div className={styles.footer}>
-            <Button variant='quiet' size='compact' onClick={() => commit(null)}>
-              Clear
-            </Button>
-          </div>
-        )}
-      </DatePopover>
-      {name && <input type='hidden' name={name} value={day ?? ''} />}
-    </>
-  )
-}
-
-interface DateRange {
-  start: string
-  end: string
-}
-
-interface DateRangePickerProps {
-  label: string
-  labelHidden?: boolean
-  /** `YYYY-MM-DD` days, or `YYYY-MM-DDTHH:mm` local date-times with `withTime`. */
-  value: DateRange | null
-  onValueChange: (value: DateRange | null) => void
-  placeholder?: string
-  min?: string
-  max?: string
-  withTime?: boolean
-  clearable?: boolean
-  disabled?: boolean
-  error?: string
-  hint?: string
-}
-
-const DAY_START = '00:00'
-const DAY_END = '23:59'
-
-interface StagedDateTime {
-  day?: string
-  time: string
-}
-
-function splitDateTime(value: string | undefined, fallbackTime: string): StagedDateTime {
-  const [day, time] = value?.split('T') ?? []
-  return { day, time: time ?? fallbackTime }
-}
-
-function stagedRange(value: DateRange | null) {
-  return {
-    start: splitDateTime(value?.start, DAY_START),
-    end: splitDateTime(value?.end, DAY_END),
-  }
-}
-
-function rangeText({ start, end }: DateRange) {
-  const describe = (value: string) => {
-    const [day, time] = value.split('T')
-    return time ? `${formatDay(day)} ${time}` : formatDay(day)
-  }
-  return `${describe(start)} – ${describe(end)}`
-}
-
-/** Days are staged in the popup and committed together by Apply; Escape discards them. */
-export function DateRangePicker({
-  label,
-  labelHidden,
-  value,
-  onValueChange,
-  placeholder = 'Select date range',
-  min,
-  max,
-  withTime,
-  clearable,
-  disabled,
-  error,
-  hint,
-}: DateRangePickerProps) {
-  const focusTarget = useRef<HTMLButtonElement>(null)
-  const [open, setOpen] = useState(false)
-  const [draft, setDraft] = useState(() => stagedRange(value))
-
-  function changeOpen(next: boolean) {
-    if (next) setDraft(stagedRange(value))
-    setOpen(next)
-  }
-
-  function pick(day: string) {
-    setDraft(({ start, end }) => {
-      if (!start.day || end.day)
-        return { start: { ...start, day }, end: { ...end, day: undefined } }
-      return day < start.day
-        ? { start: { ...start, day }, end: { ...end, day: start.day } }
-        : { start, end: { ...end, day } }
-    })
-  }
-
-  function commit(next: DateRange | null) {
-    onValueChange(next)
-    setOpen(false)
-  }
-
-  function apply() {
-    const { start, end } = draft
-    if (!start.day || !end.day) return
-    commit(
-      withTime
-        ? { start: `${start.day}T${start.time}`, end: `${end.day}T${end.time}` }
-        : { start: start.day, end: end.day }
-    )
-  }
-
-  return (
-    <DatePopover
-      label={label}
-      labelHidden={labelHidden}
-      text={value ? rangeText(value) : placeholder}
-      empty={!value}
-      disabled={disabled}
-      error={error}
-      hint={hint}
-      open={open}
-      onOpenChange={changeOpen}
-      focusTarget={focusTarget}
-    >
-      <Calendar
-        label={label}
-        start={draft.start.day}
-        end={draft.end.day}
-        min={min}
-        max={max}
-        focusTarget={focusTarget}
-        onSelect={pick}
-      />
-      {withTime && (
-        <div className={styles.times}>
-          <Input
-            type='time'
-            label='Start time'
-            value={draft.start.time}
-            onChange={(time) => setDraft((d) => ({ ...d, start: { ...d.start, time } }))}
-          />
-          <Input
-            type='time'
-            label='End time'
-            value={draft.end.time}
-            onChange={(time) => setDraft((d) => ({ ...d, end: { ...d.end, time } }))}
-          />
-        </div>
-      )}
-      <div className={styles.footer}>
-        {clearable && value && (
-          <Button variant='quiet' size='compact' onClick={() => commit(null)}>
-            Clear
-          </Button>
-        )}
-        <Button
-          variant='primary'
-          size='compact'
-          disabled={!draft.start.day || !draft.end.day}
-          onClick={apply}
-        >
-          Apply
-        </Button>
-      </div>
-    </DatePopover>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/picker/multi-select.tsx b/apps/sim/platform/design-system/components/picker/multi-select.tsx
deleted file mode 100644
index 3ccd780b471..00000000000
--- a/apps/sim/platform/design-system/components/picker/multi-select.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-'use client'
-
-import { useId, useMemo } from 'react'
-import { Combobox } from '@base-ui/react/combobox'
-import { FieldFrame, fieldDescription } from '@/platform/design-system/components/field/fields'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import { usePopoverContainer } from '@/platform/design-system/components/menu/use-popover-container'
-import picker from '@/platform/design-system/components/picker/picker.module.css'
-import {
-  optionKeys,
-  type PickerOption,
-  type PickerServerSearch,
-  SearchPopup,
-} from '@/platform/design-system/components/picker/search-popup'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-interface MultiSelectProps {
-  label: string
-  labelHidden?: boolean
-  options: readonly PickerOption[]
-  value: readonly string[]
-  onValueChange: (value: string[]) => void
-  /** Trigger text for selected values the current `options` may not contain. */
-  selectedLabels?: Readonly<Record<string, string>>
-  placeholder?: string
-  searchLabel: string
-  search?: PickerServerSearch
-  name?: string
-  disabled?: boolean
-  error?: string
-  hint?: string
-}
-
-export function MultiSelect({
-  label,
-  labelHidden,
-  options,
-  value,
-  onValueChange,
-  selectedLabels,
-  placeholder = 'None selected',
-  searchLabel,
-  search,
-  name,
-  disabled,
-  error,
-  hint,
-}: MultiSelectProps) {
-  const id = useId()
-  const { trigger, container } = usePopoverContainer()
-  const valueEdges = useScrollEdges<HTMLSpanElement>('horizontal')
-  const items = useMemo(() => Combobox.createItems(options, optionKeys), [options])
-  const [only] = value
-  const onlyOption = options.find((option) => optionKeys.getValue(option) === only)
-  const summary =
-    value.length === 0
-      ? placeholder
-      : value.length > 1
-        ? `${value.length} selected`
-        : (selectedLabels?.[only] ?? (onlyOption ? optionKeys.getLabel(onlyOption) : only))
-  return (
-    <FieldFrame id={id} label={label} labelHidden={labelHidden} error={error} hint={hint}>
-      <Combobox.Root
-        multiple
-        items={items}
-        value={[...value]}
-        name={name}
-        filter={search ? null : undefined}
-        inputValue={search?.query}
-        onInputValueChange={search?.onQueryChange}
-        onValueChange={onValueChange}
-        autoHighlight
-        disabled={disabled}
-        modal={false}
-      >
-        <Combobox.Trigger
-          id={id}
-          ref={trigger}
-          aria-label={`${label}: ${summary}`}
-          aria-invalid={error ? true : undefined}
-          aria-describedby={fieldDescription(id, error, hint)}
-          className={picker.trigger}
-          data-empty={value.length === 0 ? true : undefined}
-          data-type='T043'
-        >
-          <span ref={valueEdges} className={picker.value}>
-            {summary}
-          </span>
-          <Icon name='I051' />
-        </Combobox.Trigger>
-        {container && (
-          <SearchPopup
-            label={label}
-            searchLabel={searchLabel}
-            container={container}
-            search={search}
-          />
-        )}
-      </Combobox.Root>
-    </FieldFrame>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/picker/picker.module.css b/apps/sim/platform/design-system/components/picker/picker.module.css
deleted file mode 100644
index 222867310a0..00000000000
--- a/apps/sim/platform/design-system/components/picker/picker.module.css
+++ /dev/null
@@ -1,143 +0,0 @@
-.trigger {
-  display: flex;
-  align-items: center;
-  inline-size: 100%;
-  min-inline-size: 0;
-  min-block-size: var(--spacing-app-chip);
-  padding-inline: var(--spacing-8);
-  gap: var(--spacing-field-label-gap);
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-control);
-  background: var(--ui-reading);
-  color: var(--ui-ink);
-  text-align: start;
-  cursor: pointer;
-}
-
-.trigger:hover:enabled {
-  border-color: var(--control-hover-border);
-}
-
-.trigger[aria-invalid="true"] {
-  border-color: var(--control-danger);
-}
-
-.trigger:disabled {
-  opacity: var(--opacity-disabled);
-  cursor: default;
-}
-
-.value {
-  flex: 1;
-  min-inline-size: 0;
-  overflow: hidden;
-  white-space: nowrap;
-}
-
-.empty {
-  color: var(--ui-secondary);
-}
-
-.empty:not(:empty) {
-  display: block;
-  padding: var(--spacing-8);
-}
-
-.trigger[data-variant="quiet"] {
-  min-block-size: var(--spacing-32);
-  padding-inline: var(--spacing-10);
-  border-color: var(--ui-divider);
-  background: var(--settings-picker-surface);
-}
-
-.trigger[data-variant="text"] {
-  inline-size: auto;
-  min-block-size: var(--spacing-app-control-sm);
-  padding-inline: var(--spacing-4);
-  border-color: transparent;
-  background: transparent;
-  color: var(--ui-secondary);
-}
-
-.trigger[data-variant="text"]:hover:enabled {
-  border-color: transparent;
-  background: var(--ui-hover);
-}
-
-.detachedPopup {
-  inline-size: min(calc(var(--spacing-320) + var(--spacing-80)), var(--available-width));
-}
-
-.searchField {
-  display: flex;
-  align-items: center;
-  min-inline-size: 0;
-  min-block-size: var(--spacing-app-chip);
-  padding-inline: var(--spacing-7);
-  gap: var(--spacing-6);
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-control);
-  background: var(--ui-reading);
-  color: var(--ui-secondary);
-}
-
-.searchField input {
-  flex: 1;
-  min-inline-size: 0;
-  background: transparent;
-  color: var(--ui-ink);
-  outline: none;
-}
-
-.searchField input::placeholder {
-  color: var(--ui-secondary);
-}
-
-.results {
-  max-block-size: var(--spacing-320);
-}
-
-.result {
-  align-items: flex-start;
-}
-
-.resultCopy {
-  display: grid;
-  flex: 1;
-  min-inline-size: 0;
-  gap: var(--ui-stack-gap);
-  overflow-wrap: anywhere;
-}
-
-.resultDetail,
-.hints {
-  color: var(--ui-secondary);
-}
-
-.resultEnter {
-  flex: none;
-  color: var(--ui-secondary);
-  visibility: hidden;
-}
-
-.result[data-highlighted] .resultEnter {
-  visibility: visible;
-}
-
-.hints {
-  display: flex;
-  justify-content: space-between;
-  gap: var(--spacing-12);
-  padding: var(--spacing-8) var(--ui-row-inset) var(--spacing-4);
-}
-
-@media (pointer: coarse) {
-  .hints,
-  .resultEnter {
-    display: none;
-  }
-}
-
-.trigger[data-empty] .value {
-  color: var(--ui-secondary);
-}
diff --git a/apps/sim/platform/design-system/components/picker/search-combobox.tsx b/apps/sim/platform/design-system/components/picker/search-combobox.tsx
deleted file mode 100644
index d9d239e6d2d..00000000000
--- a/apps/sim/platform/design-system/components/picker/search-combobox.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-'use client'
-
-import { type ReactNode, useMemo } from 'react'
-import { Combobox } from '@base-ui/react/combobox'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import popup from '@/platform/design-system/components/menu/popup.shared.module.css'
-import { usePopoverContainer } from '@/platform/design-system/components/menu/use-popover-container'
-import picker from '@/platform/design-system/components/picker/picker.module.css'
-import type { PickerServerSearch } from '@/platform/design-system/components/picker/search-popup'
-import { LoadMoreFooter } from '@/platform/design-system/components/scroll-area/load-more-footer'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-interface SearchComboboxOption {
-  value: string
-  label: string
-  /** Lines under the label that tell results with the same label apart. */
-  details?: readonly string[]
-  leading?: ReactNode
-}
-
-const OPTION_KEYS = {
-  getValue: (option: SearchComboboxOption) => option.value,
-  getLabel: (option: SearchComboboxOption) => option.label,
-}
-
-interface SearchComboboxProps {
-  label: string
-  placeholder: string
-  /** Names the results above the list. */
-  heading: string
-  emptyLabel: string
-  /** What Enter does to the highlighted result, in the keyboard hints. */
-  enterHint: string
-  options: readonly SearchComboboxOption[]
-  search: PickerServerSearch
-  onSelect: (value: string) => void
-  /** Lets a caller read its options only once the viewer asks for them. */
-  onOpenChange?: (open: boolean) => void
-}
-
-/** A search field that stays on the page, with its server results in a popup under it. */
-export function SearchCombobox({
-  label,
-  placeholder,
-  heading,
-  emptyLabel,
-  enterHint,
-  options,
-  search,
-  onSelect,
-  onOpenChange,
-}: SearchComboboxProps) {
-  const { trigger, container, opener } = usePopoverContainer()
-  const scrollRef = useScrollEdges<HTMLDivElement>()
-  const items = useMemo(() => Combobox.createItems(options, OPTION_KEYS), [options])
-  return (
-    <Combobox.Root
-      items={items}
-      value={null}
-      filter={null}
-      inputValue={search.query}
-      onInputValueChange={(query, details) => {
-        if (details.reason !== 'item-press') search.onQueryChange(query)
-      }}
-      onOpenChange={onOpenChange}
-      onValueChange={(next) => {
-        if (!next) return
-        search.onQueryChange('')
-        onSelect(next)
-      }}
-      autoHighlight
-      modal={false}
-    >
-      <div ref={trigger} className={picker.searchField}>
-        <Icon name='I089' />
-        <Combobox.Input aria-label={label} placeholder={placeholder} data-type='T043' />
-      </div>
-      {container && (
-        <Combobox.Portal container={container}>
-          <Combobox.Positioner
-            anchor={opener}
-            align='start'
-            positionMethod='fixed'
-            sideOffset={8}
-            className={`${popup.positioner} ${picker.detachedPopup}`}
-          >
-            <Combobox.Popup className={popup.popup} data-material='floating' data-elevation='menu'>
-              <span className={popup.heading} data-type='T050'>
-                {heading}
-              </span>
-              <Combobox.Empty className={picker.empty} data-type='T060'>
-                {search.loading || search.error ? null : emptyLabel}
-              </Combobox.Empty>
-              <Combobox.List
-                ref={scrollRef}
-                aria-label={label}
-                className={`${popup.list} ${picker.results}`}
-              >
-                <Combobox.Collection>
-                  {(option: SearchComboboxOption) => (
-                    <Combobox.Item
-                      key={option.value}
-                      value={option.value}
-                      className={`${popup.item} ${picker.result}`}
-                    >
-                      {option.leading}
-                      <span className={picker.resultCopy}>
-                        <span data-type='T042'>{option.label}</span>
-                        {option.details?.map((detail) => (
-                          <span key={detail} className={picker.resultDetail} data-type='T050'>
-                            {detail}
-                          </span>
-                        ))}
-                      </span>
-                      <span className={picker.resultEnter} aria-hidden='true' data-type='T050'>
-                        ↵
-                      </span>
-                    </Combobox.Item>
-                  )}
-                </Combobox.Collection>
-                <LoadMoreFooter state={search} />
-              </Combobox.List>
-              <div className={picker.hints} aria-hidden='true' data-type='T050'>
-                <span>↑↓ Navigate</span>
-                <span>{enterHint}</span>
-                <span>Esc to close</span>
-              </div>
-            </Combobox.Popup>
-          </Combobox.Positioner>
-        </Combobox.Portal>
-      )}
-    </Combobox.Root>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/picker/search-popup.tsx b/apps/sim/platform/design-system/components/picker/search-popup.tsx
deleted file mode 100644
index 4c3bf6b2d9e..00000000000
--- a/apps/sim/platform/design-system/components/picker/search-popup.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-'use client'
-
-import { type ReactNode, useRef } from 'react'
-import { Combobox } from '@base-ui/react/combobox'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import popup from '@/platform/design-system/components/menu/popup.shared.module.css'
-import picker from '@/platform/design-system/components/picker/picker.module.css'
-import { LoadMoreFooter } from '@/platform/design-system/components/scroll-area/load-more-footer'
-import type { LoadMoreState } from '@/platform/design-system/components/scroll-area/use-load-more'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-import { MenuSearchField } from '@/platform/design-system/components/search-field/menu-search-field'
-
-export type PickerOption = string | { value: string; label: string }
-
-/** Hand searching to the caller: `options` becomes the current server result, unfiltered. */
-export interface PickerServerSearch extends LoadMoreState {
-  query: string
-  onQueryChange: (query: string) => void
-}
-
-export const optionKeys = {
-  getValue: (option: PickerOption) => (typeof option === 'string' ? option : option.value),
-  getLabel: (option: PickerOption) => (typeof option === 'string' ? option : option.label),
-}
-
-interface SearchPopupProps {
-  label: string
-  searchLabel: string
-  container: HTMLElement
-  search?: PickerServerSearch
-  /** Size the popup for its rows instead of matching its trigger's width. */
-  detached?: boolean
-  children?: ReactNode
-}
-
-/** The floating part of a searchable picker. Must sit inside a `Combobox.Root`. */
-export function SearchPopup({
-  label,
-  searchLabel,
-  container,
-  search,
-  detached,
-  children,
-}: SearchPopupProps) {
-  const input = useRef<HTMLInputElement>(null)
-  const queryEdges = useScrollEdges('horizontal', { viewport: input })
-  const scrollRef = useScrollEdges<HTMLDivElement>()
-  return (
-    <Combobox.Portal container={container}>
-      <Combobox.Positioner
-        align='start'
-        positionMethod='fixed'
-        sideOffset={8}
-        className={detached ? `${popup.positioner} ${picker.detachedPopup}` : popup.anchorWidth}
-      >
-        <Combobox.Popup
-          className={popup.popup}
-          data-material='floating'
-          data-elevation='menu'
-          aria-label={label}
-          initialFocus={input}
-        >
-          <MenuSearchField
-            input={
-              <Combobox.Input ref={queryEdges} aria-label={searchLabel} placeholder={searchLabel} />
-            }
-          />
-          <Combobox.Empty className={picker.empty} data-type='T060'>
-            {search?.loading || search?.error ? null : 'No matches'}
-          </Combobox.Empty>
-          <Combobox.List ref={scrollRef} aria-label={label} className={popup.list}>
-            <Combobox.Collection>
-              {(option: PickerOption) => (
-                <Combobox.Item
-                  key={optionKeys.getValue(option)}
-                  value={optionKeys.getValue(option)}
-                  className={popup.item}
-                  data-type='T060'
-                >
-                  <span className={popup.label}>{optionKeys.getLabel(option)}</span>
-                  <Combobox.ItemIndicator className={popup.indicator}>
-                    <Icon name='I072' />
-                  </Combobox.ItemIndicator>
-                </Combobox.Item>
-              )}
-            </Combobox.Collection>
-            {search && <LoadMoreFooter state={search} />}
-          </Combobox.List>
-          {children}
-        </Combobox.Popup>
-      </Combobox.Positioner>
-    </Combobox.Portal>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/picker/searchable-select.tsx b/apps/sim/platform/design-system/components/picker/searchable-select.tsx
deleted file mode 100644
index 97584758f90..00000000000
--- a/apps/sim/platform/design-system/components/picker/searchable-select.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-'use client'
-
-import { useId, useMemo, useRef } from 'react'
-import { Combobox } from '@base-ui/react/combobox'
-import { FieldFrame, fieldDescription } from '@/platform/design-system/components/field/fields'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import popup from '@/platform/design-system/components/menu/popup.shared.module.css'
-import picker from '@/platform/design-system/components/picker/picker.module.css'
-import {
-  optionKeys,
-  type PickerOption,
-  type PickerServerSearch,
-  SearchPopup,
-} from '@/platform/design-system/components/picker/search-popup'
-import { usePickerValue } from '@/platform/design-system/components/picker/use-picker-value'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-interface SearchableSelectProps {
-  label: string
-  labelHidden?: boolean
-  /** `text` sits in a line of copy, such as a breadcrumb, with a popup wider than its label. */
-  variant?: 'field' | 'text'
-  options: readonly PickerOption[]
-  defaultValue?: string
-  /** Controlled selection, where `null` holds nothing. It may be absent from the current `options`. */
-  value?: string | null
-  onValueChange?: (value: string | null) => void
-  /** The trigger's text for a controlled `value` the current `options` may not contain. */
-  selectedLabel?: string
-  placeholder?: string
-  searchLabel: string
-  /** Needs a controlled `value`: a selection may leave the current `options`. */
-  search?: PickerServerSearch
-  /** Lets a caller read its options only once the viewer asks for them. */
-  onOpenChange?: (open: boolean) => void
-  name?: string
-  disabled?: boolean
-  error?: string
-  hint?: string
-  createLabel?: string
-  onCreate?: () => void
-}
-
-export function SearchableSelect({
-  label,
-  labelHidden,
-  variant = 'field',
-  options,
-  defaultValue,
-  value,
-  onValueChange,
-  selectedLabel,
-  placeholder,
-  searchLabel,
-  search,
-  onOpenChange,
-  name,
-  disabled,
-  error,
-  hint,
-  createLabel,
-  onCreate,
-}: SearchableSelectProps) {
-  const id = useId()
-  const actions = useRef<Combobox.Root.Actions>(null)
-  const valueEdges = useScrollEdges<HTMLSpanElement>('horizontal')
-  const selection = usePickerValue(options, optionKeys.getValue, defaultValue)
-  const items = useMemo(() => Combobox.createItems(options, optionKeys), [options])
-  const current = value === undefined ? selection.value : value
-  return (
-    <FieldFrame id={id} label={label} labelHidden={labelHidden} error={error} hint={hint}>
-      <Combobox.Root
-        items={items}
-        value={current}
-        name={name}
-        filter={search ? null : undefined}
-        inputValue={search?.query}
-        onInputValueChange={search?.onQueryChange}
-        onOpenChange={onOpenChange}
-        onValueChange={(next) => {
-          selection.setValue(next)
-          onValueChange?.(next)
-        }}
-        autoHighlight
-        actionsRef={actions}
-        disabled={disabled || (options.length === 0 && !createLabel && !search)}
-        modal={false}
-      >
-        <Combobox.Trigger
-          id={id}
-          ref={selection.trigger}
-          aria-label={label}
-          aria-invalid={error ? true : undefined}
-          aria-describedby={fieldDescription(id, error, hint)}
-          className={picker.trigger}
-          data-variant={variant === 'text' ? 'text' : undefined}
-          data-empty={current === null && placeholder ? true : undefined}
-          data-type='T043'
-        >
-          <span ref={valueEdges} className={picker.value}>
-            {current === null && placeholder ? placeholder : (selectedLabel ?? <Combobox.Value />)}
-          </span>
-          <Icon name='I051' />
-        </Combobox.Trigger>
-        {selection.container && (
-          <SearchPopup
-            label={label}
-            searchLabel={searchLabel}
-            container={selection.container}
-            search={search}
-            detached={variant === 'text'}
-          >
-            {createLabel && (
-              <>
-                <Combobox.Separator className={popup.separator} />
-                <button
-                  type='button'
-                  className={popup.item}
-                  data-type='T060'
-                  onClick={() => {
-                    actions.current?.close()
-                    onCreate?.()
-                  }}
-                >
-                  <Icon name='I074' />
-                  {createLabel}
-                </button>
-              </>
-            )}
-          </SearchPopup>
-        )}
-      </Combobox.Root>
-    </FieldFrame>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/picker/select.tsx b/apps/sim/platform/design-system/components/picker/select.tsx
deleted file mode 100644
index 875a6a2eafb..00000000000
--- a/apps/sim/platform/design-system/components/picker/select.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-'use client'
-
-import { Select as BaseSelect } from '@base-ui/react/select'
-import type { ControlProps } from '@/platform/design-system/components/field/inputs'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import popup from '@/platform/design-system/components/menu/popup.shared.module.css'
-import picker from '@/platform/design-system/components/picker/picker.module.css'
-import { usePickerValue } from '@/platform/design-system/components/picker/use-picker-value'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-const optionValue = (option: { value: string }) => option.value
-
-interface SelectProps extends ControlProps {
-  variant?: 'quiet'
-  value?: string
-  onValueChange?: (value: string) => void
-  options: ReadonlyArray<{ value: string; label: string }>
-}
-
-export function Select({
-  id,
-  label,
-  name,
-  options,
-  variant,
-  value,
-  onValueChange,
-  defaultValue,
-  disabled,
-  invalid,
-  describedBy,
-}: SelectProps) {
-  const valueEdges = useScrollEdges<HTMLSpanElement>('horizontal')
-  const scrollRef = useScrollEdges<HTMLDivElement>()
-  const selection = usePickerValue(options, optionValue, defaultValue)
-  return (
-    <BaseSelect.Root
-      items={options}
-      name={name}
-      value={value ?? selection.value}
-      onValueChange={(value) => {
-        selection.setValue(value)
-        if (value !== null) onValueChange?.(value)
-      }}
-      disabled={disabled || options.length === 0}
-      modal={false}
-    >
-      <BaseSelect.Trigger
-        id={id}
-        ref={selection.trigger}
-        aria-label={label}
-        aria-invalid={invalid || undefined}
-        aria-describedby={describedBy}
-        className={picker.trigger}
-        data-variant={variant}
-        data-type={variant === 'quiet' ? 'T057' : 'T043'}
-      >
-        <BaseSelect.Value ref={valueEdges} className={picker.value} />
-        <Icon name='I051' />
-      </BaseSelect.Trigger>
-      {selection.container && (
-        <BaseSelect.Portal container={selection.container}>
-          <BaseSelect.Positioner
-            align='start'
-            sideOffset={8}
-            alignItemWithTrigger={false}
-            positionMethod='fixed'
-            className={popup.anchorWidth}
-          >
-            <BaseSelect.Popup
-              aria-label={label}
-              className={popup.popup}
-              data-material='floating'
-              data-elevation='menu'
-            >
-              <BaseSelect.List ref={scrollRef} className={popup.list}>
-                {options.map(({ value, label: text }) => (
-                  <BaseSelect.Item
-                    key={value}
-                    value={value}
-                    className={popup.item}
-                    data-type='T060'
-                  >
-                    <BaseSelect.ItemText className={popup.label}>{text}</BaseSelect.ItemText>
-                    <BaseSelect.ItemIndicator className={popup.indicator}>
-                      <Icon name='I072' />
-                    </BaseSelect.ItemIndicator>
-                  </BaseSelect.Item>
-                ))}
-              </BaseSelect.List>
-            </BaseSelect.Popup>
-          </BaseSelect.Positioner>
-        </BaseSelect.Portal>
-      )}
-    </BaseSelect.Root>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/picker/use-picker-value.ts b/apps/sim/platform/design-system/components/picker/use-picker-value.ts
deleted file mode 100644
index 96aa6ab1d17..00000000000
--- a/apps/sim/platform/design-system/components/picker/use-picker-value.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useState } from 'react'
-import { usePopoverContainer } from '@/platform/design-system/components/menu/use-popover-container'
-
-/** Mirror the native form's reset into the picker's selection while its popup is portaled. */
-export function usePickerValue<Option>(
-  options: readonly Option[],
-  getValue: (option: Option) => string,
-  defaultValue?: string
-) {
-  const initial = options.find((option) => getValue(option) === defaultValue) ?? options[0]
-  const initialValue = initial === undefined ? null : getValue(initial)
-  const [selected, setValue] = useState(initialValue)
-  const value = options.some((option) => getValue(option) === selected) ? selected : initialValue
-  if (value !== selected) setValue(value)
-  const [form, setForm] = useState<HTMLFormElement | null>(null)
-  const { trigger: locate, container } = usePopoverContainer()
-  const trigger = useCallback(
-    (node: HTMLButtonElement | null) => {
-      locate(node)
-      setForm(node?.form ?? null)
-    },
-    [locate]
-  )
-  useEffect(() => {
-    if (!form) return
-    const reset = (event: Event) =>
-      queueMicrotask(() => {
-        if (!event.defaultPrevented) setValue(initialValue)
-      })
-    form.addEventListener('reset', reset)
-    return () => form.removeEventListener('reset', reset)
-  }, [form, initialValue])
-  return { value, setValue, trigger, container }
-}
diff --git a/apps/sim/platform/design-system/components/property-list/property-list.module.css b/apps/sim/platform/design-system/components/property-list/property-list.module.css
deleted file mode 100644
index f69781b26bb..00000000000
--- a/apps/sim/platform/design-system/components/property-list/property-list.module.css
+++ /dev/null
@@ -1,49 +0,0 @@
-.list,
-.rows {
-  display: flex;
-  flex-direction: column;
-  min-inline-size: 0;
-  gap: var(--spacing-8);
-}
-
-.row {
-  display: grid;
-  grid-template-columns: var(--spacing-64) minmax(0, 1fr);
-  align-items: center;
-  gap: var(--spacing-8);
-  min-block-size: var(--spacing-32);
-  overflow-wrap: anywhere;
-}
-
-.row dt,
-.row dd[data-kind="metadata"],
-.row dd[data-kind="person"] {
-  color: var(--ui-secondary);
-}
-
-.row dd[data-kind="person"] {
-  display: flex;
-  align-items: center;
-  gap: var(--spacing-8);
-}
-
-.row :is(dt, dd) {
-  min-inline-size: 0;
-  white-space: pre-wrap;
-}
-
-.row a {
-  color: var(--ui-ink);
-}
-
-.row a:hover {
-  text-decoration: underline;
-}
-
-@media (pointer: coarse) {
-  .row a {
-    display: inline-flex;
-    align-items: center;
-    min-block-size: var(--spacing-app-touch-target);
-  }
-}
diff --git a/apps/sim/platform/design-system/components/property-list/property-list.tsx b/apps/sim/platform/design-system/components/property-list/property-list.tsx
deleted file mode 100644
index c9b05f42fe4..00000000000
--- a/apps/sim/platform/design-system/components/property-list/property-list.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { useId } from 'react'
-import Link from 'next/link'
-import { Avatar } from '@/platform/design-system/components/avatar/avatar'
-import styles from '@/platform/design-system/components/property-list/property-list.module.css'
-
-export type PropertyItem = { id: string; label: string } & (
-  | { kind: 'text' | 'metadata'; value: string }
-  | { kind: 'link'; value: string; href: string }
-  | { kind: 'person'; value: string; src?: string }
-)
-
-interface PropertyListProps {
-  title: string
-  /** Name the list for assistive technology only, where its section already titles it. */
-  titleHidden?: boolean
-  properties: readonly PropertyItem[]
-}
-
-export function PropertyList({ title, titleHidden, properties }: PropertyListProps) {
-  const heading = useId()
-  return (
-    <section aria-labelledby={heading} className={styles.list}>
-      <h2 id={heading} data-type='T042' data-visually-hidden={titleHidden || undefined}>
-        {title}
-      </h2>
-      <dl className={styles.rows}>
-        {properties.map((property) => (
-          <div className={styles.row} key={property.id}>
-            <dt data-type='T050'>{property.label}</dt>
-            <dd data-type='T060' data-kind={property.kind}>
-              {property.kind === 'person' && <Avatar name={property.value} src={property.src} />}
-              {property.kind === 'link' ? (
-                <Link href={property.href}>{property.value}</Link>
-              ) : (
-                <span>{property.value}</span>
-              )}
-            </dd>
-          </div>
-        ))}
-      </dl>
-    </section>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/recent-items/recent-items.module.css b/apps/sim/platform/design-system/components/recent-items/recent-items.module.css
deleted file mode 100644
index 9cd8a1d84c2..00000000000
--- a/apps/sim/platform/design-system/components/recent-items/recent-items.module.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.recents {
-  display: grid;
-  min-inline-size: 0;
-  max-inline-size: 100%;
-  gap: var(--ui-row-gap);
-  inline-size: 100%;
-}
-.heading {
-  display: flex;
-  align-items: center;
-  min-height: var(--spacing-20);
-  padding-inline: var(--spacing-8);
-  color: var(--collection-heading-ink);
-}
-.recentLane {
-  display: flex;
-  align-items: center;
-  gap: var(--ui-list-gap);
-}
-.recentLane > li {
-  flex: none;
-}
diff --git a/apps/sim/platform/design-system/components/recent-items/recent-items.tsx b/apps/sim/platform/design-system/components/recent-items/recent-items.tsx
deleted file mode 100644
index 8f0f01a8440..00000000000
--- a/apps/sim/platform/design-system/components/recent-items/recent-items.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import Link from 'next/link'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-import styles from '@/platform/design-system/components/recent-items/recent-items.module.css'
-import { ScrollArea } from '@/platform/design-system/components/scroll-area/scroll-area'
-
-export interface RecentItem {
-  id: string
-  label: string
-  icon?: IconName
-  /** An external link opens independently of the current workspace. */
-  href?: string
-}
-
-interface RecentItemsProps {
-  label: string
-  title?: string
-  onSelect?: (id: string) => void
-  onRemove?: (id: string) => void
-  items: readonly RecentItem[]
-}
-
-export function RecentItems({ label, title = label, items, onSelect, onRemove }: RecentItemsProps) {
-  return (
-    <section className={styles.recents}>
-      <h3 className={styles.heading} data-type='T067'>
-        {title}
-      </h3>
-      <ScrollArea axis='horizontal' arrows label={label}>
-        <ul className={styles.recentLane} aria-label={label}>
-          {items.map((item) => (
-            <li key={item.id}>
-              <ControlRow
-                label={item.label}
-                icon={item.icon}
-                actionSide={item.icon ? 'start' : 'end'}
-                render={
-                  item.href ? (
-                    <Link href={item.href} target='_blank' rel='noopener noreferrer' />
-                  ) : onSelect ? (
-                    <button type='button' onClick={() => onSelect(item.id)} />
-                  ) : (
-                    <span />
-                  )
-                }
-                action={
-                  onRemove && (
-                    <IconButton
-                      icon='I105'
-                      size='compact'
-                      label={`Remove ${item.label} from recents`}
-                      onClick={() => onRemove(item.id)}
-                    />
-                  )
-                }
-              />
-            </li>
-          ))}
-        </ul>
-      </ScrollArea>
-    </section>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/scroll-area/load-more-footer.tsx b/apps/sim/platform/design-system/components/scroll-area/load-more-footer.tsx
deleted file mode 100644
index ce7259a8dd9..00000000000
--- a/apps/sim/platform/design-system/components/scroll-area/load-more-footer.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-'use client'
-
-import { Button } from '@/platform/design-system/components/button/button'
-import styles from '@/platform/design-system/components/scroll-area/scroll-area.module.css'
-import {
-  type LoadMoreState,
-  useLoadMore,
-} from '@/platform/design-system/components/scroll-area/use-load-more'
-
-interface LoadMoreFooterProps {
-  state: LoadMoreState
-}
-
-/** The end of a paged list: requests the next page on arrival and reports loading and failure. */
-export function LoadMoreFooter({ state }: LoadMoreFooterProps) {
-  const sentinel = useLoadMore(state)
-  const retry = state.onRetry ?? state.onLoadMore
-  return (
-    <>
-      <div ref={sentinel} className={styles.sentinel} aria-hidden='true' />
-      {(state.loading || state.error) && (
-        <div
-          className={styles.loadStatus}
-          data-failed={state.error ? true : undefined}
-          data-type='T060'
-          role={state.error ? 'alert' : 'status'}
-        >
-          <span>{state.error ?? 'Loading…'}</span>
-          {state.error && retry && (
-            <Button variant='quiet' size='compact' onClick={retry}>
-              Retry
-            </Button>
-          )}
-        </div>
-      )}
-    </>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/scroll-area/scroll-area.module.css b/apps/sim/platform/design-system/components/scroll-area/scroll-area.module.css
deleted file mode 100644
index bb466268e04..00000000000
--- a/apps/sim/platform/design-system/components/scroll-area/scroll-area.module.css
+++ /dev/null
@@ -1,72 +0,0 @@
-.viewport {
-  min-inline-size: 0;
-  min-block-size: 0;
-  max-inline-size: 100%;
-  max-block-size: 100%;
-  overflow: auto;
-  overscroll-behavior: contain;
-}
-.viewport[data-hide-scrollbar] {
-  scrollbar-width: none;
-}
-.viewport[data-axis="horizontal"] {
-  overflow-y: hidden;
-}
-.viewport[data-axis="horizontal"] > .content {
-  inline-size: max-content;
-}
-.viewport[data-axis="vertical"] {
-  overflow-x: hidden;
-}
-.shell {
-  display: flex;
-  align-items: center;
-  min-inline-size: 0;
-}
-.shell .viewport {
-  flex: 1;
-}
-.previous,
-.next {
-  display: none;
-  width: var(--spacing-36);
-  flex: none;
-  justify-content: center;
-}
-.shell:has(> .viewport:is([data-edges="start"], [data-edges="both"])) > .previous,
-.shell:has(> .viewport:is([data-edges="end"], [data-edges="both"])) > .next {
-  display: flex;
-}
-@media (pointer: coarse) {
-  .previous,
-  .next {
-    width: var(--spacing-app-touch-target);
-  }
-}
-
-.previous,
-.next:dir(rtl) {
-  transform: scaleX(-1);
-}
-.previous:dir(rtl) {
-  transform: none;
-}
-.viewport[data-axis="horizontal"] > .content {
-  min-inline-size: 100%;
-}
-.sentinel {
-  block-size: var(--spacing-1);
-}
-.loadStatus {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  min-block-size: var(--spacing-app-control-md);
-  padding-inline: var(--ui-row-inset);
-  gap: var(--ui-row-gap);
-  color: var(--ui-secondary);
-  overflow-wrap: anywhere;
-}
-.loadStatus[data-failed] {
-  color: var(--control-danger);
-}
diff --git a/apps/sim/platform/design-system/components/scroll-area/scroll-area.tsx b/apps/sim/platform/design-system/components/scroll-area/scroll-area.tsx
deleted file mode 100644
index 03889b90a55..00000000000
--- a/apps/sim/platform/design-system/components/scroll-area/scroll-area.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-'use client'
-
-import { type ReactNode, useRef } from 'react'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import styles from '@/platform/design-system/components/scroll-area/scroll-area.module.css'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-
-interface ScrollAreaProps {
-  label: string
-  axis?: 'vertical' | 'horizontal'
-  arrows?: boolean
-  hideScrollbar?: boolean
-  startAtEnd?: boolean
-  children: ReactNode
-}
-
-export function ScrollArea({
-  label,
-  axis = 'vertical',
-  arrows = false,
-  hideScrollbar = false,
-  startAtEnd = false,
-  children,
-}: ScrollAreaProps) {
-  const viewport = useRef<HTMLDivElement>(null)
-  const scrollRef = useScrollEdges(axis, { viewport, arrows, startAtEnd, tabStop: true })
-  const region = (
-    <div
-      ref={scrollRef}
-      className={styles.viewport}
-      data-axis={axis}
-      data-hide-scrollbar={arrows || hideScrollbar || undefined}
-      role='region'
-      aria-label={label}
-    >
-      <div className={styles.content}>{children}</div>
-    </div>
-  )
-  if (!arrows) return region
-
-  function move(direction: number) {
-    const el = viewport.current
-    if (!el) return
-    const sign = window.getComputedStyle(el).direction === 'rtl' ? -1 : 1
-    el.scrollBy({ left: direction * sign * el.clientWidth * 0.8 })
-    el.focus({ preventScroll: true })
-  }
-
-  return (
-    <div className={styles.shell}>
-      <div className={styles.previous}>
-        <IconButton label={`Scroll ${label} backward`} icon='I032' onClick={() => move(-1)} />
-      </div>
-      {region}
-      <div className={styles.next}>
-        <IconButton label={`Scroll ${label} forward`} icon='I032' onClick={() => move(1)} />
-      </div>
-    </div>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/scroll-area/use-load-more.ts b/apps/sim/platform/design-system/components/scroll-area/use-load-more.ts
deleted file mode 100644
index 8d3e3149632..00000000000
--- a/apps/sim/platform/design-system/components/scroll-area/use-load-more.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-'use client'
-
-import { useCallback } from 'react'
-
-export interface LoadMoreState {
-  hasMore?: boolean
-  loading?: boolean
-  error?: string
-  onLoadMore?: () => void
-  /** What Retry runs after `error`, when that is not asking for the next page. */
-  onRetry?: () => void
-}
-
-/**
- * A callback ref for the element at the end of a paged list: `onLoadMore` runs when it scrolls
- * within 200px of its vertical scroller or the window. `loading` rebuilds the observer as the fetch
- * settles, so a sentinel still in view asks again. After a failure it asks only once the sentinel
- * leaves view and returns, so a failing request does not retry in a loop.
- */
-export function useLoadMore({ hasMore, loading, error, onLoadMore }: LoadMoreState) {
-  const enabled = Boolean(hasMore && !loading)
-  const failed = Boolean(error)
-  return useCallback(
-    (sentinel: HTMLDivElement | null) => {
-      if (!sentinel || !onLoadMore || !enabled) return
-      let armed = !failed
-      const observer = new IntersectionObserver(
-        ([entry]) => {
-          if (!entry?.isIntersecting) armed = true
-          else if (armed) onLoadMore()
-        },
-        {
-          root: sentinel.parentElement?.closest('[data-scroll-axis="vertical"]') ?? null,
-          rootMargin: '200px',
-        }
-      )
-      observer.observe(sentinel)
-      return () => observer.disconnect()
-    },
-    [onLoadMore, enabled, failed]
-  )
-}
diff --git a/apps/sim/platform/design-system/components/scroll-area/use-scroll-edges.ts b/apps/sim/platform/design-system/components/scroll-area/use-scroll-edges.ts
deleted file mode 100644
index 7a58f7cff2c..00000000000
--- a/apps/sim/platform/design-system/components/scroll-area/use-scroll-edges.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-'use client'
-
-import { type RefObject, useCallback } from 'react'
-
-type ScrollAxis = 'vertical' | 'horizontal'
-interface ScrollOptions<T> {
-  viewport?: RefObject<T | null>
-  tabStop?: boolean
-  arrows?: boolean
-  startAtEnd?: boolean
-}
-
-/** Measure the actual scrolling element, including portalled lists and editable fields. */
-export function useScrollEdges<T extends HTMLElement>(
-  axis: ScrollAxis = 'vertical',
-  { viewport, tabStop, arrows, startAtEnd }: ScrollOptions<T> = {}
-) {
-  return useCallback(
-    (element: T | null) => {
-      if (!element) return
-      if (viewport) viewport.current = element
-      element.dataset.scrollAxis = axis
-      let jump = startAtEnd
-      const vertical = axis === 'vertical'
-      function measure() {
-        if (!element) return
-        if (jump && element.clientHeight && element.clientWidth) {
-          if (vertical) element.scrollTop = element.scrollHeight
-          else element.scrollLeft = element.scrollWidth
-          jump = false
-        }
-        const offset = vertical ? element.scrollTop : Math.abs(element.scrollLeft)
-        const max = vertical
-          ? element.scrollHeight - element.clientHeight
-          : element.scrollWidth - element.clientWidth
-        const fitsLane =
-          arrows &&
-          element.parentElement &&
-          element.firstElementChild &&
-          element.firstElementChild.scrollWidth <= element.parentElement.clientWidth + 1
-        const start = !fitsLane && offset > 1
-        const end = !fitsLane && offset < max - 1
-        element.dataset.edges = start ? (end ? 'both' : 'start') : end ? 'end' : 'none'
-        if (tabStop) element.tabIndex = start || end ? 0 : -1
-      }
-      const resize = new ResizeObserver(measure)
-      resize.observe(element)
-      if (arrows && element.parentElement) resize.observe(element.parentElement)
-      const observedChildren = new Set<Element>()
-      /** Only the rows that came or went, so a windowed list's scrolling stays cheap. */
-      const syncChildren = () => {
-        for (const child of observedChildren) {
-          if (child.parentElement === element) continue
-          resize.unobserve(child)
-          observedChildren.delete(child)
-        }
-        for (const child of element.children) {
-          if (observedChildren.has(child)) continue
-          resize.observe(child)
-          observedChildren.add(child)
-        }
-        measure()
-      }
-      syncChildren()
-      const content = new MutationObserver((records) => {
-        if (records.some(({ type, target }) => type === 'childList' && target === element))
-          syncChildren()
-        else measure()
-      })
-      content.observe(element, { childList: true, subtree: true, characterData: true })
-      const form =
-        element instanceof HTMLInputElement || element instanceof HTMLTextAreaElement
-          ? element.form
-          : null
-      let resetFrame = 0
-      const afterReset = () => {
-        cancelAnimationFrame(resetFrame)
-        resetFrame = requestAnimationFrame(measure)
-      }
-      form?.addEventListener('reset', afterReset)
-      element.addEventListener('scroll', measure, { passive: true })
-      element.addEventListener('input', measure)
-      return () => {
-        form?.removeEventListener('reset', afterReset)
-        cancelAnimationFrame(resetFrame)
-        content.disconnect()
-        resize.disconnect()
-        element.removeEventListener('scroll', measure)
-        element.removeEventListener('input', measure)
-        if (viewport) viewport.current = null
-      }
-    },
-    [axis, viewport, tabStop, arrows, startAtEnd]
-  )
-}
diff --git a/apps/sim/platform/design-system/components/search-field/menu-search-field.tsx b/apps/sim/platform/design-system/components/search-field/menu-search-field.tsx
deleted file mode 100644
index e699ee8cb67..00000000000
--- a/apps/sim/platform/design-system/components/search-field/menu-search-field.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-'use client'
-
-import type { ReactElement } from 'react'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-import styles from '@/platform/design-system/components/search-field/search-field.module.css'
-
-type MenuSearchFieldProps =
-  | { label: string; input?: never }
-  | { input: ReactElement; label?: never }
-
-export function MenuSearchField({ input, label }: MenuSearchFieldProps) {
-  const queryEdges = useScrollEdges<HTMLInputElement>('horizontal')
-  return (
-    <div className={styles.menuSearch} data-type='T060'>
-      <Icon name='I089' />
-      {input ?? <input ref={queryEdges} type='search' aria-label={label} placeholder={label} />}
-    </div>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/search-field/search-field.module.css b/apps/sim/platform/design-system/components/search-field/search-field.module.css
deleted file mode 100644
index 2245c502f81..00000000000
--- a/apps/sim/platform/design-system/components/search-field/search-field.module.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.search {
-  min-inline-size: 0;
-}
-.search {
-  display: flex;
-  align-items: center;
-}
-
-.search {
-  min-height: var(--spacing-app-chip);
-  padding-inline: var(--spacing-7);
-  gap: var(--spacing-6);
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-control);
-  background: var(--ui-reading);
-  color: var(--ui-secondary);
-}
-.search[data-variant="sidebar"] {
-  border-color: var(--ui-divider);
-}
-.menuSearch {
-  display: flex;
-  flex: none;
-  align-items: center;
-  block-size: var(--spacing-app-control-md);
-  padding-inline: var(--spacing-8);
-  margin-block-end: var(--spacing-4);
-  gap: var(--spacing-8);
-  color: var(--ui-secondary);
-}
-.menuSearch input,
-.query {
-  flex: 1;
-  min-inline-size: 0;
-  padding: 0;
-  appearance: none;
-  color: var(--ui-ink);
-  background: transparent;
-}
-.menuSearch input::placeholder,
-.query::placeholder {
-  color: var(--ui-secondary);
-}
-.menuSearch input::-webkit-search-cancel-button,
-.query::-webkit-search-cancel-button {
-  display: none;
-}
-.shortcut {
-  display: inline-flex;
-  flex: none;
-  width: var(--spacing-app-control-sm);
-  height: var(--spacing-app-control-sm);
-  justify-content: center;
-  align-items: center;
-}
diff --git a/apps/sim/platform/design-system/components/search-field/search-field.tsx b/apps/sim/platform/design-system/components/search-field/search-field.tsx
deleted file mode 100644
index 07c3989b75e..00000000000
--- a/apps/sim/platform/design-system/components/search-field/search-field.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-'use client'
-
-import { useEffect, useEffectEvent, useRef, useState } from 'react'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-import styles from '@/platform/design-system/components/search-field/search-field.module.css'
-
-interface SearchFieldProps {
-  label: string
-  placeholder?: string
-  defaultValue?: string
-  value?: string
-  shortcut?: '⌘K' | '/'
-  variant?: 'outlined' | 'sidebar'
-  onValueChange?: (query: string) => void
-}
-
-export function SearchField({
-  label,
-  placeholder,
-  defaultValue = '',
-  value,
-  shortcut,
-  variant = 'outlined',
-  onValueChange,
-}: SearchFieldProps) {
-  const input = useRef<HTMLInputElement>(null)
-  const queryEdges = useScrollEdges('horizontal', { viewport: input })
-  const [draft, setDraft] = useState(defaultValue)
-  const query = value ?? draft
-  const adoptInitialInput = useEffectEvent(() => {
-    const typed = input.current?.value
-    if (typed !== undefined && typed !== query) change(typed)
-  })
-  useEffect(() => {
-    adoptInitialInput()
-  }, [])
-  useEffect(() => {
-    if (!shortcut) return
-    function focus(event: KeyboardEvent) {
-      if (
-        event.defaultPrevented ||
-        event.isComposing ||
-        event.altKey ||
-        event.shiftKey ||
-        !input.current?.getClientRects().length
-      )
-        return
-      const matches =
-        shortcut === '⌘K'
-          ? (event.metaKey || event.ctrlKey) && event.key.toLowerCase() === 'k'
-          : event.key === '/' &&
-            !event.metaKey &&
-            !event.ctrlKey &&
-            !(
-              event.target instanceof HTMLElement &&
-              event.target.closest(
-                'input, textarea, select, [contenteditable]:not([contenteditable="false"])'
-              )
-            )
-      if (!matches) return
-      event.preventDefault()
-      input.current?.focus()
-    }
-    document.addEventListener('keydown', focus)
-    return () => document.removeEventListener('keydown', focus)
-  }, [shortcut])
-
-  function change(next: string) {
-    if (value === undefined) setDraft(next)
-    onValueChange?.(next)
-  }
-  return (
-    <div className={styles.search} data-variant={variant}>
-      <Icon name='I089' />
-      <input
-        ref={queryEdges}
-        type='search'
-        aria-label={label}
-        placeholder={placeholder}
-        className={styles.query}
-        data-type='T043'
-        value={query}
-        onChange={(event) => change(event.currentTarget.value)}
-      />
-      {query ? (
-        <IconButton
-          label='Clear search'
-          icon='I105'
-          onClick={() => {
-            change('')
-            input.current?.focus()
-          }}
-        />
-      ) : (
-        shortcut && (
-          <kbd className={styles.shortcut} data-type='T001'>
-            {shortcut === '/' ? <Icon name='I044' /> : shortcut}
-          </kbd>
-        )
-      )}
-    </div>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/segmented-control/segmented-control.module.css b/apps/sim/platform/design-system/components/segmented-control/segmented-control.module.css
deleted file mode 100644
index 0cdcd840985..00000000000
--- a/apps/sim/platform/design-system/components/segmented-control/segmented-control.module.css
+++ /dev/null
@@ -1,66 +0,0 @@
-.choiceLabel {
-  display: flex;
-  align-items: center;
-}
-
-.segmented {
-  display: inline-flex;
-  align-items: stretch;
-  inline-size: fit-content;
-  max-inline-size: 100%;
-  min-inline-size: 0;
-  min-block-size: var(--spacing-app-control-sm);
-  padding: 0;
-  border: 0;
-  border-radius: var(--radius-full);
-  gap: var(--spacing-1);
-  background: var(--choice-track);
-}
-.choice {
-  display: inline-flex;
-  position: relative;
-  min-inline-size: 0;
-  min-block-size: var(--spacing-app-control-sm);
-  cursor: pointer;
-}
-.radio {
-  position: absolute;
-  inset: 0;
-  width: 100%;
-  height: 100%;
-  margin: 0;
-  opacity: 0;
-  cursor: pointer;
-}
-.choiceLabel {
-  min-inline-size: 0;
-  padding-inline: var(--spacing-12);
-  gap: var(--spacing-6);
-  justify-content: center;
-  border: var(--spacing-stroke-default) solid transparent;
-  border-radius: var(--radius-full);
-  color: var(--ui-secondary);
-  overflow-wrap: anywhere;
-}
-.choiceLabel[data-icon] {
-  padding-inline: var(--spacing-8);
-}
-.segmented:has(> .choice:nth-child(3)) .choiceLabel:not([data-icon]) {
-  padding-inline: min(var(--spacing-12), 4cqi);
-}
-.radio:checked + .choiceLabel {
-  color: var(--ui-ink);
-  background: var(--choice-selected);
-  border-color: var(--choice-edge);
-  box-shadow: var(--choice-shadow);
-}
-.radio:disabled,
-.choice:has(.radio:disabled) {
-  cursor: default;
-}
-.radio:disabled:not(:checked) + .choiceLabel {
-  opacity: var(--opacity-disabled);
-}
-.radio:focus-visible + .choiceLabel {
-  outline: var(--spacing-stroke-focus) solid var(--ui-secondary);
-}
diff --git a/apps/sim/platform/design-system/components/segmented-control/segmented-control.tsx b/apps/sim/platform/design-system/components/segmented-control/segmented-control.tsx
deleted file mode 100644
index 49e11f544cd..00000000000
--- a/apps/sim/platform/design-system/components/segmented-control/segmented-control.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-'use client'
-
-import { useId, useState } from 'react'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import styles from '@/platform/design-system/components/segmented-control/segmented-control.module.css'
-
-interface Choice<Value extends string = string> {
-  value: Value
-  label: string
-  icon?: IconName
-  disabled?: boolean
-}
-
-interface SelectionItemProps extends Choice {
-  name: string
-  checked?: boolean
-  defaultChecked?: boolean
-  onReselect?: () => void
-  onSelect?: (value: string) => void
-}
-
-export function SelectionItem({
-  name,
-  label,
-  value,
-  icon,
-  checked,
-  disabled,
-  defaultChecked,
-  onReselect,
-  onSelect,
-}: SelectionItemProps) {
-  return (
-    <label className={styles.choice}>
-      <input
-        type='radio'
-        className={styles.radio}
-        name={name}
-        value={value}
-        checked={checked}
-        disabled={disabled}
-        defaultChecked={defaultChecked}
-        onClick={
-          onReselect &&
-          ((event) => {
-            if (event.detail > 0) onReselect()
-          })
-        }
-        onChange={onSelect && (() => onSelect(value))}
-      />
-      <span
-        className={styles.choiceLabel}
-        data-icon={icon ? true : undefined}
-        data-type={icon ? 'T056' : 'T057'}
-      >
-        {icon && <Icon name={icon} />}
-        {label}
-      </span>
-    </label>
-  )
-}
-
-type SegmentedControlProps<Value extends string> = {
-  label: string
-  description?: string
-  options: readonly Choice<Value>[]
-  onSelect?: (value: Value) => void
-} & ({ value: Value; defaultValue?: never } | { value?: never; defaultValue: Value })
-
-export function SegmentedControl<Value extends string>({
-  label,
-  description,
-  options,
-  value,
-  defaultValue,
-  onSelect,
-}: SegmentedControlProps<Value>) {
-  const group = useId()
-  const [localValue, setLocalValue] = useState(defaultValue)
-  const selected = value ?? localValue
-  function select(next: Value) {
-    if (value === undefined) setLocalValue(next)
-    onSelect?.(next)
-  }
-  return (
-    <fieldset className={styles.segmented} aria-label={label} aria-description={description}>
-      {options.map((option, index) => (
-        <SelectionItem
-          key={option.value}
-          name={group}
-          value={option.value}
-          label={option.label}
-          icon={option.icon}
-          disabled={option.disabled}
-          checked={selected === option.value}
-          onSelect={() => select(option.value)}
-          onReselect={
-            options.length === 2 && selected === option.value && !options[1 - index].disabled
-              ? () => select(options[1 - index].value)
-              : undefined
-          }
-        />
-      ))}
-    </fieldset>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/settings-section/settings-section.module.css b/apps/sim/platform/design-system/components/settings-section/settings-section.module.css
deleted file mode 100644
index 4c50b10e3f2..00000000000
--- a/apps/sim/platform/design-system/components/settings-section/settings-section.module.css
+++ /dev/null
@@ -1,86 +0,0 @@
-.section {
-  display: grid;
-  gap: var(--spacing-12);
-  min-inline-size: 0;
-}
-
-.surface {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr);
-  gap: var(--ui-list-gap);
-  container: settings-rows / inline-size;
-  padding: var(--spacing-4) var(--spacing-20);
-  border: var(--spacing-stroke-default) solid var(--ui-divider);
-  border-radius: var(--radius-12);
-}
-
-.row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--spacing-24);
-  min-block-size: var(--spacing-64);
-  padding-block: var(--spacing-12);
-  overflow-wrap: anywhere;
-}
-
-.copy {
-  display: grid;
-  flex: 1;
-  min-inline-size: 0;
-  gap: var(--ui-stack-gap);
-}
-
-.identity {
-  display: flex;
-  flex: 1;
-  align-items: flex-start;
-  min-inline-size: 0;
-  gap: var(--ui-row-gap);
-}
-
-.leading {
-  display: inline-flex;
-  flex: none;
-}
-
-.detail {
-  color: var(--ui-secondary);
-}
-
-.control {
-  display: flex;
-  align-items: center;
-  justify-content: end;
-  min-inline-size: 0;
-  max-inline-size: 52%;
-  text-align: end;
-}
-
-.row[data-field] .control {
-  inline-size: var(--settings-control-width);
-}
-
-@container settings-rows (max-width: 30rem) {
-  .row {
-    gap: var(--spacing-16);
-    min-block-size: var(--spacing-68);
-  }
-  .row[data-field] {
-    flex-direction: column;
-    align-items: stretch;
-    gap: var(--spacing-8);
-  }
-  .row[data-field] .control {
-    inline-size: 100%;
-    max-inline-size: none;
-    min-block-size: var(--spacing-44);
-    align-items: stretch;
-  }
-}
-
-@media (max-width: 40rem) {
-  .surface {
-    padding-inline: var(--spacing-16);
-  }
-}
diff --git a/apps/sim/platform/design-system/components/settings-section/settings-section.tsx b/apps/sim/platform/design-system/components/settings-section/settings-section.tsx
deleted file mode 100644
index 0f50a6f07d4..00000000000
--- a/apps/sim/platform/design-system/components/settings-section/settings-section.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import type { ReactNode } from 'react'
-import styles from '@/platform/design-system/components/settings-section/settings-section.module.css'
-
-interface SettingsSectionProps {
-  title: string
-  children: ReactNode
-}
-
-export function SettingsSection({ title, children }: SettingsSectionProps) {
-  return (
-    <section className={styles.section} aria-label={title}>
-      <h2 data-type='T093'>{title}</h2>
-      <SettingsSurface>{children}</SettingsSurface>
-    </section>
-  )
-}
-
-interface SettingsSurfaceProps {
-  children: ReactNode
-}
-
-export function SettingsSurface({ children }: SettingsSurfaceProps) {
-  return (
-    <div className={styles.surface} data-material='reading'>
-      {children}
-    </div>
-  )
-}
-
-interface SettingsRowProps {
-  label: string
-  description?: string
-  /** An avatar or glyph aligned with the first line of the label. */
-  leading?: ReactNode
-  children?: ReactNode
-  field?: boolean
-}
-
-export function SettingsRow({ label, description, leading, children, field }: SettingsRowProps) {
-  const copy = (
-    <div className={styles.copy}>
-      <span data-type='T043'>{label}</span>
-      {description && (
-        <span className={styles.detail} data-type='T060'>
-          {description}
-        </span>
-      )}
-    </div>
-  )
-  return (
-    <div className={styles.row} data-field={field || undefined}>
-      {leading ? (
-        <div className={styles.identity}>
-          <span className={styles.leading}>{leading}</span>
-          {copy}
-        </div>
-      ) : (
-        copy
-      )}
-      {children && <div className={styles.control}>{children}</div>}
-    </div>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/status/status.module.css b/apps/sim/platform/design-system/components/status/status.module.css
deleted file mode 100644
index ef9f41ce6bf..00000000000
--- a/apps/sim/platform/design-system/components/status/status.module.css
+++ /dev/null
@@ -1,62 +0,0 @@
-.tag,
-.notice {
-  background: var(--ui-hover);
-  color: var(--ui-secondary);
-}
-
-:is(.tag, .notice)[data-intent="info"] {
-  background: var(--status-info-soft);
-  color: var(--status-info);
-}
-
-:is(.tag, .notice)[data-intent="success"] {
-  background: var(--status-success-soft);
-  color: var(--status-success);
-}
-
-:is(.tag, .notice)[data-intent="warning"] {
-  background: var(--status-warning-soft);
-  color: var(--status-warning);
-}
-
-:is(.tag, .notice)[data-intent="danger"] {
-  background: var(--control-danger-soft);
-  color: var(--control-danger);
-}
-
-.tag {
-  display: inline-flex;
-  align-items: center;
-  max-inline-size: 100%;
-  min-inline-size: 0;
-  padding-inline: var(--spacing-6);
-  border-radius: var(--ui-control-radius);
-  overflow-wrap: anywhere;
-}
-
-.notice {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--spacing-8) var(--spacing-12);
-  padding: var(--spacing-8) var(--spacing-12);
-  border-radius: var(--radius-control);
-  overflow-wrap: anywhere;
-}
-
-.copy {
-  display: grid;
-  flex: 1;
-  min-inline-size: min(100%, var(--spacing-128));
-  gap: var(--ui-stack-gap);
-}
-
-.action {
-  display: flex;
-  flex: none;
-  align-items: center;
-  max-inline-size: 100%;
-  gap: var(--ui-action-gap);
-  color: var(--ui-ink);
-}
diff --git a/apps/sim/platform/design-system/components/status/status.tsx b/apps/sim/platform/design-system/components/status/status.tsx
deleted file mode 100644
index e7da13505ee..00000000000
--- a/apps/sim/platform/design-system/components/status/status.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import type { ReactNode } from 'react'
-import { Button } from '@/platform/design-system/components/button/button'
-import styles from '@/platform/design-system/components/status/status.module.css'
-
-type StatusIntent = 'neutral' | 'info' | 'success' | 'warning' | 'danger'
-
-interface StatusTagProps {
-  label: string
-  intent?: StatusIntent
-  /** Announce changes to this tag, for a status that updates while it is on screen. */
-  live?: boolean
-}
-
-export function StatusTag({ label, intent = 'neutral', live }: StatusTagProps) {
-  return (
-    <span
-      className={styles.tag}
-      data-intent={intent}
-      data-type='T052'
-      role={live ? 'status' : undefined}
-    >
-      {label}
-    </span>
-  )
-}
-
-interface InlineNoticeProps {
-  message: string
-  title?: string
-  intent?: StatusIntent
-  action?: ReactNode
-}
-
-/** A persistent message in the page flow. A `danger` notice is announced as an alert. */
-export function InlineNotice({ message, title, intent = 'neutral', action }: InlineNoticeProps) {
-  return (
-    <div
-      className={styles.notice}
-      data-intent={intent}
-      role={intent === 'danger' ? 'alert' : 'status'}
-    >
-      <div className={styles.copy}>
-        {title && <span data-type='T059'>{title}</span>}
-        <span data-type='T060'>{message}</span>
-      </div>
-      {action && <div className={styles.action}>{action}</div>}
-    </div>
-  )
-}
-
-interface FailureNoticeProps {
-  message: string
-  title?: string
-  retrying?: boolean
-  onRetry?: () => void
-}
-
-/** A read that failed, with its way back. It stays distinct from an empty list or an absent setting. */
-export function FailureNotice({ message, title, retrying, onRetry }: FailureNoticeProps) {
-  return (
-    <InlineNotice
-      intent='danger'
-      title={title}
-      message={message}
-      action={
-        onRetry && (
-          <Button variant='quiet' size='compact' disabled={retrying} onClick={onRetry}>
-            {retrying ? 'Retrying…' : 'Retry'}
-          </Button>
-        )
-      }
-    />
-  )
-}
diff --git a/apps/sim/platform/design-system/components/surface/platform-surface.tsx b/apps/sim/platform/design-system/components/surface/platform-surface.tsx
deleted file mode 100644
index 2a964b6dd7b..00000000000
--- a/apps/sim/platform/design-system/components/surface/platform-surface.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { ReactNode } from 'react'
-import type { Appearance } from '@/platform/design-system/navigation'
-
-interface PlatformSurfaceProps {
-  theme: Appearance
-  systemFont?: boolean
-  systemMono?: boolean
-  children: ReactNode
-}
-
-export function PlatformSurface({ theme, children, systemFont, systemMono }: PlatformSurfaceProps) {
-  return (
-    <div
-      data-platform-ui=''
-      data-theme={theme}
-      data-system-font={systemFont || undefined}
-      data-system-mono={systemMono || undefined}
-    >
-      {children}
-    </div>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/switch/switch.module.css b/apps/sim/platform/design-system/components/switch/switch.module.css
deleted file mode 100644
index f0e5925c94a..00000000000
--- a/apps/sim/platform/design-system/components/switch/switch.module.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.target {
-  display: inline-grid;
-  place-items: center;
-  border-radius: var(--radius-full);
-  flex: none;
-  min-inline-size: var(--spacing-36);
-  min-block-size: var(--spacing-20);
-  cursor: pointer;
-}
-
-.target[data-disabled] {
-  opacity: var(--opacity-disabled);
-  cursor: default;
-}
-
-.track {
-  display: flex;
-  align-items: center;
-  inline-size: var(--spacing-36);
-  block-size: var(--spacing-20);
-  padding: var(--spacing-2);
-  border-radius: var(--radius-full);
-  background: var(--switch-off);
-}
-
-.target[data-checked] .track {
-  justify-content: end;
-  background: var(--switch-on);
-}
-
-.thumb {
-  display: block;
-  inline-size: var(--spacing-16);
-  block-size: var(--spacing-16);
-  border: var(--spacing-stroke-hairline) solid var(--switch-thumb-edge);
-  border-radius: var(--radius-full);
-  background: var(--switch-thumb);
-  box-shadow: var(--switch-thumb-shadow);
-}
-
-@media (pointer: coarse) {
-  .target {
-    min-inline-size: var(--spacing-44);
-    min-block-size: var(--spacing-44);
-  }
-}
diff --git a/apps/sim/platform/design-system/components/switch/switch.tsx b/apps/sim/platform/design-system/components/switch/switch.tsx
deleted file mode 100644
index ee9169c828d..00000000000
--- a/apps/sim/platform/design-system/components/switch/switch.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-'use client'
-
-import { Switch as BaseSwitch } from '@base-ui/react/switch'
-import styles from '@/platform/design-system/components/switch/switch.module.css'
-
-interface SwitchProps {
-  label: string
-  checked?: boolean
-  defaultChecked?: boolean
-  disabled?: boolean
-  onCheckedChange?: (checked: boolean) => void
-}
-
-export function Switch({ label, checked, defaultChecked, disabled, onCheckedChange }: SwitchProps) {
-  return (
-    <BaseSwitch.Root
-      aria-label={label}
-      checked={checked}
-      defaultChecked={defaultChecked}
-      disabled={disabled}
-      onCheckedChange={onCheckedChange}
-      className={styles.target}
-    >
-      <span className={styles.track}>
-        <BaseSwitch.Thumb className={styles.thumb} />
-      </span>
-    </BaseSwitch.Root>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/tabs/tabs.module.css b/apps/sim/platform/design-system/components/tabs/tabs.module.css
deleted file mode 100644
index 9a9270daf2e..00000000000
--- a/apps/sim/platform/design-system/components/tabs/tabs.module.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.root,
-.pane {
-  min-height: 0;
-  min-width: 0;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-}
-.pane[hidden] {
-  display: none;
-}
-.strip {
-  display: grid;
-  min-width: 0;
-  overflow: auto;
-  scrollbar-width: none;
-}
-.tabs {
-  display: flex;
-  align-items: center;
-  gap: var(--ui-list-gap);
-}
-.tabs > * {
-  min-inline-size: var(--spacing-64);
-  flex: 0 1 var(--panel-tab-width);
-}
diff --git a/apps/sim/platform/design-system/components/tabs/tabs.tsx b/apps/sim/platform/design-system/components/tabs/tabs.tsx
deleted file mode 100644
index 309ae97c394..00000000000
--- a/apps/sim/platform/design-system/components/tabs/tabs.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-'use client'
-
-import { type ReactNode, useRef } from 'react'
-import { Tabs as BaseTabs } from '@base-ui/react/tabs'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-import styles from '@/platform/design-system/components/tabs/tabs.module.css'
-
-export interface TabItem {
-  id: string
-  label: string
-  icon?: IconName
-  content: ReactNode
-}
-
-interface TabsProps {
-  label: string
-  tabs: readonly TabItem[]
-  current: string
-  onSelect: (id: string) => void
-  onRemove: (id: string) => void
-  renderHeader: (tabList: ReactNode) => ReactNode
-}
-
-export function Tabs({ label, tabs, current, onSelect, onRemove, renderHeader }: TabsProps) {
-  const scrollRef = useScrollEdges<HTMLDivElement>('horizontal')
-  const selected = useRef<HTMLButtonElement>(null)
-  function closeTab(id: string) {
-    onRemove(id)
-    if (tabs.length > 1) requestAnimationFrame(() => selected.current?.focus())
-  }
-  return (
-    <BaseTabs.Root
-      className={styles.root}
-      value={current}
-      onValueChange={(value) => {
-        if (typeof value === 'string') onSelect(value)
-      }}
-    >
-      {renderHeader(
-        <div ref={scrollRef} className={styles.strip}>
-          <BaseTabs.List className={styles.tabs} aria-label={label} activateOnFocus>
-            {tabs.map((tab) => (
-              <ControlRow
-                key={tab.id}
-                label={tab.label}
-                icon={tab.icon}
-                render={
-                  <BaseTabs.Tab
-                    value={tab.id}
-                    ref={tab.id === current ? selected : undefined}
-                    onKeyDown={(event) => {
-                      if (event.key === 'Delete') {
-                        event.preventDefault()
-                        closeTab(tab.id)
-                      }
-                    }}
-                  />
-                }
-                action={
-                  <IconButton
-                    icon='I105'
-                    size='compact'
-                    label={`Close ${tab.label} tab`}
-                    onClick={() => closeTab(tab.id)}
-                  />
-                }
-              />
-            ))}
-          </BaseTabs.List>
-        </div>
-      )}
-      {tabs.map((tab) => (
-        <BaseTabs.Panel key={tab.id} value={tab.id} keepMounted className={styles.pane}>
-          {tab.content}
-        </BaseTabs.Panel>
-      ))}
-    </BaseTabs.Root>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/tooltip/tooltip.module.css b/apps/sim/platform/design-system/components/tooltip/tooltip.module.css
deleted file mode 100644
index f528db732b1..00000000000
--- a/apps/sim/platform/design-system/components/tooltip/tooltip.module.css
+++ /dev/null
@@ -1,41 +0,0 @@
-.tooltipHost {
-  min-inline-size: 0;
-  max-inline-size: 100%;
-  position: relative;
-  display: inline-flex;
-}
-
-.tooltip,
-.tooltipPanel {
-  position: fixed;
-  z-index: 1;
-  top: 0;
-  left: 0;
-  visibility: hidden;
-}
-
-.tooltip[data-positioned],
-.tooltipPanel[data-positioned] {
-  visibility: visible;
-}
-
-.tooltip[aria-hidden="true"] {
-  pointer-events: none;
-}
-
-.tooltip {
-  width: max-content;
-  max-width: min(var(--container-app-sidebar), 90vw);
-  padding: var(--spacing-6) var(--spacing-8);
-  border-radius: var(--radius-item);
-  background: var(--control-tooltip);
-  color: var(--control-tooltip-ink);
-  overflow-wrap: anywhere;
-}
-
-.label {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
-  overflow: hidden;
-}
diff --git a/apps/sim/platform/design-system/components/tooltip/tooltip.tsx b/apps/sim/platform/design-system/components/tooltip/tooltip.tsx
deleted file mode 100644
index b7fdf7cf892..00000000000
--- a/apps/sim/platform/design-system/components/tooltip/tooltip.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-'use client'
-
-import {
-  type ReactElement,
-  type ReactNode,
-  useEffect,
-  useId,
-  useLayoutEffect,
-  useRef,
-  useState,
-} from 'react'
-import { autoUpdate, computePosition, flip, shift } from '@floating-ui/dom'
-import { Slot } from '@radix-ui/react-slot'
-import { createPortal } from 'react-dom'
-import styles from '@/platform/design-system/components/tooltip/tooltip.module.css'
-
-const TOOLTIP_OPEN = 'sim-platform-tooltip-open'
-
-interface TooltipProps {
-  label: string
-  enabled?: boolean
-  visualOnly?: boolean
-  panel?: ReactNode
-  children: ReactElement
-}
-
-export function Tooltip({ label, enabled = true, visualOnly, panel, children }: TooltipProps) {
-  const host = useRef<HTMLSpanElement>(null)
-  const floating = useRef<HTMLSpanElement>(null)
-  const id = useId()
-  const [target, setTarget] = useState<Element | null>(null)
-  const hasPanel = Boolean(panel)
-
-  function show() {
-    const trigger = host.current
-    if (enabled && trigger && !trigger.querySelector('[aria-haspopup][aria-expanded="true"]'))
-      setTarget(trigger.closest('dialog[open]') ?? trigger.closest('[data-platform-ui]'))
-  }
-
-  useEffect(() => {
-    const anchor = host.current
-    const enclosing = anchor?.closest('button, a[href], [role=button], [role=tab]')
-    if (!anchor || !enclosing || !enabled) return
-    const focus = () =>
-      setTarget(anchor.closest('dialog[open]') ?? anchor.closest('[data-platform-ui]'))
-    const blur = () => setTarget(null)
-    enclosing.addEventListener('focus', focus)
-    enclosing.addEventListener('blur', blur)
-    return () => {
-      enclosing.removeEventListener('focus', focus)
-      enclosing.removeEventListener('blur', blur)
-    }
-  }, [enabled])
-
-  useLayoutEffect(() => {
-    const anchor = host.current
-    const tip = floating.current
-    if (!anchor || !tip || !target || !enabled) return
-    let active = true
-    const stop = autoUpdate(anchor, tip, async () => {
-      const { x, y } = await computePosition(anchor, tip, {
-        strategy: 'fixed',
-        placement: hasPanel ? 'bottom-end' : 'top',
-        middleware: [flip(), shift()],
-      })
-      if (active) {
-        tip.style.left = `${x}px`
-        tip.style.top = `${y}px`
-        tip.dataset.positioned = ''
-      }
-    })
-    function dismiss(event: KeyboardEvent) {
-      if (event.key === 'Escape') setTarget(null)
-    }
-    const owner = anchor.ownerDocument
-    const dismissPrevious = () => setTarget(null)
-    owner.dispatchEvent(new Event(TOOLTIP_OPEN))
-    owner.addEventListener(TOOLTIP_OPEN, dismissPrevious)
-    owner.addEventListener('keydown', dismiss)
-    return () => {
-      active = false
-      stop()
-      owner.removeEventListener(TOOLTIP_OPEN, dismissPrevious)
-      owner.removeEventListener('keydown', dismiss)
-    }
-  }, [target, enabled, hasPanel])
-
-  return (
-    <span
-      ref={host}
-      className={styles.tooltipHost}
-      onFocus={show}
-      onPointerEnter={show}
-      onBlur={() => setTarget(null)}
-      onClickCapture={hasPanel ? undefined : () => setTarget(null)}
-      onPointerLeave={(event) => {
-        if (event.relatedTarget instanceof Node && floating.current?.contains(event.relatedTarget))
-          return
-        if (!event.currentTarget.matches(':focus-within')) setTarget(null)
-      }}
-    >
-      <Slot aria-describedby={enabled && target && !visualOnly ? id : undefined}>{children}</Slot>
-      {enabled &&
-        target &&
-        createPortal(
-          <span
-            ref={floating}
-            id={id}
-            role='tooltip'
-            aria-hidden={visualOnly || undefined}
-            className={styles[hasPanel ? 'tooltipPanel' : 'tooltip']}
-            data-type={hasPanel ? undefined : 'T050'}
-            data-elevation={hasPanel ? undefined : 'tooltip'}
-            onPointerLeave={(event) => {
-              if (
-                event.relatedTarget instanceof Node &&
-                host.current?.contains(event.relatedTarget)
-              )
-                return
-              if (!host.current?.matches(':focus-within')) setTarget(null)
-            }}
-          >
-            {panel ?? <span className={styles.label}>{label}</span>}
-          </span>,
-          target
-        )}
-    </span>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/touch-target/touch-target.module.css b/apps/sim/platform/design-system/components/touch-target/touch-target.module.css
deleted file mode 100644
index c9319aea111..00000000000
--- a/apps/sim/platform/design-system/components/touch-target/touch-target.module.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.touchTarget {
-  position: relative;
-  display: inline-grid;
-  place-items: center;
-  inline-size: var(--spacing-app-touch-target);
-  block-size: var(--spacing-app-touch-target);
-}
-.touchTarget button::after {
-  content: "";
-  position: absolute;
-  inset: 0;
-}
diff --git a/apps/sim/platform/design-system/components/touch-target/touch-target.tsx b/apps/sim/platform/design-system/components/touch-target/touch-target.tsx
deleted file mode 100644
index 0788faa6a8e..00000000000
--- a/apps/sim/platform/design-system/components/touch-target/touch-target.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { ReactElement } from 'react'
-import styles from '@/platform/design-system/components/touch-target/touch-target.module.css'
-
-interface TouchTargetProps {
-  children: ReactElement
-}
-
-export function TouchTarget({ children }: TouchTargetProps) {
-  return <span className={styles.touchTarget}>{children}</span>
-}
diff --git a/apps/sim/platform/design-system/components/workspace-fields/workspace-fields.module.css b/apps/sim/platform/design-system/components/workspace-fields/workspace-fields.module.css
deleted file mode 100644
index 094a516993e..00000000000
--- a/apps/sim/platform/design-system/components/workspace-fields/workspace-fields.module.css
+++ /dev/null
@@ -1,101 +0,0 @@
-.upload,
-.recipients {
-  border: var(--spacing-stroke-default) solid var(--ui-border);
-  border-radius: var(--radius-control);
-  background: var(--ui-reading);
-  color: var(--ui-ink);
-}
-
-.recipientViewport input {
-  flex: 1;
-  min-width: 0;
-  padding: 0;
-  border: 0;
-  background: transparent;
-  color: inherit;
-}
-
-.upload {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: var(--spacing-4);
-  width: var(--spacing-64);
-  height: var(--spacing-64);
-  color: var(--ui-secondary);
-}
-
-.uploadInput {
-  position: absolute;
-  inset: 0;
-  width: 100%;
-  height: 100%;
-  opacity: 0;
-  cursor: pointer;
-}
-
-.recipients {
-  block-size: var(--spacing-76);
-  padding-inline: var(--spacing-8);
-  cursor: text;
-}
-
-.recipients:hover:where(:not([data-disabled])) {
-  border-color: var(--control-hover-border);
-}
-
-.recipients[data-disabled] {
-  opacity: var(--opacity-disabled);
-  cursor: default;
-}
-
-.recipients[data-invalid] {
-  border-color: var(--control-danger);
-}
-
-.tag {
-  display: inline-flex;
-  align-items: center;
-  min-inline-size: 0;
-  max-inline-size: 100%;
-  gap: var(--ui-action-gap);
-  padding-inline: var(--spacing-5) var(--spacing-1);
-  border-radius: var(--ui-control-radius);
-  background: var(--ui-hover);
-}
-
-.tag[data-invalid] {
-  background: var(--control-danger-soft);
-  color: var(--control-danger);
-}
-
-@media (pointer: coarse) {
-  .tag {
-    padding-inline: var(--spacing-6) 0;
-  }
-}
-
-.recipientViewport {
-  display: flex;
-  flex-wrap: wrap;
-  align-content: flex-start;
-  align-items: center;
-  block-size: 100%;
-  padding-block: var(--spacing-8);
-  gap: var(--spacing-4);
-  overflow: auto;
-  overscroll-behavior: contain;
-}
-
-.recipientViewport input {
-  min-width: min(100%, var(--spacing-96));
-  block-size: 1lh;
-  scroll-margin-block: var(--spacing-8);
-}
-
-.recipientViewport input::placeholder {
-  color: var(--ui-secondary);
-  opacity: 1;
-}
diff --git a/apps/sim/platform/design-system/components/workspace-fields/workspace-fields.tsx b/apps/sim/platform/design-system/components/workspace-fields/workspace-fields.tsx
deleted file mode 100644
index 05b589538a5..00000000000
--- a/apps/sim/platform/design-system/components/workspace-fields/workspace-fields.tsx
+++ /dev/null
@@ -1,219 +0,0 @@
-'use client'
-
-import { useId, useLayoutEffect, useRef, useState } from 'react'
-import { IconButton } from '@/platform/design-system/components/button/button'
-import { FieldFrame, fieldDescription } from '@/platform/design-system/components/field/fields'
-import { Icon } from '@/platform/design-system/components/icon/icon'
-import { OverflowText } from '@/platform/design-system/components/overflow-text/overflow-text'
-import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
-import styles from '@/platform/design-system/components/workspace-fields/workspace-fields.module.css'
-
-interface LogoUploadFieldProps {
-  label: string
-  optional?: boolean
-}
-
-export function LogoUploadField({ label, optional }: LogoUploadFieldProps) {
-  const id = useId()
-  return (
-    <FieldFrame id={id} label={label} optional={optional}>
-      <div className={styles.upload} data-type='T052'>
-        <Icon name='I117' />
-        Upload
-        <input id={id} type='file' accept='image/*' className={styles.uploadInput} />
-      </div>
-    </FieldFrame>
-  )
-}
-
-interface Recipient {
-  address: string
-  invalid?: boolean
-}
-
-interface RecipientTagProps extends Recipient {
-  onRemove?: (address: string) => void
-}
-
-export function RecipientTag({ address, invalid, onRemove }: RecipientTagProps) {
-  return (
-    <span className={styles.tag} data-invalid={invalid || undefined} data-type='T052'>
-      <OverflowText text={address}>{address}</OverflowText>
-      {onRemove && (
-        <IconButton
-          size='inline'
-          label={`Remove ${address}`}
-          icon='I105'
-          onClick={() => onRemove(address)}
-        />
-      )}
-    </span>
-  )
-}
-
-interface RecipientFieldProps {
-  label: string
-  defaultRecipients?: readonly Recipient[]
-  /** Controlled tags. A caller can mark an address `invalid`, for one the server refused. */
-  recipients?: readonly Recipient[]
-  onRecipientsChange?: (recipients: Recipient[]) => void
-  /** Whether a newly committed address is acceptable. Defaults to the browser's email check. */
-  validate?: (address: string) => boolean
-  /** Replaces the default message shown while any tag is invalid. */
-  error?: string
-  hint?: string
-  disabled?: boolean
-  name?: string
-  placeholder?: string
-}
-
-function isEmailAddress(address: string) {
-  const email = document.createElement('input')
-  email.type = 'email'
-  email.value = address
-  return email.validity.valid
-}
-
-export function RecipientField({
-  label,
-  defaultRecipients = [],
-  recipients: controlledRecipients,
-  onRecipientsChange,
-  validate = isEmailAddress,
-  error: errorMessage,
-  hint,
-  disabled,
-  name,
-  placeholder,
-}: RecipientFieldProps) {
-  const id = useId()
-  const input = useRef<HTMLInputElement>(null)
-  const inputEdges = useScrollEdges('horizontal', { viewport: input })
-  const viewportEdges = useScrollEdges<HTMLDivElement>()
-  const [localRecipients, setLocalRecipients] = useState(defaultRecipients)
-  const recipients = controlledRecipients ?? localRecipients
-  const [draft, setDraft] = useState('')
-  const error =
-    errorMessage ??
-    (recipients.some((recipient) => recipient.invalid) ? 'Enter a valid email address.' : undefined)
-
-  function setRecipients(next: Recipient[]) {
-    setLocalRecipients(next)
-    onRecipientsChange?.(next)
-  }
-
-  useLayoutEffect(() => {
-    const editor = input.current
-    editor?.setCustomValidity(error ?? '')
-    if (editor && recipients.length && document.activeElement === editor) {
-      editor.scrollIntoView({ block: 'nearest', inline: 'nearest' })
-    }
-  }, [error, recipients.length])
-
-  function commit(text: string) {
-    const addresses = text
-      .trim()
-      .split(/[,;\s]+/)
-      .filter(Boolean)
-    if (!addresses.length) return
-    const known = new Set(recipients.map(({ address }) => address.toLowerCase()))
-    const additions = addresses.filter((address) => {
-      const key = address.toLowerCase()
-      if (known.has(key)) return false
-      known.add(key)
-      return true
-    })
-    if (!additions.length) return
-    setRecipients([
-      ...recipients,
-      ...additions.map((address) => ({ address, invalid: !validate(address) })),
-    ])
-  }
-
-  function finish(text: string) {
-    commit(text)
-    setDraft('')
-  }
-
-  function remove(address: string) {
-    setRecipients(recipients.filter((recipient) => recipient.address !== address))
-    input.current?.focus()
-  }
-
-  return (
-    <FieldFrame id={id} label={label} error={error} hint={hint}>
-      <div
-        className={styles.recipients}
-        data-invalid={error ? true : undefined}
-        data-disabled={disabled || undefined}
-        role='presentation'
-        onClick={(event) => {
-          if (event.target instanceof Element && !event.target.closest('input, button')) {
-            input.current?.focus()
-          }
-        }}
-      >
-        <div ref={viewportEdges} className={styles.recipientViewport}>
-          {recipients.map((recipient) => (
-            <RecipientTag
-              key={recipient.address}
-              address={recipient.address}
-              invalid={recipient.invalid}
-              onRemove={disabled ? undefined : remove}
-            />
-          ))}
-          <input
-            ref={inputEdges}
-            id={id}
-            inputMode='email'
-            autoComplete='off'
-            spellCheck={false}
-            disabled={disabled}
-            data-type='T043'
-            placeholder={recipients.length ? undefined : placeholder}
-            value={draft}
-            aria-invalid={error ? true : undefined}
-            aria-describedby={fieldDescription(id, error, hint)}
-            onChange={(event) => {
-              const value = event.currentTarget.value
-              const last = Math.max(value.lastIndexOf(','), value.lastIndexOf(';'))
-              if (
-                last >= 0 &&
-                !('isComposing' in event.nativeEvent && event.nativeEvent.isComposing)
-              ) {
-                commit(value.slice(0, last))
-                setDraft(value.slice(last + 1))
-              } else setDraft(value)
-            }}
-            onKeyDown={(event) => {
-              if (event.nativeEvent.isComposing) return
-              if (event.key === 'Enter') {
-                event.preventDefault()
-                finish(draft)
-              } else if (event.key === 'Backspace' && !draft) {
-                event.preventDefault()
-                if (recipients.length) setRecipients(recipients.slice(0, -1))
-              }
-            }}
-            onPaste={(event) => {
-              const pasted = event.clipboardData.getData('text/plain')
-              if (!/[,;\s]/.test(pasted)) return
-              event.preventDefault()
-              const { selectionStart, selectionEnd } = event.currentTarget
-              finish(
-                draft.slice(0, selectionStart ?? draft.length) +
-                  pasted +
-                  draft.slice(selectionEnd ?? draft.length)
-              )
-            }}
-            onBlur={() => finish(draft)}
-          />
-        </div>
-        {name &&
-          recipients.map(({ address }) => (
-            <input key={address} type='hidden' name={name} value={address} />
-          ))}
-      </div>
-    </FieldFrame>
-  )
-}
diff --git a/apps/sim/platform/design-system/components/workspace-list/workspace-list.module.css b/apps/sim/platform/design-system/components/workspace-list/workspace-list.module.css
deleted file mode 100644
index 233444ddc55..00000000000
--- a/apps/sim/platform/design-system/components/workspace-list/workspace-list.module.css
+++ /dev/null
@@ -1,42 +0,0 @@
-.workspaces {
-  display: grid;
-  min-inline-size: 0;
-  inline-size: fit-content;
-  max-inline-size: min(100%, var(--container-480));
-  gap: var(--spacing-12);
-}
-.heading {
-  display: flex;
-  align-items: center;
-  min-height: var(--spacing-20);
-  padding-inline: var(--spacing-8);
-  color: var(--collection-heading-ink);
-}
-.rows {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr);
-  min-inline-size: 0;
-  gap: var(--ui-list-gap);
-}
-.workspaceViewport {
-  display: grid;
-  grid-template-rows: minmax(0, 1fr);
-  max-block-size: var(--collection-workspace-viewport);
-  min-inline-size: 0;
-}
-.workspaceRow {
-  display: grid;
-  place-items: center start;
-  min-inline-size: 0;
-}
-.workspaces[data-target="touch"] .workspaceRow {
-  min-height: var(--spacing-app-touch-target);
-}
-.workspaces[data-target="touch"] .workspaceViewport {
-  max-block-size: var(--collection-touch-viewport);
-}
-@media (pointer: coarse) {
-  .workspaceRow {
-    min-height: var(--spacing-app-touch-target);
-  }
-}
diff --git a/apps/sim/platform/design-system/components/workspace-list/workspace-list.tsx b/apps/sim/platform/design-system/components/workspace-list/workspace-list.tsx
deleted file mode 100644
index cef960131a7..00000000000
--- a/apps/sim/platform/design-system/components/workspace-list/workspace-list.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { ControlRow } from '@/platform/design-system/components/button/control-row'
-import { ScrollArea } from '@/platform/design-system/components/scroll-area/scroll-area'
-import styles from '@/platform/design-system/components/workspace-list/workspace-list.module.css'
-
-interface WorkspaceItemsProps {
-  label: string
-  items: readonly { id: string; name: string }[]
-}
-
-interface WorkspaceListProps extends WorkspaceItemsProps {
-  onSelect?: (id: string) => void
-  target?: 'standard' | 'touch'
-}
-
-export function WorkspaceList({ label, items, onSelect, target = 'standard' }: WorkspaceListProps) {
-  return (
-    <section className={styles.workspaces} data-target={target}>
-      <h3 className={styles.heading} data-type='T067'>
-        {label}
-      </h3>
-      <div className={styles.workspaceViewport}>
-        <ScrollArea label={label}>
-          <ul className={styles.rows} aria-label={label}>
-            {items.map((item) => (
-              <li className={styles.workspaceRow} key={item.id}>
-                <ControlRow
-                  label={item.name}
-                  wrap
-                  render={
-                    onSelect ? <button type='button' onClick={() => onSelect(item.id)} /> : <span />
-                  }
-                />
-              </li>
-            ))}
-          </ul>
-        </ScrollArea>
-      </div>
-    </section>
-  )
-}
-
-export function SidebarWorkspaceItems({ label, items }: WorkspaceItemsProps) {
-  return (
-    <ul className={styles.rows} aria-label={label}>
-      {items.map((item) => (
-        <li key={item.id}>
-          <ControlRow label={item.name} render={<span />} />
-        </li>
-      ))}
-    </ul>
-  )
-}
diff --git a/apps/sim/platform/design-system/fonts/OFL.txt b/apps/sim/platform/design-system/fonts/OFL.txt
deleted file mode 100644
index dac9ac2fb61..00000000000
--- a/apps/sim/platform/design-system/fonts/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2024 The Geist Project Authors (https://github.com/vercel/geist-font)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/apps/sim/platform/design-system/fonts/geist-mono.woff2 b/apps/sim/platform/design-system/fonts/geist-mono.woff2
deleted file mode 100644
index 0e746fc1822..00000000000
Binary files a/apps/sim/platform/design-system/fonts/geist-mono.woff2 and /dev/null differ
diff --git a/apps/sim/platform/design-system/fonts/geist.woff2 b/apps/sim/platform/design-system/fonts/geist.woff2
deleted file mode 100644
index 71dab8bedba..00000000000
Binary files a/apps/sim/platform/design-system/fonts/geist.woff2 and /dev/null differ
diff --git a/apps/sim/platform/design-system/navigation.ts b/apps/sim/platform/design-system/navigation.ts
deleted file mode 100644
index b7197df2579..00000000000
--- a/apps/sim/platform/design-system/navigation.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/** A route on the legacy surface is named by its absolute URL; Next's router must not handle it. */
-export function isAbsoluteHref(href: string): boolean {
-  return /^https?:\/\//.test(href)
-}
-
-export type Appearance = 'system' | 'light' | 'dark'
-
-export function readAppearance(value: string | string[] | null | undefined): Appearance {
-  const theme = Array.isArray(value) ? value[0] : value
-  return theme === 'light' || theme === 'dark' ? theme : 'system'
-}
-
-interface SearchValues {
-  get(key: string): string | null
-}
-
-/** Keep the selected fixture and appearance when moving between product routes. */
-export function platformHref(path: string, search: SearchValues) {
-  const query = new URLSearchParams()
-  const state = search.get('state')
-  const theme = search.get('theme')
-  if (state === 'empty' || state === 'full' || state === 'stress') query.set('state', state)
-  if (theme === 'system' || theme === 'light' || theme === 'dark') query.set('theme', theme)
-  if (state === 'stress' && search.get('secrets') === 'organization')
-    query.set('secrets', 'organization')
-  return query.size ? `${path}?${query}` : path
-}
-
-/** A file under `public/`: unlike `next/link` and the router, the browser adds no base path to it. */
-export function publicAssetPath(path: string) {
-  return `${process.env.NEXT_PUBLIC_SIM_PLATFORM_BASE_PATH ?? ''}${path}`
-}
-
-export function readScenario(value: string | string[] | null | undefined) {
-  return value === 'empty' || value === 'stress' ? value : 'full'
-}
diff --git a/apps/sim/platform/design-system/styles/chart-roles.css b/apps/sim/platform/design-system/styles/chart-roles.css
deleted file mode 100644
index 27756539d89..00000000000
--- a/apps/sim/platform/design-system/styles/chart-roles.css
+++ /dev/null
@@ -1,28 +0,0 @@
-[data-platform-ui] {
-  --chart-tooltip-width: 11.25rem;
-  --chart-tooltip-fill: var(--ui-floating);
-  --chart-tooltip-blur: blur(var(--spacing-glass-blur));
-  --chart-tooltip-shadow:
-    inset 0 var(--spacing-1) 0 var(--ui-highlight), 0 var(--spacing-10) var(--spacing-15)
-    calc(-1 * var(--spacing-3)) var(--ui-shadow-menu);
-  --activity-chart-grid: var(--color-chart-grid);
-}
-
-[data-platform-ui] [data-plot="home-activity"] {
-  --ui-plot-primary: var(--color-chart-series);
-  --plot-gradient-ink: var(--color-chart-area);
-  --ui-plot-area-opacity: var(--opacity-chart-area);
-  --plot-stroke-width: calc(var(--spacing-stroke-default) + var(--spacing-stroke-hairline));
-}
-
-[data-platform-ui][data-theme="dark"] {
-  --activity-chart-grid: var(--color-dark-chart-grid);
-  --chart-tooltip-fill: var(--color-dark-tooltip-surface);
-  --chart-tooltip-blur: none;
-  --chart-tooltip-shadow: var(--ui-elevation-tooltip);
-}
-
-[data-platform-ui][data-theme="dark"] [data-plot="home-activity"] {
-  --ui-plot-primary: var(--color-app-dark-chart-series);
-  --plot-gradient-ink: var(--color-app-dark-chart-area);
-}
diff --git a/apps/sim/platform/design-system/styles/choice-roles.css b/apps/sim/platform/design-system/styles/choice-roles.css
deleted file mode 100644
index 0738f64e746..00000000000
--- a/apps/sim/platform/design-system/styles/choice-roles.css
+++ /dev/null
@@ -1,16 +0,0 @@
-[data-platform-ui] {
-  --menu-zoom-width: 10.5rem;
-  --menu-browser-width: 16.5rem;
-  --menu-action-width: 13.75rem;
-  --menu-choice-width: 10rem;
-  --choice-track: var(--color-black-4);
-  --choice-selected: var(--color-tooltip-text);
-  --choice-edge: var(--color-light-divider);
-  --choice-shadow: 0 1px 2px var(--color-black-4);
-}
-[data-platform-ui][data-theme="dark"] {
-  --choice-track: var(--color-dark-raised);
-  --choice-selected: var(--color-dark-selected);
-  --choice-edge: var(--color-dark-boundary);
-  --choice-shadow: 0 1px 2px var(--color-dark-shadow-soft);
-}
diff --git a/apps/sim/platform/design-system/styles/collection-roles.css b/apps/sim/platform/design-system/styles/collection-roles.css
deleted file mode 100644
index 266da12a657..00000000000
--- a/apps/sim/platform/design-system/styles/collection-roles.css
+++ /dev/null
@@ -1,9 +0,0 @@
-[data-platform-ui] {
-  --collection-heading-ink: var(--color-light-text-secondary);
-  --collection-workspace-viewport: 16rem;
-  --collection-touch-viewport: 19.25rem;
-}
-
-[data-platform-ui][data-theme="dark"] {
-  --collection-heading-ink: var(--color-dark-muted);
-}
diff --git a/apps/sim/platform/design-system/styles/control-roles.css b/apps/sim/platform/design-system/styles/control-roles.css
deleted file mode 100644
index 3dca344c6ec..00000000000
--- a/apps/sim/platform/design-system/styles/control-roles.css
+++ /dev/null
@@ -1,100 +0,0 @@
-[data-platform-ui] {
-  --control-people-width: 15rem;
-  --control-on-solid: var(--color-tooltip-text);
-  --control-primary-fill: color-mix(in srgb, var(--ui-strong) 80%, var(--ui-canvas));
-  --control-solid-step: 0.03;
-  --control-danger: var(--color-light-danger);
-  --control-danger-soft: var(--color-red-soft);
-  --status-info: var(--color-light-accent);
-  --status-info-soft: var(--color-blue-soft);
-  --status-success: var(--color-light-success);
-  --status-success-soft: var(--color-green-soft);
-  --status-warning: var(--color-light-warning);
-  --status-warning-soft: var(--color-orange-soft);
-  --control-hover-border: var(--color-ink-20);
-  --control-avatar: var(--color-surface-muted);
-  --control-muted-fill: var(--color-neutral-silver);
-  --control-muted-hover: var(--color-neutral-238);
-  --control-muted-pressed: var(--color-neutral-235);
-  --control-tooltip: var(--color-tooltip-surface);
-  --control-tooltip-ink: var(--color-tooltip-text);
-}
-
-[data-platform-ui][data-theme="dark"] {
-  --control-on-solid: var(--color-dark-canvas);
-  --control-primary-fill: var(--ui-ink);
-  --control-solid-step: 0.1;
-  --control-danger: var(--color-dark-red);
-  --control-danger-soft: var(--color-dark-red-soft);
-  --status-info: var(--color-dark-blue);
-  --status-info-soft: var(--color-dark-blue-soft);
-  --status-success: var(--color-dark-green);
-  --status-success-soft: var(--color-dark-green-soft);
-  --status-warning: var(--color-dark-orange);
-  --status-warning-soft: var(--color-dark-orange-soft);
-  --control-hover-border: var(--color-white-20);
-  --control-avatar: var(--color-dark-selected);
-  --control-muted-fill: var(--color-dark-raised);
-  --control-muted-hover: var(--color-dark-hover);
-  --control-muted-pressed: var(--color-dark-selected);
-  --control-tooltip: var(--color-dark-tooltip-surface);
-  --control-tooltip-ink: var(--color-dark-text);
-}
-
-[data-platform-ui][data-theme="dark"] svg {
-  --color-nav-link-muted: var(--color-dark-text-secondary);
-  --color-light-text-secondary: var(--color-dark-text-secondary);
-  --color-app-text-secondary: var(--color-app-dark-text-secondary);
-  --color-app-text-primary: var(--color-app-dark-text-primary);
-  --color-control-text: var(--color-dark-text);
-  --color-chart-series: var(--color-app-dark-chart-series);
-  --color-chart-area: var(--color-app-dark-chart-area);
-}
-
-[data-platform-ui] [data-solid] {
-  --control-solid-fill: var(--control-primary-fill);
-  --control-solid-hover: oklch(
-    from var(--control-solid-fill) calc(l - var(--control-solid-step)) c h
-  );
-  --control-solid-pressed: oklch(
-    from var(--control-solid-fill) calc(l - 1.75 * var(--control-solid-step)) c h
-  );
-}
-[data-platform-ui] [data-solid][data-variant="destructive"] {
-  --control-solid-fill: var(--control-danger);
-}
-[data-platform-ui] [data-destructive-quiet] {
-  --ui-hover: color-mix(in srgb, var(--control-danger) 6%, transparent);
-  --ui-selected: color-mix(in srgb, var(--control-danger) 8%, transparent);
-  --ui-icon-active: color-mix(
-    in srgb,
-    var(--control-danger) var(--ui-active-icon-strength),
-    var(--ui-canvas)
-  );
-}
-[data-platform-ui]
-  [data-destructive-quiet]:not(:disabled, [data-disabled]):is(:hover, [data-highlighted]) {
-  --ui-icon-ink: var(--ui-icon-active);
-  color: var(--control-danger);
-}
-
-[data-platform-ui] [data-solid] svg {
-  --color-nav-link-muted: currentColor;
-  --color-app-text-secondary: currentColor;
-}
-
-[data-platform-ui] {
-  --settings-control-width: 11.25rem;
-  --settings-picker-surface: transparent;
-  --switch-off: var(--color-light-divider);
-  --switch-on: var(--color-light-accent);
-  --switch-thumb: var(--color-tooltip-text);
-  --switch-thumb-edge: var(--color-neutral-0-a7-843137);
-  --switch-thumb-shadow: 0 1px 2px var(--color-black-4);
-}
-
-[data-platform-ui][data-theme="dark"] {
-  --settings-picker-surface: var(--color-dark-reading);
-  --switch-off: var(--color-dark-raised);
-  --switch-on: var(--color-dark-blue);
-}
diff --git a/apps/sim/platform/design-system/styles/embedded.css b/apps/sim/platform/design-system/styles/embedded.css
deleted file mode 100644
index d4f304f080c..00000000000
--- a/apps/sim/platform/design-system/styles/embedded.css
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * The design system's stylesheet for a surface embedded in the existing app.
- *
- * Next keeps route CSS loaded after client navigation, so nothing here may reach an element outside
- * `[data-platform-ui]`. `lib/postcss/platform-embed.cjs` scopes every rule, and
- * `scripts/check-platform-css.ts` compiles this file and fails on anything that escapes. No preflight
- * (the host's is the same Tailwind reset) and no Tailwind utilities: components style through hashed
- * CSS Modules.
- */
-@import "./tokens.css";
-@import "./collection-roles.css";
-@import "./typography.css";
-@import "./materials.css";
-@import "./chart-roles.css";
-@import "./control-roles.css";
-@import "./choice-roles.css";
-@import "./rhythm.css";
-@import "./panel-roles.css";
-@import "./shell-roles.css";
-@import "./recipe-values.css";
-
-@font-face {
-  font-family: "Geist";
-  font-style: normal;
-  font-weight: 100 900;
-  font-display: swap;
-  src: url("../fonts/geist.woff2") format("woff2");
-}
-@font-face {
-  font-family: "Geist Mono";
-  font-style: normal;
-  font-weight: 100 900;
-  font-display: swap;
-  src: url("../fonts/geist-mono.woff2") format("woff2");
-}
-
-[data-platform-ui] {
-  color-scheme: light;
-  color: var(--ui-ink);
-  background: var(--ui-canvas);
-  font-family: var(--font-sans);
-  font-synthesis: none;
-  -webkit-font-smoothing: antialiased;
-  /* The host's body sets these for its own type; they inherit into the surface otherwise. */
-  letter-spacing: normal;
-  text-rendering: auto;
-  font-feature-settings: normal;
-  font-variation-settings: normal;
-}
-
-[data-platform-ui][data-theme="dark"] {
-  color-scheme: dark;
-}
-
-[data-platform-ui] textarea {
-  resize: none;
-}
-
-[data-platform-ui] :focus {
-  outline: none;
-}
-
-[data-platform-ui] :focus-visible:not(input, textarea, select, [tabindex="-1"]) {
-  outline: var(--spacing-stroke-focus) solid var(--ui-secondary);
-}
-
-[data-platform-ui][data-system-font] {
-  --font-sans: var(--font-native);
-}
-
-[data-platform-ui][data-system-mono] {
-  --font-mono: ui-monospace, monospace;
-}
diff --git a/apps/sim/platform/design-system/styles/materials.css b/apps/sim/platform/design-system/styles/materials.css
deleted file mode 100644
index d994c0b104a..00000000000
--- a/apps/sim/platform/design-system/styles/materials.css
+++ /dev/null
@@ -1,159 +0,0 @@
-[data-platform-ui] {
-  --ui-canvas: var(--color-light-canvas);
-  --ui-ink: var(--color-app-text-primary);
-  --ui-strong: var(--color-light-text-strong);
-  --ui-secondary: var(--color-app-text-secondary);
-  --ui-muted: var(--color-app-text-muted);
-  --ui-border: var(--color-light-border);
-  --ui-divider: var(--color-light-divider);
-  --ui-conversation-rule: var(--spacing-stroke-default) solid var(--ui-divider);
-  --ui-hover: var(--color-light-hover);
-  --ui-selected: var(--color-light-selected);
-  --ui-shell: var(--color-light-glass-shell);
-  --ui-floating: var(--color-light-glass-floating);
-  --ui-reading: var(--color-light-reading);
-  --ui-scrim: var(--color-black-22);
-  --ui-highlight: var(--color-light-glass-highlight);
-  --ui-shadow-control: var(--color-black-4);
-  --ui-shadow-menu: var(--color-black-6);
-  --ui-shadow-modal: var(--color-light-shadow-modal);
-  --ui-elevation-shell: 12px 0 32px var(--color-neutral-0-a5-098039);
-  --ui-elevation-tooltip: 0 2px 6px var(--color-neutral-0-a14-901961);
-}
-
-[data-platform-ui][data-theme="dark"] {
-  --ui-canvas: var(--color-dark-canvas);
-  --ui-ink: var(--color-app-dark-text-primary);
-  --ui-strong: var(--color-dark-text-primary);
-  --ui-secondary: var(--color-app-dark-text-secondary);
-  --ui-muted: var(--color-app-dark-text-muted);
-  --ui-border: var(--color-dark-border);
-  --ui-divider: var(--color-dark-border);
-  --ui-hover: var(--color-app-dark-hover);
-  --ui-selected: var(--color-dark-selected);
-  --ui-shell: var(--color-dark-glass-shell);
-  --ui-floating: var(--color-dark-glass-floating);
-  --ui-reading: var(--color-dark-reading);
-  --ui-scrim: var(--color-dark-scrim);
-  --ui-highlight: var(--color-dark-highlight);
-  --ui-shadow-control: var(--color-dark-shadow);
-  --ui-shadow-menu: var(--color-dark-shadow);
-  --ui-shadow-modal: var(--color-dark-shadow);
-  --ui-elevation-shell: 12px 0 32px -12px var(--color-dark-shadow-floating);
-  --ui-elevation-tooltip: 0 2px 8px var(--color-dark-shadow-soft);
-}
-
-[data-material="shell"] {
-  background: var(--ui-shell);
-}
-[data-material="floating"] {
-  background: var(--ui-floating);
-}
-[data-material="reading"] {
-  background: var(--ui-reading);
-}
-[data-material="shell"],
-[data-material="floating"] {
-  backdrop-filter: blur(var(--spacing-glass-blur));
-}
-[data-elevation="control"] {
-  box-shadow: 0 1px 2px var(--ui-shadow-control);
-}
-[data-elevation="menu"] {
-  box-shadow:
-    inset 0 1px 0 var(--ui-highlight),
-    0 10px 15px -3px var(--ui-shadow-menu);
-}
-[data-material="reading"][data-elevation="composer"] {
-  background: var(--ui-reading);
-  border: var(--spacing-stroke-default) solid var(--ui-divider);
-  box-shadow:
-    inset 0 var(--spacing-1) 0 var(--ui-highlight),
-    0 var(--spacing-2) var(--spacing-6) var(--ui-shadow-control);
-}
-[data-elevation="modal"] {
-  box-shadow: 0 20px 48px -12px var(--ui-shadow-modal);
-}
-[data-elevation="tooltip"] {
-  box-shadow: var(--ui-elevation-tooltip);
-}
-[data-elevation="shell"] {
-  box-shadow: var(--ui-elevation-shell);
-}
-
-[data-platform-ui] [data-scroll-axis] {
-  --fade-direction: to bottom;
-  --fade-start: linear-gradient(
-    var(--fade-direction),
-    transparent,
-    black var(--spacing-overflow-fade)
-  );
-  --fade-end: linear-gradient(
-    var(--fade-direction),
-    black calc(100% - var(--spacing-overflow-fade)),
-    transparent
-  );
-  --fade-both: linear-gradient(
-    var(--fade-direction),
-    transparent,
-    black var(--spacing-overflow-fade),
-    black calc(100% - var(--spacing-overflow-fade)),
-    transparent
-  );
-}
-[data-platform-ui] [data-scroll-axis="horizontal"] {
-  --fade-direction: to right;
-}
-[data-platform-ui] [data-scroll-axis="horizontal"]:dir(rtl) {
-  --fade-direction: to left;
-}
-
-[data-platform-ui] {
-  --ui-table-number: 5.5rem;
-  --ui-table-wide: 6.5rem;
-  --ui-table-compact: var(--spacing-80);
-  --ui-table-head: var(--spacing-app-control-md);
-  --ui-table-viewport-offset: 12rem;
-}
-
-@media (pointer: coarse) {
-  [data-platform-ui] {
-    --ui-table-head: var(--spacing-app-touch-target);
-  }
-}
-
-[data-platform-ui] {
-  --chart-plot-height: 9.5rem;
-  --chart-donut-block: 11rem;
-  --chart-ring-size: 10rem;
-  --plot-gradient-ink: var(--ui-plot-primary);
-  --plot-stroke-width: var(--spacing-2);
-  --ui-plot-area-opacity: 0.16;
-}
-
-[data-platform-ui] [data-scroll-axis][data-sticky-head] {
-  --fade-start: linear-gradient(
-    to bottom,
-    black var(--ui-table-head),
-    transparent var(--ui-table-head),
-    black calc(var(--ui-table-head) + var(--spacing-overflow-fade))
-  );
-  --fade-both: linear-gradient(
-    to bottom,
-    black var(--ui-table-head),
-    transparent var(--ui-table-head),
-    black calc(var(--ui-table-head) + var(--spacing-overflow-fade)),
-    black calc(100% - var(--spacing-overflow-fade)),
-    transparent
-  );
-}
-
-[data-platform-ui] [data-scroll-axis][data-edges="start"] {
-  mask-image: var(--fade-start);
-}
-[data-platform-ui] [data-scroll-axis][data-edges="end"] {
-  mask-image: var(--fade-end);
-}
-[data-platform-ui] [data-scroll-axis][data-edges="both"] {
-  mask-image: var(--fade-both);
-}
diff --git a/apps/sim/platform/design-system/styles/panel-roles.css b/apps/sim/platform/design-system/styles/panel-roles.css
deleted file mode 100644
index 64201204468..00000000000
--- a/apps/sim/platform/design-system/styles/panel-roles.css
+++ /dev/null
@@ -1,6 +0,0 @@
-[data-platform-ui] {
-  --panel-tab-width: 11.5rem;
-}
-[data-sim-desktop-title-bar] [data-platform-ui] {
-  --panel-tab-width: var(--container-208);
-}
diff --git a/apps/sim/platform/design-system/styles/recipe-values.css b/apps/sim/platform/design-system/styles/recipe-values.css
deleted file mode 100644
index 51b694bbcee..00000000000
--- a/apps/sim/platform/design-system/styles/recipe-values.css
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Generated by scripts/sync-platform-recipes.ts from verified Paper masters. */
-[data-platform-ui] {
-  --paper-box-shadow-5e02d7e3e5: var(--color-dark-shadow-floating) var(--spacing-12)
-    var(--spacing-0) var(--spacing-32) calc(-1 * var(--spacing-12));
-  --paper-box-shadow-84fd7efa0a: var(--color-light-border) var(--spacing-0) var(--spacing-16)
-    var(--spacing-48) calc(-1 * var(--spacing-16));
-  --paper-box-shadow-95bf5e0e4a:
-    var(--color-neutral-0-a5-882353) var(--spacing-0) var(--spacing-4) var(--spacing-16),
-    var(--color-neutral-0-a3-137255) var(--spacing-0) var(--spacing-1) var(--spacing-3);
-  --paper-box-shadow-a6dfdbd7e2: var(--color-neutral-0-a5-882353) var(--spacing-0) var(--spacing-4)
-    var(--spacing-16);
-  --paper-box-shadow-bded2a6c62:
-    var(--color-neutral-255-a70-196078) var(--spacing-0) var(--spacing-1) var(--spacing-0) inset,
-    var(--color-neutral-0-a2-352941) var(--spacing-0) var(--spacing-2) var(--spacing-6);
-  --paper-box-shadow-d5ae8a3ddf: var(--color-black-4) var(--spacing-0) var(--spacing-2)
-    var(--spacing-8);
-  --paper-box-shadow-e9c6b5a770:
-    var(--color-light-glass-highlight) var(--spacing-0) var(--spacing-1) var(--spacing-0) inset,
-    var(--color-black-6) var(--spacing-0) var(--spacing-10) var(--spacing-15)
-    calc(-1 * var(--spacing-3));
-  --paper-box-shadow-f5f0fda4b2:
-    var(--color-neutral-0-a18-039216) var(--spacing-0) var(--spacing-24) var(--spacing-64) calc(
-      -1 *
-      var(--spacing-16)
-    ), var(--color-neutral-0-a7-843137) var(--spacing-0) var(--spacing-4) var(--spacing-12) calc(
-      -1 *
-      var(--spacing-4)
-    ), var(--color-light-divider) var(--spacing-0) var(--spacing-0) var(--spacing-0) var(
-      --spacing-1
-    );
-  --paper-box-shadow-f854b37e03:
-    var(--color-dark-highlight) var(--spacing-0) var(--spacing-1) var(--spacing-0) inset,
-    var(--color-dark-shadow) var(--spacing-0) var(--spacing-10) var(--spacing-15)
-    calc(-1 * var(--spacing-3));
-  --paper-mask-image-afb93a5e3e: linear-gradient(
-    to right,
-    black calc(100% - var(--spacing-overflow-fade)),
-    transparent
-  );
-  --paper-mask-image-be2d02b582: linear-gradient(
-    to right,
-    black calc(100% - var(--spacing-28) - var(--spacing-8) - var(--spacing-overflow-fade)),
-    transparent calc(100% - var(--spacing-28) - var(--spacing-8))
-  );
-  --paper-mask-image-e1151e899a: linear-gradient(
-    to bottom,
-    black calc(100% - var(--spacing-overflow-fade)),
-    transparent
-  );
-}
-[data-platform-ui] {
-  --ui-plot-primary: var(--color-chart-light-blue);
-  --ui-plot-secondary: var(--color-chart-light-blue-secondary);
-  --ui-plot-area: var(--color-chart-light-blue-area);
-  --ui-plot-violet-1: var(--color-chart-light-violet-1);
-  --ui-plot-violet-2: var(--color-chart-light-violet-2);
-  --ui-plot-violet-3: var(--color-chart-light-violet-3);
-  --ui-plot-violet-4: var(--color-chart-light-violet-4);
-}
-[data-platform-ui][data-theme="dark"] {
-  --ui-plot-primary: var(--color-chart-dark-blue);
-  --ui-plot-secondary: var(--color-chart-dark-blue-secondary);
-  --ui-plot-area: var(--color-chart-dark-blue-area);
-  --ui-plot-violet-1: var(--color-chart-dark-violet-1);
-  --ui-plot-violet-2: var(--color-chart-dark-violet-2);
-  --ui-plot-violet-3: var(--color-chart-dark-violet-3);
-  --ui-plot-violet-4: var(--color-chart-dark-violet-4);
-}
diff --git a/apps/sim/platform/design-system/styles/rhythm.css b/apps/sim/platform/design-system/styles/rhythm.css
deleted file mode 100644
index fcac5e5c88c..00000000000
--- a/apps/sim/platform/design-system/styles/rhythm.css
+++ /dev/null
@@ -1,77 +0,0 @@
-[data-platform-ui] {
-  --ui-page-max-size: calc(var(--container-app-dashboard) + 2 * var(--spacing-48));
-  --ui-page-inline-gutter: clamp(var(--spacing-16), 4cqi, var(--spacing-48));
-  --ui-product-section-gap: var(--spacing-24);
-  --ui-widget-max-size: var(--spacing-320);
-  --ui-page-inset-block: var(--ui-product-section-gap);
-  --ui-motion-color: 120ms;
-  --ui-control-radius: var(--radius-control);
-  --ui-stack-gap: var(--spacing-2);
-  --ui-list-gap: var(--spacing-2);
-  --ui-action-gap: var(--spacing-2);
-  --ui-row-gap: var(--spacing-8);
-  --ui-row-inset: var(--spacing-8);
-  --ui-row-block: var(--spacing-6);
-  --ui-icon-stroke: 1.125px;
-  --ui-action-overhang: calc((var(--spacing-app-control-sm) - var(--ui-glyph-size)) / 2);
-  --ui-icon-muted: color-mix(in srgb, var(--color-light-text-strong) 54%, var(--color-light-canvas));
-  --ui-active-icon-strength: 72%;
-  --ui-icon-active: color-mix(
-    in srgb,
-    var(--color-light-text-strong) var(--ui-active-icon-strength),
-    var(--color-light-canvas)
-  );
-  --ui-icon-ink: var(--ui-icon-muted);
-  --ui-icon-ratio: 1.15em;
-  --ui-icon-size: var(--spacing-app-icon);
-  --ui-glyph-size: min(var(--ui-icon-ratio), var(--ui-icon-size));
-  --ui-popup-padding: var(--spacing-menu-inset);
-  --ui-dialog-inset: var(--spacing-16);
-  --ui-section-gap: var(--spacing-12);
-}
-
-[data-platform-ui][data-theme="dark"] {
-  --ui-icon-muted: color-mix(in srgb, var(--color-dark-muted) 88%, var(--color-dark-canvas));
-  --ui-active-icon-strength: 100%;
-  --ui-icon-active: var(--color-dark-text);
-}
-
-[data-platform-ui]
-  :is(
-    [data-menu-row],
-    [role="menuitem"],
-    [role="menuitemradio"],
-    [role="menuitemcheckbox"],
-    [role="option"]
-  ):not(:disabled, [data-disabled], [aria-disabled="true"]):is(
-    :hover:not([role="option"]),
-    [data-highlighted],
-    [data-popup-open]
-  ),
-[data-platform-ui] :is([aria-current="page"], [role="tab"][aria-selected="true"]) {
-  --ui-icon-ink: var(--ui-icon-active);
-}
-[data-platform-ui] [data-solid] {
-  --ui-icon-ink: var(--control-on-solid);
-}
-
-@media (pointer: coarse) {
-  [data-platform-ui] {
-    --ui-action-overhang: calc((var(--spacing-app-touch-target) - var(--ui-glyph-size)) / 2);
-  }
-}
-
-@media (prefers-reduced-motion: reduce) {
-  [data-platform-ui] {
-    --ui-motion-color: 0ms;
-  }
-}
-
-[data-platform-ui] [data-visually-hidden] {
-  position: absolute;
-  inline-size: 1px;
-  block-size: 1px;
-  overflow: hidden;
-  clip-path: inset(50%);
-  white-space: nowrap;
-}
diff --git a/apps/sim/platform/design-system/styles/shell-roles.css b/apps/sim/platform/design-system/styles/shell-roles.css
deleted file mode 100644
index 3f3ce7e2e8e..00000000000
--- a/apps/sim/platform/design-system/styles/shell-roles.css
+++ /dev/null
@@ -1,42 +0,0 @@
-[data-platform-ui] {
-  --shell-inbox-width: 27rem;
-  --shell-notice-width: 22.5rem;
-  --shell-org-menu-width: 16.5rem;
-  --shell-edge-inset: var(--spacing-12);
-  --shell-toolbar-end: calc(var(--shell-edge-inset) + var(--spacing-app-chip));
-  --shell-home-row-start: calc(var(--shell-toolbar-end) + var(--ui-product-section-gap));
-  --shell-page-opener-space: 0px;
-  --ui-navigation-inset: 0px;
-}
-@container scrolling-shell (width < 75rem) {
-  [data-platform-ui] [data-page-opener] {
-    --shell-page-opener-space: var(--shell-toolbar-end);
-    --shell-home-row-start: var(--ui-product-section-gap);
-  }
-}
-[data-platform-ui] [data-sidebar-collapsed] {
-  --ui-navigation-inset: var(--spacing-52);
-}
-@media (max-width: 48rem) {
-  [data-platform-ui] {
-    --ui-navigation-inset: var(--spacing-52);
-  }
-}
-[data-platform-ui] [data-desktop] {
-  --ui-navigation-inset: 0px;
-}
-
-[data-platform-ui] [data-desktop][data-conversation][data-sidebar-collapsed] {
-  --ui-navigation-inset: var(--spacing-128);
-}
-[data-sim-desktop-title-bar="inset"] [data-desktop][data-conversation][data-sidebar-collapsed] {
-  --ui-navigation-inset: var(--spacing-192);
-}
-@media (max-width: 48rem) {
-  [data-platform-ui] [data-desktop][data-conversation] {
-    --ui-navigation-inset: var(--spacing-128);
-  }
-  [data-sim-desktop-title-bar="inset"] [data-desktop][data-conversation] {
-    --ui-navigation-inset: var(--spacing-192);
-  }
-}
diff --git a/apps/sim/platform/design-system/styles/theme.css b/apps/sim/platform/design-system/styles/theme.css
deleted file mode 100644
index 73fa36f7091..00000000000
--- a/apps/sim/platform/design-system/styles/theme.css
+++ /dev/null
@@ -1,20 +0,0 @@
-@theme {
-  --spacing: 0.25rem;
-  --breakpoint-compact: 48rem;
-  --breakpoint-expanded: 80rem;
-}
-@theme inline {
-  --color-canvas: var(--ui-canvas);
-  --color-ink: var(--ui-ink);
-  --color-secondary: var(--ui-secondary);
-  --color-boundary: var(--ui-border);
-  --color-reading: var(--ui-reading);
-  --color-floating: var(--ui-floating);
-  --color-selected: var(--ui-selected);
-  --spacing-control-gap: var(--spacing-control-icon-gap);
-  --spacing-field: var(--spacing-field-stack);
-  --spacing-modal: var(--spacing-modal-inset);
-  --radius-field: var(--radius-control);
-  --radius-modal: var(--radius-dialog);
-  --container-dialog: var(--container-app-modal-md);
-}
diff --git a/apps/sim/platform/design-system/styles/tokens.css b/apps/sim/platform/design-system/styles/tokens.css
deleted file mode 100644
index 83e93e6a37a..00000000000
--- a/apps/sim/platform/design-system/styles/tokens.css
+++ /dev/null
@@ -1,710 +0,0 @@
-/* Shared foundation. Reference px become rem at a 16px root; strokes retain their measured width. */
-[data-platform-ui] {
-  --breakpoint-app-compact: var(--breakpoint-compact);
-  --breakpoint-app-expanded: var(--breakpoint-expanded);
-  --breakpoint-compact: 48rem;
-  --breakpoint-expanded: 80rem;
-  --black-12: var(--color-light-border);
-  --black-22: var(--color-black-22);
-  --black-4: var(--color-black-4);
-  --black-6: var(--color-light-divider);
-  --black-72: var(--color-black-72);
-  --black-8: var(--color-light-selected);
-  --blue: var(--color-light-accent);
-  --color-accent: var(--color-light-accent);
-  --color-announcement-badge: var(--color-orange);
-  --color-announcement-badge-background: var(--color-orange-10);
-  --color-announcement-border: var(--color-ink-8);
-  --color-announcement-border-hover: var(--color-ink-15);
-  --color-announcement-description-hover: var(--color-light-text);
-  --color-announcement-separator: var(--color-ink-20);
-  --color-app-accent: var(--color-light-accent);
-  --color-app-border: var(--color-light-divider);
-  --color-app-canvas: var(--color-light-canvas);
-  --color-app-dark-accent: var(--color-dark-blue);
-  --color-app-dark-accent-hover: var(--color-dark-accent-hover);
-  --color-app-dark-accent-pressed: var(--color-dark-accent-pressed);
-  --color-app-dark-avatar: var(--color-dark-selected);
-  --color-app-dark-border: var(--color-dark-border);
-  --color-app-dark-boundary: var(--color-dark-boundary);
-  --color-app-dark-button-label: var(--color-dark-canvas);
-  --color-app-dark-button-primary: var(--color-dark-text);
-  --color-app-dark-button-primary-hover: var(--color-dark-button-primary-hover);
-  --color-app-dark-button-primary-pressed: var(--color-dark-button-primary-pressed);
-  --color-app-dark-button-secondary: var(--color-dark-selected);
-  --color-app-dark-button-secondary-hover: var(--color-dark-pressed);
-  --color-app-dark-button-secondary-pressed: var(--color-dark-button-secondary-pressed);
-  --color-app-dark-canvas: var(--color-dark-canvas);
-  --color-app-dark-chart-area: var(--color-dark-muted);
-  --color-app-dark-chart-grid: var(--color-dark-chart-grid);
-  --color-app-dark-chart-series: var(--color-dark-chart-series);
-  --color-app-dark-composer-glass: var(--color-dark-composer-glass);
-  --color-app-dark-disabled: var(--color-dark-text-disabled);
-  --color-app-dark-error: var(--color-dark-red);
-  --color-app-dark-glass: var(--color-dark-glass-shell);
-  --color-app-dark-glass-edge: var(--color-dark-glass-edge);
-  --color-app-dark-glass-edge-bottom: var(--color-dark-hover-alt);
-  --color-app-dark-glass-edge-top: var(--color-dark-glass-edge-top);
-  --color-app-dark-header-glass: var(--color-dark-glass-shell);
-  --color-app-dark-highlight: var(--color-white-10);
-  --color-app-dark-hover: var(--color-dark-hover-alt);
-  --color-app-dark-muted-surface: var(--color-dark-raised);
-  --color-app-dark-overlay: var(--color-dark-overlay);
-  --color-app-dark-pressed: var(--color-dark-pressed);
-  --color-app-dark-raised: var(--color-dark-raised);
-  --color-app-dark-reading: var(--color-dark-reading);
-  --color-app-dark-scrim: var(--color-dark-scrim);
-  --color-app-dark-selected: var(--color-dark-selected);
-  --color-app-dark-shadow-floating: var(--color-dark-shadow-floating);
-  --color-app-dark-shadow-soft: var(--color-dark-shadow-soft);
-  --color-app-dark-success: var(--color-dark-blue);
-  --color-app-dark-text-muted: var(--color-dark-text-muted);
-  --color-app-dark-text-primary: var(--color-dark-text);
-  --color-app-dark-text-secondary: var(--color-dark-muted);
-  --color-app-dark-tooltip-surface: var(--color-dark-tooltip-surface);
-  --color-app-dark-tooltip-text: var(--color-dark-text);
-  --color-app-dark-warning: var(--color-dark-orange);
-  --color-app-dark-warning-soft: var(--color-dark-orange-soft);
-  --color-app-error: var(--color-light-danger);
-  --color-app-glass: var(--color-light-glass-shell);
-  --color-app-header-glass: var(--color-header-glass);
-  --color-app-hover: var(--color-light-hover);
-  --color-app-overlay: var(--color-light-glass-floating);
-  --color-app-pressed: var(--color-light-border);
-  --color-app-reading: var(--color-light-reading);
-  --color-app-selected: var(--color-light-selected);
-  --color-app-success: var(--color-light-accent);
-  --color-app-text-muted: var(--color-light-text-secondary);
-  --color-app-text-primary: var(--color-light-text);
-  --color-app-text-secondary: var(--color-light-text-secondary);
-  --color-auth-field: var(--color-light-reading);
-  --color-auth-panel: var(--color-panel);
-  --color-background: var(--color-light-canvas);
-  --color-black-22: rgb(0 0 0 / 22%);
-  --color-black-4: rgb(0 0 0 / 4%);
-  --color-black-6: var(--color-light-divider);
-  --color-black-72: rgb(0 0 0 / 72%);
-  --color-blue-soft: #e9f2ff;
-  --color-border: var(--color-light-border);
-  --color-border-subtle: var(--color-light-divider);
-  --color-brand-0066cc: #0066cc;
-  --color-brand-22c55e33: #22c55e33;
-  --color-brand-3b82f633: #3b82f633;
-  --color-brand-a855f733: #a855f733;
-  --color-brand-ef444433: #ef444433;
-  --color-brand-f5f5f7: #f5f5f7;
-  --color-brand-f9731633: #f9731633;
-  --color-brand-fafafccc: #fafafccc;
-  --color-brand-ff6308: #ff6308;
-  --color-brand-ff63081a: #ff63081a;
-  --color-brand-fff2e9: #fff2e9;
-  --color-button-label: var(--color-light-canvas);
-  --color-button-label-hover: var(--color-white-90);
-  --color-button-primary: var(--color-light-text-strong);
-  --color-button-primary-hover: var(--color-ink-hover);
-  --color-button-secondary: var(--color-surface-muted);
-  --color-button-secondary-hover: var(--color-ink-8);
-  --color-chart-area: var(--color-light-text-strong);
-  --color-chart-dark-blue: #8abeff;
-  --color-chart-dark-blue-area: #272f3a;
-  --color-chart-dark-blue-secondary: #58779c;
-  --color-chart-dark-violet-1: #c4a6f2;
-  --color-chart-dark-violet-2: #9d86c1;
-  --color-chart-dark-violet-3: #776690;
-  --color-chart-dark-violet-4: #50465f;
-  --color-chart-grid: var(--color-surface-muted);
-  --color-chart-light-blue: #4d94db;
-  --color-chart-light-blue-area: #e0edf9;
-  --color-chart-light-blue-secondary: #a3c8ed;
-  --color-chart-light-violet-1: #9b69f1;
-  --color-chart-light-violet-2: #b691f5;
-  --color-chart-light-violet-3: #d0b8f9;
-  --color-chart-light-violet-4: #e7dcfc;
-  --color-chart-series: rgb(10 10 10 / 50%);
-  --color-control-boundary-light: #767676;
-  --color-control-text: var(--color-light-text-strong);
-  --color-dark-accent: var(--color-dark-blue);
-  --color-dark-accent-hover: #9fcbff;
-  --color-dark-accent-pressed: #73adee;
-  --color-dark-blue: #8abeff;
-  --color-dark-blue-soft: #203047;
-  --color-dark-border: #383838;
-  --color-dark-boundary: #8a8a8a;
-  --color-dark-button-label: var(--color-dark-canvas);
-  --color-dark-button-primary: var(--color-dark-text);
-  --color-dark-button-primary-hover: #d4d4d4;
-  --color-dark-button-primary-pressed: #c2c2c2;
-  --color-dark-button-secondary: var(--color-dark-selected);
-  --color-dark-button-secondary-hover: var(--color-dark-pressed);
-  --color-dark-button-secondary-pressed: #424242;
-  --color-dark-canvas: #141414;
-  --color-dark-chart-grid: #292929;
-  --color-dark-chart-series: #969696;
-  --color-dark-composer-glass: rgb(28 28 28 / 90%);
-  --color-dark-danger: var(--color-dark-red);
-  --color-dark-danger-hover: #e48888;
-  --color-dark-danger-pressed: #d67d7d;
-  --color-dark-divider: var(--color-dark-border);
-  --color-dark-focus: var(--color-dark-blue);
-  --color-dark-glass: var(--color-dark-glass-floating);
-  --color-dark-glass-edge: rgb(255 255 255 / 8%);
-  --color-dark-glass-edge-top: rgb(255 255 255 / 12%);
-  --color-dark-glass-floating: rgb(36 36 36 / 92%);
-  --color-dark-glass-shell: rgb(20 20 20 / 92%);
-  --color-dark-green: #8ed5a4;
-  --color-dark-green-soft: #20382a;
-  --color-dark-highlight: var(--color-white-10);
-  --color-dark-hover: #2b2b2b;
-  --color-dark-hover-alt: rgb(255 255 255 / 6%);
-  --color-dark-muted: #b0b0b0;
-  --color-dark-nav-glass: var(--color-dark-glass-shell);
-  --color-dark-orange: #edb27b;
-  --color-dark-orange-soft: #3e3024;
-  --color-dark-overlay: rgb(32 32 32 / 88%);
-  --color-dark-pressed: #3a3a3a;
-  --color-dark-purple: #c4a6f2;
-  --color-dark-purple-soft: #332b43;
-  --color-dark-raised: #242424;
-  --color-dark-reading: #1c1c1c;
-  --color-dark-red: #f09a9a;
-  --color-dark-red-soft: #432a2a;
-  --color-dark-scrim: rgb(0 0 0 / 60%);
-  --color-dark-selected: #333333;
-  --color-dark-selection: rgb(138 190 255 / 24%);
-  --color-dark-shadow: rgb(0 0 0 / 40%);
-  --color-dark-shadow-floating: rgb(0 0 0 / 32%);
-  --color-dark-shadow-soft: rgb(0 0 0 / 20%);
-  --color-dark-success: var(--color-dark-green);
-  --color-dark-surface: var(--color-dark-reading);
-  --color-dark-text: #e6e6e6;
-  --color-dark-text-disabled: #707070;
-  --color-dark-text-muted: #a8a8a8;
-  --color-dark-text-primary: var(--color-dark-text);
-  --color-dark-text-secondary: var(--color-dark-muted);
-  --color-dark-tooltip-surface: #303030;
-  --color-dark-warning: var(--color-dark-orange);
-  --color-docs-blue: var(--color-light-accent);
-  --color-docs-blue-soft: var(--color-blue-soft);
-  --color-docs-dark-blue: var(--color-dark-blue);
-  --color-docs-dark-border: var(--color-dark-border);
-  --color-docs-dark-canvas: var(--color-dark-canvas);
-  --color-docs-dark-green: var(--color-dark-green);
-  --color-docs-dark-hover: var(--color-dark-hover);
-  --color-docs-dark-muted: var(--color-dark-muted);
-  --color-docs-dark-orange: var(--color-dark-orange);
-  --color-docs-dark-purple: var(--color-dark-purple);
-  --color-docs-dark-reading: var(--color-dark-reading);
-  --color-docs-dark-red: var(--color-dark-red);
-  --color-docs-dark-selected: var(--color-dark-selected);
-  --color-docs-dark-text: var(--color-dark-text);
-  --color-docs-gray: var(--color-light-text-secondary);
-  --color-docs-gray-soft: var(--color-surface-muted);
-  --color-docs-green: var(--color-light-success);
-  --color-docs-green-soft: var(--color-green-soft);
-  --color-docs-orange: var(--color-light-warning);
-  --color-docs-orange-soft: var(--color-orange-soft);
-  --color-docs-purple: var(--color-light-purple);
-  --color-docs-purple-soft: var(--color-purple-soft);
-  --color-docs-red: var(--color-light-danger);
-  --color-docs-red-soft: var(--color-red-soft);
-  --color-fade-clear: var(--color-transparent);
-  --color-fade-edge: var(--color-white-85);
-  --color-fade-middle: var(--color-white-30);
-  --color-focus: var(--color-ink-30);
-  --color-footer-link: var(--color-light-text-strong);
-  --color-glass: var(--color-light-glass-shell);
-  --color-glass-fallback: var(--color-neutral-pearl);
-  --color-glass-floating: var(--color-light-glass-floating);
-  --color-glass-highlight: var(--color-light-glass-highlight);
-  --color-green-soft: #e7fcee;
-  --color-header-glass: rgb(254 254 254 / 92%);
-  --color-icon-background: var(--color-transparent);
-  --color-icon-background-hover: var(--color-light-hover);
-  --color-ink-15: rgb(10 10 10 / 15%);
-  --color-ink-20: rgb(10 10 10 / 20%);
-  --color-ink-30: rgb(10 10 10 / 30%);
-  --color-ink-8: rgb(10 10 10 / 8%);
-  --color-ink-hover: rgb(9 9 9);
-  --color-landing-button-secondary: var(--color-warm-3);
-  --color-landing-nav-backdrop: var(--color-nav-backdrop-alt);
-  --color-landing-nav-dropdown: var(--color-nav-dropdown-shared);
-  --color-light-accent: rgb(0 102 204);
-  --color-light-border: rgb(0 0 0 / 12%);
-  --color-light-canvas: rgb(255 255 255);
-  --color-light-danger: #c83232;
-  --color-light-divider: rgb(0 0 0 / 6%);
-  --color-light-glass-floating: rgb(255 255 255 / 88%);
-  --color-light-glass-highlight: rgb(255 255 255 / 70%);
-  --color-light-glass-shell: rgb(255 255 255 / 80%);
-  --color-light-hover: rgb(10 10 10 / 6%);
-  --color-light-purple: #7c3aed;
-  --color-light-reading: rgb(255 255 255 / 96%);
-  --color-light-selected: rgb(0 0 0 / 8%);
-  --color-light-shadow-modal: rgb(0 0 0 / 12%);
-  --color-light-success: #15803d;
-  --color-light-text: rgb(10 10 10 / 80%);
-  --color-light-text-secondary: rgb(10 10 10 / 60%);
-  --color-light-text-strong: rgb(10 10 10);
-  --color-light-warning: #c2410c;
-  --color-mark-edge-end: #d9d9d9;
-  --color-mark-edge-start: #858585;
-  --color-mark-face-front: #efefef;
-  --color-mark-face-side: #e5e5e5;
-  --color-mark-face-top: #f7f7f7;
-  --color-menu-border: var(--color-light-hover);
-  --color-menu-hover: var(--color-surface-muted);
-  --color-nav-backdrop: rgb(232 232 232 / 40%);
-  --color-nav-backdrop-alt: rgb(232 232 237 / 40%);
-  --color-nav-background: var(--color-light-canvas);
-  --color-nav-dropdown: var(--color-light-glass-floating);
-  --color-nav-dropdown-shared: #fafafc;
-  --color-nav-glass: var(--color-light-glass-shell);
-  --color-nav-link-muted: var(--color-light-text-secondary);
-  --color-neutral-0: #000000;
-  --color-neutral-0-a10-196078: #0000001a;
-  --color-neutral-0-a12-156863: #0000001f;
-  --color-neutral-0-a14-901961: #00000026;
-  --color-neutral-0-a16-078431: #00000029;
-  --color-neutral-0-a18-039216: #0000002e;
-  --color-neutral-0-a2-352941: #00000006;
-  --color-neutral-0-a25-098039: #00000040;
-  --color-neutral-0-a3-137255: #00000008;
-  --color-neutral-0-a3-921569: #0000000a;
-  --color-neutral-0-a5-098039: #0000000d;
-  --color-neutral-0-a5-882353: #0000000f;
-  --color-neutral-0-a7-843137: #00000014;
-  --color-neutral-10: #0a0a0a;
-  --color-neutral-10-a14-901961: #0a0a0a26;
-  --color-neutral-10-a3-921569: #0a0a0a0a;
-  --color-neutral-10-a7-843137: #0a0a0a14;
-  --color-neutral-10-a80-0: #0a0a0acc;
-  --color-neutral-14: #0e0e0e;
-  --color-neutral-202: #cacaca;
-  --color-neutral-222: #dedede;
-  --color-neutral-232: #e8e8e8;
-  --color-neutral-234: #eaeaea;
-  --color-neutral-235: #ebebeb;
-  --color-neutral-238: #eeeeee;
-  --color-neutral-24: #181818;
-  --color-neutral-255-a10-196078: #ffffff1a;
-  --color-neutral-255-a20-0: #ffffff33;
-  --color-neutral-255-a30-196078: #ffffff4d;
-  --color-neutral-255-a70-196078: #ffffffb3;
-  --color-neutral-255-a74-901961: #ffffffbf;
-  --color-neutral-255-a80-0: #ffffffcc;
-  --color-neutral-255-a85-098039: #ffffffd9;
-  --color-neutral-32: #202020;
-  --color-neutral-52: #343434;
-  --color-neutral-9: #090909;
-  --color-neutral-black: rgb(0 0 0);
-  --color-neutral-graphite: #1d1d1d;
-  --color-neutral-gray: #6e6e6e;
-  --color-neutral-pearl: #fafafa;
-  --color-neutral-silver: #f5f5f5;
-  --color-neutral-warm: rgb(249 248 246);
-  --color-orange: rgb(255 99 8);
-  --color-orange-10: rgb(255 99 8 / 10%);
-  --color-orange-soft: #fff1e1;
-  --color-panel: #00000000;
-  --color-purple-soft: #f7f0ff;
-  --color-red-soft: #ffecec;
-  --color-shadow: var(--color-light-selected);
-  --color-shadow-floating: var(--color-light-border);
-  --color-split-divider: var(--color-white-20);
-  --color-split-hover: var(--color-white-10);
-  --color-status-complete: var(--color-light-accent);
-  --color-status-complete-background: rgb(235 243 251);
-  --color-status-pending: #856404;
-  --color-status-pending-background: #fff5cc;
-  --color-surface: var(--color-light-canvas);
-  --color-surface-inverse: var(--color-neutral-black);
-  --color-surface-muted: rgb(10 10 10 / 4%);
-  --color-surface-reading: var(--color-light-reading);
-  --color-text-inverse: var(--color-neutral-silver);
-  --color-text-primary: var(--color-light-text-strong);
-  --color-text-secondary: var(--color-light-text-secondary);
-  --color-tint: var(--color-black-4);
-  --color-tint-hover: var(--color-light-divider);
-  --color-tooltip-surface: #191919;
-  --color-tooltip-text: #ffffff;
-  --color-transparent: rgb(255 255 255 / 0%);
-  --color-warm-3: rgb(242 241 239);
-  --color-warm-7: rgb(232 231 229);
-  --color-white-10: rgb(255 255 255 / 10%);
-  --color-white-20: rgb(255 255 255 / 20%);
-  --color-white-30: rgb(255 255 255 / 30%);
-  --color-white-85: rgb(255 255 255 / 85%);
-  --color-white-90: rgb(229 229 229);
-  --ink-15: var(--color-ink-15);
-  --ink-20: var(--color-ink-20);
-  --ink-30: var(--color-ink-30);
-  --ink-4: var(--color-surface-muted);
-  --ink-50: var(--color-chart-series);
-  --ink-6: var(--color-light-hover);
-  --ink-60: var(--color-light-text-secondary);
-  --ink-8: var(--color-ink-8);
-  --ink-80: var(--color-light-text);
-  --ink-hover: var(--color-ink-hover);
-  --neutral-black: var(--color-neutral-black);
-  --neutral-graphite: var(--color-neutral-graphite);
-  --neutral-gray: var(--color-neutral-gray);
-  --neutral-ink: var(--color-light-text-strong);
-  --neutral-pearl: var(--color-neutral-pearl);
-  --neutral-silver: var(--color-neutral-silver);
-  --neutral-warm: var(--color-neutral-warm);
-  --neutral-white: var(--color-light-canvas);
-  --orange: var(--color-orange);
-  --orange-10: var(--color-orange-10);
-  --pearl-80: var(--color-light-glass-shell);
-  --warm-3: var(--color-warm-3);
-  --warm-7: var(--color-warm-7);
-  --white-0: var(--color-transparent);
-  --white-10: var(--color-white-10);
-  --white-20: var(--color-white-20);
-  --white-30: var(--color-white-30);
-  --white-70: var(--color-light-glass-highlight);
-  --white-80: var(--color-light-glass-shell);
-  --white-85: var(--color-white-85);
-  --white-90: var(--color-white-90);
-  --container-1200: 75rem;
-  --container-1280: 80rem;
-  --container-16: 1rem;
-  --container-20: 1.25rem;
-  --container-208: 13rem;
-  --container-216: 13.5rem;
-  --container-40: 2.5rem;
-  --container-440: 27.5rem;
-  --container-480: 30rem;
-  --container-56: 3.5rem;
-  --container-560: 35rem;
-  --container-640: 40rem;
-  --container-688: 43rem;
-  --container-700: 43.75rem;
-  --container-760: 47.5rem;
-  --container-800: 50rem;
-  --container-app-command: var(--container-reading);
-  --container-app-composer: var(--container-688);
-  --container-app-dashboard: var(--container-1200);
-  --container-app-modal-lg: var(--container-760);
-  --container-app-modal-md: var(--container-560);
-  --container-app-modal-sm: var(--container-440);
-  --container-app-panel-start: var(--container-480);
-  --container-app-settings: var(--container-700);
-  --container-app-sidebar: var(--container-sidebar);
-  --container-auth-form: var(--container-form);
-  --container-auth-nav: var(--container-1280);
-  --container-auth-panel: var(--container-form);
-  --container-chat: 44rem;
-  --container-chat-message: var(--container-640);
-  --container-chat-thread: var(--container-800);
-  --container-docs-article: var(--container-reading);
-  --container-docs-shell: var(--container-1280);
-  --container-docs-sidebar: var(--container-216);
-  --container-docs-toc: var(--container-208);
-  --container-form: 25rem;
-  --container-reading: 42.5rem;
-  --container-sidebar: 17.5rem;
-  --height-nav: var(--container-56);
-  --size-button-icon: var(--container-16);
-  --size-button-icon-large: var(--container-20);
-  --width-nav-logo: var(--container-40);
-  --font-mono: "Geist Mono";
-  --font-mono-mobile: var(--font-mono);
-  --font-mono-tablet: var(--font-mono);
-  --font-native: system-ui, sans-serif;
-  --font-sans: "Geist";
-  --font-sans-mobile: var(--font-sans);
-  --font-sans-tablet: var(--font-sans);
-  --text-10: 0.625rem;
-  --text-17: 1.0625rem;
-  --text-20: 1.25rem;
-  --text-22: 1.375rem;
-  --text-28: 1.75rem;
-  --text-30: 1.875rem;
-  --text-36: 2.25rem;
-  --text-app-body: var(--text-body);
-  --text-app-caption: var(--text-caption);
-  --text-app-control: var(--text-control);
-  --text-app-page: var(--text-heading);
-  --text-app-section: var(--text-reading);
-  --text-badge: 0.6875rem;
-  --text-body: 0.875rem;
-  --text-caption: 0.75rem;
-  --text-chart-value: var(--text-heading);
-  --text-control: 0.8125rem;
-  --text-display: 3.75rem;
-  --text-display-lg: 3rem;
-  --text-docs-body: var(--text-reading);
-  --text-docs-title: var(--text-title);
-  --text-heading: 1.5rem;
-  --text-hero: 2.5rem;
-  --text-lead: 1.125rem;
-  --text-reading: 1rem;
-  --text-title: 2rem;
-  --type-badge-size: var(--text-badge);
-  --type-body-size: var(--text-reading);
-  --type-body-size-mobile: var(--text-reading);
-  --type-body-size-tablet: var(--text-reading);
-  --type-body-small-size: var(--text-body);
-  --type-body-small-size-mobile: var(--text-body);
-  --type-body-small-size-tablet: var(--text-body);
-  --type-button-large-size: var(--text-reading);
-  --type-button-size: var(--text-body);
-  --type-button-size-mobile: var(--text-body);
-  --type-button-size-tablet: var(--text-body);
-  --type-caption-size: var(--text-caption);
-  --type-caption-size-mobile: var(--text-caption);
-  --type-caption-size-tablet: var(--text-caption);
-  --type-card-size: var(--text-reading);
-  --type-card-size-mobile: var(--text-reading);
-  --type-card-size-tablet: var(--text-reading);
-  --type-code-size: var(--text-control);
-  --type-code-size-mobile: var(--text-control);
-  --type-code-size-tablet: var(--text-control);
-  --type-display-size: var(--text-display);
-  --type-display-size-mobile: var(--text-36);
-  --type-display-size-tablet: var(--text-display-lg);
-  --type-eyebrow-size: var(--text-body);
-  --type-eyebrow-size-mobile: var(--text-body);
-  --type-eyebrow-size-tablet: var(--text-body);
-  --type-footer-size: var(--text-control);
-  --type-hero-size: var(--text-hero);
-  --type-hero-size-mobile: var(--text-title);
-  --type-lead-size: var(--text-lead);
-  --type-lead-size-mobile: var(--text-lead);
-  --type-lead-size-tablet: var(--text-lead);
-  --type-nav-size: var(--text-control);
-  --type-nav-size-mobile: var(--text-control);
-  --type-nav-size-tablet: var(--text-control);
-  --type-page-size: var(--text-display-lg);
-  --type-page-size-mobile: var(--text-36);
-  --type-page-size-tablet: var(--text-display-lg);
-  --type-section-size: var(--text-30);
-  --type-section-size-mobile: var(--text-heading);
-  --type-section-size-tablet: var(--text-30);
-  --type-subsection-size: var(--text-heading);
-  --type-subsection-size-mobile: var(--text-heading);
-  --type-subsection-size-tablet: var(--text-heading);
-  --font-weight-control: 450;
-  --font-weight-control-mobile: var(--font-weight-control);
-  --font-weight-control-tablet: var(--font-weight-control);
-  --font-weight-display: var(--font-weight-control);
-  --font-weight-display-mobile: var(--font-weight-control);
-  --font-weight-display-tablet: var(--font-weight-control);
-  --font-weight-medium: 500;
-  --font-weight-medium-mobile: var(--font-weight-medium);
-  --font-weight-medium-tablet: var(--font-weight-medium);
-  --font-weight-regular: 400;
-  --font-weight-regular-mobile: var(--font-weight-regular);
-  --font-weight-regular-tablet: var(--font-weight-regular);
-  --font-weight-semibold: 600;
-  --font-weight-semibold-mobile: var(--font-weight-semibold);
-  --font-weight-semibold-tablet: var(--font-weight-semibold);
-  --tracking-0-12em: 0.12em;
-  --tracking-0em: 0em;
-  --tracking-0px: 0px;
-  --tracking-app-body: var(--tracking-0em);
-  --tracking-app-title: var(--tracking-minus-0-02em);
-  --tracking-minus-0-01em: -0.01em;
-  --tracking-minus-0-02em: -0.02em;
-  --type-footer-tracking: var(--tracking-0px);
-  --type-hero-tracking: var(--tracking-minus-0-01em);
-  --leading-11: 0.6875rem;
-  --leading-12: 0.75rem;
-  --leading-14: 0.875rem;
-  --leading-16: 1rem;
-  --leading-18: 1.125rem;
-  --leading-19-5: 1.21875rem;
-  --leading-20: 1.25rem;
-  --leading-21-125: 1.3203125rem;
-  --leading-22: 1.375rem;
-  --leading-22-75: 1.421875rem;
-  --leading-24: 1.5rem;
-  --leading-26: 1.625rem;
-  --leading-28: 1.75rem;
-  --leading-29-25: 1.828125rem;
-  --leading-30: 1.875rem;
-  --leading-32: 2rem;
-  --leading-36: 2.25rem;
-  --leading-39-599998474121094: 2.4749999046325684rem;
-  --leading-40: 2.5rem;
-  --leading-44: 2.75rem;
-  --leading-48: 3rem;
-  --leading-60: 3.75rem;
-  --leading-app-body: var(--leading-22);
-  --leading-app-control: var(--leading-18);
-  --leading-app-page: var(--leading-32);
-  --leading-docs-body: var(--leading-26);
-  --leading-docs-title: var(--leading-40);
-  --type-badge-leading: var(--leading-11);
-  --type-body-leading: var(--leading-26);
-  --type-body-leading-mobile: var(--leading-26);
-  --type-body-leading-tablet: var(--leading-26);
-  --type-body-small-leading: var(--leading-22-75);
-  --type-body-small-leading-mobile: var(--leading-22-75);
-  --type-body-small-leading-tablet: var(--leading-22-75);
-  --type-button-leading: var(--leading-20);
-  --type-button-leading-mobile: var(--leading-20);
-  --type-button-leading-tablet: var(--leading-20);
-  --type-caption-leading: var(--leading-16);
-  --type-caption-leading-mobile: var(--leading-16);
-  --type-caption-leading-tablet: var(--leading-16);
-  --type-card-leading: var(--leading-22);
-  --type-card-leading-mobile: var(--leading-22);
-  --type-card-leading-tablet: var(--leading-22);
-  --type-code-leading: var(--leading-19-5);
-  --type-code-leading-mobile: var(--leading-19-5);
-  --type-code-leading-tablet: var(--leading-19-5);
-  --type-display-leading: var(--leading-60);
-  --type-display-leading-mobile: var(--leading-39-599998474121094);
-  --type-display-leading-tablet: var(--leading-48);
-  --type-eyebrow-leading: var(--leading-20);
-  --type-eyebrow-leading-mobile: var(--leading-20);
-  --type-eyebrow-leading-tablet: var(--leading-20);
-  --type-footer-leading: var(--leading-21-125);
-  --type-hero-leading: var(--leading-44);
-  --type-hero-leading-mobile: var(--leading-36);
-  --type-lead-leading: var(--leading-29-25);
-  --type-lead-leading-mobile: var(--leading-29-25);
-  --type-lead-leading-tablet: var(--leading-29-25);
-  --type-nav-leading: var(--leading-19-5);
-  --type-nav-leading-mobile: var(--leading-19-5);
-  --type-nav-leading-tablet: var(--leading-19-5);
-  --type-page-leading: var(--leading-48);
-  --type-page-leading-mobile: var(--leading-40);
-  --type-page-leading-tablet: var(--leading-48);
-  --type-section-leading: var(--leading-36);
-  --type-section-leading-mobile: var(--leading-32);
-  --type-section-leading-tablet: var(--leading-36);
-  --type-subsection-leading: var(--leading-32);
-  --type-subsection-leading-mobile: var(--leading-32);
-  --type-subsection-leading-tablet: var(--leading-32);
-  --opacity-0: 0%;
-  --opacity-0-35: 35%;
-  --opacity-0-4: 40%;
-  --opacity-0-45: 45%;
-  --opacity-0-5: 50%;
-  --opacity-0-6: 60%;
-  --opacity-40: 40%;
-  --opacity-6: 6%;
-  --opacity-app-disabled: var(--opacity-40);
-  --opacity-chart-area: var(--opacity-6);
-  --opacity-disabled: var(--opacity-40);
-  --opacity-hidden: var(--opacity-0);
-  --opacity-visible: 100%;
-  --radius-1: 1px;
-  --radius-12: 0.75rem;
-  --radius-2: 2px;
-  --radius-4: 0.25rem;
-  --radius-5: 0.3125rem;
-  --radius-app-composer: var(--radius-composer);
-  --radius-app-dialog: var(--radius-dialog);
-  --radius-app-md: var(--radius-control);
-  --radius-app-menu: var(--radius-menu-shared);
-  --radius-app-sm: var(--radius-item);
-  --radius-composer: 1.25rem;
-  --radius-control: 0.5rem;
-  --radius-dialog: 1rem;
-  --radius-full: 624.9375rem;
-  --radius-item: 0.375rem;
-  --radius-menu: var(--radius-12);
-  --radius-menu-shared: 0.625rem;
-  --radius-panel: var(--radius-dialog);
-  --space-0: var(--spacing-0);
-  --space-10: var(--spacing-10);
-  --space-12: var(--spacing-12);
-  --space-16: var(--spacing-16);
-  --space-18: var(--spacing-18);
-  --space-20: var(--spacing-20);
-  --space-24: var(--spacing-24);
-  --space-3: var(--spacing-3);
-  --space-32: var(--spacing-32);
-  --space-4: var(--spacing-4);
-  --space-40: var(--spacing-40);
-  --space-48: var(--spacing-48);
-  --space-56: var(--spacing-56);
-  --space-6: var(--spacing-6);
-  --space-64: var(--spacing-64);
-  --space-8: var(--spacing-8);
-  --spacing-0: 0px;
-  --spacing-0-5: 0.5px;
-  --spacing-1: 1px;
-  --spacing-10: 0.625rem;
-  --spacing-12: 0.75rem;
-  --spacing-128: 8rem;
-  --spacing-132: 8.25rem;
-  --spacing-14: 0.875rem;
-  --spacing-15: 0.9375rem;
-  --spacing-154: 9.625rem;
-  --spacing-16: 1rem;
-  --spacing-18: 1.125rem;
-  --spacing-19: 1.1875rem;
-  --spacing-192: 12rem;
-  --spacing-2: 2px;
-  --spacing-20: 1.25rem;
-  --spacing-21: 1.3125rem;
-  --spacing-22: 1.375rem;
-  --spacing-224: 14rem;
-  --spacing-24: 1.5rem;
-  --spacing-25: 1.5625rem;
-  --spacing-28: 1.75rem;
-  --spacing-3: 3px;
-  --spacing-30: 1.875rem;
-  --spacing-32: 2rem;
-  --spacing-320: 20rem;
-  --spacing-36: 2.25rem;
-  --spacing-4: 0.25rem;
-  --spacing-40: 2.5rem;
-  --spacing-44: 2.75rem;
-  --spacing-48: 3rem;
-  --spacing-5: 0.3125rem;
-  --spacing-50: 3.125rem;
-  --spacing-52: 3.25rem;
-  --spacing-56: 3.5rem;
-  --spacing-6: 0.375rem;
-  --spacing-60: 3.75rem;
-  --spacing-64: 4rem;
-  --spacing-68: 4.25rem;
-  --spacing-7: 0.4375rem;
-  --spacing-72: 4.5rem;
-  --spacing-76: 4.75rem;
-  --spacing-8: 0.5rem;
-  --spacing-80: 5rem;
-  --spacing-9: 0.5625rem;
-  --spacing-90: 5.625rem;
-  --spacing-96: 6rem;
-  --spacing-app-activity-row: var(--spacing-44);
-  --spacing-app-chip: var(--spacing-30);
-  --spacing-app-control-md: var(--spacing-32);
-  --spacing-app-control-sm: var(--spacing-28);
-  --spacing-app-dashboard-row: var(--spacing-56);
-  --spacing-app-gutter-compact: var(--spacing-24);
-  --spacing-app-gutter-desktop: var(--spacing-48);
-  --spacing-app-gutter-mobile: var(--spacing-16);
-  --spacing-app-icon: var(--spacing-16);
-  --spacing-app-touch-target: var(--spacing-44);
-  --spacing-app-unit: var(--spacing-4);
-  --spacing-auth-control: var(--spacing-32);
-  --spacing-canvas-screen-gap: 10rem;
-  --spacing-chart-plot: var(--spacing-128);
-  --spacing-chat-turn: var(--spacing-24);
-  --spacing-control-icon-gap: var(--spacing-6);
-  --spacing-control-inline: var(--spacing-10);
-  --spacing-docs-gutter: var(--spacing-48);
-  --spacing-field-label-gap: var(--spacing-8);
-  --spacing-field-stack: var(--spacing-20);
-  --spacing-glass-blur: var(--spacing-20);
-  --spacing-list-metadata: var(--spacing-4);
-  --spacing-menu-inset: var(--spacing-4);
-  --spacing-menu-items: var(--spacing-4);
-  --spacing-modal-inset: var(--spacing-24);
-  --spacing-modal-inset-compact: var(--spacing-16);
-  --spacing-modal-section: var(--spacing-24);
-  --spacing-overflow-fade: var(--spacing-16);
-  --spacing-overflow-gap: var(--spacing-8);
-  --spacing-scrim-blur: var(--spacing-4);
-  --spacing-stroke-default: var(--spacing-1);
-  --spacing-stroke-focus: var(--spacing-2);
-  --spacing-stroke-hairline: var(--spacing-0-5);
-  --stroke-border: var(--spacing-1);
-}
diff --git a/apps/sim/platform/design-system/styles/typography.css b/apps/sim/platform/design-system/styles/typography.css
deleted file mode 100644
index 11638df9e1e..00000000000
--- a/apps/sim/platform/design-system/styles/typography.css
+++ /dev/null
@@ -1,352 +0,0 @@
-/* Shared type masters. Color and wrapping belong to the semantic slot. */
-[data-platform-ui] [data-type] {
-  letter-spacing: normal;
-  font-variation-settings: normal;
-}
-[data-platform-ui] [data-type="T001"] {
-  font: var(--font-weight-regular) var(--text-badge) / var(--leading-14) var(--font-mono);
-}
-[data-platform-ui] [data-type="T002"] {
-  font: var(--font-weight-regular) var(--text-badge) / var(--leading-18) var(--font-mono);
-}
-[data-platform-ui] [data-type="T003"] {
-  font: var(--font-weight-medium) var(--text-body) / var(--leading-22) var(--font-mono);
-}
-[data-platform-ui] [data-type="T004"] {
-  font: var(--font-weight-regular) var(--text-body) / var(--leading-22) var(--font-mono);
-}
-[data-platform-ui] [data-type="T005"] {
-  font: var(--font-weight-regular) var(--text-caption) / var(--leading-16) var(--font-mono);
-}
-[data-platform-ui] [data-type="T006"] {
-  font: var(--font-weight-medium) var(--text-caption) / var(--leading-18) var(--font-mono);
-}
-[data-platform-ui] [data-type="T007"] {
-  font: var(--font-weight-regular) var(--text-caption) / var(--leading-18) var(--font-mono);
-}
-[data-platform-ui] [data-type="T008"] {
-  font: var(--font-weight-medium) var(--text-caption) / var(--leading-20) var(--font-mono);
-}
-[data-platform-ui] [data-type="T009"] {
-  font: var(--font-weight-regular) var(--text-caption) / var(--leading-20) var(--font-mono);
-}
-[data-platform-ui] [data-type="T010"] {
-  font: var(--font-weight-regular) var(--text-caption) / var(--leading-22) var(--font-mono);
-}
-[data-platform-ui] [data-type="T011"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-18) var(--font-mono);
-}
-[data-platform-ui] [data-type="T012"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-19-5) var(--font-mono);
-}
-[data-platform-ui] [data-type="T013"] {
-  font: var(--font-weight-medium) var(--text-control) / var(--leading-20) var(--font-mono);
-}
-[data-platform-ui] [data-type="T014"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-20) var(--font-mono);
-}
-[data-platform-ui] [data-type="T015"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-22) var(--font-mono);
-}
-[data-platform-ui] [data-type="T016"] {
-  font: var(--font-weight-semibold) var(--text-17) / var(--leading-22) var(--font-native);
-}
-[data-platform-ui] [data-type="T017"] {
-  font: var(--font-weight-regular) var(--text-body) / var(--leading-22) var(--font-native);
-}
-[data-platform-ui] [data-type="T018"] {
-  font: var(--font-weight-regular) var(--text-caption) / var(--leading-16) var(--font-native);
-}
-[data-platform-ui] [data-type="T019"] {
-  font: var(--font-weight-medium) var(--text-lead) / var(--leading-26) var(--font-native);
-}
-[data-platform-ui] [data-type="T020"] {
-  font: var(--font-weight-regular) var(--text-reading) / var(--leading-26) var(--font-native);
-}
-[data-platform-ui] [data-type="T021"] {
-  font: var(--font-weight-regular) var(--text-10) / var(--leading-12) var(--font-sans);
-}
-[data-platform-ui] [data-type="T022"] {
-  font: var(--font-weight-medium) var(--text-10) / var(--leading-16) var(--font-sans);
-}
-[data-platform-ui] [data-type="T023"] {
-  font: var(--font-weight-control) var(--text-20) / var(--leading-28) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T024"] {
-  font: var(--font-weight-medium) var(--text-20) / var(--leading-28) var(--font-sans);
-}
-[data-platform-ui] [data-type="T025"] {
-  font: var(--font-weight-regular) var(--text-20) / var(--leading-28) var(--font-sans);
-}
-[data-platform-ui] [data-type="T026"] {
-  font: var(--font-weight-regular) var(--text-22) / var(--leading-30) var(--font-sans);
-}
-[data-platform-ui] [data-type="T027"] {
-  font: var(--font-weight-control) var(--text-28) / var(--leading-36) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T028"] {
-  font: var(--font-weight-medium) var(--text-28) / var(--leading-36) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-02em);
-}
-[data-platform-ui] [data-type="T029"] {
-  font: var(--font-weight-medium) var(--text-28) / var(--leading-36) var(--font-sans);
-}
-[data-platform-ui] [data-type="T030"] {
-  font: var(--font-weight-regular) var(--text-28) / var(--leading-36) var(--font-sans);
-}
-[data-platform-ui] [data-type="T031"] {
-  font: var(--font-weight-medium) var(--text-30) / var(--leading-36) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-01em);
-}
-[data-platform-ui] [data-type="T032"] {
-  font: var(--font-weight-regular) var(--text-30) / var(--leading-36) var(--font-sans);
-}
-[data-platform-ui] [data-type="T033"] {
-  font: var(--font-weight-control) var(--text-badge) / var(--leading-11) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T034"] {
-  font: var(--font-weight-regular) var(--text-badge) / var(--leading-14) var(--font-sans);
-}
-[data-platform-ui] [data-type="T035"] {
-  font: var(--font-weight-regular) var(--text-badge) / var(--leading-16) var(--font-sans);
-}
-[data-platform-ui] [data-type="T036"] {
-  font: var(--font-weight-regular) var(--text-badge) / var(--leading-18) var(--font-sans);
-}
-[data-platform-ui] [data-type="T037"] {
-  font: var(--font-weight-medium) var(--text-body) / var(--leading-18) var(--font-sans);
-}
-[data-platform-ui] [data-type="T038"] {
-  font: var(--font-weight-regular) var(--text-body) / var(--leading-18) var(--font-sans);
-}
-[data-platform-ui] [data-type="T039"] {
-  font: var(--font-weight-control) var(--text-body) / var(--leading-20) var(--font-sans);
-  letter-spacing: var(--tracking-0em);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T040"] {
-  font: var(--font-weight-control) var(--text-body) / var(--leading-20) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T041"] {
-  font: var(--font-weight-medium) var(--text-body) / var(--leading-20) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-01em);
-}
-[data-platform-ui] [data-type="T042"] {
-  font: var(--font-weight-medium) var(--text-body) / var(--leading-20) var(--font-sans);
-}
-[data-platform-ui] [data-type="T043"] {
-  font: var(--font-weight-regular) var(--text-body) / var(--leading-20) var(--font-sans);
-}
-[data-platform-ui] [data-type="T044"] {
-  font: var(--font-weight-regular) var(--text-body) / var(--leading-22-75) var(--font-sans);
-}
-[data-platform-ui] [data-type="T045"] {
-  font: var(--font-weight-regular) var(--text-body) / var(--leading-22) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-regular);
-}
-[data-platform-ui] [data-type="T046"] {
-  font: var(--font-weight-control) var(--text-body) / var(--leading-22) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T047"] {
-  font: var(--font-weight-medium) var(--text-body) / var(--leading-22) var(--font-sans);
-}
-[data-platform-ui] [data-type="T048"] {
-  font: var(--font-weight-regular) var(--text-body) / var(--leading-22) var(--font-sans);
-}
-[data-platform-ui] [data-type="T049"] {
-  font: var(--font-weight-regular) var(--text-body) / var(--leading-24) var(--font-sans);
-}
-[data-platform-ui] [data-type="T050"] {
-  font: var(--font-weight-regular) var(--text-caption) / var(--leading-16) var(--font-sans);
-}
-[data-platform-ui] [data-type="T051"] {
-  font: var(--font-weight-medium) var(--text-caption) / var(--leading-18) var(--font-sans);
-}
-[data-platform-ui] [data-type="T052"] {
-  font: var(--font-weight-regular) var(--text-caption) / var(--leading-18) var(--font-sans);
-}
-[data-platform-ui] [data-type="T053"] {
-  font: var(--font-weight-medium) var(--text-caption) / var(--leading-20) var(--font-sans);
-}
-[data-platform-ui] [data-type="T054"] {
-  font: var(--font-weight-regular) var(--text-caption) / var(--leading-20) var(--font-sans);
-}
-[data-platform-ui] [data-type="T055"] {
-  font: var(--font-weight-regular) var(--text-caption) / var(--leading-22) var(--font-sans);
-}
-[data-platform-ui] [data-type="T056"],
-[data-platform-ui] [data-type="T057"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-16) var(--font-sans);
-}
-[data-platform-ui] [data-type="T058"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-18) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-regular);
-}
-[data-platform-ui] [data-type="T059"] {
-  font: var(--font-weight-medium) var(--text-control) / var(--leading-18) var(--font-sans);
-}
-[data-platform-ui] [data-type="T060"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-18) var(--font-sans);
-}
-[data-platform-ui] [data-type="T061"] {
-  font: var(--font-weight-control) var(--text-control) / var(--leading-19-5) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T062"] {
-  font: var(--font-weight-medium) var(--text-control) / var(--leading-19-5) var(--font-sans);
-}
-[data-platform-ui] [data-type="T063"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-19-5) var(--font-sans);
-}
-[data-platform-ui] [data-type="T064"] {
-  font: var(--font-weight-control) var(--text-control) / var(--leading-20) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T065"] {
-  font: var(--font-weight-medium) var(--text-control) / var(--leading-20) var(--font-sans);
-  letter-spacing: var(--tracking-0-12em);
-}
-[data-platform-ui] [data-type="T066"] {
-  font: var(--font-weight-medium) var(--text-control) / var(--leading-20) var(--font-sans);
-}
-[data-platform-ui] [data-type="T067"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-20) var(--font-sans);
-}
-[data-platform-ui] [data-type="T068"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-21-125) var(--font-sans);
-}
-[data-platform-ui] [data-type="T069"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-22) var(--font-sans);
-}
-[data-platform-ui] [data-type="T070"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-24) var(--font-sans);
-}
-[data-platform-ui] [data-type="T071"] {
-  font: var(--font-weight-regular) var(--text-control) / var(--leading-44) var(--font-sans);
-}
-[data-platform-ui] [data-type="T072"] {
-  font: var(--font-weight-medium) var(--text-display-lg) / var(--leading-48) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-01em);
-}
-[data-platform-ui] [data-type="T073"] {
-  font: var(--font-weight-control) var(--text-display) / var(--leading-60) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-01em);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T074"] {
-  font: var(--font-weight-control) var(--text-heading) / var(--leading-32) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T075"] {
-  font: var(--font-weight-medium) var(--text-heading) / var(--leading-32) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-01em);
-}
-[data-platform-ui] [data-type="T076"] {
-  font: var(--font-weight-medium) var(--text-heading) / var(--leading-32) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-02em);
-}
-[data-platform-ui] [data-type="T077"] {
-  font: var(--font-weight-medium) var(--text-heading) / var(--leading-32) var(--font-sans);
-}
-[data-platform-ui] [data-type="T078"] {
-  font: var(--font-weight-regular) var(--text-heading) / var(--leading-32) var(--font-sans);
-}
-[data-platform-ui] [data-type="T079"] {
-  font: var(--font-weight-control) var(--text-hero) / var(--leading-44) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-01em);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T080"] {
-  font: var(--font-weight-medium) var(--text-hero) / var(--leading-48) var(--font-sans);
-}
-[data-platform-ui] [data-type="T081"] {
-  font: var(--font-weight-medium) var(--text-lead) / var(--leading-24) var(--font-sans);
-}
-[data-platform-ui] [data-type="T082"] {
-  font: var(--font-weight-medium) var(--text-lead) / var(--leading-26) var(--font-sans);
-}
-[data-platform-ui] [data-type="T083"] {
-  font: var(--font-weight-medium) var(--text-lead) / var(--leading-28) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-01em);
-}
-[data-platform-ui] [data-type="T084"] {
-  font: var(--font-weight-medium) var(--text-lead) / var(--leading-28) var(--font-sans);
-}
-[data-platform-ui] [data-type="T085"] {
-  font: var(--font-weight-regular) var(--text-lead) / var(--leading-28) var(--font-sans);
-}
-[data-platform-ui] [data-type="T086"] {
-  font: var(--font-weight-regular) var(--text-lead) / var(--leading-29-25) var(--font-sans);
-}
-[data-platform-ui] [data-type="T087"] {
-  font: var(--font-weight-regular) var(--text-reading) / var(--leading-18) var(--font-sans);
-}
-[data-platform-ui] [data-type="T088"] {
-  font: var(--font-weight-control) var(--text-reading) / var(--leading-20) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T089"] {
-  font: var(--font-weight-control) var(--text-reading) / var(--leading-22) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T090"] {
-  font: var(--font-weight-medium) var(--text-reading) / var(--leading-22) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-01em);
-}
-[data-platform-ui] [data-type="T091"] {
-  font: var(--font-weight-medium) var(--text-reading) / var(--leading-22) var(--font-sans);
-}
-[data-platform-ui] [data-type="T092"] {
-  font: var(--font-weight-regular) var(--text-reading) / var(--leading-22) var(--font-sans);
-}
-[data-platform-ui] [data-type="T093"] {
-  font: var(--font-weight-medium) var(--text-reading) / var(--leading-24) var(--font-sans);
-}
-[data-platform-ui] [data-type="T094"] {
-  font: var(--font-weight-regular) var(--text-reading) / var(--leading-24) var(--font-sans);
-}
-[data-platform-ui] [data-type="T095"] {
-  font: var(--font-weight-medium) var(--text-reading) / var(--leading-26) var(--font-sans);
-}
-[data-platform-ui] [data-type="T096"],
-[data-platform-ui] [data-type="T097"] {
-  font: var(--font-weight-regular) var(--text-reading) / var(--leading-26) var(--font-sans);
-}
-[data-platform-ui] [data-type="T098"] {
-  font: var(--font-weight-control) var(--text-title) / var(--leading-36) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-01em);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T099"] {
-  font: var(--font-weight-regular) var(--text-title) / var(--leading-40) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-02em);
-  font-variation-settings: "wght" var(--font-weight-regular);
-}
-[data-platform-ui] [data-type="T100"] {
-  font: var(--font-weight-control) var(--text-title) / var(--leading-40) var(--font-sans);
-  font-variation-settings: "wght" var(--font-weight-control);
-}
-[data-platform-ui] [data-type="T101"] {
-  font: var(--font-weight-medium) var(--text-title) / var(--leading-40) var(--font-sans);
-  letter-spacing: var(--tracking-minus-0-02em);
-}
-[data-platform-ui] [data-type="T102"] {
-  font: var(--font-weight-medium) var(--text-title) / var(--leading-40) var(--font-sans);
-}
-[data-platform-ui] [data-type="T103"] {
-  font: var(--font-weight-regular) var(--text-title) / var(--leading-40) var(--font-sans);
-}
-[data-platform-ui] [data-type="T104"] {
-  font: var(--font-weight-regular) var(--text-reading) / var(--leading-20) var(--font-native);
-}
-[data-platform-ui] [data-type="T105"] {
-  font: var(--font-weight-regular) var(--text-display-lg) / var(--leading-48) var(--font-sans);
-}
-[data-platform-ui] [data-type="T106"] {
-  font: var(--font-weight-regular) var(--text-lead) / var(--leading-26) var(--font-sans);
-}
diff --git a/apps/sim/platform/lib/data/chat-list.ts b/apps/sim/platform/lib/data/chat-list.ts
deleted file mode 100644
index 8991339e430..00000000000
--- a/apps/sim/platform/lib/data/chat-list.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-'use client'
-
-import { toast } from '@sim/emcn'
-import { getErrorMessage } from '@sim/utils/errors'
-import type { organizationRoutes } from '@/lib/navigation/paths'
-import {
-  MothershipChatDeleteError,
-  useDeleteMothershipChat,
-  useDeleteMothershipChats,
-  useMarkMothershipChatRead,
-  useMarkMothershipChatUnread,
-  useRenameMothershipChat,
-  useSetMothershipChatPinned,
-} from '@/hooks/queries/mothership-chats'
-
-export function organizationChatHref(
-  chat: { id: string; mode?: string },
-  routes: ReturnType<typeof organizationRoutes>
-) {
-  return chat.mode === 'assistant' ? routes.searchChat(chat.id) : routes.chat(chat.id)
-}
-
-/** A partial bulk failure still reports which chats went, so the view can narrow what is left. */
-interface ChatRemoval {
-  removedIds: readonly string[]
-  failure?: string
-}
-
-/** Failures of a fire-and-forget action report through a toast. */
-export function useChatListActions(organizationId: string) {
-  const owner = { organizationId }
-  const { mutateAsync: deleteChat } = useDeleteMothershipChat(owner)
-  const { mutateAsync: deleteChats } = useDeleteMothershipChats(owner)
-  const { mutateAsync: renameChat } = useRenameMothershipChat(owner)
-  const { mutate: pinChat } = useSetMothershipChatPinned(owner)
-  const { mutate: readChat } = useMarkMothershipChatRead(owner)
-  const { mutate: unreadChat } = useMarkMothershipChatUnread(owner)
-  const reportFailure = { onError: (error: Error) => void toast.error(error.message) }
-  return {
-    rename: async (chatId: string, title: string) => {
-      await renameChat({ chatId, title })
-    },
-    async remove(ids: readonly string[]): Promise<ChatRemoval> {
-      try {
-        if (ids.length === 1) await deleteChat(ids[0])
-        else await deleteChats([...ids])
-        return { removedIds: ids }
-      } catch (error) {
-        return {
-          removedIds: error instanceof MothershipChatDeleteError ? error.deletedChatIds : [],
-          failure: getErrorMessage(error, 'Failed to delete'),
-        }
-      }
-    },
-    setPinned: (chatId: string, pinned: boolean) => pinChat({ chatId, pinned }, reportFailure),
-    setRead: (chatId: string, read: boolean) =>
-      read ? readChat(chatId, reportFailure) : unreadChat(chatId, reportFailure),
-  }
-}
diff --git a/apps/sim/platform/lib/data/home-model.test.ts b/apps/sim/platform/lib/data/home-model.test.ts
deleted file mode 100644
index 6cf2a03f30a..00000000000
--- a/apps/sim/platform/lib/data/home-model.test.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * @vitest-environment node
- *
- * The widget state machine is what stands between a member and a dead Connect button or a false
- * "all caught up", and day positions are where a time-zone mistake would hide. Failure modes: an
- * organization that offers nothing reading as not connected, one bad account hiding the good ones,
- * a meeting placed by UTC rather than the viewer's clock, and a day's edge wrapping around.
- */
-import { describe, expect, it } from 'vitest'
-import type { SearchIntegrationStatus } from '@/lib/api/contracts/knowledge/search-integrations'
-import type { MemberIntegration } from '@/lib/credential-groups/member-integrations'
-import type { CredentialGroupProvider } from '@/lib/credential-groups/providers'
-import { defaultLiveSearchPolicy, type LiveSearchPolicy } from '@/lib/sim-search/live/policy-schema'
-import {
-  HOME_EMAIL_SOURCES,
-  settleReadAccounts,
-  toCalendarDay,
-  toHomeConnection,
-  toReadableProviders,
-} from '@/platform/lib/data/home-model'
-
-function entry(provider: string, overrides: Partial<MemberIntegration>): MemberIntegration {
-  return {
-    id: provider,
-    provider,
-    name: provider,
-    icon: () => null,
-    accounts: [],
-    permissionAccountIds: [],
-    reconnectAccountIds: [],
-    ready: true,
-    ...overrides,
-  }
-}
-
-const account = (credentialId: string, status: 'active' | 'needs_reauth') => ({
-  credentialId,
-  displayName: `${credentialId}@example.com`,
-  providerId: 'google-email',
-  groupId: 'group',
-  optionId: 'option',
-  status,
-})
-
-const connection = (
-  entries: MemberIntegration[] | undefined,
-  allowed = true,
-  readableProviders: CredentialGroupProvider[] = ['gmail', 'outlook']
-) =>
-  toHomeConnection({
-    allowed,
-    entries,
-    readableProviders,
-    failure: undefined,
-    retrying: false,
-    sources: HOME_EMAIL_SOURCES,
-  })
-
-describe('where a widget stands', () => {
-  it('waits for the inventory rather than saying nothing is connected', () => {
-    expect(connection(undefined).status).toBe('loading')
-  })
-
-  it('offers no Connect when the viewer has no integrations surface at all', () => {
-    expect(
-      connection([entry('gmail', { connectionTarget: { optionId: 'gmail-option' } })], false).status
-    ).toBe('not_offered')
-  })
-
-  it('offers no Connect when the organization has not made the provider connectable', () => {
-    expect(connection([]).status).toBe('not_offered')
-    expect(
-      connection([entry('gmail', { ready: false, connectionTarget: { optionId: 'gmail-option' } })])
-        .status
-    ).toBe('not_offered')
-    expect(connection([entry('gmail', {})]).status).toBe('not_offered')
-  })
-
-  it('offers only the providers the inventory marks connectable', () => {
-    const state = connection([
-      entry('gmail', { connectionTarget: { optionId: 'gmail-option' } }),
-      entry('outlook', { ready: false, connectionTarget: { optionId: 'outlook-option' } }),
-      entry('slack', { connectionTarget: { optionId: 'slack-option' } }),
-    ])
-    expect(state).toMatchObject({
-      status: 'not_connected',
-      options: [{ id: 'gmail-option', label: 'gmail' }],
-    })
-  })
-
-  it('offers no Connect for a provider the viewer’s permission group cannot read', () => {
-    const inventory = [entry('gmail', { connectionTarget: { optionId: 'gmail-option' } })]
-    expect(connection(inventory, true, ['slack']).status).toBe('not_offered')
-  })
-
-  it('shows nothing connected on a provider the viewer’s permission group cannot read', () => {
-    const reauth = entry('gmail', {
-      accounts: [account('a', 'needs_reauth')],
-      reconnectAccountIds: ['a'],
-    })
-    expect(connection([reauth], true, ['slack']).status).toBe('not_offered')
-  })
-
-  it('offers a readable provider beside one the permission group took away', () => {
-    const state = connection(
-      [
-        entry('outlook', { accounts: [account('a', 'active')], reconnectAccountIds: ['a'] }),
-        entry('gmail', { connectionTarget: { optionId: 'gmail-option' } }),
-      ],
-      true,
-      ['gmail']
-    )
-    expect(state).toMatchObject({ status: 'not_connected', options: [{ id: 'gmail-option' }] })
-  })
-
-  it('leads with Google and keeps an approved Outlook as the second choice', () => {
-    const state = connection([
-      entry('outlook', { connectionTarget: { optionId: 'outlook-option' } }),
-      entry('gmail', { connectionTarget: { optionId: 'gmail-option' } }),
-    ])
-    expect(state.status === 'not_connected' && state.options.map(({ id }) => id)).toEqual([
-      'gmail-option',
-      'outlook-option',
-    ])
-  })
-
-  it('asks to reconnect only when no connected account can still be read', () => {
-    const reauth = entry('gmail', {
-      accounts: [account('a', 'needs_reauth')],
-      reconnectAccountIds: ['a'],
-    })
-    expect(connection([reauth])).toMatchObject({
-      status: 'needs_reauth',
-      accounts: [{ id: 'a', canReconnect: true, problem: 'needs_reauth' }],
-    })
-    expect(
-      connection([
-        reauth,
-        entry('outlook', { accounts: [account('b', 'active')], reconnectAccountIds: ['b'] }),
-      ]).status
-    ).toBe('connected')
-  })
-})
-
-describe('which providers a widget can read', () => {
-  const status = (connectorType: string, policy: Partial<LiveSearchPolicy>) =>
-    ({
-      connectorType,
-      policy: { ...defaultLiveSearchPolicy(connectorType), ...policy },
-    }) as SearchIntegrationStatus
-
-  it('keeps a provider whose source has no content boundary', () => {
-    expect(toReadableProviders(['gmail', 'slack'], [status('gmail', {})])).toEqual([
-      'gmail',
-      'slack',
-    ])
-  })
-
-  it('drops a provider whose source restricts content, which a direct read would sidestep', () => {
-    expect(
-      toReadableProviders(['gmail', 'outlook'], [status('gmail', { excludePromotions: true })])
-    ).toEqual(['outlook'])
-  })
-})
-
-describe('settling a read', () => {
-  const view = (id: string, problem?: 'needs_reauth' | 'unavailable' | 'not_offered') => ({
-    id,
-    label: id,
-    canReconnect: true,
-    problem,
-  })
-
-  it('keeps the list when any account answered', () => {
-    expect(settleReadAccounts([view('a'), view('b', 'unavailable')])).toBeNull()
-  })
-
-  it('tells a withdrawn provider apart from a failing one', () => {
-    expect(settleReadAccounts([view('a', 'not_offered')])?.status).toBe('not_offered')
-    expect(settleReadAccounts([view('a', 'unavailable')])?.status).toBe('error')
-    expect(settleReadAccounts([view('a', 'needs_reauth'), view('b', 'unavailable')])).toMatchObject(
-      { status: 'needs_reauth', accounts: [{ id: 'a' }] }
-    )
-  })
-})
-
-describe('placing a meeting on the day', () => {
-  const window = { startAt: '2026-11-05T08:00:00.000Z', endAt: '2026-11-06T08:00:00.000Z' }
-  const event = (startAt: string, endAt: string, allDay = false) => ({
-    id: 'e',
-    credentialId: 'c',
-    title: 'Review',
-    allDay,
-    startAt,
-    endAt,
-    people: [],
-  })
-  const day = (events: ReturnType<typeof event>[]) =>
-    toCalendarDay(
-      { accounts: [], window, events },
-      { date: '2026-11-05', nowMinute: null, timeZone: 'America/Los_Angeles' }
-    )
-
-  it('reads the viewer’s clock, not UTC', () => {
-    const [meeting] = day([event('2026-11-05T17:00:00.000Z', '2026-11-05T17:30:00.000Z')]).meetings
-    expect(meeting).toMatchObject({ startMinute: 9 * 60, duration: 30 })
-  })
-
-  it('clamps a meeting running across midnight to the day on screen', () => {
-    const [before] = day([event('2026-11-05T06:00:00.000Z', '2026-11-05T09:00:00.000Z')]).meetings
-    expect(before).toMatchObject({ startMinute: 0, duration: 60 })
-    const [after] = day([event('2026-11-06T07:00:00.000Z', '2026-11-06T10:00:00.000Z')]).meetings
-    expect(after).toMatchObject({ startMinute: 23 * 60, duration: 60 })
-  })
-
-  it('keeps an all-day event off the timeline without dropping it', () => {
-    const calendar = day([event(window.startAt, window.endAt, true)])
-    expect(calendar.meetings).toEqual([])
-    expect(calendar.allDay).toHaveLength(1)
-  })
-})
diff --git a/apps/sim/platform/lib/data/home-model.ts b/apps/sim/platform/lib/data/home-model.ts
deleted file mode 100644
index aa27e9f425e..00000000000
--- a/apps/sim/platform/lib/data/home-model.ts
+++ /dev/null
@@ -1,322 +0,0 @@
-import type { AccessRequestRecord } from '@/lib/api/contracts/access-requests'
-import type { SearchHistoryResponse } from '@/lib/api/contracts/knowledge/search-history'
-import type { SearchIntegrationStatus } from '@/lib/api/contracts/knowledge/search-integrations'
-import type { OrganizationActivitySummary } from '@/lib/api/contracts/organization-activity'
-import type {
-  HomeWidgetAccount,
-  OrganizationHomeCalendar,
-  OrganizationHomeEmail,
-} from '@/lib/api/contracts/organization-home'
-import { assistantSearchSourceForProvider } from '@/lib/assistant-actions/providers'
-import { getWallClockParts, zonedWallClock } from '@/lib/core/utils/timezone'
-import type { MemberIntegration } from '@/lib/credential-groups/member-integrations'
-import {
-  type CredentialGroupProvider,
-  getCredentialGroupProviderId,
-} from '@/lib/credential-groups/providers'
-import { requiresScopedRetrieval } from '@/lib/sim-search/live/policy-schema'
-import { linkSiteName } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-link'
-import type {
-  AttentionItem,
-  CalendarMeeting,
-  EmailItem,
-  HomeAccountView,
-  HomeCalendarDay,
-  HomeConnectOption,
-  HomeWidgetState,
-} from '@/platform/app/(shell)/home/_components/model'
-import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
-import { providerMark } from '@/platform/design-system/components/icon/provider-marks'
-import type { RecentItem } from '@/platform/design-system/components/recent-items/recent-items'
-
-interface HomeWidgetSource {
-  /** The member inventory provider this widget draws on, so both surfaces agree by construction. */
-  provider: string
-  /** The credential provider the widget's read is allowed through. */
-  credentialProvider: CredentialGroupProvider
-  icon: IconName
-}
-
-/** Outlook appears twice on purpose: one Microsoft account serves both mail and calendar. */
-export const HOME_EMAIL_SOURCES: readonly HomeWidgetSource[] = [
-  { provider: 'gmail', credentialProvider: 'gmail', icon: 'I005' },
-  { provider: 'outlook', credentialProvider: 'outlook', icon: 'I120' },
-]
-export const HOME_CALENDAR_SOURCES: readonly HomeWidgetSource[] = [
-  { provider: 'google_calendar', credentialProvider: 'google-calendar', icon: 'I088' },
-  { provider: 'outlook', credentialProvider: 'outlook', icon: 'I120' },
-]
-
-function accountView(
-  account: MemberIntegration['accounts'][number],
-  entry: MemberIntegration
-): HomeAccountView {
-  return {
-    id: account.credentialId,
-    label: account.displayName || entry.name,
-    canReconnect: entry.reconnectAccountIds.includes(account.credentialId),
-    ...(account.status === 'needs_reauth' ? { problem: 'needs_reauth' as const } : {}),
-  }
-}
-
-export type HomeConnection =
-  | Exclude<HomeWidgetState<never>, { status: 'ready' }>
-  | { status: 'connected'; accounts: readonly HomeAccountView[] }
-
-interface HomeConnectionInput {
-  allowed: boolean
-  /** Undefined until both the accounts and the policies have loaded. */
-  entries: readonly MemberIntegration[] | undefined
-  /** The widget's read answers to this list, so nothing outside it is shown or offered. */
-  readableProviders: readonly CredentialGroupProvider[]
-  /** A refusal means the viewer has no inventory; anything else can be retried. */
-  failure: 'refused' | 'failed' | undefined
-  retrying: boolean
-  sources: readonly HomeWidgetSource[]
-}
-
-/**
- * The two gates a widget's server read applies: the viewer's permission group, and a Search source's
- * content boundary, which a direct read would sidestep.
- */
-export function toReadableProviders(
-  assistantProviders: readonly CredentialGroupProvider[],
-  policies: readonly SearchIntegrationStatus[]
-): CredentialGroupProvider[] {
-  return assistantProviders.filter((provider) => {
-    const source = assistantSearchSourceForProvider(getCredentialGroupProviderId(provider))
-    const policy = policies.find((candidate) => candidate.connectorType === source)?.policy
-    return !(source && policy && requiresScopedRetrieval(source, policy))
-  })
-}
-
-/** Where a widget stands before any provider is asked, from the member inventory alone. */
-export function toHomeConnection({
-  allowed,
-  entries,
-  readableProviders,
-  failure,
-  retrying,
-  sources,
-}: HomeConnectionInput): HomeConnection {
-  if (!allowed || failure === 'refused') return { status: 'not_offered' }
-  if (failure === 'failed') return { status: 'error', retrying }
-  if (!entries) return { status: 'loading' }
-  const readable = sources.filter((source) => readableProviders.includes(source.credentialProvider))
-  const matched = readable.flatMap((source) => {
-    const entry = entries.find((candidate) => candidate.provider === source.provider)
-    return entry ? [{ source, entry }] : []
-  })
-  const accounts = matched.flatMap(({ entry }) =>
-    entry.accounts.map((account) => accountView(account, entry))
-  )
-  if (accounts.length === 0) {
-    const options: HomeConnectOption[] = matched.flatMap(({ source, entry }) => {
-      const target = entry.connectionTarget
-      return entry.ready && target && 'optionId' in target
-        ? [{ id: target.optionId, label: entry.name, icon: source.icon }]
-        : []
-    })
-    return options.length ? { status: 'not_connected', options } : { status: 'not_offered' }
-  }
-  return accounts.every((account) => account.problem === 'needs_reauth')
-    ? { status: 'needs_reauth', accounts }
-    : { status: 'connected', accounts }
-}
-
-/** The inventory says what is connected; the read says what actually answered just now. */
-export function toReadAccounts(
-  read: readonly HomeWidgetAccount[],
-  connected: readonly HomeAccountView[]
-): HomeAccountView[] {
-  if (read.length === 0) return [...connected]
-  return read.map((account) => ({
-    id: account.credentialId,
-    label: account.displayName,
-    canReconnect: connected.some((view) => view.id === account.credentialId && view.canReconnect),
-    ...(account.state === 'ready' ? {} : { problem: account.state }),
-  }))
-}
-
-/** What a read's accounts amount to: `null` when at least one answered, so its data can show. */
-export function settleReadAccounts(
-  accounts: readonly HomeAccountView[]
-):
-  | { status: 'not_offered' }
-  | { status: 'needs_reauth'; accounts: readonly HomeAccountView[] }
-  | { status: 'error' }
-  | null {
-  if (accounts.some((account) => !account.problem)) return null
-  if (accounts.every((account) => account.problem === 'not_offered'))
-    return { status: 'not_offered' }
-  const reauth = accounts.filter((account) => account.problem === 'needs_reauth')
-  return reauth.length ? { status: 'needs_reauth', accounts: reauth } : { status: 'error' }
-}
-
-export function toEmailItems(email: OrganizationHomeEmail): EmailItem[] {
-  return email.threads.map((thread) => ({
-    id: `${thread.credentialId}:${thread.id}`,
-    sender: thread.sender,
-    subject: thread.subject,
-    excerpt: thread.excerpt,
-    receivedAt: Date.parse(thread.receivedAt),
-    count: thread.messageCount,
-    url: thread.url,
-  }))
-}
-
-const MINUTES_PER_DAY = 24 * 60
-
-export function wallClockMinute(instantMs: number, timeZone: string): number {
-  const { hour, minute } = getWallClockParts(new Date(instantMs), timeZone)
-  return hour * 60 + minute
-}
-
-/** A wall-clock minute of the requested day; an instant outside it clamps to that day's edge. */
-function minuteOfDay(
-  instant: string,
-  window: OrganizationHomeCalendar['window'],
-  timeZone: string
-) {
-  if (instant <= window.startAt) return 0
-  if (instant >= window.endAt) return MINUTES_PER_DAY
-  return wallClockMinute(Date.parse(instant), timeZone)
-}
-
-export function toCalendarDay(
-  calendar: OrganizationHomeCalendar,
-  day: { date: string; nowMinute: number | null; timeZone: string }
-): HomeCalendarDay {
-  const meetings: CalendarMeeting[] = []
-  const allDay: HomeCalendarDay['allDay'][number][] = []
-  for (const event of calendar.events) {
-    const id = `${event.credentialId}:${event.id}`
-    if (event.allDay) {
-      allDay.push({ id, title: event.title, providerUrl: event.url })
-      continue
-    }
-    const startMinute = minuteOfDay(event.startAt, calendar.window, day.timeZone)
-    meetings.push({
-      id,
-      title: event.title,
-      startMinute,
-      duration: Math.max(1, minuteOfDay(event.endAt, calendar.window, day.timeZone) - startMinute),
-      providerUrl: event.url,
-      people: event.people,
-    })
-  }
-  return { date: day.date, nowMinute: day.nowMinute, status: 'ready', meetings, allDay }
-}
-
-export function localDate(instant: Date, timeZone: string): string {
-  return zonedWallClock(instant, timeZone).slice(0, 10)
-}
-
-/**
- * "Tasks run" counts both things Sim ran on the organization's behalf: workflow runs and chat runs.
- * Buckets arrive as civil timestamps on the viewer's calendar days, one for every day in the window.
- */
-export function toTaskPoints(summary: OrganizationActivitySummary) {
-  return summary.series.map((point) => ({
-    date: point.timestamp.slice(0, 10),
-    value: point.workflowRuns + point.chatRuns,
-  }))
-}
-
-export function toRecentItems(history: SearchHistoryResponse): RecentItem[] {
-  return history.sources.map((source) => {
-    const mark = source.connectorType ? providerMark(source.connectorType) : undefined
-    return {
-      id: source.url,
-      label: source.title ?? linkSiteName(source.url, source.siteName),
-      href: source.url,
-      icon: typeof mark === 'string' ? mark : undefined,
-    }
-  })
-}
-
-export function greetingAt(nowMs: number, timeZone: string): string {
-  const { hour } = getWallClockParts(new Date(nowMs), timeZone)
-  if (hour < 12) return 'Good morning'
-  return hour < 18 ? 'Good afternoon' : 'Good evening'
-}
-
-/** A chat row: its link depends on its mode, so the caller, which knows the mode, supplies it. */
-interface AttentionChat {
-  id: string
-  title: string
-  href: string
-  isUnread: boolean
-  updatedAt: number
-}
-
-interface AttentionInput {
-  entries: readonly MemberIntegration[]
-  readAccounts: readonly HomeAccountView[]
-  chats: readonly AttentionChat[]
-  requests: readonly AccessRequestRecord[]
-  reconnect: ((accountId: string) => void) | undefined
-  requestsHref: string
-}
-
-/** What is waiting on the viewer. Items with no moment of their own lead the list. */
-export function toAttentionItems({
-  entries,
-  readAccounts,
-  chats,
-  requests,
-  reconnect,
-  requestsHref,
-}: AttentionInput): AttentionItem[] {
-  const reconnects = new Map<string, Pick<AttentionItem, 'title' | 'detail'>>()
-  for (const entry of entries) {
-    for (const account of entry.accounts) {
-      if (
-        account.status === 'needs_reauth' &&
-        entry.reconnectAccountIds.includes(account.credentialId)
-      )
-        reconnects.set(account.credentialId, {
-          title: `Reconnect ${entry.name}`,
-          detail: account.displayName,
-        })
-    }
-  }
-  for (const account of readAccounts) {
-    if (account.problem === 'needs_reauth' && account.canReconnect && !reconnects.has(account.id))
-      reconnects.set(account.id, {
-        title: `Reconnect ${account.label}`,
-        detail: 'Sim can no longer read this account',
-      })
-  }
-  const items: AttentionItem[] = [...reconnects].map(([id, copy]) => ({
-    ...copy,
-    id: `reconnect-${id}`,
-    icon: 'I070',
-    onOpen: () => reconnect?.(id),
-  }))
-  for (const chat of chats) {
-    if (!chat.isUnread) continue
-    items.push({
-      id: `chat-${chat.id}`,
-      title: chat.title,
-      detail: 'New reply in this chat',
-      occurredAt: chat.updatedAt,
-      icon: 'I050',
-      href: chat.href,
-    })
-  }
-  for (const request of requests) {
-    items.push({
-      id: `request-${request.id}`,
-      title: `${request.requester.name || request.requester.email} asked for ${request.targetLabel}`,
-      detail: request.reason ?? 'Waiting for your review',
-      occurredAt: Date.parse(request.createdAt),
-      icon: 'I015',
-      href: requestsHref,
-    })
-  }
-  return items.sort(
-    (left, right) =>
-      (right.occurredAt ?? Number.POSITIVE_INFINITY) - (left.occurredAt ?? Number.POSITIVE_INFINITY)
-  )
-}
diff --git a/apps/sim/platform/lib/data/home.ts b/apps/sim/platform/lib/data/home.ts
deleted file mode 100644
index 51c5a8e87a2..00000000000
--- a/apps/sim/platform/lib/data/home.ts
+++ /dev/null
@@ -1,410 +0,0 @@
-'use client'
-
-import { useState, useSyncExternalStore } from 'react'
-import { toast } from '@sim/emcn'
-import { getErrorMessage } from '@sim/utils/errors'
-import { useQueryState } from 'nuqs'
-import {
-  isOrganizationSettingsSectionAvailable,
-  resolveOrganizationSectionAccess,
-} from '@/components/settings/navigation'
-import { isApiClientError } from '@/lib/api/client/errors'
-import { useSession } from '@/lib/auth/client'
-import { addCalendarDays, getBrowserTimezone } from '@/lib/core/utils/timezone'
-import {
-  canReadMemberIntegrations,
-  memberIntegrationEntries,
-} from '@/lib/credential-groups/member-integrations'
-import { organizationRoutes } from '@/lib/navigation/paths'
-import type { OrganizationSurfaceContext } from '@/lib/organizations/surface'
-import { useGetStartedSteps } from '@/app/o/[organizationId]/home/components/get-started/use-get-started-steps'
-import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import { useOrganizationAccessRequests } from '@/hooks/queries/access-requests'
-import { useOrganizationMothershipChats } from '@/hooks/queries/mothership-chats'
-import { useOrganizationAccounts } from '@/hooks/queries/organization-accounts'
-import { useOrganizationActivitySummary } from '@/hooks/queries/organization-activity'
-import {
-  useOrganizationHomeCalendar,
-  useOrganizationHomeEmail,
-} from '@/hooks/queries/organization-home'
-import { useRemoveSearchHistorySource, useSearchHistory } from '@/hooks/queries/search-history'
-import { useSearchIntegrations } from '@/hooks/queries/search-integrations'
-import type {
-  AttentionItem,
-  EmailItem,
-  HomeAccountView,
-  HomeActions,
-  HomeActivityState,
-  HomeCalendarDay,
-  HomeListState,
-  HomeView,
-  HomeWidgetActions,
-  HomeWidgetState,
-} from '@/platform/app/(shell)/home/_components/model'
-import { homeDayParam } from '@/platform/app/(shell)/home/search-params'
-import type { RecentItem } from '@/platform/design-system/components/recent-items/recent-items'
-import { organizationChatHref } from '@/platform/lib/data/chat-list'
-import {
-  greetingAt,
-  HOME_CALENDAR_SOURCES,
-  HOME_EMAIL_SOURCES,
-  type HomeConnection,
-  localDate,
-  settleReadAccounts,
-  toAttentionItems,
-  toCalendarDay,
-  toEmailItems,
-  toHomeConnection,
-  toReadAccounts,
-  toReadableProviders,
-  toRecentItems,
-  toTaskPoints,
-  wallClockMinute,
-} from '@/platform/lib/data/home-model'
-import { useIntegrationActions } from '@/platform/lib/data/integrations'
-import { MINUTE_MS } from '@/platform/lib/time'
-import {
-  type OrganizationHomeWidget,
-  useOrganizationHomeStore,
-} from '@/stores/organization-home/store'
-
-/** Long enough to fit the 7, 30 and 90 day chart windows in one read of daily buckets. */
-const ACTIVITY_DAYS = 90
-const REFUSAL_STATUSES: ReadonlySet<number> = new Set([401, 403, 404, 409])
-const NO_WIDGETS: readonly OrganizationHomeWidget[] = []
-
-function subscribeToMinutes(onChange: () => void) {
-  const interval = setInterval(onChange, MINUTE_MS)
-  window.addEventListener('focus', onChange)
-  return () => {
-    clearInterval(interval)
-    window.removeEventListener('focus', onChange)
-  }
-}
-
-function currentMinute() {
-  return Math.floor(Date.now() / MINUTE_MS) * MINUTE_MS
-}
-
-/** Home mounts only after hydration, behind the conversation's own gate, so no markup can disagree. */
-function useMinuteClock(): number {
-  return useSyncExternalStore(subscribeToMinutes, currentMinute, currentMinute)
-}
-
-/** An answer about the viewer, which retrying cannot change, unlike a failure or a rate limit. */
-function isRefusal(error: unknown) {
-  return isApiClientError(error) && REFUSAL_STATUSES.has(error.status)
-}
-
-function useHomeIntegrations(organization: OrganizationSurfaceContext) {
-  const organizationId = organization.organization.id
-  const allowed = canReadMemberIntegrations(organization)
-  const accounts = useOrganizationAccounts(allowed ? organizationId : undefined)
-  const policies = useSearchIntegrations(organizationId, { enabled: allowed })
-  const entries =
-    accounts.data && policies.data
-      ? memberIntegrationEntries(accounts.data, policies.data)
-      : undefined
-  const error = accounts.error ?? policies.error
-  const failure = !error
-    ? undefined
-    : isRefusal(error)
-      ? ('refused' as const)
-      : entries
-        ? undefined
-        : ('failed' as const)
-  return {
-    allowed,
-    accounts,
-    policies,
-    entries,
-    readableProviders: toReadableProviders(
-      accounts.data?.assistantProviders ?? [],
-      policies.data ?? []
-    ),
-    failure,
-    retrying: accounts.isFetching || policies.isFetching,
-    retry: () => {
-      if (!allowed) return
-      void accounts.refetch()
-      void policies.refetch()
-    },
-  }
-}
-
-function useConnectionActions(organizationId: string): Omit<HomeWidgetActions, 'retry'> {
-  const { connecting, connect, reconnect, disconnect } = useIntegrationActions(organizationId)
-  return {
-    connect: connecting ? undefined : (optionId) => connect({ optionId }),
-    reconnect: connecting ? undefined : reconnect,
-    disconnect: async (credentialId) => {
-      await disconnect(credentialId)
-    },
-  }
-}
-
-interface HomeWidgetRead<T> {
-  state: HomeWidgetState<T>
-  retry: () => void
-}
-
-/** A read with nothing to show yet: failed and maybe retrying, or still on its way. */
-function withoutResult(read: {
-  isError: boolean
-  isFetching: boolean
-}): { status: 'error'; retrying: boolean } | { status: 'loading' } {
-  return read.isError ? { status: 'error', retrying: read.isFetching } : { status: 'loading' }
-}
-
-function useHomeEmail(
-  organizationId: string,
-  connection: HomeConnection,
-  retryConnection: () => void,
-  hidden: boolean
-): HomeWidgetRead<readonly EmailItem[]> {
-  const read = useOrganizationHomeEmail(organizationId, {
-    enabled: connection.status === 'connected' && !hidden,
-  })
-  const retry = () => void read.refetch()
-  if (connection.status !== 'connected') return { state: connection, retry: retryConnection }
-  if (!read.data) return { state: withoutResult(read), retry }
-  const accounts = toReadAccounts(read.data.accounts, connection.accounts)
-  const settled = settleReadAccounts(accounts)
-  if (settled?.status === 'error')
-    return { state: { status: 'error', retrying: read.isFetching }, retry }
-  return {
-    state: settled ?? { status: 'ready', data: toEmailItems(read.data), accounts },
-    retry,
-  }
-}
-
-interface HomeClock {
-  nowMs: number
-  today: string
-}
-
-function useHomeCalendar(
-  organizationId: string,
-  connection: HomeConnection,
-  retryConnection: () => void,
-  clock: HomeClock,
-  selectedDay: string | null,
-  timeZone: string,
-  hidden: boolean
-): HomeWidgetRead<HomeCalendarDay> {
-  const date = selectedDay ?? clock.today
-  const read = useOrganizationHomeCalendar(organizationId, date, timeZone, {
-    enabled: connection.status === 'connected' && !hidden,
-  })
-  const retry = () => void read.refetch()
-  if (connection.status !== 'connected') return { state: connection, retry: retryConnection }
-  const nowMinute = date === clock.today ? wallClockMinute(clock.nowMs, timeZone) : null
-  const ready = (day: HomeCalendarDay, accounts: readonly HomeAccountView[]) => ({
-    state: { status: 'ready' as const, data: day, accounts },
-    retry,
-  })
-  const withoutData = (status: HomeCalendarDay['status'], accounts = connection.accounts) =>
-    ready({ date, nowMinute, status, meetings: [], allDay: [] }, accounts)
-  if (!read.data) return withoutData(read.isError ? 'error' : 'loading')
-  const accounts = toReadAccounts(read.data.accounts, connection.accounts)
-  const settled = settleReadAccounts(accounts)
-  if (settled?.status === 'error') return withoutData('error', accounts)
-  if (settled) return { state: settled, retry }
-  return ready(toCalendarDay(read.data, { date, nowMinute, timeZone }), accounts)
-}
-
-/** Tasks run, behind the same gates as the settings section that shows them. */
-function useHomeActivity(
-  organization: OrganizationSurfaceContext,
-  today: string,
-  timeZone: string,
-  hidden: boolean
-): { state: HomeActivityState; retry: () => void } {
-  const allowed =
-    resolveOrganizationSectionAccess({
-      section: 'usage',
-      isTargetOrganizationMember: true,
-      isTargetOrganizationAdmin: organization.viewer.isAdmin,
-    }) !== 'unavailable' &&
-    isOrganizationSettingsSectionAvailable('usage', organization.settingsFeatures)
-  const summary = useOrganizationActivitySummary(
-    organization.organization.id,
-    {
-      preset: 'custom',
-      startDate: addCalendarDays(today, 1 - ACTIVITY_DAYS),
-      endDate: today,
-      timezone: timeZone,
-    },
-    { enabled: allowed && !hidden }
-  )
-  const retry = () => void summary.refetch()
-  if (!allowed || (summary.error && isRefusal(summary.error)))
-    return { state: { status: 'hidden' }, retry }
-  if (summary.data) return { state: { status: 'ready', points: toTaskPoints(summary.data) }, retry }
-  return { state: withoutResult(summary), retry }
-}
-
-function useHomeRecents(organization: OrganizationSurfaceContext, userId: string | undefined) {
-  const organizationId = organization.organization.id
-  const allowed = organization.searchAccess.memberScoped
-  const history = useSearchHistory(allowed ? organizationId : undefined, userId)
-  const remove = useRemoveSearchHistorySource(organizationId, userId)
-  const state: HomeListState<RecentItem> = !allowed
-    ? { status: 'ready', items: [] }
-    : history.data
-      ? { status: 'ready', items: toRecentItems(history.data) }
-      : withoutResult(history)
-  return {
-    state,
-    retry: () => void history.refetch(),
-    remove: (url: string) =>
-      remove.mutate(url, {
-        onError: (error) =>
-          toast.error(getErrorMessage(error, 'That recent could not be removed.')),
-      }),
-  }
-}
-
-function useHomeAttention(
-  organization: OrganizationSurfaceContext,
-  integrations: ReturnType<typeof useHomeIntegrations>,
-  reconnect: HomeWidgetActions['reconnect'],
-  readAccounts: readonly HomeAccountView[]
-): { state: HomeListState<AttentionItem>; retry: () => void } {
-  const organizationId = organization.organization.id
-  const routes = organizationRoutes(organizationId)
-  const canReview = organization.viewer.isAdmin
-  const chats = useOrganizationMothershipChats(organizationId)
-  const requests = useOrganizationAccessRequests(canReview ? organizationId : '')
-  const reviewFailed = canReview && requests.isError && !isRefusal(requests.error)
-  const items = toAttentionItems({
-    entries: integrations.entries ?? [],
-    readAccounts,
-    chats: (chats.data ?? []).map((chat) => ({
-      id: chat.id,
-      title: chat.name,
-      href: organizationChatHref(chat, routes),
-      isUnread: chat.isUnread,
-      updatedAt: chat.updatedAt.getTime(),
-    })),
-    requests: requests.data?.requests ?? [],
-    reconnect,
-    requestsHref: routes.settingsSection('requests'),
-  })
-  const failed = integrations.failure === 'failed' || chats.isError || reviewFailed
-  const pending =
-    (integrations.allowed && !integrations.entries && !integrations.failure) ||
-    chats.isPending ||
-    (canReview && requests.isPending)
-  const state: HomeListState<AttentionItem> =
-    items.length === 0 && pending
-      ? { status: 'loading' }
-      : items.length === 0 && failed
-        ? {
-            status: 'error',
-            retrying: integrations.retrying || chats.isFetching || requests.isFetching,
-          }
-        : { status: 'ready', items, partial: failed }
-  return {
-    state,
-    retry: () => {
-      integrations.retry()
-      void chats.refetch()
-      if (canReview) void requests.refetch()
-    },
-  }
-}
-
-function firstNameOf(user: { name?: string | null; email?: string | null } | null | undefined) {
-  return user?.name && user.name !== user.email ? user.name.split(/\s/u)[0] : undefined
-}
-
-/**
- * Home's view and actions. Every widget reads the same member inventory the Integrations page reads,
- * so the two cannot disagree on what is offered. `assistant` is whether the viewer searches rather
- * than builds here, which decides whether Get started is theirs.
- */
-export function useLiveHome(assistant: boolean): { view: HomeView; actions: HomeActions } {
-  const organization = useOrganizationContext()
-  const { data: session } = useSession()
-  const organizationId = organization.organization.id
-  const viewer = `${session?.user?.id}:${organizationId}`
-  const hiddenWidgets = useOrganizationHomeStore(
-    (state) => state.hiddenWidgets[viewer] ?? NO_WIDGETS
-  )
-  const setWidgetHidden = useOrganizationHomeStore((state) => state.setWidgetHidden)
-  const nowMs = useMinuteClock()
-  const [timeZone] = useState(getBrowserTimezone)
-  const [selectedDay, setSelectedDay] = useQueryState(homeDayParam.key, homeDayParam.parser)
-  const today = localDate(new Date(nowMs), timeZone)
-  const clock = { nowMs, today }
-
-  const integrations = useHomeIntegrations(organization)
-  const connectionFor = (sources: typeof HOME_EMAIL_SOURCES) =>
-    toHomeConnection({ ...integrations, sources })
-  const connectionActions = useConnectionActions(organizationId)
-  const email = useHomeEmail(
-    organizationId,
-    connectionFor(HOME_EMAIL_SOURCES),
-    integrations.retry,
-    hiddenWidgets.includes('Email')
-  )
-  const calendar = useHomeCalendar(
-    organizationId,
-    connectionFor(HOME_CALENDAR_SOURCES),
-    integrations.retry,
-    clock,
-    selectedDay,
-    timeZone,
-    hiddenWidgets.includes('Calendar')
-  )
-  const activity = useHomeActivity(
-    organization,
-    today,
-    timeZone,
-    hiddenWidgets.includes('Activity')
-  )
-  const recents = useHomeRecents(organization, session?.user?.id)
-  const attention = useHomeAttention(
-    organization,
-    integrations,
-    connectionActions.reconnect,
-    [email.state, calendar.state].flatMap((state) => ('accounts' in state ? state.accounts : []))
-  )
-  // Search-only members start here, so their onboarding comes with the Assistant composer.
-  const getStarted = useGetStartedSteps(assistant && organization.searchAccess.memberScoped)
-
-  const showDay = (day: string | null) =>
-    void setSelectedDay(day === today ? null : day, { history: 'replace', scroll: false })
-
-  return {
-    view: {
-      asOf: nowMs,
-      greeting: greetingAt(nowMs, timeZone),
-      firstName: firstNameOf(session?.user),
-      attention: attention.state,
-      activity: activity.state,
-      email: email.state,
-      calendar: calendar.state,
-      recents: recents.state,
-      getStarted,
-      hiddenWidgets,
-    },
-    actions: {
-      email: { ...connectionActions, retry: email.retry },
-      calendar: { ...connectionActions, retry: calendar.retry },
-      openEmail: (mail) => {
-        window.open(mail.url, '_blank', 'noopener,noreferrer')
-      },
-      changeDay: (delta) => {
-        showDay(addCalendarDays(selectedDay ?? today, delta))
-      },
-      returnToToday: () => showDay(null),
-      retryAttention: attention.retry,
-      retryActivity: activity.retry,
-      retryRecents: recents.retry,
-      removeRecent: recents.remove,
-      setWidgetHidden: (widget, hidden) => setWidgetHidden(viewer, widget, hidden),
-    },
-  }
-}
diff --git a/apps/sim/platform/lib/data/integrations-model.ts b/apps/sim/platform/lib/data/integrations-model.ts
deleted file mode 100644
index 43158162cc3..00000000000
--- a/apps/sim/platform/lib/data/integrations-model.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { SIM_DOCS_URL } from '@sim/utils/site'
-import type { AssistantToolPermissionsResponse } from '@/lib/api/contracts/assistant-actions'
-import type { SearchIntegrationStatus } from '@/lib/api/contracts/knowledge/search-integrations'
-import type { OrganizationAccountsSettings } from '@/lib/api/contracts/organization-accounts'
-import {
-  type MemberIntegration,
-  memberIntegrationEntries,
-} from '@/lib/credential-groups/member-integrations'
-import type { SecretSourceMode } from '@/lib/organization-secrets/validation'
-import { LIVE_SEARCH_SCOPE_FIELDS } from '@/lib/sim-search/live/policy-schema'
-import {
-  memberSecretMetadata,
-  providerMetadata,
-} from '@/platform/lib/integrations/metadata.generated'
-import {
-  type GenericSecrets,
-  integrationSegment,
-  type OrganizationIntegration,
-  type ToolPermissionsModel,
-} from '@/platform/lib/integrations/model'
-import { plural } from '@/platform/lib/plural'
-
-const CONNECT_ACCOUNT_GUIDE = `${SIM_DOCS_URL}/search/connect-your-account`
-
-function availabilityOf(entry: MemberIntegration): OrganizationIntegration['availability'] {
-  if (entry.managed) return 'managed'
-  return entry.ready ? 'ready' : 'blocked'
-}
-
-function memberIntegrationStatus(entry: MemberIntegration) {
-  if (entry.managed) return 'Organization managed'
-  if (!entry.ready) return entry.description ?? 'Checking availability'
-  if (
-    entry.accounts.some(
-      (account) =>
-        account.status === 'needs_reauth' &&
-        entry.reconnectAccountIds.includes(account.credentialId)
-    )
-  )
-    return 'Reconnect needed'
-  if (entry.accounts.length) return plural(entry.accounts.length, 'account')
-  return 'Not connected'
-}
-
-function toOrganizationIntegration(entry: MemberIntegration): OrganizationIntegration {
-  const metadata = providerMetadata.find(({ id }) => id === entry.provider)
-  return {
-    id: integrationSegment(entry.id),
-    providerId: entry.provider,
-    icon: entry.icon,
-    name: entry.name,
-    description: metadata?.description ?? `Connect your ${entry.name} account to use it here`,
-    setupGuideUrl:
-      metadata?.setupGuideUrl ??
-      (LIVE_SEARCH_SCOPE_FIELDS[entry.provider]
-        ? `${SIM_DOCS_URL}/search/${entry.provider}`
-        : CONNECT_ACCOUNT_GUIDE),
-    searchResource:
-      metadata?.searchResource ?? LIVE_SEARCH_SCOPE_FIELDS[entry.provider]?.label ?? null,
-    searchReads: metadata?.searchReads ?? [],
-    requestedScopes: metadata?.requestedScopes ?? null,
-    accessDescription: entry.description ?? 'Access follows your account permissions',
-    availability: availabilityOf(entry),
-    status: memberIntegrationStatus(entry),
-    connectionTarget: entry.managed ? undefined : entry.connectionTarget,
-    accounts: entry.managed
-      ? []
-      : entry.accounts.map((account) => ({
-          id: account.credentialId,
-          label: account.displayName,
-          status: account.status,
-          canReconnect: entry.reconnectAccountIds.includes(account.credentialId),
-          hasToolPermissions: entry.permissionAccountIds.includes(account.credentialId),
-        })),
-  }
-}
-
-/** Policies stay undefined until they load, so nothing is offered as connectable on a failed read. */
-export function toOrganizationIntegrations(
-  accounts: OrganizationAccountsSettings,
-  policies: SearchIntegrationStatus[] | undefined
-): OrganizationIntegration[] {
-  return memberIntegrationEntries(accounts, policies).map(toOrganizationIntegration)
-}
-
-export function toGenericSecrets(
-  source: { mode: SecretSourceMode } | null | undefined
-): GenericSecrets | null {
-  return source ? { ...memberSecretMetadata, mode: source.mode } : null
-}
-
-export function toToolPermissions(data: AssistantToolPermissionsResponse): ToolPermissionsModel {
-  return {
-    read: data.readPolicy,
-    write: data.writePolicy,
-    canAutoApprove: data.canAutoApprove,
-    accountActive: data.account.active,
-    tools: data.tools.map((tool) => ({
-      id: tool.toolId,
-      label: tool.name,
-      description: tool.description,
-      kind: tool.effect,
-      policy: tool.policy,
-      inherited: tool.inherited,
-    })),
-  }
-}
diff --git a/apps/sim/platform/lib/data/integrations.ts b/apps/sim/platform/lib/data/integrations.ts
deleted file mode 100644
index 19a63da92c6..00000000000
--- a/apps/sim/platform/lib/data/integrations.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { useCallback, useState } from 'react'
-import { getErrorMessage } from '@sim/utils/errors'
-import type { SaveSearchPersonalCredentialBody } from '@/lib/api/contracts/search-personal-credentials'
-import { resolveCredentialDisplay } from '@/lib/integrations/credential-display'
-import {
-  useAssistantToolPermissions,
-  useUpdateAssistantToolPermissions,
-} from '@/hooks/queries/assistant-actions'
-import {
-  useConnectOrganizationAccount,
-  useDisconnectPersonalOrganizationAccount,
-  useOrganizationAccounts,
-  useReconnectPersonalOrganizationAccount,
-} from '@/hooks/queries/organization-accounts'
-import { useOrganizationSecretSource } from '@/hooks/queries/organization-secrets'
-import { useRemovePersonalSearchCredential } from '@/hooks/queries/personal-search-integrations'
-import { useSearchIntegrations } from '@/hooks/queries/search-integrations'
-import { usePlatformNotices } from '@/platform/app/(shell)/_components/notification-tray/notification-tray'
-import {
-  toGenericSecrets,
-  toOrganizationIntegrations,
-  toToolPermissions,
-} from '@/platform/lib/data/integrations-model'
-import type {
-  OrganizationIntegration,
-  ToolPermissionChange,
-} from '@/platform/lib/integrations/model'
-
-const ACTION_NOTICE_ID = 'integrations-action'
-
-function useActionFailureNotice() {
-  const notices = usePlatformNotices()
-  return (error: unknown) =>
-    notices.notify({
-      id: ACTION_NOTICE_ID,
-      title: getErrorMessage(error, 'That did not work. Try again.'),
-      variant: 'error',
-    })
-}
-
-/** The member inventory and its reads, each failing and retrying on its own. */
-export function useMemberIntegrations(organizationId: string) {
-  const inventory = useOrganizationAccounts(organizationId)
-  const policies = useSearchIntegrations(organizationId)
-  const secrets = useOrganizationSecretSource(organizationId)
-  return {
-    integrations: inventory.data
-      ? toOrganizationIntegrations(inventory.data, policies.isSuccess ? policies.data : undefined)
-      : [],
-    genericSecrets: toGenericSecrets(secrets.data?.source),
-    inventory,
-    policies,
-    secrets,
-  }
-}
-
-export function useIntegrationActions(organizationId: string) {
-  const [savedConnection, setSavedConnection] = useState<{
-    providerId: SaveSearchPersonalCredentialBody['providerId']
-    credentialId?: string
-    displayName?: string
-  } | null>(null)
-  const inventory = useOrganizationAccounts(organizationId)
-  const savedAccounts = inventory.data?.viewerSavedAccounts ?? []
-  const removeSaved = useRemovePersonalSearchCredential()
-  const connect = useConnectOrganizationAccount()
-  const reconnect = useReconnectPersonalOrganizationAccount()
-  const disconnect = useDisconnectPersonalOrganizationAccount()
-  const onError = useActionFailureNotice()
-  const connecting = connect.isPending || reconnect.isPending
-  const closeSavedConnection = useCallback(() => setSavedConnection(null), [])
-  return {
-    connecting,
-    pending: connecting || disconnect.isPending || removeSaved.isPending,
-    savedConnection,
-    closeSavedConnection,
-    connect: (target: NonNullable<OrganizationIntegration['connectionTarget']>) => {
-      if ('savedProviderId' in target) setSavedConnection({ providerId: target.savedProviderId })
-      else connect.mutate({ organizationId, ...target }, { onError })
-    },
-    reconnect: (credentialId: string) => {
-      const saved = savedAccounts.find((account) => account.credentialId === credentialId)
-      if (saved)
-        setSavedConnection({
-          providerId: saved.providerId,
-          credentialId,
-          displayName: saved.displayName,
-        })
-      else reconnect.mutate(credentialId, { onError })
-    },
-    disconnect: async (credentialId: string) => {
-      if (savedAccounts.some((account) => account.credentialId === credentialId))
-        await removeSaved.mutateAsync({ organizationId, credentialId })
-      else await disconnect.mutateAsync({ credentialId, organizationId })
-    },
-  }
-}
-
-export function useToolPermissions(organizationId: string, credentialId: string) {
-  const query = useAssistantToolPermissions(organizationId, credentialId)
-  const update = useUpdateAssistantToolPermissions(organizationId, credentialId)
-  const onError = useActionFailureNotice()
-  const data = query.data
-  const display = data && resolveCredentialDisplay({ ...data.account, type: 'managed_oauth' })
-  return {
-    query,
-    pending: update.isPending,
-    view: data &&
-      display && {
-        permissions: toToolPermissions(data),
-        heading: {
-          name: display.detailTitle || data.account.providerId,
-          account: data.account.displayName,
-          icon: display.icon ?? undefined,
-        },
-      },
-    save(change: ToolPermissionChange) {
-      if (!data || update.isPending) return
-      update.mutate({ revision: data.revision, change }, { onError })
-    },
-  }
-}
diff --git a/apps/sim/platform/lib/data/invite.ts b/apps/sim/platform/lib/data/invite.ts
deleted file mode 100644
index 98f0dd0ed85..00000000000
--- a/apps/sim/platform/lib/data/invite.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-'use client'
-
-import { toast } from '@sim/emcn'
-import { useSession } from '@/lib/auth/client'
-import { isEnterprise } from '@/lib/billing/plan-helpers'
-import { buildInviteFailureMessage } from '@/lib/invitations/error-messages'
-import { quickValidateEmail } from '@/lib/messaging/email/validation'
-import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import { useSendWorkspaceInvitations } from '@/hooks/queries/invitations'
-import { useOrganizationPlanSeats } from '@/hooks/queries/organization-plan-seats'
-import { plural } from '@/platform/lib/plural'
-
-export const ORGANIZATION_ROLE_OPTIONS = [
-  { value: 'member', label: 'Member' },
-  { value: 'admin', label: 'Admin' },
-] as const
-
-const SEAT_WARNING =
-  'invites beyond that may fail. External collaborators and existing members do not use seats.'
-
-/**
- * Inviting people to the organization, offered only to a viewer who may, which implies an admin. The
- * seat warning is advisory: the server decides per address, since an existing member or an external
- * collaborator takes no seat, and reports each failure back.
- */
-export function useInviteMembers() {
-  const { organization, deployment } = useOrganizationContext()
-  const { data: session } = useSession()
-  const seats = useOrganizationPlanSeats(organization.id, { enabled: deployment.billingEnabled })
-  const send = useSendWorkspaceInvitations()
-  const viewerEmail = session?.user?.email?.toLowerCase()
-  const seatData = seats.data?.data
-  const available = seatData ? Math.max(0, seatData.totalSeats - seatData.usedSeats) : 0
-  const seatCapped = Boolean(
-    seatData && isEnterprise(seatData.subscriptionPlan) && seatData.totalSeats > 0
-  )
-  return {
-    addressProblem: (address: string): string | null => {
-      const format = quickValidateEmail(address)
-      if (!format.isValid) return format.reason ?? 'Invalid email'
-      return address.toLowerCase() === viewerEmail ? 'You cannot invite yourself' : null
-    },
-    seatWarning: (count: number): string | undefined =>
-      seatCapped && count > available
-        ? `Only ${plural(available, 'seat')} available — ${SEAT_WARNING}`
-        : undefined,
-    /** Resolves with the addresses to keep, and the reasons when any of them failed. */
-    submit: async (emails: string[], membership: 'member' | 'admin') => {
-      const result = await send.mutateAsync({
-        workspaceIds: [],
-        emails,
-        permission: 'write',
-        membership,
-        organizationId: organization.id,
-      })
-      const sent = [
-        result.added.length > 0 && `${plural(result.added.length, 'member')} added`,
-        result.successful.length > 0 && `${plural(result.successful.length, 'invite')} sent`,
-      ].filter(Boolean)
-      if (sent.length > 0) toast.success(sent.join(' · '))
-      return {
-        failed: result.failed.map((failure) => failure.email),
-        message: result.failed.length
-          ? buildInviteFailureMessage(result.failed, emails.length)
-          : null,
-      }
-    },
-  }
-}
diff --git a/apps/sim/platform/lib/data/links.ts b/apps/sim/platform/lib/data/links.ts
deleted file mode 100644
index 182ad9ef767..00000000000
--- a/apps/sim/platform/lib/data/links.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-'use client'
-
-import { useCallback, useMemo, useState } from 'react'
-import { writeTextToClipboard } from '@sim/emcn'
-import { createLogger } from '@sim/logger'
-import { SIM_DOCS_URL } from '@sim/utils/site'
-import { useQueryStates } from 'nuqs'
-import { isApiClientError } from '@/lib/api/client/errors'
-import { flattenFieldErrors } from '@/lib/api/contracts/primitives'
-import type { SimLink, SimLinkBody } from '@/lib/api/contracts/sim-links'
-import { simLinkPath, simLinkUrl } from '@/lib/navigation/paths'
-import {
-  isVariableSimLinkUrl,
-  simLinkFieldsSchema,
-  toSimLinkName,
-} from '@/lib/sim-links/validation'
-import { SEARCH_DEBOUNCE_MS } from '@/lib/url-state'
-import {
-  boundedSearch,
-  simLinksParsers,
-  simLinksSortParams,
-  simLinksUrlKeys,
-} from '@/app/o/[organizationId]/links/search-params'
-import {
-  useCreateSimLink,
-  useDeleteSimLink,
-  useSimLinks,
-  useUpdateSimLink,
-} from '@/hooks/queries/sim-links'
-import { useDebouncedSearchSetter } from '@/hooks/use-debounced-search-setter'
-import { useSearchFilterValue } from '@/hooks/use-search-filter-value'
-import { useUrlSort } from '@/hooks/use-url-sort'
-import { usePlatformNotices } from '@/platform/app/(shell)/_components/notification-tray/notification-tray'
-import { openLinkInNewTab } from '@/platform/app/(shell)/_components/sidebar/row-links'
-import type { MenuAction } from '@/platform/design-system/components/menu/action-menu'
-
-const logger = createLogger('SimLinks')
-
-const SIM_FOR_CHROME_URL =
-  'https://chromewebstore.google.com/detail/sim/oanlcahddodnjpdoopcpjlcageejjpmg'
-const SIM_LINKS_DOCS_URL = `${SIM_DOCS_URL}/search/sim-links`
-const COPY_NOTICE_ID = 'sim-link-copy'
-
-const SORT_OPTIONS = [
-  { id: 'name', label: 'Name' },
-  { id: 'popular', label: 'Opens' },
-] as const
-
-type LinkField = 'name' | 'url' | 'defaultUrl' | 'description'
-
-export function openChromeStore() {
-  openLinkInNewTab(SIM_FOR_CHROME_URL)
-}
-
-export function openLinkDocs() {
-  openLinkInNewTab(SIM_LINKS_DOCS_URL)
-}
-
-export function openLink(name: string) {
-  openLinkInNewTab(simLinkPath(name))
-}
-
-/** Every Sim link the viewer may browse, driven by the page's URL state. */
-export function useLinksPage(organizationId: string) {
-  const [{ search, create }, setView] = useQueryStates(simLinksParsers, simLinksUrlKeys)
-  const setSearch = useDebouncedSearchSetter((value, options) =>
-    setView({ search: value && boundedSearch(value) }, options)
-  )
-  const settled = useSearchFilterValue(search, SEARCH_DEBOUNCE_MS)
-  const { sort, dir, activeSort, onSort, onClear } = useUrlSort(simLinksSortParams, simLinksUrlKeys)
-  const term = settled.trim()
-  const links = useSimLinks(organizationId, term, sort, dir)
-  const remove = useDeleteSimLink(organizationId)
-  const notices = usePlatformNotices()
-
-  const rows = useMemo(() => links.data?.pages.flatMap((page) => page.links) ?? [], [links.data])
-  // Placeholder rows belong to the previous search, and asking for a page cancels a running refetch.
-  const hasMore = links.hasNextPage && !links.isPlaceholderData && !links.isFetching
-  const { isFetchingNextPage, isFetchNextPageError, fetchNextPage } = links
-  const loadMore = useMemo(
-    () => ({
-      hasMore,
-      loading: isFetchingNextPage,
-      error: isFetchNextPageError ? 'Failed to load more links' : undefined,
-      onLoadMore: () => void fetchNextPage(),
-    }),
-    [hasMore, isFetchingNextPage, isFetchNextPageError, fetchNextPage]
-  )
-  const copy = useCallback(
-    async (name: string) => {
-      try {
-        await writeTextToClipboard(simLinkUrl(window.location.origin, name))
-        notices.notify({ id: COPY_NOTICE_ID, title: 'Link copied', variant: 'success' })
-      } catch (error) {
-        logger.error('Failed to copy Sim link', { error })
-        notices.notify({ id: COPY_NOTICE_ID, title: 'Unable to copy link', variant: 'error' })
-      }
-    },
-    [notices]
-  )
-
-  const sortActions: MenuAction[] = [
-    ...(activeSort
-      ? [{ id: 'clear', label: 'Clear sort', icon: 'I105' as const, onSelect: onClear }]
-      : []),
-    ...SORT_OPTIONS.map(({ id, label }, index) => {
-      const direction = activeSort?.column === id ? activeSort.direction : null
-      return {
-        id,
-        label,
-        separatorBefore: Boolean(activeSort) && index === 0,
-        trailingIcon: direction ? (direction === 'asc' ? 'I023' : 'I102') : undefined,
-        onSelect: () => onSort(id, direction === 'desc' ? 'asc' : 'desc'),
-      } satisfies MenuAction
-    }),
-  ]
-  const activeSortLabel = SORT_OPTIONS.find(({ id }) => id === activeSort?.column)?.label
-
-  return {
-    /** A failed refresh keeps its rows; only a list that never loaded reports a failure. */
-    status: links.isLoadingError
-      ? ('error' as const)
-      : links.data
-        ? ('success' as const)
-        : ('pending' as const),
-    retry: () => void links.refetch(),
-    error: links.error?.message,
-    rows,
-    /** The rows still belong to the previous search, so an empty list says nothing yet. */
-    isPlaceholder: links.isPlaceholderData,
-    /** When the rows were read, which server and client agree on. Unset for placeholder rows. */
-    asOf: links.isPlaceholderData ? undefined : links.dataUpdatedAt,
-    term,
-    search,
-    setSearch,
-    sortLabel: activeSortLabel ? `Sort: ${activeSortLabel}` : 'Sort',
-    sortActions,
-    loadMore,
-    /** The name to prefill when the URL asks for a new link; null when it does not. */
-    createName: create === null ? null : toSimLinkName(create),
-    startCreate: () => void setView({ create: '' }),
-    closeCreate: () => void setView({ create: null }),
-    copy,
-    remove: async (id: string) => {
-      await remove.mutateAsync(id)
-    },
-  }
-}
-
-function draftOf(link: SimLink | undefined, initialName = ''): SimLinkBody {
-  return {
-    name: link?.name ?? initialName,
-    url: link?.url ?? '',
-    defaultUrl: link?.defaultUrl ?? null,
-    description: link?.description ?? '',
-    unlisted: link?.unlisted ?? false,
-    restrictEdit: link?.restrictEdit ?? false,
-  }
-}
-
-/** One open editor's draft. Mount it per link (keyed) so each starts from that link's saved fields. */
-export function useLinkEditor(organizationId: string, link?: SimLink, initialName?: string) {
-  const create = useCreateSimLink(organizationId)
-  const update = useUpdateSimLink(organizationId)
-  const [draft, setDraft] = useState(() => draftOf(link, initialName))
-  const [errors, setErrors] = useState<Partial<Record<LinkField, string>>>({})
-  const variable = isVariableSimLinkUrl(draft.url)
-  const change = <K extends keyof SimLinkBody>(field: K, value: SimLinkBody[K]) => {
-    setDraft((current) => ({ ...current, [field]: value }))
-    setErrors((current) => ({ ...current, [field]: undefined }))
-  }
-  return {
-    draft,
-    errors,
-    variable,
-    canManage: link?.canManage ?? true,
-    pending: create.isPending || update.isPending,
-    change,
-    changeName: (value: string) => change('name', toSimLinkName(value)),
-    /**
-     * Resolves `false` when the problem is shown on a field, which keeps the dialog open without a
-     * second message. Any other failure rejects, and the dialog shows it.
-     */
-    save: async () => {
-      const parsed = simLinkFieldsSchema.safeParse({
-        ...draft,
-        defaultUrl: variable ? draft.defaultUrl : null,
-      })
-      if (!parsed.success) {
-        setErrors(flattenFieldErrors<LinkField>(parsed.error))
-        return false
-      }
-      try {
-        if (link) await update.mutateAsync({ linkId: link.id, body: parsed.data })
-        else await create.mutateAsync(parsed.data)
-        return true
-      } catch (error) {
-        if (!isApiClientError(error) || error.status !== 409) throw error
-        setErrors((current) => ({ ...current, name: error.message }))
-        return false
-      }
-    },
-  }
-}
diff --git a/apps/sim/platform/lib/data/nav-warmers.ts b/apps/sim/platform/lib/data/nav-warmers.ts
deleted file mode 100644
index c20357c4f0f..00000000000
--- a/apps/sim/platform/lib/data/nav-warmers.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-'use client'
-
-import { useEffect, useRef } from 'react'
-import { useQueryClient } from '@tanstack/react-query'
-import { useRouter } from 'next/navigation'
-import { canReadMemberIntegrations } from '@/lib/credential-groups/member-integrations'
-import { organizationRoutes } from '@/lib/navigation/paths'
-import { simLinksSortParams } from '@/app/o/[organizationId]/links/search-params'
-import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import { warmOrganizationSettingsSectionQuery } from '@/app/o/[organizationId]/settings/settings-query-warmers'
-import { organizationAccountsQueryOptions } from '@/hooks/queries/organization-accounts'
-import { searchIntegrationsQueryOptions } from '@/hooks/queries/search-integrations'
-import { simLinksQueryOptions } from '@/hooks/queries/sim-links'
-import {
-  dropFailedSpeculativeQuery,
-  prefetchQueryOnIntent,
-} from '@/hooks/queries/utils/prefetch-query-on-intent'
-
-const NAV_WARM_DWELL_MS = 80
-
-/**
- * Reads a nav row's page ahead of an intended open, through the options its hooks read, so the keys
- * and payloads are the same ones. Only the cheap database reads: slow provider reads stay on the page.
- */
-export function useNavWarmers() {
-  const context = useOrganizationContext()
-  const organizationId = context.organization.id
-  const queryClient = useQueryClient()
-  const router = useRouter()
-  const timer = useRef<ReturnType<typeof setTimeout> | null>(null)
-
-  function cancel() {
-    if (timer.current) clearTimeout(timer.current)
-    timer.current = null
-  }
-
-  useEffect(() => cancel, [])
-
-  function warm(destination: string) {
-    if (destination === 'integrations' && canReadMemberIntegrations(context)) {
-      prefetchQueryOnIntent(queryClient, organizationAccountsQueryOptions(organizationId))
-      prefetchQueryOnIntent(queryClient, searchIntegrationsQueryOptions(organizationId))
-    }
-    if (destination === 'sim-links') {
-      const { column, direction } = simLinksSortParams.default
-      const options = simLinksQueryOptions(organizationId, '', column, direction)
-      void queryClient
-        .prefetchInfiniteQuery(options)
-        .then(() => dropFailedSpeculativeQuery(queryClient, options.queryKey))
-    }
-  }
-
-  return {
-    cancel,
-    schedule(destination: string) {
-      cancel()
-      timer.current = setTimeout(() => warm(destination), NAV_WARM_DWELL_MS)
-    },
-    /** A menu holding a Settings entry just opened, so its section's route and reads go ahead. */
-    warmSettings(section: 'general' | 'members') {
-      router.prefetch(organizationRoutes(organizationId).settingsSection(section))
-      warmOrganizationSettingsSectionQuery(
-        queryClient,
-        { organizationId, isAdmin: context.viewer.isAdmin },
-        section
-      )
-    },
-  }
-}
diff --git a/apps/sim/platform/lib/data/people.ts b/apps/sim/platform/lib/data/people.ts
deleted file mode 100644
index 16702606328..00000000000
--- a/apps/sim/platform/lib/data/people.ts
+++ /dev/null
@@ -1,445 +0,0 @@
-'use client'
-
-import { useMemo, useState } from 'react'
-import { useQueryStates } from 'nuqs'
-import { isOrganizationSettingsSectionAvailable } from '@/components/settings/navigation'
-import { isApiClientError } from '@/lib/api/client/errors'
-import type {
-  ChartBranch as ContractChartBranch,
-  PeopleImportResult as ContractImportResult,
-  Person as ContractPerson,
-  PersonSummary as ContractPersonSummary,
-  PeopleImportBody,
-  PersonBody,
-} from '@/lib/api/contracts/people'
-import {
-  type PeopleSyncConfig,
-  type PeopleSyncStatus,
-  peopleSyncConfigSchema,
-} from '@/lib/api/contracts/people-sync'
-import { flattenFieldErrors } from '@/lib/api/contracts/primitives'
-import { useDeploymentShape } from '@/lib/core/config/deployment-shape'
-import { organizationRoutes } from '@/lib/navigation/paths'
-import { readPeopleSheet } from '@/lib/people/read-sheet'
-import {
-  boundedSearch,
-  peopleParsers,
-  peopleUrlKeys,
-  serializePeopleView,
-} from '@/lib/people/search-params'
-import { memberProfileFieldsSchema } from '@/lib/people/validation'
-import { saveBlob } from '@/lib/uploads/client/download'
-import { SEARCH_DEBOUNCE_MS } from '@/lib/url-state'
-import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import { useScimConnection } from '@/ee/scim/hooks/scim'
-import { serializeSsoSettings } from '@/ee/sso/search-params'
-import {
-  useDepartments,
-  useImportPeople,
-  usePeople,
-  usePeopleChart,
-  usePerson,
-  useUpdatePerson,
-} from '@/hooks/queries/people'
-import {
-  isDirectorySyncAccessError,
-  usePeopleSyncActions,
-  usePeopleSyncStatus,
-} from '@/hooks/queries/people-sync'
-import { useDebounce } from '@/hooks/use-debounce'
-import { useDebouncedSearchSetter } from '@/hooks/use-debounced-search-setter'
-import { useIsMobile } from '@/hooks/use-is-mobile'
-import { useSearchFilterValue } from '@/hooks/use-search-filter-value'
-
-export type ChartBranch = ContractChartBranch
-export type PeopleImportResult = ContractImportResult
-export type Person = ContractPerson
-export type PersonSummary = ContractPersonSummary
-export type SyncStatus = PeopleSyncStatus
-export type SyncSource = PeopleSyncConfig['source']
-
-export const SYNC_SOURCE_NAMES: Record<SyncSource, string> = {
-  okta: 'Okta',
-  entra: 'Microsoft Entra ID',
-  scim: 'SCIM provisioning',
-}
-
-/** Who is viewing, and which of the page's administration they may reach. */
-export function usePeopleViewer() {
-  const { organization, viewer, settingsFeatures } = useOrganizationContext()
-  const { features, hosted } = useDeploymentShape()
-  return {
-    organizationName: organization.name,
-    isAdmin: viewer.isAdmin,
-    canProvision: features.scim && (!hosted || settingsFeatures.hasEnterprisePlan),
-    canOpenProvisioningSettings: isOrganizationSettingsSectionAvailable('sso', settingsFeatures),
-    provisioningSettingsHref: serializeSsoSettings(
-      organizationRoutes(organization.id).settingsSection('sso'),
-      { tab: 'provisioning' }
-    ),
-  }
-}
-
-export function personHref(organizationId: string, memberId: string, originQuery = ''): string {
-  return `${organizationRoutes(organizationId).person(memberId)}${originQuery}`
-}
-
-export function isApiConflict(error: unknown): boolean {
-  return isApiClientError(error) && error.status === 409
-}
-
-const REFUSAL_STATUSES = new Set([400, 401, 403, 404])
-
-/** A refusal replaces what is on screen; a transient failure, including a 429, keeps it. */
-export function isRefusal(error: unknown): boolean {
-  return isApiClientError(error) && REFUSAL_STATUSES.has(error.status)
-}
-
-export function usePeopleUrl() {
-  return useQueryStates(peopleParsers, peopleUrlKeys)
-}
-
-type PeopleUrl = ReturnType<typeof usePeopleUrl>[0]
-type PeopleUrlOverrides = { [Key in keyof PeopleUrl]?: PeopleUrl[Key] | null }
-
-function profileOriginQuery(origin: PeopleUrl, overrides: PeopleUrlOverrides): string {
-  return serializePeopleView({ ...origin, panel: null, ...overrides })
-}
-
-function peopleViewHref(
-  organizationId: string,
-  origin: PeopleUrl,
-  overrides: PeopleUrlOverrides
-): string {
-  return serializePeopleView(organizationRoutes(organizationId).people, {
-    ...origin,
-    panel: null,
-    ...overrides,
-  })
-}
-
-export function usePeopleDirectory(organizationId: string) {
-  const [origin, setView] = usePeopleUrl()
-  const { search, department, departmentKey } = origin
-  const setSearch = useDebouncedSearchSetter((value, options) =>
-    setView({ view: 'directory', search: value }, options)
-  )
-  const debounced = useSearchFilterValue(search, SEARCH_DEBOUNCE_MS)
-  const query = debounced.trim()
-  const people = usePeople(organizationId, query, department, { departmentKey })
-  const changingFilter = people.isPlaceholderData || query !== search.trim()
-  const pages = people.isRefetchError || changingFilter ? undefined : people.data?.pages
-  const rows = useMemo(() => (pages ?? []).flatMap((page) => page.people), [pages])
-  const hasDepartment = Boolean(departmentKey || department)
-  const departmentLabel = departmentKey
-    ? (!people.isPlaceholderData && people.data?.pages[0]?.selectedDepartment) ||
-      'Selected department'
-    : department
-  return {
-    origin,
-    search,
-    query,
-    setSearch: (value: string) => setSearch(boundedSearch(value)),
-    rows,
-    hasDepartment,
-    departmentLabel,
-    originQuery: profileOriginQuery(origin, { view: 'directory' }),
-    loading: people.isPending || changingFilter,
-    error: people.isLoadingError || people.isRefetchError ? people.error : null,
-    retry: () => void people.refetch(),
-    loadMore: {
-      hasMore: people.hasNextPage && !changingFilter,
-      loading: people.isFetchingNextPage,
-      error: people.isFetchNextPageError ? people.error.message : undefined,
-      onLoadMore: () => void people.fetchNextPage(),
-    },
-    setDepartment: (next: { name: string; key?: string } | null) =>
-      void setView({
-        view: 'directory',
-        department: next && !next.key ? next.name : null,
-        departmentKey: next?.key ?? null,
-      }),
-    clearFilters: () =>
-      void setView({ view: 'directory', search: '', department: '', departmentKey: '' }),
-  }
-}
-
-/** The filter's option values: stored text can't hold a NUL, so no department collides with these. */
-const DEPARTMENT_KEY_PREFIX = '\u0000key:'
-const ALL_DEPARTMENTS = '\u0000all'
-
-export function useDepartmentOptions(
-  organizationId: string,
-  selected: { department: string; departmentKey: string }
-) {
-  const [open, setOpen] = useState(false)
-  const [term, setTerm] = useState('')
-  const debounced = useSearchFilterValue(term, SEARCH_DEBOUNCE_MS).trim()
-  const departments = useDepartments(organizationId, debounced, open)
-  const waiting = term.trim() !== debounced
-  const options = useMemo(() => {
-    const entries = waiting
-      ? []
-      : (departments.data?.pages.flatMap((page) => page.departments) ?? [])
-    return [
-      { value: ALL_DEPARTMENTS, label: 'All departments' },
-      ...entries.map(({ name, count, departmentKey }) => ({
-        value: departmentKey ? `${DEPARTMENT_KEY_PREFIX}${departmentKey}` : name,
-        label: `${name} (${count})`,
-      })),
-    ]
-  }, [waiting, departments.data])
-  return {
-    options,
-    onOpenChange: setOpen,
-    value: selected.departmentKey
-      ? `${DEPARTMENT_KEY_PREFIX}${selected.departmentKey}`
-      : selected.department || ALL_DEPARTMENTS,
-    /** Maps an option back to the URL's split between a plain name and an opaque key. */
-    parse: (value: string | null): { name: string; key?: string } | null => {
-      if (!value || value === ALL_DEPARTMENTS) return null
-      return value.startsWith(DEPARTMENT_KEY_PREFIX)
-        ? { name: '', key: value.slice(DEPARTMENT_KEY_PREFIX.length) }
-        : { name: value }
-    },
-    search: {
-      query: term,
-      onQueryChange: (query: string) => setTerm(boundedSearch(query)),
-      hasMore: !waiting && departments.hasNextPage,
-      loading: waiting || departments.isFetching,
-      error: waiting ? undefined : departments.error?.message,
-      onLoadMore: () => void departments.fetchNextPage(),
-      onRetry: () => void departments.refetch(),
-    },
-  }
-}
-
-/** Paginated directory search for the chart's pickers and for choosing a manager. */
-export function usePeoplePicker(
-  organizationId: string,
-  scope?: 'roots' | 'members',
-  excludeMemberId?: string
-) {
-  const [open, setOpen] = useState(false)
-  const [term, setTerm] = useState('')
-  const debounced = useDebounce(term.trim(), SEARCH_DEBOUNCE_MS)
-  const query = usePeople(organizationId, debounced, '', { scope, enabled: open })
-  const waiting = term.trim() !== debounced || query.isPlaceholderData
-  const pages = waiting || query.isRefetchError ? undefined : query.data?.pages
-  const people = useMemo(
-    () =>
-      (pages ?? []).flatMap((page) =>
-        page.people.filter((person) => person.memberId !== excludeMemberId)
-      ),
-    [pages, excludeMemberId]
-  )
-  const options = useMemo(
-    () =>
-      people.map((person) => ({
-        value: person.memberId,
-        label: [person.name, person.title, person.email].filter(Boolean).join(' · '),
-      })),
-    [people]
-  )
-  return {
-    people,
-    options,
-    onOpenChange: setOpen,
-    search: {
-      query: term,
-      onQueryChange: (next: string) => setTerm(boundedSearch(next)),
-      hasMore: query.hasNextPage && !waiting,
-      loading: waiting || query.isFetching,
-      error: waiting ? undefined : query.error?.message,
-      onLoadMore: () => void query.fetchNextPage(),
-      onRetry: () => void query.refetch(),
-    },
-  }
-}
-
-const CHART_MAX_PAGE = 1_000_000
-
-export function useOrgChart(organizationId: string) {
-  const [origin, setView] = usePeopleUrl()
-  const { focus, page } = origin
-  const compact = useIsMobile()
-  const size = compact ? 1 : 4
-  const chart = usePeopleChart(
-    organizationId,
-    focus,
-    Math.max(1, Math.min(page, CHART_MAX_PAGE)),
-    size
-  )
-  const branch = isRefusal(chart.error) ? undefined : chart.data
-  return {
-    setView,
-    focus,
-    page,
-    size,
-    compact,
-    branch,
-    error: chart.error,
-    retry: () => void chart.refetch(),
-    profileQuery: profileOriginQuery(origin, {
-      view: 'chart',
-      focus: branch?.person.memberId ?? focus,
-      page: branch?.page ?? page,
-    }),
-  }
-}
-
-/** Whether any reporting line exists yet, and the first team to offer someone who has none. */
-export function useChartRoots(organizationId: string, enabled = true) {
-  const roots = usePeople(organizationId, '', '', { scope: 'roots', enabled })
-  const firstTeam = roots.data?.pages[0]?.people[0]
-  return {
-    firstTeam,
-    emptyOrganization: Boolean(roots.data) && !firstTeam,
-    settled: !roots.isPending,
-  }
-}
-
-export function usePersonProfile(organizationId: string, memberId: string) {
-  const [origin] = usePeopleUrl()
-  const query = usePerson(organizationId, memberId)
-  const loadError = query.data && !isRefusal(query.error) ? null : query.error
-  const data = loadError ? undefined : query.data
-  const originView = origin.view ?? 'directory'
-  return {
-    data,
-    error: loadError,
-    retrying: query.isFetching,
-    retry: () => void query.refetch(),
-    originView,
-    originQuery: profileOriginQuery(origin, { view: originView }),
-    chartHref: peopleViewHref(organizationId, origin, {
-      view: 'chart',
-      focus: data?.person.memberId ?? memberId,
-      page: origin.focus === data?.person.memberId ? origin.page : 1,
-    }),
-    departmentHref: peopleViewHref(organizationId, origin, {
-      view: 'directory',
-      search: '',
-      department: data?.person.departmentKey ? null : data?.person.department,
-      departmentKey: data?.person.departmentKey ?? null,
-    }),
-    backHref: peopleViewHref(organizationId, origin, { view: originView }),
-    directoryHref: peopleViewHref(organizationId, origin, { view: 'directory' }),
-  }
-}
-
-export type PersonDraft = PersonBody
-
-export function useEditPerson(organizationId: string, memberId: string) {
-  const update = useUpdatePerson(organizationId)
-  return {
-    /** Field problems, or null once the update went through. A failed request rejects. */
-    save: async (
-      draft: PersonDraft
-    ): Promise<Partial<Record<keyof PersonDraft, string>> | null> => {
-      const parsed = memberProfileFieldsSchema.safeParse(draft)
-      if (!parsed.success) return flattenFieldErrors<keyof PersonDraft & string>(parsed.error)
-      await update.mutateAsync({ memberId, body: parsed.data })
-      return null
-    },
-  }
-}
-
-export type ImportBody = PeopleImportBody
-
-const IMPORT_TEMPLATE_CSV =
-  'email,title,department,location,start_date,manager_email\nada@example.com,Engineer,Platform,Berlin,2024-01-31,grace@example.com\n'
-
-export function downloadImportTemplate() {
-  saveBlob(new Blob([IMPORT_TEMPLATE_CSV], { type: 'text/csv' }), 'people-template.csv')
-}
-
-/** The import mutation that keeps provider tokens out of the mutation cache, and its sheet reader. */
-export function usePeopleImport(organizationId: string) {
-  const importPeople = useImportPeople(organizationId)
-  return {
-    submit: importPeople.submit,
-    pending: importPeople.isPending,
-    readSheet: readPeopleSheet,
-  }
-}
-
-export function useProvisioningConnection(organizationId: string, enabled: boolean) {
-  const connection = useScimConnection(organizationId, enabled)
-  const directory = connection.data?.connection
-  return {
-    loading: connection.isLoading,
-    failed: connection.isError,
-    fetching: connection.isFetching,
-    active: directory?.status === 'active',
-    ready: connection.isSuccess && directory?.status === 'active',
-    userCount: directory?.userCount ?? 0,
-    refresh: () => void connection.refetch(),
-  }
-}
-
-export interface SyncDraft {
-  domain: string
-  token: string
-  tenantId: string
-  clientId: string
-  clientSecret: string
-}
-
-export type SyncFieldErrors = Partial<Record<keyof SyncDraft, string>>
-
-/**
- * The connection as the page header reads it. Members never ask: its reads are admin-only. Reads
- * only the result, so a poll starting or settling doesn't re-render the page under it.
- */
-export function useDirectorySyncStatus(organizationId: string, enabled: boolean) {
-  const query = usePeopleSyncStatus(organizationId, enabled)
-  const status = isDirectorySyncAccessError(query.error) ? undefined : query.data
-  return { loaded: Boolean(status), settled: !query.isPending, sync: status?.sync ?? null }
-}
-
-/** The status with the action state machine the hook keeps out of the cache. */
-export function useDirectorySync(organizationId: string) {
-  const query = usePeopleSyncStatus(organizationId)
-  const actions = usePeopleSyncActions(organizationId)
-  const denied = isDirectorySyncAccessError(query.error)
-  const status = denied ? undefined : query.data
-  const connect = (
-    source: SyncSource,
-    draft: SyncDraft,
-    onConnected: () => void
-  ): SyncFieldErrors | null => {
-    const parsed = peopleSyncConfigSchema.safeParse(
-      source === 'okta'
-        ? { source: 'okta', domain: draft.domain, token: draft.token }
-        : source === 'entra'
-          ? {
-              source: 'entra',
-              tenantId: draft.tenantId.trim(),
-              clientId: draft.clientId.trim(),
-              clientSecret: draft.clientSecret,
-            }
-          : { source: 'scim' }
-    )
-    if (!parsed.success) return flattenFieldErrors(parsed.error)
-    actions.configure(parsed.data, onConnected)
-    return null
-  }
-  return {
-    denied,
-    loading: query.isPending,
-    loaded: Boolean(status),
-    loadError: query.isError && !status ? query.error : null,
-    fetching: query.isFetching,
-    retry: () => void query.refetch(),
-    sync: status?.sync ?? null,
-    pending: actions.pending,
-    running: actions.action === 'run',
-    actionError: actions.error,
-    reset: actions.reset,
-    run: actions.run,
-    /** Settles with the request, so a dialog can hold itself open as pending. */
-    disconnect: () => new Promise<void>((resolve, reject) => actions.disconnect(resolve, reject)),
-    connect,
-  }
-}
diff --git a/apps/sim/platform/lib/data/prefetch-member-inventory.ts b/apps/sim/platform/lib/data/prefetch-member-inventory.ts
deleted file mode 100644
index 5618ac09b83..00000000000
--- a/apps/sim/platform/lib/data/prefetch-member-inventory.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import 'server-only'
-import type { SessionPrincipal } from '@sim/auth/principal'
-import type { DehydratedState } from '@tanstack/react-query'
-import { listSearchIntegrationsContract } from '@/lib/api/contracts/knowledge/search-integrations'
-import { getOrganizationAccountsContract } from '@/lib/api/contracts/organization-accounts'
-import { getOrganizationAccountsSettings } from '@/lib/credential-groups/application/organization-accounts'
-import { canReadMemberIntegrations } from '@/lib/credential-groups/member-integrations'
-import { listSearchIntegrations } from '@/lib/knowledge/application/search-integrations'
-import {
-  ORGANIZATION_ACCOUNTS_STALE_TIME,
-  organizationAccountsKeys,
-} from '@/hooks/queries/utils/organization-accounts-keys'
-import {
-  SEARCH_INTEGRATIONS_STALE_TIME,
-  searchIntegrationKeys,
-} from '@/hooks/queries/utils/search-integration-keys'
-import { createSeeds } from '@/platform/lib/data/prefetch'
-
-type PrefetchSurface = Parameters<typeof canReadMemberIntegrations>[0] & {
-  organization: { id: string }
-}
-
-function seedMemberInventory(
-  seeds: ReturnType<typeof createSeeds>,
-  surface: PrefetchSurface,
-  principal: SessionPrincipal
-) {
-  if (!canReadMemberIntegrations(surface)) return []
-  const organizationId = surface.organization.id
-  const input = { organizationId }
-  return [
-    seeds.seed(
-      organizationAccountsKeys.detail(organizationId),
-      ORGANIZATION_ACCOUNTS_STALE_TIME,
-      async () =>
-        getOrganizationAccountsContract.response.schema.parse(
-          await getOrganizationAccountsSettings.execute({ principal, input })
-        )
-    ),
-    seeds.seed(
-      searchIntegrationKeys.list(organizationId),
-      SEARCH_INTEGRATIONS_STALE_TIME,
-      async () =>
-        listSearchIntegrationsContract.response.schema.parse({
-          success: true,
-          data: await listSearchIntegrations.execute({ principal, input }),
-        }).data
-    ),
-  ]
-}
-
-/**
- * What decides each Home widget's state, so a viewer with no connection paints their prompt at once.
- * Provider reads stay on the client: they can take seconds.
- */
-export function prefetchHome(
-  surface: PrefetchSurface,
-  principal: SessionPrincipal
-): Promise<DehydratedState> {
-  const seeds = createSeeds(surface.organization.id, principal)
-  return seeds.settle([
-    ...seedMemberInventory(seeds, surface, principal),
-    ...(surface.searchAccess.memberScoped ? [seeds.searchHistory()] : []),
-  ])
-}
-
-export function prefetchIntegrations(
-  surface: PrefetchSurface,
-  principal: SessionPrincipal
-): Promise<DehydratedState> {
-  const seeds = createSeeds(surface.organization.id, principal)
-  return seeds.settle([...seedMemberInventory(seeds, surface, principal), seeds.secretSource()])
-}
diff --git a/apps/sim/platform/lib/data/prefetch.test.ts b/apps/sim/platform/lib/data/prefetch.test.ts
deleted file mode 100644
index 1294852df35..00000000000
--- a/apps/sim/platform/lib/data/prefetch.test.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * @vitest-environment node
- *
- * First paint must never wait on a slow read or seed the wrong answer. Failure modes: a read past
- * its budget holding the document, a failed or malformed read hydrating as if it succeeded, reads
- * for a viewer the routes would refuse, an entry the client hook would not find, and a list whose
- * cached shape differs from what the route sends.
- */
-import { createSessionPrincipal } from '@sim/testing/factories/principal.factory'
-import type { DehydratedState } from '@tanstack/react-query'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { searchIntegrationsQueryOptions } from '@/hooks/queries/search-integrations'
-import { simLinksQueryOptions } from '@/hooks/queries/sim-links'
-import { organizationAccountsKeys } from '@/hooks/queries/utils/organization-accounts-keys'
-import { organizationSecretKeys } from '@/hooks/queries/utils/organization-secret-keys'
-import { searchHistoryKeys } from '@/hooks/queries/utils/search-history-keys'
-
-const mocks = vi.hoisted(() => ({
-  accounts: vi.fn(),
-  integrations: vi.fn(),
-  history: vi.fn(),
-  secretSource: vi.fn(),
-  links: vi.fn(),
-}))
-vi.mock('server-only', () => ({}))
-vi.mock('@/lib/credential-groups/application/organization-accounts', () => ({
-  getOrganizationAccountsSettings: { execute: mocks.accounts },
-}))
-vi.mock('@/lib/knowledge/application/search-integrations', () => ({
-  listSearchIntegrations: { execute: mocks.integrations },
-}))
-vi.mock('@/lib/knowledge/application/search-history', () => ({
-  listSearchHistory: { execute: mocks.history },
-}))
-vi.mock('@/lib/organization-secrets/application/use-cases', () => ({
-  readOrganizationSecretSource: { execute: mocks.secretSource },
-}))
-vi.mock('@/lib/sim-links/application/use-cases', () => ({
-  listSimLinks: { execute: mocks.links },
-}))
-
-import { prefetchSearch, prefetchSimLinks } from '@/platform/lib/data/prefetch'
-import { prefetchHome, prefetchIntegrations } from '@/platform/lib/data/prefetch-member-inventory'
-
-const principal = createSessionPrincipal({ userId: 'viewer' })
-const surface = (memberScoped: boolean, canConnect = true) => ({
-  organization: { id: 'org-1' },
-  searchAccess: { memberScoped },
-  viewer: { canConnectSearchIntegrations: canConnect },
-  connectedAccountsAvailable: true,
-})
-
-const seeded = (state: DehydratedState) => state.queries.map((query) => query.queryKey)
-
-const ACCOUNTS_KEY = [...organizationAccountsKeys.detail('org-1')]
-const INTEGRATIONS_KEY = [...searchIntegrationsQueryOptions('org-1').queryKey]
-const HISTORY_KEY = [...searchHistoryKeys.list('org-1', 'viewer')]
-const SECRET_SOURCE_KEY = [...organizationSecretKeys.source('org-1')]
-
-const ACCOUNTS = {
-  credentialGroup: null,
-  viewerAccounts: [],
-  viewerMcpAccounts: [],
-  availableProviders: [],
-  assistantProviders: [],
-  availableMcpConnectors: [],
-  canManage: false,
-  indexingAvailable: true,
-}
-
-const LINK_RECORD = {
-  id: 'link-1',
-  name: 'handbook',
-  normalizedName: 'handbook',
-  url: 'https://example.com/handbook',
-  defaultUrl: null,
-  description: null,
-  unlisted: false,
-  restrictEdit: false,
-  visitCount: 3,
-  createdBy: null,
-  updatedAt: new Date('2026-11-01T00:00:00.000Z'),
-  canEdit: true,
-  canManage: false,
-}
-
-beforeEach(() => {
-  mocks.accounts.mockResolvedValue(ACCOUNTS)
-  mocks.integrations.mockResolvedValue([])
-  mocks.history.mockResolvedValue({ sources: [], queries: [] })
-  mocks.secretSource.mockResolvedValue({ source: null })
-  mocks.links.mockResolvedValue({ links: [LINK_RECORD], nextCursor: 'handbook' })
-})
-
-afterEach(() => {
-  vi.useRealTimers()
-})
-
-describe('seeding under the keys the hooks read', () => {
-  it('seeds Home', async () => {
-    expect(seeded(await prefetchHome(surface(true), principal))).toEqual(
-      expect.arrayContaining([ACCOUNTS_KEY, INTEGRATIONS_KEY, HISTORY_KEY])
-    )
-  })
-
-  it('seeds Search', async () => {
-    expect(seeded(await prefetchSearch('org-1', principal))).toEqual([HISTORY_KEY])
-  })
-
-  it('seeds Integrations', async () => {
-    expect(seeded(await prefetchIntegrations(surface(true), principal))).toEqual(
-      expect.arrayContaining([ACCOUNTS_KEY, INTEGRATIONS_KEY, SECRET_SOURCE_KEY])
-    )
-  })
-
-  it.each([
-    [{ search: '', sort: 'name', dir: 'asc' }, ''],
-    [{ search: ' handbook ', sort: 'popular', dir: 'desc' }, 'handbook'],
-  ] as const)('seeds Links for the list the URL asks for: %j', async (view, term) => {
-    expect(seeded(await prefetchSimLinks('org-1', principal, view))).toEqual([
-      [...simLinksQueryOptions('org-1', term, view.sort, view.dir).queryKey],
-    ])
-    expect(mocks.links).toHaveBeenCalledWith({
-      principal,
-      input: { organizationId: 'org-1', search: term || undefined, sort: view.sort, dir: view.dir },
-    })
-  })
-})
-
-describe('Links first paint', () => {
-  it('caches the page as the route sends it, for the hook to page on from', async () => {
-    const state = await prefetchSimLinks('org-1', principal, {
-      search: '',
-      sort: 'name',
-      dir: 'asc',
-    })
-    const { normalizedName, ...wire } = LINK_RECORD
-    expect(state.queries[0].state.data).toEqual({
-      pages: [
-        {
-          links: [{ ...wire, updatedAt: '2026-11-01T00:00:00.000Z' }],
-          nextCursor: 'handbook',
-        },
-      ],
-      pageParams: [undefined],
-    })
-  })
-
-  it('leaves a refused list for the client, which reaches the route for the real answer', async () => {
-    mocks.links.mockRejectedValue(new Error('Forbidden'))
-    const state = await prefetchSimLinks('org-1', principal, {
-      search: '',
-      sort: 'name',
-      dir: 'asc',
-    })
-    expect(seeded(state)).toEqual([])
-  })
-})
-
-describe('what stays out of hydration', () => {
-  it('reads nothing the routes would refuse this viewer', async () => {
-    expect(seeded(await prefetchHome(surface(false), principal))).toEqual([])
-    expect(mocks.accounts).not.toHaveBeenCalled()
-    expect(mocks.history).not.toHaveBeenCalled()
-    expect(seeded(await prefetchHome(surface(true, false), principal))).toEqual([HISTORY_KEY])
-    expect(seeded(await prefetchIntegrations(surface(true, false), principal))).toEqual([
-      SECRET_SOURCE_KEY,
-    ])
-    expect(mocks.accounts).not.toHaveBeenCalled()
-  })
-
-  it('leaves a failed read for the client and keeps the rest', async () => {
-    mocks.accounts.mockRejectedValue(new Error('database unavailable'))
-    const keys = seeded(await prefetchHome(surface(true), principal))
-    expect(keys).not.toContainEqual(ACCOUNTS_KEY)
-    expect(keys).toContainEqual(HISTORY_KEY)
-  })
-
-  it('leaves a read outside its contract for the client', async () => {
-    mocks.history.mockResolvedValue({ sources: 'not a list', queries: [] })
-    expect(seeded(await prefetchSearch('org-1', principal))).toEqual([])
-  })
-
-  it('gives up on a slow read rather than hold the document', async () => {
-    vi.useFakeTimers()
-    mocks.accounts.mockReturnValue(new Promise(() => {}))
-    const prefetched = prefetchIntegrations(surface(true), principal)
-    await vi.advanceTimersByTimeAsync(2_000)
-    const keys = seeded(await prefetched)
-    expect(keys).not.toContainEqual(ACCOUNTS_KEY)
-    expect(keys).toContainEqual(INTEGRATIONS_KEY)
-  })
-})
diff --git a/apps/sim/platform/lib/data/prefetch.ts b/apps/sim/platform/lib/data/prefetch.ts
deleted file mode 100644
index 157c03ffe8c..00000000000
--- a/apps/sim/platform/lib/data/prefetch.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import 'server-only'
-import type { SessionPrincipal } from '@sim/auth/principal'
-import { type DehydratedState, dehydrate } from '@tanstack/react-query'
-import { listSearchHistoryContract } from '@/lib/api/contracts/knowledge/search-history'
-import { getSecretSourceContract } from '@/lib/api/contracts/organization-secrets'
-import { listSimLinksContract } from '@/lib/api/contracts/sim-links'
-import { presentSimLinkPage } from '@/lib/api/server/sim-link-presenters'
-import { withinDeadline } from '@/lib/core/utils/deadline'
-import { listSearchHistory } from '@/lib/knowledge/application/search-history'
-import { readOrganizationSecretSource } from '@/lib/organization-secrets/application/use-cases'
-import { listSimLinks } from '@/lib/sim-links/application/use-cases'
-import type { SimLinkSort } from '@/lib/sim-links/validation'
-import type { SortDirection } from '@/lib/url-state'
-import { makeQueryClient } from '@/app/_shell/providers/get-query-client'
-import {
-  ORGANIZATION_SECRET_STALE_TIME,
-  organizationSecretKeys,
-} from '@/hooks/queries/utils/organization-secret-keys'
-import {
-  SEARCH_HISTORY_STALE_TIME,
-  searchHistoryKeys,
-} from '@/hooks/queries/utils/search-history-keys'
-import { SIM_LINKS_STALE_TIME, simLinkKeys } from '@/hooks/queries/utils/sim-link-keys'
-
-/** A slow read gives up its first-paint seat rather than hold the document; the client fetches it. */
-const PREFETCH_TIMEOUT_MS = 2_000
-
-function withinBudget<T>(read: () => Promise<T>) {
-  return () => withinDeadline(read, Date.now() + PREFETCH_TIMEOUT_MS)
-}
-
-interface SimLinksListView {
-  search: string
-  sort: SimLinkSort
-  dir: SortDirection
-}
-
-/**
- * The cheap reads behind first paint. Each runs its route's use case and contract schema under its
- * hook's key, together rather than in turn. A failed or slow read stays out of hydration for the
- * client to retry, and a read the route would refuse this viewer fails the same way here.
- *
- * Keep these light, since each lands in its route's server graph: the member inventory, which reaches
- * the block and tool registries, is apart in `prefetch-member-inventory.ts`.
- */
-export function createSeeds(organizationId: string, principal: SessionPrincipal) {
-  const queryClient = makeQueryClient()
-  const input = { organizationId }
-  const seed = <T>(queryKey: readonly unknown[], staleTime: number, read: () => Promise<T>) =>
-    queryClient.prefetchQuery({ queryKey, staleTime, queryFn: withinBudget(read) })
-  return {
-    seed,
-    searchHistory: () =>
-      seed(
-        searchHistoryKeys.list(organizationId, principal.userId),
-        SEARCH_HISTORY_STALE_TIME,
-        async () =>
-          listSearchHistoryContract.response.schema.parse(
-            await listSearchHistory.execute({ principal, input })
-          )
-      ),
-    secretSource: () =>
-      seed(
-        organizationSecretKeys.source(organizationId),
-        ORGANIZATION_SECRET_STALE_TIME,
-        async () =>
-          getSecretSourceContract.response.schema.parse(
-            await readOrganizationSecretSource.execute({ principal, input })
-          )
-      ),
-    simLinks: ({ search, sort, dir }: SimLinksListView) => {
-      const term = search.trim()
-      return queryClient.prefetchInfiniteQuery({
-        queryKey: simLinkKeys.list(organizationId, term, sort, dir),
-        staleTime: SIM_LINKS_STALE_TIME,
-        initialPageParam: undefined as string | undefined,
-        queryFn: withinBudget(async () =>
-          listSimLinksContract.response.schema.parse(
-            presentSimLinkPage(
-              await listSimLinks.execute({
-                principal,
-                input: { organizationId, search: term || undefined, sort, dir },
-              })
-            )
-          )
-        ),
-      })
-    },
-    settle: async (reads: readonly Promise<void>[]): Promise<DehydratedState> => {
-      await Promise.all(reads)
-      return dehydrate(queryClient)
-    },
-  }
-}
-
-/** The history under Search's field. Results stay on the client: they are the slow live read. */
-export function prefetchSearch(
-  organizationId: string,
-  principal: SessionPrincipal
-): Promise<DehydratedState> {
-  const seeds = createSeeds(organizationId, principal)
-  return seeds.settle([seeds.searchHistory()])
-}
-
-/** The first page of the list the URL asks for. Later pages load as the table scrolls. */
-export function prefetchSimLinks(
-  organizationId: string,
-  principal: SessionPrincipal,
-  view: SimLinksListView
-): Promise<DehydratedState> {
-  const seeds = createSeeds(organizationId, principal)
-  return seeds.settle([seeds.simLinks(view)])
-}
diff --git a/apps/sim/platform/lib/data/shell-actions.ts b/apps/sim/platform/lib/data/shell-actions.ts
deleted file mode 100644
index 189c6763338..00000000000
--- a/apps/sim/platform/lib/data/shell-actions.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-'use client'
-
-import { toast } from '@sim/emcn'
-import { getErrorMessage } from '@sim/utils/errors'
-import { useRouter } from 'next/navigation'
-import { usePostHog } from 'posthog-js/react'
-import { signOutAndRedirect } from '@/lib/auth/sign-out'
-import { isDesktopApp } from '@/lib/desktop'
-import { DOCS_URL, SLACK_COMMUNITY_URL } from '@/lib/help-links'
-import { rememberSettingsReturnUrl } from '@/lib/navigation/settings-return'
-import { captureEvent } from '@/lib/posthog/client'
-import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import { useRenameOrganization } from '@/hooks/queries/organization'
-import { useUploadOrganizationLogo } from '@/hooks/queries/organization-logo'
-import {
-  desktopUpdateActionLabel,
-  hasAvailableDesktopUpdate,
-  runDesktopUpdateAction,
-  useDesktopUpdateState,
-} from '@/hooks/use-desktop-update-state'
-import type { ShellActions } from '@/platform/app/(shell)/_components/model'
-import { openLinkInNewTab } from '@/platform/app/(shell)/_components/sidebar/row-links'
-import { useSettingsDirtyStore } from '@/stores/settings/dirty/store'
-
-export function useHelp() {
-  const { deployment } = useOrganizationContext()
-  const posthog = usePostHog()
-  const updateState = useDesktopUpdateState()
-  return {
-    openDocumentation() {
-      openLinkInNewTab(DOCS_URL)
-      captureEvent(posthog, 'docs_opened', { source: 'help_menu' })
-    },
-    joinSlack() {
-      openLinkInNewTab(SLACK_COMMUNITY_URL)
-      captureEvent(posthog, 'slack_community_opened', { source: 'help_menu' })
-    },
-    changelogUrl: deployment.hosted ? '/changelog' : undefined,
-    downloadUrl: deployment.hosted && !isDesktopApp() ? '/api/desktop/update/download' : undefined,
-    desktopUpdate: hasAvailableDesktopUpdate(updateState)
-      ? {
-          label: desktopUpdateActionLabel(updateState),
-          disabled: updateState.status === 'downloading',
-          run: () => runDesktopUpdateAction(updateState),
-        }
-      : undefined,
-  }
-}
-
-export function useOrganizationActions() {
-  const { organization, viewer } = useOrganizationContext()
-  const router = useRouter()
-  const { mutateAsync: renameOrganization, isPending: isRenaming } = useRenameOrganization()
-  const { mutateAsync: uploadLogo, isPending: isUploadingLogo } = useUploadOrganizationLogo(
-    organization.id
-  )
-  return {
-    canEditIdentity: viewer.isAdmin,
-    canInvite: viewer.canInviteMembers,
-    isRenaming,
-    isUploadingLogo,
-    async rename(name: string) {
-      await renameOrganization({ orgId: organization.id, name })
-    },
-    async uploadLogo(file: File) {
-      try {
-        await uploadLogo(file)
-        router.refresh()
-      } catch (error) {
-        toast.error(getErrorMessage(error, 'Failed to upload logo'))
-      }
-    },
-  }
-}
-
-export function useShellActions(): ShellActions {
-  const router = useRouter()
-  const requestLeave = (leave: () => void) => useSettingsDirtyStore.getState().requestLeave(leave)
-  return {
-    requestLeave,
-    signOut: () => requestLeave(() => void signOutAndRedirect(router.push)),
-    navigate: (href) =>
-      requestLeave(() => {
-        rememberSettingsReturnUrl(href)
-        router.push(href)
-      }),
-  }
-}
diff --git a/apps/sim/platform/lib/data/shell.ts b/apps/sim/platform/lib/data/shell.ts
deleted file mode 100644
index b959ca1fbd0..00000000000
--- a/apps/sim/platform/lib/data/shell.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-'use client'
-
-import { ANONYMOUS_USER_ID } from '@sim/auth/principal'
-import type { Workspace } from '@/lib/api/contracts'
-import { organizationRoutes } from '@/lib/navigation/paths'
-import { canUseOrganizationChat } from '@/app/o/[organizationId]/home/home-redirect'
-import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import type { UserProfile } from '@/hooks/queries/current-user-data'
-import type { MothershipChatMetadata } from '@/hooks/queries/mothership-chats'
-import { useOrganizationMothershipChats } from '@/hooks/queries/mothership-chats'
-import { useUserProfile } from '@/hooks/queries/user-profile'
-import {
-  useOrderedWorkspacesQuery,
-  usePinnedWorkspaceIds,
-  useWorkspaceCreationPolicy,
-} from '@/hooks/queries/workspace'
-import { buildOrganizationNavItems } from '@/platform/app/(shell)/_components/destinations'
-import type { ShellChat, ShellData, ShellWorkspace } from '@/platform/app/(shell)/_components/model'
-import { organizationChatHref } from '@/platform/lib/data/chat-list'
-import { workspaceHref } from '@/platform/lib/data/workspaces'
-
-function toShellWorkspace(
-  workspace: Workspace,
-  pinnedIds: ReadonlySet<string> | undefined
-): ShellWorkspace {
-  return {
-    id: workspace.id,
-    name: workspace.name,
-    href: workspaceHref(workspace.id),
-    logoUrl: workspace.logoUrl,
-    permissions: workspace.permissions ?? null,
-    isPinned: pinnedIds?.has(workspace.id) ?? false,
-  }
-}
-
-function toShellChat(
-  chat: MothershipChatMetadata,
-  routes: ReturnType<typeof organizationRoutes>
-): ShellChat {
-  return {
-    id: chat.id,
-    title: chat.name,
-    href: organizationChatHref(chat, routes),
-    isActive: chat.isActive,
-    isUnread: chat.isUnread,
-    isPinned: chat.isPinned,
-  }
-}
-
-function toShellUser(profile: UserProfile | undefined): ShellData['user'] {
-  if (!profile) return undefined
-  return {
-    name: profile.name?.trim() || profile.email,
-    image: profile.image ?? null,
-    canSignOut: profile.id !== ANONYMOUS_USER_ID,
-  }
-}
-
-export interface OrganizationNavFlags {
-  benchmarkEnabled: boolean
-  simLinksEnabled: boolean
-  peopleEnabled: boolean
-}
-
-/**
- * The viewer's shell, shaped for the sidebar's views and read through the hooks and keys the layout
- * prefetches, so the rail paints hydrated. A failed background refetch keeps the rows it has, and
- * says nothing: only a list that never loaded reports a failure.
- */
-export function useOrganizationShell(flags: OrganizationNavFlags) {
-  const context = useOrganizationContext()
-  const { organization, searchAccess } = context
-  const routes = organizationRoutes(organization.id)
-  const workspaces = useOrderedWorkspacesQuery()
-  const pinnedIds = usePinnedWorkspaceIds()
-  const { data: policy } = useWorkspaceCreationPolicy()
-  const chatsAvailable = canUseOrganizationChat(context)
-  const chats = useOrganizationMothershipChats(organization.id, 'active', {
-    enabled: chatsAvailable,
-  })
-  const profile = useUserProfile()
-  const data: ShellData = {
-    organization,
-    user: toShellUser(profile.data),
-    workspaces: (workspaces.data ?? [])
-      .filter((workspace) => workspace.organizationId === organization.id)
-      .map((workspace) => toShellWorkspace(workspace, pinnedIds.data)),
-    chats: chatsAvailable ? (chats.data ?? []).map((chat) => toShellChat(chat, routes)) : [],
-    status: {
-      workspaces: workspaces.isRefetchError ? 'success' : workspaces.status,
-      chats: chats.isRefetchError ? 'success' : chats.status,
-    },
-    workspaceCreation: {
-      canCreate: policy?.canCreate === true && policy.organizationId === organization.id,
-      reason: policy?.reason ?? null,
-    },
-    chatsAvailable,
-    destinations: buildOrganizationNavItems(organization.id, {
-      searchAvailable: searchAccess.memberScoped,
-      homeAvailable: chatsAvailable,
-      ...flags,
-    }),
-  }
-  return {
-    data,
-    retryChats: () => void chats.refetch(),
-    retryWorkspaces: () => void workspaces.refetch(),
-  }
-}
diff --git a/apps/sim/platform/lib/data/workspaces.ts b/apps/sim/platform/lib/data/workspaces.ts
deleted file mode 100644
index c0d34ad0779..00000000000
--- a/apps/sim/platform/lib/data/workspaces.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-'use client'
-
-import { toast } from '@sim/emcn'
-import { WORKSPACES_PATH } from '@/lib/navigation/paths'
-import {
-  useCreateWorkspace,
-  useToggleWorkspacePin,
-  useUpdateWorkspace,
-} from '@/hooks/queries/workspace'
-
-export const workspaceHref = (workspaceId: string) => `${WORKSPACES_PATH}/${workspaceId}`
-
-export function useWorkspaceActions() {
-  const { mutateAsync: createWorkspace } = useCreateWorkspace()
-  const { mutateAsync: updateWorkspace } = useUpdateWorkspace()
-  const { mutate: togglePin } = useToggleWorkspacePin()
-  return {
-    /** Resolves with where the new workspace opens. */
-    async create(name: string) {
-      const workspace = await createWorkspace({ name })
-      return workspaceHref(workspace.id)
-    },
-    async rename(workspaceId: string, name: string) {
-      await updateWorkspace({ workspaceId, name })
-    },
-    setPinned: (workspaceId: string, pinned: boolean) =>
-      togglePin({ workspaceId, pinned }, { onError: (error) => void toast.error(error.message) }),
-  }
-}
diff --git a/apps/sim/platform/lib/integrations/metadata.generated.ts b/apps/sim/platform/lib/integrations/metadata.generated.ts
deleted file mode 100644
index 117927aa2e9..00000000000
--- a/apps/sim/platform/lib/integrations/metadata.generated.ts
+++ /dev/null
@@ -1,428 +0,0 @@
-/** Snapshot of the Platform branch's `scripts/sync-platform-integration-metadata.ts` output. */
-export const providerMetadata = [
-  {
-    id: 'coda',
-    name: 'Coda',
-    description: 'Read and write Coda docs, pages, tables, and rows',
-    setupGuideUrl: 'https://docs.sim.ai/search/coda',
-    searchResource: 'Documents',
-    searchReads: [
-      { id: 'search', label: 'Search pages and table rows' },
-      { id: 'content_read', label: 'Read page content' },
-      { id: 'document_outline', label: 'Read document outlines' },
-      { id: 'table_rows_read', label: 'Read table rows' },
-    ],
-    requestedScopes: null,
-  },
-  {
-    id: 'confluence',
-    name: 'Confluence',
-    description: 'Manage Confluence pages, comments, and attachments',
-    setupGuideUrl: 'https://docs.sim.ai/search/confluence',
-    searchResource: 'Spaces',
-    searchReads: [],
-    requestedScopes: [
-      { id: 'read:confluence-content.all', label: 'Read all Confluence content' },
-      { id: 'read:confluence-space.summary', label: 'Read Confluence space information' },
-      { id: 'read:space:confluence', label: 'View Confluence spaces' },
-      {
-        id: 'write:confluence-content',
-        label: 'Create and edit Confluence pages, blog posts, and comments',
-      },
-      { id: 'write:confluence-space', label: 'Manage Confluence spaces' },
-      { id: 'write:confluence-file', label: 'Upload files to Confluence' },
-      { id: 'read:page:confluence', label: 'View Confluence pages' },
-      { id: 'write:page:confluence', label: 'Create and update Confluence pages' },
-      { id: 'read:comment:confluence', label: 'View comments on Confluence pages' },
-      { id: 'write:comment:confluence', label: 'Create and update comments' },
-      { id: 'delete:comment:confluence', label: 'Delete comments from Confluence pages' },
-      { id: 'delete:attachment:confluence', label: 'Delete attachments from Confluence pages' },
-      { id: 'delete:page:confluence', label: 'Delete Confluence pages' },
-      { id: 'read:label:confluence', label: 'View labels on Confluence content' },
-      { id: 'write:label:confluence', label: 'Add and remove labels' },
-      { id: 'read:attachment:confluence', label: 'View attachments on Confluence pages' },
-      { id: 'write:attachment:confluence', label: 'Upload and manage attachments' },
-      { id: 'search:confluence', label: 'Search Confluence content' },
-      { id: 'read:me', label: 'Read profile information' },
-      { id: 'offline_access', label: 'Access account when not using the application' },
-      {
-        id: 'read:hierarchical-content:confluence',
-        label: 'View page hierarchy (children and ancestors)',
-      },
-      {
-        id: 'read:content.metadata:confluence',
-        label: 'View content metadata (required for ancestors)',
-      },
-      { id: 'read:user:confluence', label: 'View Confluence user profiles' },
-      { id: 'read:confluence-user', label: 'View Confluence user profiles (v1 API)' },
-      { id: 'read:group:confluence', label: 'View Confluence groups and memberships' },
-      { id: 'read:task:confluence', label: 'View Confluence inline tasks' },
-      { id: 'write:task:confluence', label: 'Update Confluence inline tasks' },
-      { id: 'write:space:confluence', label: 'Create and update Confluence spaces' },
-      { id: 'delete:space:confluence', label: 'Delete Confluence spaces' },
-      { id: 'read:blogpost:confluence', label: 'View Confluence blog posts' },
-      { id: 'write:blogpost:confluence', label: 'Create and update Confluence blog posts' },
-      { id: 'delete:blogpost:confluence', label: 'Delete Confluence blog posts' },
-      { id: 'read:content.property:confluence', label: 'View properties on Confluence content' },
-      { id: 'write:content.property:confluence', label: 'Create and manage content properties' },
-      { id: 'read:space.property:confluence', label: 'View Confluence space properties' },
-      { id: 'write:space.property:confluence', label: 'Create and manage space properties' },
-      { id: 'read:space.permission:confluence', label: 'View Confluence space permissions' },
-    ],
-  },
-  {
-    id: 'fireflies',
-    name: 'Fireflies',
-    description: 'Interact with Fireflies.ai meeting transcripts and recordings',
-    setupGuideUrl: 'https://docs.sim.ai/search/fireflies',
-    searchResource: 'Meetings',
-    searchReads: [
-      { id: 'fireflies_get_transcripts', label: 'Search meeting titles and transcripts' },
-      { id: 'fireflies_get_transcript', label: 'Read transcripts with speakers and timestamps' },
-      { id: 'fireflies_get_summary', label: 'Read available meeting summaries' },
-    ],
-    requestedScopes: null,
-  },
-  {
-    id: 'github',
-    name: 'GitHub',
-    description: 'Interact with GitHub or trigger workflows from GitHub events',
-    setupGuideUrl: 'https://docs.sim.ai/search/github',
-    searchResource: 'Repositories',
-    searchReads: [],
-    requestedScopes: [],
-  },
-  {
-    id: 'gitlab',
-    name: 'GitLab',
-    description: 'Interact with GitLab projects, issues, merge requests, and pipelines',
-    setupGuideUrl: 'https://docs.sim.ai/search/gitlab',
-    searchResource: 'Projects',
-    searchReads: [],
-    requestedScopes: [],
-  },
-  {
-    id: 'gmail',
-    name: 'Gmail',
-    description:
-      'Send, read, search, and move Gmail messages or trigger workflows from Gmail events',
-    setupGuideUrl: 'https://docs.sim.ai/search/gmail',
-    searchResource: 'Labels',
-    searchReads: [],
-    requestedScopes: [
-      { id: 'https://www.googleapis.com/auth/userinfo.email', label: 'View email address' },
-      { id: 'https://www.googleapis.com/auth/userinfo.profile', label: 'View basic profile info' },
-      { id: 'https://www.googleapis.com/auth/gmail.send', label: 'Send emails' },
-      {
-        id: 'https://www.googleapis.com/auth/gmail.modify',
-        label: 'Read, compose, send, and modify email messages',
-      },
-      { id: 'https://www.googleapis.com/auth/gmail.labels', label: 'View and manage email labels' },
-      { id: 'openid', label: 'Standard authentication' },
-    ],
-  },
-  {
-    id: 'google_calendar',
-    name: 'Google Calendar',
-    description: 'Manage Google Calendar events',
-    setupGuideUrl: 'https://docs.sim.ai/search/google-calendar',
-    searchResource: 'Calendars',
-    searchReads: [],
-    requestedScopes: [
-      { id: 'https://www.googleapis.com/auth/userinfo.email', label: 'View email address' },
-      { id: 'https://www.googleapis.com/auth/userinfo.profile', label: 'View basic profile info' },
-      { id: 'https://www.googleapis.com/auth/calendar', label: 'View and manage calendar' },
-      { id: 'openid', label: 'Standard authentication' },
-    ],
-  },
-  {
-    id: 'google_drive',
-    name: 'Google Drive',
-    description: 'Manage files, folders, and permissions',
-    setupGuideUrl: 'https://docs.sim.ai/search/google-drive',
-    searchResource: 'Folders and shared drives',
-    searchReads: [],
-    requestedScopes: [
-      { id: 'https://www.googleapis.com/auth/userinfo.email', label: 'View email address' },
-      { id: 'https://www.googleapis.com/auth/userinfo.profile', label: 'View basic profile info' },
-      {
-        id: 'https://www.googleapis.com/auth/drive.file',
-        label: 'View and manage Google Drive files you open or create with Sim',
-      },
-      {
-        id: 'https://www.googleapis.com/auth/drive',
-        label: 'View, edit, create, and delete all Google Drive files',
-      },
-      { id: 'openid', label: 'Standard authentication' },
-    ],
-  },
-  {
-    id: 'google_meet',
-    name: 'Google Meet',
-    description: 'Create and manage Google Meet meetings',
-    setupGuideUrl: 'https://docs.sim.ai/search/google-meet',
-    searchResource: 'Meetings',
-    searchReads: [],
-    requestedScopes: [
-      { id: 'https://www.googleapis.com/auth/userinfo.email', label: 'View email address' },
-      { id: 'https://www.googleapis.com/auth/userinfo.profile', label: 'View basic profile info' },
-      {
-        id: 'https://www.googleapis.com/auth/meetings.space.created',
-        label: 'Create and manage Google Meet meeting spaces created by Sim',
-      },
-      {
-        id: 'https://www.googleapis.com/auth/meetings.space.readonly',
-        label: 'View information about your Google Meet conferences',
-      },
-      { id: 'openid', label: 'Standard authentication' },
-    ],
-  },
-  {
-    id: 'granola',
-    name: 'Granola',
-    description: 'Access meeting notes, transcripts, and audit events from Granola',
-    setupGuideUrl: 'https://docs.sim.ai/search/granola',
-    searchResource: 'Meetings',
-    searchReads: [
-      { id: 'query_granola_meetings', label: 'Search meeting notes' },
-      { id: 'list_meetings', label: 'Find meetings by date' },
-      { id: 'get_meetings', label: 'Read meeting notes' },
-      { id: 'get_meeting_transcript', label: 'Read available meeting transcripts' },
-    ],
-    requestedScopes: null,
-  },
-  {
-    id: 'hubspot',
-    name: 'HubSpot',
-    description: 'Interact with HubSpot CRM or trigger workflows from HubSpot events',
-    setupGuideUrl: 'https://docs.sim.ai/search/hubspot',
-    searchResource: 'CRM records',
-    searchReads: [
-      { id: 'search_crm_objects', label: 'Search CRM records' },
-      { id: 'get_crm_objects', label: 'Read CRM records' },
-    ],
-    requestedScopes: null,
-  },
-  {
-    id: 'jira',
-    name: 'Jira',
-    description: 'Manage Jira issues, comments, attachments, and worklogs',
-    setupGuideUrl: 'https://docs.sim.ai/search/jira',
-    searchResource: 'Projects',
-    searchReads: [],
-    requestedScopes: [
-      { id: 'read:jira-user', label: 'View Jira user profiles, including email addresses' },
-      { id: 'read:jira-work', label: 'View Jira projects and issues, and search issues' },
-      {
-        id: 'write:jira-work',
-        label: 'Create, edit, and delete Jira issues, comments, and worklogs',
-      },
-      { id: 'read:me', label: 'Read profile information' },
-      { id: 'offline_access', label: 'Access account when not using the application' },
-      { id: 'read:issue.vote:jira', label: 'Read Jira issue votes' },
-      { id: 'read:user:jira', label: 'View Jira users' },
-      { id: 'delete:issue:jira', label: 'Delete Jira issues' },
-      { id: 'delete:comment:jira', label: 'Delete comments from Jira issues' },
-      { id: 'delete:attachment:jira', label: 'Delete attachments from Jira issues' },
-      { id: 'delete:issue-worklog:jira', label: 'Delete worklog entries from Jira issues' },
-      { id: 'delete:issue-link:jira', label: 'Delete links between Jira issues' },
-      { id: 'read:servicedesk-request', label: 'View service desk requests' },
-      { id: 'write:servicedesk-request', label: 'Create and update service desk requests' },
-      {
-        id: 'manage:servicedesk-customer',
-        label: 'Manage service desk customers and organizations',
-      },
-      {
-        id: 'read:servicedesk:jira-service-management',
-        label: 'View service desks and their settings',
-      },
-      {
-        id: 'read:requesttype:jira-service-management',
-        label: 'View request types available in service desks',
-      },
-      {
-        id: 'read:request:jira-service-management',
-        label: 'View customer requests in service desks',
-      },
-      {
-        id: 'write:request:jira-service-management',
-        label: 'Create customer requests in service desks',
-      },
-      {
-        id: 'read:request.comment:jira-service-management',
-        label: 'View comments on customer requests',
-      },
-      {
-        id: 'write:request.comment:jira-service-management',
-        label: 'Add comments to customer requests',
-      },
-      {
-        id: 'read:servicedesk.customer:jira-service-management',
-        label: 'View customers linked to service desks',
-      },
-      {
-        id: 'write:servicedesk.customer:jira-service-management',
-        label: 'Add and remove customers from service desks',
-      },
-      { id: 'read:organization:jira-service-management', label: 'View organizations' },
-      {
-        id: 'write:organization:jira-service-management',
-        label: 'Create and manage organizations',
-      },
-      {
-        id: 'read:servicedesk.organization:jira-service-management',
-        label: 'View organizations linked to service desks',
-      },
-      {
-        id: 'write:servicedesk.organization:jira-service-management',
-        label: 'Add and remove organizations from service desks',
-      },
-      {
-        id: 'read:queue:jira-service-management',
-        label: 'View service desk queues and their issues',
-      },
-      {
-        id: 'read:request.sla:jira-service-management',
-        label: 'View SLA information for customer requests',
-      },
-      {
-        id: 'read:request.status:jira-service-management',
-        label: 'View status of customer requests',
-      },
-      {
-        id: 'write:request.status:jira-service-management',
-        label: 'Transition customer request status',
-      },
-      {
-        id: 'read:request.participant:jira-service-management',
-        label: 'View participants on customer requests',
-      },
-      {
-        id: 'write:request.participant:jira-service-management',
-        label: 'Add and remove participants from customer requests',
-      },
-      {
-        id: 'read:request.approval:jira-service-management',
-        label: 'View approvals on customer requests',
-      },
-      {
-        id: 'write:request.approval:jira-service-management',
-        label: 'Approve or decline customer requests',
-      },
-      { id: 'read:cmdb-object:jira', label: 'View Assets objects and run AQL searches' },
-      { id: 'write:cmdb-object:jira', label: 'Create and update Assets objects' },
-      { id: 'delete:cmdb-object:jira', label: 'Delete Assets objects' },
-      { id: 'read:cmdb-schema:jira', label: 'View Assets object schemas' },
-      { id: 'read:cmdb-type:jira', label: 'View Assets object types' },
-      { id: 'read:cmdb-attribute:jira', label: 'View Assets object type attributes' },
-      { id: 'write:sprint:jira-software', label: 'Create and update Jira Software sprints' },
-    ],
-  },
-  {
-    id: 'linear',
-    name: 'Linear',
-    description: 'Interact with Linear issues, projects, and more',
-    setupGuideUrl: 'https://docs.sim.ai/search/linear',
-    searchResource: 'Projects',
-    searchReads: [],
-    requestedScopes: [
-      { id: 'read', label: 'Read issues, projects, teams, and other workspace data' },
-      {
-        id: 'write',
-        label: 'Create and update issues, projects, comments, and other workspace data',
-      },
-    ],
-  },
-  {
-    id: 'lucid',
-    name: 'Lucid',
-    description: 'Search Lucidchart diagrams and Lucidspark boards using your Lucid account',
-    setupGuideUrl: 'https://docs.sim.ai/search/lucid',
-    searchResource: 'Documents',
-    searchReads: [
-      { id: 'search', label: 'Search document titles' },
-      { id: 'fetch', label: 'Read document content' },
-      { id: 'lucid_search_document', label: 'Search within a document' },
-      { id: 'lucid_get_document_metadata', label: 'Read document details' },
-      { id: 'lucid_list_folder_contents', label: 'Browse folders' },
-    ],
-    requestedScopes: null,
-  },
-  {
-    id: 'notion',
-    name: 'Notion',
-    description: 'Manage Notion pages',
-    setupGuideUrl: 'https://docs.sim.ai/search/notion',
-    searchResource: 'Pages',
-    searchReads: [
-      { id: 'notion-search', label: 'Find pages and databases by keyword' },
-      { id: 'notion-ai-search', label: 'Search with AI when available' },
-      { id: 'notion-fetch', label: 'Read pages and databases' },
-      { id: 'notion-list-private-pages', label: 'Browse private pages' },
-      { id: 'notion-list-shared-pages', label: 'Browse shared pages' },
-      { id: 'notion-list-favorite-pages', label: 'Browse favorite pages' },
-      { id: 'notion-list-recent-pages', label: 'Browse recent pages' },
-    ],
-    requestedScopes: null,
-  },
-  {
-    id: 'salesforce',
-    name: 'Salesforce',
-    description: 'Interact with Salesforce CRM',
-    setupGuideUrl: 'https://docs.sim.ai/search/connect-your-account',
-    searchResource: null,
-    searchReads: [],
-    requestedScopes: [
-      { id: 'api', label: 'Access Salesforce API' },
-      { id: 'refresh_token', label: 'Maintain long-term access to Salesforce account' },
-      { id: 'openid', label: 'Standard authentication' },
-    ],
-  },
-  {
-    id: 'slack',
-    name: 'Slack',
-    description:
-      'Manage Slack messages, channels, users, files, Lists, canvases, and Agent Sessions',
-    setupGuideUrl: 'https://docs.sim.ai/search/slack',
-    searchResource: 'Channels',
-    searchReads: [],
-    requestedScopes: [
-      { id: 'channels:history', label: 'Read public channel messages' },
-      { id: 'channels:read', label: 'View public channels' },
-      { id: 'groups:history', label: 'Read private channel messages' },
-      { id: 'groups:read', label: 'View private channels' },
-      { id: 'im:history', label: 'Read direct message history' },
-      { id: 'im:read', label: 'View direct message channels' },
-      { id: 'mpim:history', label: 'Read group direct message history' },
-      { id: 'mpim:read', label: 'View group direct message conversations' },
-      { id: 'users:read', label: 'View workspace users' },
-      { id: 'users:read.email', label: 'View user email addresses' },
-      { id: 'search:read.files', label: 'Search files' },
-      { id: 'files:read', label: 'Download and read files' },
-      { id: 'search:read.public', label: 'Search public channels' },
-      { id: 'search:read.private', label: 'Search private channels you can access' },
-      { id: 'search:read.mpim', label: 'Search group direct messages you can access' },
-      { id: 'search:read.im', label: 'Search direct messages you can access' },
-    ],
-  },
-  {
-    id: 'zoom',
-    name: 'Zoom',
-    description: 'Create and manage Zoom meetings and recordings',
-    setupGuideUrl: 'https://docs.sim.ai/search/zoom',
-    searchResource: 'Meetings',
-    searchReads: [
-      { id: 'search_meetings', label: 'Search past meetings' },
-      { id: 'get_meeting_assets', label: 'Read available transcripts, notes, and summaries' },
-    ],
-    requestedScopes: [
-      { id: 'meeting:read:search', label: 'Search past meetings' },
-      { id: 'meeting:read:assets', label: 'Read meeting assets' },
-    ],
-  },
-] as const
-export const memberSecretMetadata = {
-  name: 'Generic Secrets',
-  description: 'Store shared or personal secrets for organization Home conversations',
-  setupGuideUrl: 'https://docs.sim.ai/search/generic-secrets',
-} as const
diff --git a/apps/sim/platform/lib/integrations/model.ts b/apps/sim/platform/lib/integrations/model.ts
deleted file mode 100644
index 8a2dc00ed24..00000000000
--- a/apps/sim/platform/lib/integrations/model.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import type { ComponentType } from 'react'
-import type {
-  AssistantToolPermissionsResponse,
-  UpdateAssistantToolPermissionsBody,
-} from '@/lib/api/contracts/assistant-actions'
-import type { MemberIntegration } from '@/lib/credential-groups/member-integrations'
-import { organizationRoutes } from '@/lib/navigation/paths'
-import type { SecretSourceMode } from '@/lib/organization-secrets/validation'
-import { LIVE_SEARCH_PROVIDER_IDS } from '@/lib/sim-search/live/provider-catalog'
-
-export type ToolPolicy = AssistantToolPermissionsResponse['readPolicy']
-
-export interface IntegrationAccount {
-  id: string
-  label: string
-  status: 'active' | 'needs_reauth'
-  canReconnect: boolean
-  hasToolPermissions: boolean
-}
-
-/** The member inventory is projected before the page receives it. */
-export interface OrganizationIntegration {
-  /** The `/integrations/[provider]` segment. */
-  id: string
-  providerId: string
-  icon: ComponentType<{ className?: string }>
-  name: string
-  description: string
-  setupGuideUrl: string
-  searchResource: string | null
-  searchReads: readonly { id: string; label: string }[]
-  requestedScopes: readonly { id: string; label: string }[] | null
-  accessDescription: string
-  /** `blocked` carries its reason in `status`. */
-  availability: 'ready' | 'managed' | 'blocked'
-  status: string
-  /** The free connection slot, absent when every slot holds an account. */
-  connectionTarget?: MemberIntegration['connectionTarget']
-  accounts: readonly IntegrationAccount[]
-}
-
-export interface GenericSecrets {
-  name: string
-  description: string
-  setupGuideUrl: string
-  mode: SecretSourceMode
-}
-
-export interface ToolPermissionsModel {
-  read: ToolPolicy
-  write: ToolPolicy
-  canAutoApprove: boolean
-  accountActive: boolean
-  tools: readonly {
-    id: string
-    label: string
-    description: string
-    kind: 'read' | 'write'
-    policy: ToolPolicy
-    inherited: boolean
-  }[]
-}
-
-export type ToolPermissionChange = UpdateAssistantToolPermissionsBody['change']
-
-/** The segment for Generic Secrets' read-only view; `/integrations/secrets` is the personal editor. */
-export const GENERIC_SECRETS_SEGMENT = 'generic-secrets'
-
-const LIVE_SEARCH_SEGMENTS: ReadonlySet<string> = new Set(LIVE_SEARCH_PROVIDER_IDS)
-
-/**
- * Maps an inventory id (`source:gmail`, `app:notion`) to its URL segment. An Assistant app can share
- * a provider id with a Search source that has no member accounts, so it takes the bare segment only
- * when no source could claim it. Anything else is left as it came.
- */
-export function integrationSegment(inventoryId: string): string {
-  const [kind, provider] = inventoryId.split(':')
-  if (kind === 'source' && provider) return provider
-  if (kind === 'app' && provider)
-    return LIVE_SEARCH_SEGMENTS.has(provider) ? `${provider}-app` : provider
-  return inventoryId
-}
-
-export function integrationPath(organizationId: string, segment: string) {
-  return `${organizationRoutes(organizationId).integrations}/${encodeURIComponent(segment)}`
-}
-
-export function isConnectable(integration: OrganizationIntegration) {
-  return integration.availability === 'ready' && Boolean(integration.connectionTarget)
-}
-
-export function accountStatus(integration: OrganizationIntegration, account: IntegrationAccount) {
-  if (integration.availability === 'blocked') return integration.status
-  return account.status === 'needs_reauth' ? 'Reconnect needed' : 'Connected'
-}
diff --git a/apps/sim/platform/lib/plural.ts b/apps/sim/platform/lib/plural.ts
deleted file mode 100644
index 9d86b4a9ed6..00000000000
--- a/apps/sim/platform/lib/plural.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/** A count with its noun, for the regular plurals product copy needs: `1 member`, `3 members`. */
-export function plural(count: number, noun: string): string {
-  return `${count} ${noun}${count === 1 ? '' : 's'}`
-}
diff --git a/apps/sim/platform/lib/time.ts b/apps/sim/platform/lib/time.ts
deleted file mode 100644
index 00bd7b4bb51..00000000000
--- a/apps/sim/platform/lib/time.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-const LOCALE = 'en-US'
-export const MINUTE_MS = 60_000
-const DAY_MS = 24 * 60 * MINUTE_MS
-
-function utcFormat(options: Intl.DateTimeFormatOptions) {
-  return new Intl.DateTimeFormat(LOCALE, { timeZone: 'UTC', ...options })
-}
-
-const DATE = {
-  short: utcFormat({ month: 'short', day: 'numeric' }),
-  full: utcFormat({ month: 'short', day: 'numeric', year: 'numeric' }),
-  weekday: utcFormat({ weekday: 'long', month: 'long', day: 'numeric' }),
-}
-const CLOCK_OPTIONS = { hour: 'numeric', minute: '2-digit', hour12: true } as const
-const UTC_CLOCK = utcFormat(CLOCK_OPTIONS)
-const ORDINAL = new Intl.PluralRules(LOCALE, { type: 'ordinal' })
-const SUFFIX: Partial<Record<Intl.LDMLPluralRule, string>> = { one: 'st', two: 'nd', few: 'rd' }
-
-/** Format an ISO calendar day independently of the viewer's time zone. */
-export function formatCalendarDate(dateKey: string, style: keyof typeof DATE = 'short') {
-  return DATE[style].format(new Date(`${dateKey}T00:00:00Z`))
-}
-
-/** Use the same reference instant for a surface's server and client renders. */
-export function formatRelativeTime(timestampMs: number, referenceMs: number) {
-  const elapsed = referenceMs - timestampMs
-  if (elapsed < MINUTE_MS) return 'now'
-  const minutes = Math.floor(elapsed / MINUTE_MS)
-  if (minutes < 60) return `${minutes}m ago`
-  const hours = Math.floor(minutes / 60)
-  if (hours < 24) return `${hours}hr${hours === 1 ? '' : 's'} ago`
-  if (elapsed < 2 * DAY_MS) return '1d ago'
-
-  const date = new Date(timestampMs)
-  const sameYear = date.getUTCFullYear() === new Date(referenceMs).getUTCFullYear()
-  return (sameYear ? DATE.short : DATE.full)
-    .formatToParts(date)
-    .map(({ type, value }) =>
-      type === 'day' ? value + (SUFFIX[ORDINAL.select(Number(value))] ?? 'th') : value
-    )
-    .join('')
-}
-
-/** Format an instant on a clock. Pass the viewer's zone for locally composed messages. */
-export function formatClockTime(timestampMs: number, timeZone = 'UTC') {
-  const clock =
-    timeZone === 'UTC' ? UTC_CLOCK : new Intl.DateTimeFormat(LOCALE, { ...CLOCK_OPTIONS, timeZone })
-  return clock.format(new Date(timestampMs)).replace(/\s/gu, ' ')
-}
-
-/** Minutes are wall-clock positions within a calendar day. The end may extend past midnight. */
-export function formatTimeRange(startMinute: number, endMinute: number) {
-  const start = startMinute * MINUTE_MS
-  const end = endMinute * MINUTE_MS
-  if (end < start || Math.floor(start / DAY_MS) !== Math.floor(end / DAY_MS)) {
-    return `${formatClockTime(start)}–${formatClockTime(end)}`
-  }
-  return UTC_CLOCK.formatRange(start, end)
-    .replace(/\s*–\s*/u, '–')
-    .replace(/\s/gu, ' ')
-}
diff --git a/apps/sim/postcss.config.mjs b/apps/sim/postcss.config.mjs
index 04ba8fdfb9d..b7c3907a456 100644
--- a/apps/sim/postcss.config.mjs
+++ b/apps/sim/postcss.config.mjs
@@ -8,7 +8,6 @@ import { fileURLToPath } from 'node:url'
 const hairlineBorderWidth = fileURLToPath(
   new URL('./lib/postcss/hairline-border-width.cjs', import.meta.url)
 )
-const platformEmbed = fileURLToPath(new URL('./lib/postcss/platform-embed.cjs', import.meta.url))
 
 /** @type {import('postcss-load-config').Config} */
 const config = {
@@ -16,8 +15,6 @@ const config = {
     '@tailwindcss/postcss': {},
     // Must run after Tailwind: it rewrites Tailwind's own border-width output.
     [hairlineBorderWidth]: {},
-    // Must run after Tailwind, which inlines the entry's imports.
-    [platformEmbed]: {},
   },
 }
 
diff --git a/apps/sim/public/provider-marks/coda.svg b/apps/sim/public/provider-marks/coda.svg
deleted file mode 100644
index 60f80ed2f60..00000000000
--- a/apps/sim/public/provider-marks/coda.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#F46A54" d="M21.194 0H2.806A2.01 2.01 0 0 0 .8 2v20c0 1.1.903 2 2.006 2h18.388a2.01 2.01 0 0 0 2.006-2v-.933c-.033-1.2-.067-3.7-.067-4.834 0-.633-.468-1.166-1.07-1.166-.668 0-1.103.4-1.437.733-1.003.9-2.508 1.067-3.812.833-.601-.133-1.17-.3-1.638-.6-1.438-.833-2.374-2.4-2.374-4.066 0-1.667.936-3.2 2.374-4.067.502-.3 1.07-.467 1.638-.6 1.27-.233 2.809-.067 3.812.833.367.334.802.734 1.437.734.602 0 1.07-.534 1.07-1.167 0-1.1.034-3.633.067-4.833V2c0-1.1-.903-2-2.006-2Z"></path></svg>
diff --git a/apps/sim/public/provider-marks/confluence.svg b/apps/sim/public/provider-marks/confluence.svg
deleted file mode 100644
index b38996a0cb8..00000000000
--- a/apps/sim/public/provider-marks/confluence.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mark" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="confluence_bottom__confluenceR_0_" gradientUnits="userSpaceOnUse" x1="26.791" y1="28.467" x2="11.792" y2="19.855" gradientTransform="scale(4)"><stop offset="0" stop-color="#0052cc"></stop><stop offset="0.918" stop-color="#2380fb"></stop><stop offset="1" stop-color="#2684ff"></stop></linearGradient><linearGradient id="confluence_top__confluenceR_0_" gradientUnits="userSpaceOnUse" x1="5.209" y1="2.523" x2="20.208" y2="11.136" gradientTransform="scale(4)"><stop offset="0" stop-color="#0052cc"></stop><stop offset="0.918" stop-color="#2380fb"></stop><stop offset="1" stop-color="#2684ff"></stop></linearGradient></defs><path fill="url(#confluence_bottom__confluenceR_0_)" d="M19.492 86.227a249.047 249.047 0 00-3.047 4.933c-.867 1.45-.433 3.336 1.016 4.207l19.863 12.188c1.45.87 3.332.433 4.203-1.016a139.349 139.349 0 012.899-4.934c7.832-12.91 15.804-11.46 30.011-4.64l19.72 9.281c1.593.727 3.335 0 4.058-1.45l9.426-21.323c.722-1.453 0-3.336-1.454-4.063-4.203-1.887-12.464-5.805-19.714-9.43-26.82-12.914-49.586-12.043-66.98 16.247zm0 0"></path><path fill="url(#confluence_top__confluenceR_0_)" d="M108.508 37.773a249.047 249.047 0 003.047-4.933c.87-1.45.433-3.336-1.016-4.207L90.676 16.445c-1.45-.87-3.332-.433-4.203 1.016a133.55 133.55 0 01-2.899 4.934c-7.832 12.91-15.804 11.46-30.011 4.64l-19.72-9.281c-1.593-.727-3.331 0-4.058 1.45l-9.422 21.323c-.726 1.453 0 3.34 1.45 4.063 4.203 1.887 12.468 5.805 19.714 9.43 26.825 12.77 49.586 12.042 66.98-16.247zm0 0"></path></svg>
diff --git a/apps/sim/public/provider-marks/fireflies.svg b/apps/sim/public/provider-marks/fireflies.svg
deleted file mode 100644
index 57221fa7f16..00000000000
--- a/apps/sim/public/provider-marks/fireflies.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mark" xmlns="http://www.w3.org/2000/svg" viewBox="-6 -6 68 68"><defs><linearGradient id="fireflies_g1__firefliesR_0_" gradientUnits="userSpaceOnUse" x1="144.66" y1="-133.78" x2="54.38" y2="-38.92" gradientTransform="matrix(0.86 0 0 -0.86 -79.24 -68.17)"><stop offset="0" stop-color="#E82A73"></stop><stop offset="0.11" stop-color="#DE2D7A"></stop><stop offset="0.3" stop-color="#C5388F"></stop><stop offset="0.54" stop-color="#9B4AB0"></stop><stop offset="0.82" stop-color="#6262DE"></stop><stop offset="0.99" stop-color="#3B73FF"></stop></linearGradient><linearGradient id="fireflies_g2__firefliesR_0_" gradientUnits="userSpaceOnUse" x1="145.17" y1="-133.31" x2="54.88" y2="-38.45" gradientTransform="matrix(0.86 0 0 -0.86 -79.24 -68.17)"><stop offset="0" stop-color="#FF3C82"></stop><stop offset="0.1" stop-color="#F53E88"></stop><stop offset="0.27" stop-color="#DC4598"></stop><stop offset="0.49" stop-color="#B251B2"></stop><stop offset="0.75" stop-color="#7961D7"></stop><stop offset="0.99" stop-color="#3B73FF"></stop></linearGradient><linearGradient id="fireflies_g3__firefliesR_0_" gradientUnits="userSpaceOnUse" x1="144.76" y1="-123.2" x2="114.17" y2="-12.34" gradientTransform="matrix(0.86 0 0 -0.86 -79.24 -68.17)"><stop offset="0" stop-color="#E82A73"></stop><stop offset="0.11" stop-color="#DE2D7A"></stop><stop offset="0.3" stop-color="#C5388F"></stop><stop offset="0.54" stop-color="#9B4AB0"></stop><stop offset="0.82" stop-color="#6262DE"></stop><stop offset="0.99" stop-color="#3B73FF"></stop></linearGradient><linearGradient id="fireflies_g4__firefliesR_0_" gradientUnits="userSpaceOnUse" x1="134.82" y1="-132.33" x2="25.31" y2="-98.96" gradientTransform="matrix(0.86 0 0 -0.86 -79.24 -68.17)"><stop offset="0" stop-color="#E82A73"></stop><stop offset="0.11" stop-color="#DE2D7A"></stop><stop offset="0.3" stop-color="#C5388F"></stop><stop offset="0.54" stop-color="#9B4AB0"></stop><stop offset="0.82" stop-color="#6262DE"></stop><stop offset="0.99" stop-color="#3B73FF"></stop></linearGradient><linearGradient id="fireflies_g5__firefliesR_0_" gradientUnits="userSpaceOnUse" x1="82.21" y1="-52.79" x2="112.88" y2="-123.08" gradientTransform="matrix(0.86 0 0 -0.86 -79.24 -68.17)"><stop offset="0" stop-color="#E82A73"></stop><stop offset="0.11" stop-color="#DE286E"></stop><stop offset="0.3" stop-color="#C52361"></stop><stop offset="0.54" stop-color="#9B1A4D"></stop><stop offset="0.83" stop-color="#620F30"></stop><stop offset="0.99" stop-color="#3D081E"></stop></linearGradient><linearGradient id="fireflies_g6__firefliesR_0_" gradientUnits="userSpaceOnUse" x1="107.65" y1="-78.53" x2="138.33" y2="-148.82" gradientTransform="matrix(0.86 0 0 -0.86 -79.24 -68.17)"><stop offset="0" stop-color="#E82A73"></stop><stop offset="0.11" stop-color="#DE286E"></stop><stop offset="0.3" stop-color="#C52361"></stop><stop offset="0.54" stop-color="#9B1A4D"></stop><stop offset="0.83" stop-color="#620F30"></stop><stop offset="0.99" stop-color="#3D081E"></stop></linearGradient><linearGradient id="fireflies_g7__firefliesR_0_" gradientUnits="userSpaceOnUse" x1="70.83" y1="-99.32" x2="140.3" y2="-145.47" gradientTransform="matrix(0.86 0 0 -0.86 -79.24 -68.17)"><stop offset="0" stop-color="#E82A73"></stop><stop offset="0.11" stop-color="#DE286E"></stop><stop offset="0.3" stop-color="#C52361"></stop><stop offset="0.54" stop-color="#9B1A4D"></stop><stop offset="0.83" stop-color="#620F30"></stop><stop offset="0.99" stop-color="#3D081E"></stop></linearGradient><linearGradient id="fireflies_g8__firefliesR_0_" gradientUnits="userSpaceOnUse" x1="297.69" y1="-1360.89" x2="309.59" y2="-1454.88" gradientTransform="matrix(0.86 0 0 -0.86 -79.24 -68.17)"><stop offset="0" stop-color="#E82A73"></stop><stop offset="0.11" stop-color="#DE286E"></stop><stop offset="0.3" stop-color="#C52361"></stop><stop offset="0.54" stop-color="#9B1A4D"></stop><stop offset="0.83" stop-color="#620F30"></stop><stop offset="0.99" stop-color="#3D081E"></stop></linearGradient></defs><g><path fill="url(#fireflies_g1__firefliesR_0_)" d="M18.4,0H0v18.3h18.4V0z"></path><path fill="url(#fireflies_g2__firefliesR_0_)" d="M40.2,22.1H21.8v18.3h18.4V22.1z"></path><path fill="url(#fireflies_g3__firefliesR_0_)" d="M40.2,0H21.8v18.3H56v-2.6c0-4.2-1.7-8.1-4.6-11.1C48.4,1.7,44.4,0,40.2,0L40.2,0z"></path><path fill="url(#fireflies_g4__firefliesR_0_)" d="M0,22.1v18.3c0,4.2,1.7,8.1,4.6,11.1c3,2.9,7,4.6,11.2,4.6h2.6V22.1H0z"></path><path fill="url(#fireflies_g5__firefliesR_0_)" opacity="0.18" d="M0,0l18.4,18.3H0V0z"></path><path fill="url(#fireflies_g6__firefliesR_0_)" opacity="0.18" d="M21.8,22.1l18.4,18.3H21.8V22.1z"></path><path fill="url(#fireflies_g7__firefliesR_0_)" opacity="0.18" d="M0,40.3c0,4.2,1.7,8.1,4.6,11.1c3,2.9,7,4.6,11.2,4.6h2.6V22.1L0,40.3z"></path><path fill="url(#fireflies_g8__firefliesR_0_)" opacity="0.18" d="M40.2,0c4.2,0,8.2,1.7,11.2,4.6c3,2.9,4.6,6.9,4.6,11.1v2.6H21.8L40.2,0z"></path></g></svg>
diff --git a/apps/sim/public/provider-marks/gitlab.svg b/apps/sim/public/provider-marks/gitlab.svg
deleted file mode 100644
index a301a95f0f0..00000000000
--- a/apps/sim/public/provider-marks/gitlab.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mark" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M22.65 14.39L12 22.13 1.35 14.39a.84.84 0 0 1-.3-.94l1.22-3.78 2.44-7.51A.42.42 0 0 1 4.82 2a.43.43 0 0 1 .58 0 .42.42 0 0 1 .11.18l2.44 7.49h8.1l2.44-7.51A.42.42 0 0 1 18.6 2a.43.43 0 0 1 .58 0 .42.42 0 0 1 .11.18l2.44 7.51L23 13.45a.84.84 0 0 1-.35.94z" fill="#FC6D26"></path><path d="M12 22.13L16.05 9.67H7.95L12 22.13z" fill="#E24329"></path><path d="M12 22.13L7.95 9.67H1.69L12 22.13z" fill="#FC6D26"></path><path d="M1.69 9.67L.47 13.45a.84.84 0 0 0 .3.94L12 22.13 1.69 9.67z" fill="#FCA326"></path><path d="M1.69 9.67H7.95L5.51 2.16A.42.42 0 0 0 4.93 2a.42.42 0 0 0-.11.18L1.69 9.67z" fill="#E24329"></path><path d="M12 22.13L16.05 9.67H22.31L12 22.13z" fill="#FC6D26"></path><path d="M22.31 9.67L23.53 13.45a.84.84 0 0 1-.3.94L12 22.13 22.31 9.67z" fill="#FCA326"></path><path d="M22.31 9.67H16.05l2.44-7.51A.42.42 0 0 1 19.07 2a.42.42 0 0 1 .11.18l3.13 7.49z" fill="#E24329"></path></svg>
diff --git a/apps/sim/public/provider-marks/google-drive.svg b/apps/sim/public/provider-marks/google-drive.svg
deleted file mode 100644
index 676f622383c..00000000000
--- a/apps/sim/public/provider-marks/google-drive.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 87.3 78"><path d="m6.6 66.85 3.85 6.65c.8 1.4 1.95 2.5 3.3 3.3l13.75-23.8h-27.5c0 1.55.4 3.1 1.2 4.5z" fill="#0066da"></path><path d="m43.65 25-13.75-23.8c-1.35.8-2.5 1.9-3.3 3.3l-25.4 44a9.06 9.06 0 0 0 -1.2 4.5h27.5z" fill="#00ac47"></path><path d="m73.55 76.8c1.35-.8 2.5-1.9 3.3-3.3l1.6-2.75 7.65-13.25c.8-1.4 1.2-2.95 1.2-4.5h-27.5l5.85 11.5z" fill="#ea4335"></path><path d="m43.65 25 13.75-23.8c-1.35-.8-2.9-1.2-4.5-1.2h-18.5c-1.6 0-3.15.45-4.5 1.2z" fill="#00832d"></path><path d="m59.8 53h-32.3l-13.75 23.8c1.35.8 2.9 1.2 4.5 1.2h50.8c1.6 0 3.15-.45 4.5-1.2z" fill="#2684fc"></path><path d="m73.4 26.5-12.7-22c-.8-1.4-1.95-2.5-3.3-3.3l-13.75 23.8 16.15 28h27.45c0-1.55-.4-3.1-1.2-4.5z" fill="#ffba00"></path></svg>
diff --git a/apps/sim/public/provider-marks/google-meet.svg b/apps/sim/public/provider-marks/google-meet.svg
deleted file mode 100644
index bfe334bec75..00000000000
--- a/apps/sim/public/provider-marks/google-meet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mark" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 87.5 72"><path fill="#00832d" d="M49.5 36l8.53 9.75 11.47 7.33 2-17.02-2-16.64-11.69 6.44z"></path><path fill="#0066da" d="M0 51.5V66c0 3.32 2.69 6 6 6h14.5l3-10.96-3-9.54-9.95-3z"></path><path fill="#e94235" d="M20.5 0L0 20.5l10.55 3 9.95-3 2.95-9.41z"></path><path fill="#2684fc" d="M20.5 20.5H0v31h20.5z"></path><path fill="#00ac47" d="M82.6 8.68L69.5 19.42v33.66l13.16 10.79c1.97 1.54 4.85.14 4.85-2.37V11c0-2.53-2.94-3.92-4.91-2.32zM49.5 36v15.5h-29V72h43c3.32 0 6-2.68 6-6V53.08z"></path><path fill="#ffba00" d="M63.5 0h-43v20.5h29V36l20-16.57V6c0-3.31-2.68-6-6-6z"></path></svg>
diff --git a/apps/sim/public/provider-marks/granola.svg b/apps/sim/public/provider-marks/granola.svg
deleted file mode 100644
index 064090aa87c..00000000000
--- a/apps/sim/public/provider-marks/granola.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mark" viewBox="0 0 242 250" fill="none" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(7.938225,0,0,7.854963,-6.01157,-0.679351)"><path fill="currentColor" fill-rule="nonzero" d="M15.826,31.913C19.127,31.913 22.586,31.182 23.979,30.168C24.869,29.534 25.311,29.596 26.104,28.837C26.325,28.616 26.421,28.551 26.483,28.489C29.497,26.012 31.243,22.808 31.243,18.652C31.243,11.892 26.452,7.291 19.599,7.291C13.57,7.291 8.969,11.13 8.969,16.048C8.969,20.522 12.46,23.726 17.44,23.726C17.726,23.726 17.854,23.567 18.171,23.567C19.378,23.567 20.361,23.219 20.996,22.553C21.313,22.205 21.917,21.505 21.979,21.474C22.265,21.218 22.327,20.839 22.393,20.68C22.455,20.522 22.582,20.425 22.648,20.204C22.71,19.949 22.617,19.632 22.617,19.349C22.617,18.842 22.838,18.335 22.838,17.859C22.838,16.528 21.251,15.193 19.823,15.193C19.665,15.193 19.665,15.065 19.568,15.065C19.471,15.065 19.378,15.162 19.282,15.162C19.185,15.162 19.061,15.003 18.933,15.003C18.806,15.003 18.744,15.131 18.554,15.131C18.14,15.131 18.109,15.193 17.792,15.193C17.695,15.193 17.537,15.224 17.474,15.255C17.347,15.317 17.347,15.414 17.219,15.414C17.049,15.414 16.964,15.446 16.964,15.51C16.964,15.859 16.995,15.796 16.836,15.796C16.666,15.796 16.56,15.807 16.519,15.828C16.391,15.89 16.488,16.048 16.36,16.145C16.233,16.207 16.202,16.303 16.171,16.493C16.14,16.683 15.95,16.748 15.95,16.938C15.95,17.035 15.981,17.097 15.981,17.159C15.981,17.349 15.602,17.287 15.602,17.476C15.602,17.604 15.698,17.697 15.698,17.825C15.698,17.921 15.636,17.983 15.636,18.08C15.636,18.176 15.698,18.238 15.698,18.3C15.698,18.459 15.477,18.49 15.477,18.618C15.477,18.745 15.605,18.838 15.605,18.935C15.605,18.997 15.508,19.032 15.508,19.125C15.508,19.218 15.477,19.063 15.667,19.346C15.795,19.535 15.795,19.632 15.667,19.79C15.54,19.949 15.288,20.046 14.97,20.046C13.639,20.046 13.48,18.68 12.749,18.459C12.529,18.397 12.494,18.363 12.494,18.269C12.494,18.176 12.494,18.207 12.622,18.08C12.749,17.952 12.78,17.859 12.78,17.762C12.78,17.666 12.78,17.635 12.718,17.573C12.463,17.159 12.339,16.652 12.339,16.083C12.339,13.165 15.891,10.72 19.258,10.72C20.271,10.72 20.113,10.975 20.716,10.975C20.875,10.975 20.813,10.975 21.034,10.944C21.606,10.847 22.651,11.071 23.476,11.482C25.759,12.623 27.252,15.321 27.252,18.463C27.252,23.826 22.493,27.727 16.147,27.727C12.687,27.727 10.307,26.647 7.959,24.015C7.704,23.729 8.086,24.078 7.672,23.35C7.165,22.46 7.228,23.032 7.228,23.032C7.069,22.843 6.783,22.301 6.624,22.112C6.434,21.891 6.179,21.922 6.086,21.794C5.958,21.636 6.148,21.349 6.086,21.191C6.024,20.936 5.482,20.556 5.42,20.366C5.358,20.177 5.134,18.97 5.134,18.749C5.134,18.494 5.324,18.463 5.324,18.304C5.324,18.083 5.037,18.018 4.879,17.7C4.72,17.383 4.624,16.652 4.624,15.859C4.624,15.445 4.624,15.286 4.751,14.334C4.782,14.017 5.258,14.017 5.258,13.668C5.258,13.541 5.196,13.382 5.196,13.289C5.196,13.162 5.196,13.13 5.227,13.034C6.558,7.45 12.525,3.294 19.157,3.294C21.441,3.294 23.186,3.708 25.883,4.85C26.773,5.229 28.073,4.563 28.073,3.867C28.135,3.646 28.011,3.58 27.977,3.453C27.945,3.325 27.818,3.166 27.69,3.135C27.628,3.104 27.594,3.008 27.532,2.915C27.435,2.756 27.342,2.694 27.087,2.628C26.959,2.597 26.897,2.566 26.831,2.501C26.735,2.373 26.673,2.311 26.545,2.246C26.418,2.183 26.325,2.246 26.259,2.215C26.197,2.183 26.162,2.118 26.1,2.087C26.069,2.056 26.004,2.056 25.911,2.056C22.71,0.342 20.616,0.086 17.826,0.086C11.797,0.086 6.403,2.69 3.072,7.226C2.785,7.605 2.944,8.24 2.534,8.623C1.74,9.354 0.757,13.351 0.757,15.89C0.757,18.014 1.264,20.839 1.93,22.394C3.23,25.44 2.661,24.171 2.851,24.457C3.23,25.06 3.548,25.122 3.706,25.312C3.706,25.312 3.803,25.502 3.803,25.692C3.803,25.819 3.803,25.85 3.834,25.912C3.93,26.102 4.372,26.419 4.499,26.547C4.786,26.833 5.006,27.437 5.482,27.913C6.214,28.644 7.259,29.213 10.59,30.768C11.763,31.306 11.097,31.024 11.225,31.055C11.511,31.151 11.891,31.151 12.115,31.31C12.242,31.407 12.084,31.372 12.432,31.372C12.494,31.372 12.494,31.403 12.56,31.434C12.622,31.465 12.687,31.562 12.78,31.562C12.842,31.562 12.877,31.5 12.97,31.531C13.063,31.562 13.287,31.72 13.477,31.817C13.636,31.913 13.667,31.913 13.732,31.848C13.922,31.72 14.05,31.879 14.239,31.879C14.301,31.879 14.398,31.848 14.588,31.848C14.843,31.848 14.843,31.91 15.826,31.91"></path></g></svg>
diff --git a/apps/sim/public/provider-marks/hubspot.svg b/apps/sim/public/provider-marks/hubspot.svg
deleted file mode 100644
index 636d279bb41..00000000000
--- a/apps/sim/public/provider-marks/hubspot.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mark" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path d="M18.164 7.93V5.084a2.198 2.198 0 0 0 1.27-1.978v-.067A2.2 2.2 0 0 0 17.238.845h-.067a2.2 2.2 0 0 0-2.193 2.194v.067a2.196 2.196 0 0 0 1.27 1.978v2.85a6.21 6.21 0 0 0-2.974 1.31L5.443.515A2.5 2.5 0 1 0 4.3 4.664l-.123.013 7.728 6.013a6.182 6.182 0 0 0-1.043 3.45c0 1.336.43 2.605 1.157 3.62l-2.35 2.348a2.022 2.022 0 0 0-.585-.1 2.026 2.026 0 1 0 2.026 2.026 1.98 1.98 0 0 0-.1-.584l2.318-2.323A6.249 6.249 0 1 0 18.166 7.93Zm-.96 9.371a3.21 3.21 0 1 1 0-6.421 3.21 3.21 0 0 1 0 6.42z"></path></svg>
diff --git a/apps/sim/public/provider-marks/jira.svg b/apps/sim/public/provider-marks/jira.svg
deleted file mode 100644
index 17242ac9dd3..00000000000
--- a/apps/sim/public/provider-marks/jira.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mark" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" fill="none"><defs><linearGradient id="jira_middle__jiraR_0_" gradientUnits="userSpaceOnUse" x1="22.034" y1="9.773" x2="17.118" y2="14.842" gradientTransform="scale(4)"><stop offset="0.176" stop-color="#0052cc"></stop><stop offset="1" stop-color="#2684ff"></stop></linearGradient><linearGradient id="jira_bottom__jiraR_0_" gradientUnits="userSpaceOnUse" x1="16.641" y1="15.564" x2="10.957" y2="21.094" gradientTransform="scale(4)"><stop offset="0.176" stop-color="#0052cc"></stop><stop offset="1" stop-color="#2684ff"></stop></linearGradient></defs><path fill="#2684ff" d="M108.023 16H61.805c0 11.52 9.324 20.848 20.847 20.848h8.5v8.226c0 11.52 9.328 20.848 20.848 20.848V19.977A3.98 3.98 0 00108.023 16zm0 0"></path><path fill="url(#jira_middle__jiraR_0_)" d="M85.121 39.04H38.902c0 11.519 9.325 20.847 20.844 20.847h8.504v8.226c0 11.52 9.328 20.848 20.848 20.848V43.016a3.983 3.983 0 00-3.977-3.977zm0 0"></path><path fill="url(#jira_bottom__jiraR_0_)" d="M62.219 62.078H16c0 11.524 9.324 20.848 20.848 20.848h8.5v8.23c0 11.52 9.328 20.844 20.847 20.844V66.059a3.984 3.984 0 00-3.976-3.98zm0 0"></path></svg>
diff --git a/apps/sim/public/provider-marks/lucid.svg b/apps/sim/public/provider-marks/lucid.svg
deleted file mode 100644
index 7547c96e64f..00000000000
--- a/apps/sim/public/provider-marks/lucid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mark" viewBox="0 0 192 192" fill="none" xmlns="http://www.w3.org/2000/svg"><g transform="translate(46 24)" fill="currentColor"><path d="M50 0L0 28.9V144.5L50 115.6V0Z"></path><path d="M100 142.7V86.7L50 115.6V142.7H100Z"></path></g></svg>
diff --git a/apps/sim/public/provider-marks/zoom.svg b/apps/sim/public/provider-marks/zoom.svg
deleted file mode 100644
index c1996c5edbc..00000000000
--- a/apps/sim/public/provider-marks/zoom.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mark" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect x="2" y="6" width="14" height="12" rx="2.5" fill="currentColor"></rect><path d="M16 9 L22 6 V18 L16 15 Z" fill="currentColor"></path></svg>
diff --git a/apps/sim/scripts/org-redesign-e2e/fixture.ts b/apps/sim/scripts/org-redesign-e2e/fixture.ts
deleted file mode 100644
index 0380944c348..00000000000
--- a/apps/sim/scripts/org-redesign-e2e/fixture.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * The organization `test-org-redesign-e2e.ts` runs against, shared with its seed: Enterprise, a
- * small admin team over a large group of members who cannot build, and made-up names throughout.
- */
-export const ORGANIZATION_ID = 'org-redesign-organization'
-export const OUTSIDE_ORGANIZATION_ID = 'org-redesign-outside'
-export const ORGANIZATION_NAME = 'Ridgeline Outfitters'
-export const PASSWORD = 'org-redesign-password-1'
-export const LINK_COUNT = 183
-
-const person = (key: string, name: string, role: 'owner' | 'admin' | 'member') => ({
-  key,
-  name,
-  role,
-  userId: `org-redesign-user-${key}`,
-  email: `${key}@org-redesign.test`,
-  sessionToken: `org-redesign-session-${key}`,
-})
-
-export const OWNER = person('owner', 'Olive Owner', 'owner')
-export const ADMIN = person('admin', 'Ada Admin', 'admin')
-/** Connected to nothing. */
-export const MEMBER = person('member', 'Mia Member', 'member')
-/** A member of the same group with managed Google accounts. */
-export const CONNECTED = person('connected', 'Cory Connected', 'member')
-/** A member of a much narrower group, with no workspaces. */
-export const NARROW = person('narrow', 'Nia Narrow', 'member')
-/** Belongs to another organization only. */
-export const OUTSIDER = person('outsider', 'Otto Outsider', 'owner')
-
-export const FILLERS = [
-  person('filler-1', 'Finn Fielding', 'member'),
-  person('filler-2', 'Gwen Garza', 'member'),
-  person('filler-3', 'Hugo Hale', 'member'),
-  person('filler-4', 'Ivy Ingram', 'member'),
-] as const
-
-export const IN_ORGANIZATION = [OWNER, ADMIN, MEMBER, CONNECTED, NARROW, ...FILLERS] as const
-export const EVERYONE = [...IN_ORGANIZATION, OUTSIDER] as const
-
-export const STANDARD_GROUP_ID = 'org-redesign-group-standard'
-export const NARROW_GROUP_ID = 'org-redesign-group-narrow'
-export const FULL_GROUP_ID = 'org-redesign-group-full'
-
-/** A restrictive group for ordinary members. */
-export const STANDARD_GROUP_CONFIG = {
-  disableInvitations: true,
-  disableToolAutoApproval: true,
-  disableLogExport: true,
-  disablePublicApi: true,
-  hideInboxTab: true,
-  disablePersonalCredentials: false,
-  disableWorkspaceCreation: false,
-  hideOrgMemberDirectory: false,
-  deniedModels: ['claude-opus-4-5', 'claude-fable-1'],
-  allowedIntegrations: [
-    'gmail_v2',
-    'google_calendar_v2',
-    'google_drive',
-    'slack_v2',
-    'jira',
-    'confluence_v2',
-    'gitlab',
-    'zoom',
-  ],
-  allowedKnowledgeConnectors: ['confluence', 'gitlab', 'slack', 'jira', 'jsm'],
-}
-
-export const NARROW_GROUP_CONFIG = {
-  ...STANDARD_GROUP_CONFIG,
-  allowedIntegrations: ['slack', 'slack_v2', 'managed_agent', 'api'],
-  allowedKnowledgeConnectors: ['slack'],
-}
-
-/** Approved search sources; only `coda` and `lucid` hold a live-search policy. */
-export const APPROVED_SOURCES = [
-  'gmail',
-  'google_calendar',
-  'google_drive',
-  'jira',
-  'slack',
-  'confluence',
-  'gitlab',
-  'coda',
-  'lucid',
-] as const
-
-/** Credential group options a member can connect through. No Microsoft provider is on offer. */
-export const CONNECTABLE_PROVIDERS = [
-  'gmail',
-  'google-calendar',
-  'google-drive',
-  'jira',
-  'confluence',
-] as const
-
-export const GRANTS = {
-  gmail: { credentialId: 'org-redesign-grant-gmail', providerId: 'google-email' },
-  'google-calendar': {
-    credentialId: 'org-redesign-grant-google-calendar',
-    providerId: 'google-calendar',
-  },
-} as const
-
-const workspaceId = (slug: string) => `org-redesign-workspace-${slug}`
-
-/** More than one page of the rail's list, so its paging is on for an admin. */
-export const WORKSPACES = [
-  { id: workspaceId('operations'), name: 'Operations' },
-  { id: workspaceId('marketing'), name: 'Marketing' },
-  { id: workspaceId('service'), name: 'Service Desk' },
-  { id: workspaceId('parts'), name: 'Parts Catalog' },
-  { id: workspaceId('finance'), name: 'Finance' },
-  { id: workspaceId('fleet'), name: 'Fleet' },
-  { id: workspaceId('training'), name: 'Training' },
-] as const
-export const MEMBER_ADMIN_WORKSPACE = WORKSPACES[0]
-export const MEMBER_WRITE_WORKSPACE = WORKSPACES[1]
-
-const uuid = (digit: string) =>
-  `${digit.repeat(8)}-${digit.repeat(4)}-4${digit.repeat(3)}-8${digit.repeat(3)}-${digit.repeat(12)}`
-
-/** The member's chats: assistant ones live under Search, and an agent one they can no longer open. */
-export const MEMBER_CHATS = {
-  assistant: { id: uuid('1'), title: 'Warranty coverage', mode: 'assistant', seen: true },
-  unread: { id: uuid('2'), title: 'Dealer onboarding', mode: 'assistant', seen: false },
-  removable: { id: uuid('3'), title: 'Old parts question', mode: 'assistant', seen: true },
-  bulkOne: { id: uuid('4'), title: 'Bulk removal one', mode: 'assistant', seen: true },
-  bulkTwo: { id: uuid('5'), title: 'Bulk removal two', mode: 'assistant', seen: true },
-  agent: { id: uuid('6'), title: 'Agent from before', mode: 'agent', seen: true },
-} as const
-
-export const ADMIN_CHATS = {
-  agent: { id: uuid('7'), title: 'Quarterly review', mode: 'agent', seen: true },
-  assistant: { id: uuid('8'), title: 'Vendor renewals', mode: 'assistant', seen: false },
-  deleted: { id: uuid('9'), title: 'Retired plan', mode: 'agent', seen: true },
-} as const
-
-/** Recognizable rows in the 183, beside the numbered ones. */
-export const NAMED_LINKS = {
-  handbook: { name: 'handbook', url: 'https://example.com/handbook', description: 'The handbook' },
-  restricted: { name: 'payroll', url: 'https://payroll.example.com', description: 'Pay stubs' },
-  unlisted: { name: 'skunkworks', url: 'https://skunk.example.com', description: 'Quiet project' },
-  variable: {
-    name: 'ticket',
-    url: 'https://tickets.example.com/browse/{*}',
-    description: 'Open a ticket',
-  },
-  mostUsed: { name: 'timesheet', url: 'https://time.example.com', description: 'Weekly hours' },
-} as const
-
-export const SEEDED_SOURCE = {
-  url: 'https://docs.example.com/service-bulletin',
-  title: 'Service bulletin',
-  query: 'service bulletin',
-}
diff --git a/apps/sim/scripts/org-redesign-e2e/scripted-agent.ts b/apps/sim/scripts/org-redesign-e2e/scripted-agent.ts
deleted file mode 100644
index 1de25c01c64..00000000000
--- a/apps/sim/scripts/org-redesign-e2e/scripted-agent.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { createServer, type IncomingMessage, type ServerResponse } from 'node:http'
-
-/**
- * Stands in for the Mothership worker at the main app's `SIM_AGENT_API_URL`, so a chat turn crosses
- * every real boundary of the app and only the model's words are scripted. A message containing
- * `Count slowly` streams until the app hangs up, which is what Stop needs; anything else answers at
- * once. Same wire format as the desktop suite's `ScriptedAgent`.
- */
-const port = Number(process.argv[2])
-if (!port) throw new Error('usage: scripted-agent.ts <port>')
-
-async function readJson(request: IncomingMessage): Promise<Record<string, unknown>> {
-  const chunks: Buffer[] = []
-  for await (const chunk of request) chunks.push(Buffer.from(chunk))
-  const raw = Buffer.concat(chunks).toString('utf8')
-  return raw ? JSON.parse(raw) : {}
-}
-
-function streamTurn(body: Record<string, unknown>, response: ServerResponse) {
-  const message = typeof body.message === 'string' ? body.message : ''
-  const streamId = typeof body.messageId === 'string' ? body.messageId : `${Date.now()}`
-  const chatId = typeof body.chatId === 'string' ? body.chatId : undefined
-  let seq = 0
-  let open = true
-  const emit = (type: string, payload: Record<string, unknown>) => {
-    if (!open) return
-    seq += 1
-    const envelope = {
-      v: 1,
-      type,
-      seq,
-      ts: new Date().toISOString(),
-      stream: { streamId, ...(chatId ? { chatId } : {}), cursor: String(seq) },
-      trace: { requestId: `live-${streamId}` },
-      payload,
-    }
-    response.write(`data: ${JSON.stringify(envelope)}\n\n`)
-  }
-  const finish = () => {
-    if (!open) return
-    emit('complete', { status: 'complete' })
-    open = false
-    response.end()
-  }
-  response.writeHead(200, {
-    'Content-Type': 'text/event-stream',
-    'Cache-Control': 'no-cache',
-    Connection: 'keep-alive',
-  })
-  response.on('close', () => {
-    open = false
-  })
-  emit('session', { kind: 'start' })
-  if (!message.includes('Count slowly')) {
-    emit('text', { channel: 'assistant', text: 'Hello from the scripted agent.' })
-    finish()
-    return
-  }
-  let count = 0
-  const timer = setInterval(() => {
-    count += 1
-    if (!open || count > 50) {
-      clearInterval(timer)
-      finish()
-      return
-    }
-    emit('text', { channel: 'assistant', text: `${count}\n` })
-  }, 500)
-}
-
-createServer((request, response) => {
-  void readJson(request)
-    .then((body) => {
-      const path = new URL(request.url ?? '/', 'http://agent').pathname
-      if (path === '/api/mothership' || path === '/api/copilot') {
-        streamTurn(body, response)
-        return
-      }
-      response.writeHead(200, { 'Content-Type': 'application/json' })
-      response.end(
-        JSON.stringify(
-          path === '/api/generate-chat-title' ? { title: 'Scripted chat' } : { settled: true }
-        )
-      )
-    })
-    .catch(() => {
-      response.writeHead(500)
-      response.end()
-    })
-}).listen(port, '127.0.0.1')
diff --git a/apps/sim/scripts/org-redesign-seed.ts b/apps/sim/scripts/org-redesign-seed.ts
deleted file mode 100644
index 1ef77b12853..00000000000
--- a/apps/sim/scripts/org-redesign-seed.ts
+++ /dev/null
@@ -1,423 +0,0 @@
-import { db } from '@sim/db'
-import {
-  account,
-  copilotChats,
-  copilotMessages,
-  credential,
-  credentialGroup,
-  credentialGroupEnrollment,
-  member,
-  organization,
-  organizationSearchHistory,
-  organizationSearchIntegration,
-  organizationSecretSource,
-  permissionGroup,
-  permissionGroupMember,
-  permissions,
-  project,
-  resourcePolicy,
-  session,
-  simLink,
-  subscription,
-  user,
-  userStats,
-  workspace,
-} from '@sim/db/schema'
-import { assertDisposableTestDatabaseUrl } from '@sim/db/testing/test-infrastructure'
-import { generateId } from '@sim/utils/id'
-import { generateRandomHex } from '@sim/utils/random'
-import { normalizeEmail } from '@sim/utils/string'
-import { hashPassword } from 'better-auth/crypto'
-import { inArray } from 'drizzle-orm'
-import { getCredentialGroupProviderAdapter } from '@/lib/credential-groups/provider-registry'
-import { encryptManagedOAuthTokenSet } from '@/lib/credentials/managed-oauth'
-import { defaultLiveSearchPolicy } from '@/lib/sim-search/live/policy-schema'
-import {
-  ADMIN,
-  ADMIN_CHATS,
-  APPROVED_SOURCES,
-  CONNECTABLE_PROVIDERS,
-  CONNECTED,
-  EVERYONE,
-  FILLERS,
-  FULL_GROUP_ID,
-  GRANTS,
-  IN_ORGANIZATION,
-  LINK_COUNT,
-  MEMBER,
-  MEMBER_ADMIN_WORKSPACE,
-  MEMBER_CHATS,
-  MEMBER_WRITE_WORKSPACE,
-  NAMED_LINKS,
-  NARROW,
-  NARROW_GROUP_CONFIG,
-  NARROW_GROUP_ID,
-  ORGANIZATION_ID,
-  ORGANIZATION_NAME,
-  OUTSIDE_ORGANIZATION_ID,
-  OUTSIDER,
-  OWNER,
-  PASSWORD,
-  SEEDED_SOURCE,
-  STANDARD_GROUP_CONFIG,
-  STANDARD_GROUP_ID,
-  WORKSPACES,
-} from '@/scripts/org-redesign-e2e/fixture'
-
-/**
- * Seeds the organization `test-org-redesign-e2e.ts` runs against. Ids are stable and a rerun starts
- * over, so a failed run can be repeated against the same database.
- */
-assertDisposableTestDatabaseUrl(process.env.DATABASE_URL ?? '')
-
-const CREDENTIAL_GROUP_ID = 'org-redesign-credential-group'
-const allUserIds = EVERYONE.map(({ userId }) => userId)
-const now = new Date()
-const passwordHash = await hashPassword(PASSWORD)
-
-/** Workspace access per viewer: admins hold all of it, members only what they were given. */
-function workspacePermissions() {
-  const rows = (
-    viewers: readonly (typeof MEMBER | typeof ADMIN | typeof OWNER)[],
-    entityId: string,
-    permissionType: 'admin' | 'write'
-  ) =>
-    viewers.map(({ key, userId }) => ({
-      id: `${entityId}-${key}`,
-      userId,
-      entityType: 'workspace' as const,
-      entityId,
-      permissionType,
-    }))
-  return [
-    ...WORKSPACES.flatMap(({ id }) => rows([OWNER, ADMIN], id, 'admin')),
-    ...rows([MEMBER, CONNECTED], MEMBER_ADMIN_WORKSPACE.id, 'admin'),
-    ...rows([MEMBER, CONNECTED], MEMBER_WRITE_WORKSPACE.id, 'write'),
-  ]
-}
-
-/** The numbered rows sort after the named ones, and creators and activity vary across them. */
-function syntheticLinks() {
-  const named = Object.values(NAMED_LINKS).map((link) => ({
-    ...link,
-    normalizedName: link.name,
-    defaultUrl: link.name === NAMED_LINKS.variable.name ? 'https://tickets.example.com' : null,
-    unlisted: link.name === NAMED_LINKS.unlisted.name,
-    restrictEdit: link.name === NAMED_LINKS.restricted.name,
-    visitCount: link.name === NAMED_LINKS.mostUsed.name ? 5000 : 3,
-    createdBy: link.name === NAMED_LINKS.mostUsed.name ? MEMBER.userId : ADMIN.userId,
-  }))
-  const numbered = Array.from({ length: LINK_COUNT - named.length }, (_, index) => {
-    const label = String(index + 1).padStart(3, '0')
-    return {
-      name: `resource-${label}`,
-      normalizedName: `resource${label}`,
-      url: `https://resources.example.com/${label}`,
-      description: index % 3 === 0 ? `Shared resource number ${label}` : null,
-      defaultUrl: null,
-      unlisted: false,
-      restrictEdit: false,
-      visitCount: index % 50,
-      createdBy: FILLERS[index % FILLERS.length].userId,
-    }
-  })
-  return [...named, ...numbered].map((link, index) => ({
-    id: `org-redesign-link-${index}`,
-    organizationId: ORGANIZATION_ID,
-    ...link,
-    createdAt: now,
-    updatedAt: now,
-  }))
-}
-
-await db.transaction(async (tx) => {
-  await tx.delete(workspace).where(inArray(workspace.ownerId, allUserIds))
-  await tx.delete(project).where(inArray(project.ownerId, allUserIds))
-  await tx
-    .delete(organization)
-    .where(inArray(organization.id, [ORGANIZATION_ID, OUTSIDE_ORGANIZATION_ID]))
-  await tx.delete(user).where(inArray(user.id, allUserIds))
-
-  await tx.insert(user).values(
-    EVERYONE.map(({ userId, email, name }) => ({
-      id: userId,
-      email,
-      name,
-      normalizedEmail: normalizeEmail(email),
-      emailVerified: true,
-      createdAt: now,
-      updatedAt: now,
-    }))
-  )
-  await tx
-    .insert(userStats)
-    .values(EVERYONE.map(({ userId }) => ({ id: `${userId}-stats`, userId })))
-  await tx.insert(account).values(
-    EVERYONE.map(({ userId }) => ({
-      id: `${userId}-credential`,
-      accountId: userId,
-      providerId: 'credential',
-      userId,
-      password: passwordHash,
-      createdAt: now,
-      updatedAt: now,
-    }))
-  )
-
-  await tx.insert(organization).values([
-    {
-      id: ORGANIZATION_ID,
-      name: ORGANIZATION_NAME,
-      slug: 'org-redesign',
-      orgUsageLimit: '1000',
-      metadata: {
-        liveSearchPolicies: {
-          coda: defaultLiveSearchPolicy('coda'),
-          lucid: defaultLiveSearchPolicy('lucid'),
-        },
-      },
-      createdAt: now,
-    },
-    {
-      id: OUTSIDE_ORGANIZATION_ID,
-      name: 'Elsewhere Inc',
-      slug: 'org-redesign-outside',
-      createdAt: now,
-    },
-  ])
-  await tx.insert(member).values([
-    ...IN_ORGANIZATION.map(({ key, userId, role }) => ({
-      id: `org-redesign-member-${key}`,
-      userId,
-      organizationId: ORGANIZATION_ID,
-      role,
-    })),
-    {
-      id: 'org-redesign-member-outsider',
-      userId: OUTSIDER.userId,
-      organizationId: OUTSIDE_ORGANIZATION_ID,
-      role: 'owner',
-    },
-  ])
-  await tx.insert(session).values(
-    EVERYONE.map(({ key, userId, sessionToken }) => ({
-      id: `org-redesign-session-row-${key}`,
-      token: sessionToken,
-      userId,
-      activeOrganizationId: key === 'outsider' ? OUTSIDE_ORGANIZATION_ID : ORGANIZATION_ID,
-      expiresAt: new Date(now.getTime() + 86_400_000),
-      createdAt: now,
-      updatedAt: now,
-    }))
-  )
-  await tx.insert(subscription).values({
-    id: 'org-redesign-subscription',
-    plan: 'enterprise',
-    referenceId: ORGANIZATION_ID,
-    status: 'active',
-    seats: 250,
-    metadata: { plan: 'enterprise', referenceId: ORGANIZATION_ID, seats: 250, monthlyPrice: 100 },
-    periodStart: now,
-    periodEnd: new Date(now.getTime() + 30 * 86_400_000),
-  })
-
-  await tx.insert(permissionGroup).values([
-    {
-      id: STANDARD_GROUP_ID,
-      organizationId: ORGANIZATION_ID,
-      name: 'Standard Access',
-      config: STANDARD_GROUP_CONFIG,
-      createdBy: OWNER.userId,
-      isDefault: true,
-    },
-    {
-      id: NARROW_GROUP_ID,
-      organizationId: ORGANIZATION_ID,
-      name: 'Field Crew',
-      config: NARROW_GROUP_CONFIG,
-      createdBy: OWNER.userId,
-      membershipMode: 'explicit',
-    },
-    {
-      id: FULL_GROUP_ID,
-      organizationId: ORGANIZATION_ID,
-      name: 'Administrators',
-      config: {},
-      createdBy: OWNER.userId,
-      membershipMode: 'explicit',
-    },
-  ])
-  await tx.insert(permissionGroupMember).values(
-    (
-      [
-        [STANDARD_GROUP_ID, [MEMBER, CONNECTED, ...FILLERS]],
-        [NARROW_GROUP_ID, [NARROW]],
-        [FULL_GROUP_ID, [OWNER, ADMIN]],
-      ] as const
-    ).flatMap(([permissionGroupId, people]) =>
-      people.map(({ key, userId }) => ({
-        id: `org-redesign-group-member-${key}`,
-        permissionGroupId,
-        organizationId: ORGANIZATION_ID,
-        userId,
-      }))
-    )
-  )
-
-  for (const { id, name } of WORKSPACES) {
-    await tx.insert(project).values({
-      id,
-      name,
-      ownerId: OWNER.userId,
-      organizationId: ORGANIZATION_ID,
-    })
-    await tx.insert(workspace).values({
-      id,
-      projectId: id,
-      name,
-      ownerId: OWNER.userId,
-      billedAccountUserId: OWNER.userId,
-      organizationId: ORGANIZATION_ID,
-    })
-  }
-  await tx.insert(permissions).values(workspacePermissions())
-
-  const chats = [
-    ...Object.values(MEMBER_CHATS).map((chat) => ({ ...chat, userId: MEMBER.userId })),
-    ...Object.values(ADMIN_CHATS).map((chat) => ({ ...chat, userId: ADMIN.userId })),
-  ]
-  await tx.insert(copilotChats).values(
-    chats.map(({ id, title, mode, seen, userId }) => ({
-      id,
-      userId,
-      organizationId: ORGANIZATION_ID,
-      type: 'mothership' as const,
-      title,
-      config: { conversationMode: mode },
-      lastSeenAt: seen ? new Date(now.getTime() + 60_000) : null,
-      deletedAt: id === ADMIN_CHATS.deleted.id ? now : null,
-    }))
-  )
-  const message = (chatId: string, role: 'user' | 'assistant', seq: number, content: string) => ({
-    chatId,
-    messageId: `${chatId}-${role}`,
-    role,
-    seq,
-    content: { id: `${chatId}-${role}`, role, content, timestamp: now.toISOString() },
-  })
-  await tx
-    .insert(copilotMessages)
-    .values(
-      chats.flatMap(({ id, title }) => [
-        message(id, 'user', 1, `About ${title}`),
-        message(id, 'assistant', 2, `Here is what I found about ${title}.`),
-      ])
-    )
-
-  await tx.insert(organizationSearchHistory).values(
-    [MEMBER, ADMIN].map(({ userId }) => ({
-      organizationId: ORGANIZATION_ID,
-      userId,
-      sources: [
-        { url: SEEDED_SOURCE.url, title: SEEDED_SOURCE.title, viewedAt: now.toISOString() },
-      ],
-      queries: [{ query: SEEDED_SOURCE.query, searchedAt: now.toISOString() }],
-    }))
-  )
-
-  await tx.insert(simLink).values(syntheticLinks())
-  await tx.insert(organizationSecretSource).values({
-    id: 'org-redesign-secret-source',
-    organizationId: ORGANIZATION_ID,
-    mode: 'member',
-  })
-
-  const policies = Object.fromEntries(
-    await Promise.all(
-      CONNECTABLE_PROVIDERS.map(
-        async (provider) =>
-          [
-            provider,
-            await getCredentialGroupProviderAdapter(provider).getPolicy(undefined, {}),
-          ] as const
-      )
-    )
-  ) as Record<
-    (typeof CONNECTABLE_PROVIDERS)[number],
-    Awaited<ReturnType<ReturnType<typeof getCredentialGroupProviderAdapter>['getPolicy']>>
-  >
-  await tx.insert(credentialGroup).values({
-    id: CREDENTIAL_GROUP_ID,
-    organizationId: ORGANIZATION_ID,
-    publicId: generateId(),
-    name: 'Connected accounts',
-    options: CONNECTABLE_PROVIDERS.map((provider) => ({
-      id: provider,
-      provider,
-      label: provider,
-      authorizationAppId: policies[provider].authorizationAppId,
-      requiredScopes: policies[provider].requiredScopes,
-      scopeVersion: policies[provider].scopeVersion,
-      required: false,
-      status: 'active' as const,
-    })),
-  })
-  await tx.insert(resourcePolicy).values({
-    id: 'org-redesign-credential-group-policy',
-    organizationId: ORGANIZATION_ID,
-    resourceType: 'credential_group',
-    resourceId: CREDENTIAL_GROUP_ID,
-    document: {
-      version: 2,
-      resource: { type: 'credential_group', id: CREDENTIAL_GROUP_ID },
-      statements: [],
-    },
-  })
-  await tx.insert(organizationSearchIntegration).values(
-    APPROVED_SOURCES.map((connectorType) => ({
-      organizationId: ORGANIZATION_ID,
-      connectorType,
-      approved: true,
-    }))
-  )
-
-  const enrollmentId = 'org-redesign-enrollment-connected'
-  await tx.insert(credentialGroupEnrollment).values({
-    id: enrollmentId,
-    userId: CONNECTED.userId,
-    credentialGroupId: CREDENTIAL_GROUP_ID,
-    email: CONNECTED.email,
-    status: 'completed',
-    invitationTokenHash: generateRandomHex(64),
-    invitationExpiresAt: new Date(now.getTime() + 86_400_000),
-    invitedAt: now,
-  })
-  for (const option of ['gmail', 'google-calendar'] as const) {
-    const policy = policies[option]
-    const grant = GRANTS[option]
-    await tx.insert(credential).values({
-      id: grant.credentialId,
-      createdBy: CONNECTED.userId,
-      credentialGroupEnrollmentId: enrollmentId,
-      credentialGroupOptionId: option,
-      organizationId: ORGANIZATION_ID,
-      type: 'managed_oauth',
-      displayName: CONNECTED.email,
-      providerId: grant.providerId,
-      managedOauthStatus: 'active',
-      managedOauthScopeVersion: policy.scopeVersion,
-      grantedScopes: policy.requiredScopes,
-      providerSubjectId: `org-redesign-${option}`,
-      authorizationAppId: policy.authorizationAppId,
-      encryptedOauthTokenSet: await encryptManagedOAuthTokenSet({
-        accessToken: `org-redesign-token-${option}`,
-        refreshToken: `org-redesign-refresh-${option}`,
-      }),
-      accessTokenExpiresAt: new Date(now.getTime() + 3_600_000),
-      grantedAt: now,
-    })
-  }
-})
-
-process.stdout.write(`Seeded ${IN_ORGANIZATION.length} members of ${ORGANIZATION_ID}\n`)
-process.exit(0)
diff --git a/apps/sim/scripts/test-assistant-actions-e2e.ts b/apps/sim/scripts/test-assistant-actions-e2e.ts
index 2d1b22a98a2..35570e5637f 100644
--- a/apps/sim/scripts/test-assistant-actions-e2e.ts
+++ b/apps/sim/scripts/test-assistant-actions-e2e.ts
@@ -171,15 +171,6 @@ async function check(name: string, run: () => Promise<void>) {
   }
 }
 
-function integrationRow(name: string) {
-  return page
-    .getByRole('main')
-    .getByRole('link')
-    .filter({
-      has: page.getByText(name, { exact: true }),
-    })
-}
-
 async function capture(name: string) {
   await page.evaluate(() => document.fonts.ready)
   await page.addStyleTag({ content: 'nextjs-portal { display: none; }' })
@@ -575,19 +566,16 @@ try {
       waitUntil: 'domcontentloaded',
       timeout: 180_000,
     })
-    await integrationRow('Salesforce').click()
+    await page.getByRole('link', { name: 'Open Salesforce integration', exact: true }).click()
     await expect(page.getByRole('button', { name: 'Add account', exact: true })).toHaveCount(0)
-    const policy = page.getByRole('group', { name: 'Create Task in Salesforce permission' })
-    await expect(policy).toBeVisible({ timeout: 180_000 })
-    await page.getByRole('button', { name: /^Manage / }).click()
-    await expect(
-      page.getByRole('menuitem', { name: 'Reconnect account', exact: true })
-    ).toBeVisible()
+    await expect(page.getByRole('button', { name: 'Reconnect', exact: true })).toBeVisible()
     await capture('integration-account-actions')
-    await page.getByRole('menuitem', { name: 'Disconnect account', exact: true }).click()
+    await page.getByRole('button', { name: 'Disconnect', exact: true }).click()
     await expect(page.getByRole('dialog', { name: 'Disconnect Salesforce' })).toBeVisible()
     await capture('integration-disconnect-confirmation')
     await page.getByRole('button', { name: 'Cancel', exact: true }).click()
+    const policy = page.getByRole('radiogroup', { name: 'Create Task in Salesforce permission' })
+    await expect(policy).toBeVisible({ timeout: 180_000 })
     await expect(policy.getByRole('radio', { name: 'Ask', exact: true })).toBeChecked()
     await capture('integration-detail-salesforce')
   })
@@ -601,37 +589,42 @@ try {
       const data = readAssistantToolPermissionsContract.response.schema.parse(await response.json())
       assert.equal(data.account.credentialId, account.credentialId)
       assert.equal(data.tools.length > 0, account.supported, account.name)
-      await integrationRow(account.name).click()
-      const permissions = page.getByRole('searchbox', { name: 'Search tools', exact: true })
+      await page
+        .getByRole('link', { name: `Open ${account.name} integration`, exact: true })
+        .click()
+      const permissions = page.getByRole('textbox', { name: 'Search tools', exact: true })
       if (account.supported) {
         await expect(permissions).toBeVisible()
-        await expect(page.getByRole('radio').first()).toBeVisible()
+        await expect(page.getByRole('radiogroup').first()).toBeVisible()
       } else {
         await expect(permissions).toHaveCount(0)
       }
       await capture(`integration-detail-${account.name.toLowerCase().replaceAll(' ', '-')}`)
     }
     await page.goto(`${baseUrl.origin}${root}/integrations`)
-    await expect(integrationRow('Salesforce')).toBeVisible()
+    await expect(
+      page.getByRole('link', { name: 'Open Salesforce integration', exact: true })
+    ).toBeVisible()
     await capture('integrations-desktop')
   })
   await check(
     'A synthetic duplicate-provider fixture isolates permissions and disconnects only the selected account',
     async () => {
       await page.goto(`${baseUrl.origin}${root}/integrations`)
-      await integrationRow('Jira').click()
-      await expect(page).toHaveURL((url) => url.pathname === `${root}/integrations/jira`)
+      await page.getByRole('link', { name: 'Open Jira integration', exact: true }).click()
+      await expect(page).toHaveURL((url) => url.searchParams.get('integration') === 'source:jira')
       const accountsUrl = page.url()
-      const firstAccount = page.getByRole('link', { name: 'taylor@acme.example', exact: true })
+      const firstAccount = page.getByRole('link', {
+        name: 'Open taylor@acme.example account',
+        exact: true,
+      })
       const secondAccount = page.getByRole('link', {
-        name: 'launch-team@acme.example',
+        name: 'Open launch-team@acme.example account',
         exact: true,
       })
       await expect(firstAccount).toBeVisible()
       await expect(secondAccount).toBeVisible()
-      await expect(page.getByRole('searchbox', { name: 'Search tools', exact: true })).toHaveCount(
-        0
-      )
+      await expect(page.getByRole('textbox', { name: 'Search tools', exact: true })).toHaveCount(0)
       await capture('integration-multiple-accounts')
       await expect(
         page.getByRole('button', { name: 'Jira integration actions', exact: true })
@@ -643,7 +636,7 @@ try {
       await secondAccount.click()
       await expect(page).toHaveURL((url) => url.searchParams.get('account') === secondCredentialId)
       const selectedUrl = page.url()
-      const policy = page.getByRole('group', { name: 'Jira Write permission' })
+      const policy = page.getByRole('radiogroup', { name: 'Jira Write permission' })
       await expect(policy.getByRole('radio', { name: 'Ask', exact: true })).toBeChecked()
       await capture('integration-selected-account')
       await policy.getByRole('radio', { name: 'Block', exact: true }).click()
@@ -671,15 +664,10 @@ try {
       await firstAccount.click()
       await expect(policy.getByRole('radio', { name: 'Ask', exact: true })).toBeChecked()
       await page.goto(selectedUrl)
+      await expect(page.getByRole('button', { name: 'Reconnect', exact: true })).toBeVisible()
       await expect(policy.getByRole('radio', { name: 'Block', exact: true })).toBeChecked()
-      await page
-        .getByRole('button', { name: 'Manage launch-team@acme.example', exact: true })
-        .click()
-      await expect(
-        page.getByRole('menuitem', { name: 'Reconnect account', exact: true })
-      ).toBeVisible()
       await capture('integration-selected-account-actions')
-      await page.getByRole('menuitem', { name: 'Disconnect account', exact: true }).click()
+      await page.getByRole('button', { name: 'Disconnect', exact: true }).click()
       const confirmation = page.getByRole('dialog', { name: 'Disconnect Jira', exact: true })
       await expect(confirmation).toContainText('launch-team@acme.example')
       await expect(confirmation).not.toContainText('taylor@acme.example')
@@ -693,16 +681,10 @@ try {
       await confirmation.getByRole('button', { name: 'Disconnect', exact: true }).click()
       assert.equal((await disconnected).status(), 200)
       await expect(confirmation).toBeHidden()
-      await expect(page).toHaveURL((url) => !url.searchParams.has('account'))
-      await expect(page.getByText('launch-team@acme.example', { exact: true })).toHaveCount(0)
-      await expect(page.getByText('taylor@acme.example', { exact: true })).toBeVisible()
-      await page.goto(selectedUrl)
       await expect(
-        page.getByRole('heading', { name: 'This account is no longer connected.', exact: true })
+        page.getByText('This account is no longer connected.', { exact: true })
       ).toBeVisible()
-      await expect(page.getByRole('searchbox', { name: 'Search tools', exact: true })).toHaveCount(
-        0
-      )
+      await expect(page.getByRole('textbox', { name: 'Search tools', exact: true })).toHaveCount(0)
       const states =
         await sql`select id, managed_oauth_status from credential where id in (${credentialId}, ${secondCredentialId})`
       assert.equal(
@@ -733,35 +715,31 @@ try {
         )
       )
       await page.goto(`${baseUrl.origin}${root}/integrations`)
-      await integrationRow('Coda').click()
-      await expect(page).toHaveURL((url) => url.pathname === `${root}/integrations/coda`)
+      await page.getByRole('link', { name: 'Open Coda integration', exact: true }).click()
+      await expect(page).toHaveURL((url) => url.searchParams.get('integration') === 'source:coda')
       const detailUrl = page.url()
-      const connect = page.getByRole('button', { name: 'Coda', exact: true })
+      const connect = page.getByRole('button', { name: 'Connect', exact: true })
       await expect(connect).toBeEnabled()
-      await expect(
-        page.getByRole('main').getByText('Connect your Coda account', { exact: true })
-      ).toBeVisible()
+      await expect(page.getByText('No account connected', { exact: true })).toBeVisible()
       await expect(page.getByText('meetings@acme.example', { exact: true })).toHaveCount(0)
       await capture('integration-enabled-empty')
       const forgedUrl = new URL(detailUrl)
       forgedUrl.searchParams.set('account', firefliesCredentialId)
       await page.goto(forgedUrl.toString())
       await expect(
-        page.getByRole('heading', { name: 'This account is no longer connected.', exact: true })
+        page.getByText('This account is no longer connected.', { exact: true })
       ).toBeVisible()
-      await expect(page.getByRole('button', { name: /^Manage / })).toHaveCount(0)
-      await expect(page.getByRole('searchbox', { name: 'Search tools', exact: true })).toHaveCount(
-        0
-      )
+      await expect(page.getByRole('button', { name: 'Disconnect', exact: true })).toHaveCount(0)
+      await expect(page.getByRole('textbox', { name: 'Search tools', exact: true })).toHaveCount(0)
       await sql`update organization_search_integration set approved = false where organization_id = ${organizationId} and connector_type = 'coda'`
       try {
         await page.goto(`${baseUrl.origin}${root}/integrations`)
-        await expect(integrationRow('Coda')).toBeVisible()
-        await integrationRow('Coda').click()
-        await expect(page).toHaveURL((url) => url.pathname === `${root}/integrations/coda`)
         await expect(
-          page.getByRole('main').getByText('Disabled by your organization', { exact: true })
+          page.getByRole('link', { name: 'Open Coda integration', exact: true })
         ).toBeVisible()
+        await page.getByRole('link', { name: 'Open Coda integration', exact: true }).click()
+        await expect(page).toHaveURL((url) => url.searchParams.get('integration') === 'source:coda')
+        await expect(page.getByText('Disabled by your organization', { exact: true })).toBeVisible()
         await expect(connect).toBeDisabled()
         await capture('integration-disabled-empty')
       } finally {
@@ -771,9 +749,7 @@ try {
       try {
         await page.reload()
         await expect(
-          page
-            .getByRole('main')
-            .getByText('Connections are paused by your organization', { exact: true })
+          page.getByText('Connections are paused by your organization', { exact: true })
         ).toBeVisible()
         await expect(connect).toBeDisabled()
         await capture('integration-paused-empty')
@@ -784,15 +760,18 @@ try {
       await sql`update credential_group set options = (select jsonb_agg(case when value->>'id' = 'salesforce' then value || '{"status":"disabled"}'::jsonb else value end) from jsonb_array_elements(options)) where id = ${groupId}`
       try {
         await page.goto(`${baseUrl.origin}${root}/integrations`)
-        const salesforce = integrationRow('Salesforce')
+        const salesforce = page.getByRole('link', {
+          name: 'Open Salesforce integration',
+          exact: true,
+        })
         await expect(salesforce).toBeVisible()
         await salesforce.click()
-        await expect(page).toHaveURL((url) => url.pathname === `${root}/integrations/salesforce`)
-        await expect(
-          page.getByRole('main').getByText('Connections unavailable', { exact: true })
-        ).toBeVisible()
-        await expect(page.getByRole('region', { name: 'Connected account' })).toHaveCount(0)
-        await expect(page.getByRole('button', { name: 'Salesforce', exact: true })).toBeDisabled()
+        await expect(page).toHaveURL(
+          (url) => url.searchParams.get('integration') === 'app:salesforce'
+        )
+        await expect(page.getByText('No account connected', { exact: true })).toBeVisible()
+        await expect(page.getByText('Connections unavailable', { exact: true })).toBeVisible()
+        await expect(connect).toHaveCount(0)
         await capture('integration-disabled-app-empty')
       } finally {
         await sql`update credential set managed_oauth_status = 'active' where id = ${nativeCredentialId}`
@@ -959,7 +938,7 @@ try {
       waitUntil: 'domcontentloaded',
       timeout: 180_000,
     })
-    const policy = page.getByRole('group', { name: 'Jira Write permission' })
+    const policy = page.getByRole('radiogroup', { name: 'Jira Write permission' })
     await expect(policy).toBeVisible({ timeout: 180_000 })
     await expect(policy.getByRole('radio', { name: 'Ask', exact: true })).toBeChecked()
     await policy.getByRole('radio', { name: 'Block', exact: true }).click()
@@ -969,22 +948,21 @@ try {
     await policy.getByRole('radio', { name: 'Ask', exact: true }).click()
     await expect(policy.getByRole('radio', { name: 'Ask', exact: true })).toBeChecked()
     await capture('tool-permissions-desktop')
-    const toolPermissions = await context.request.get(
-      `${baseUrl.origin}/api/organizations/${organizationId}/connected-accounts/personal/${credentialId}/tool-permissions`
-    )
-    const { tools } = readAssistantToolPermissionsContract.response.schema.parse(
-      await toolPermissions.json()
-    )
-    const jiraWrite = tools.find((tool) => tool.toolId === 'jira_write')
-    assert(jiraWrite?.description)
-    await expect(page.getByText(jiraWrite.description, { exact: true })).toBeVisible()
-    await expect(policy).not.toHaveAttribute('aria-description')
-    const inherited = tools.find((tool) => tool.inherited)
-    assert(inherited)
-    await expect(
-      page.getByRole('group', { name: `${inherited.name} permission`, exact: true })
-    ).toHaveAttribute('aria-description', /^Inherits (Allow|Ask|Block) from /)
+    const toolDescription = page
+      .getByRole('button', { name: 'More information', exact: true })
+      .first()
+    await toolDescription.hover()
+    await expect(page.getByRole('tooltip')).toBeVisible()
     await capture('tool-permission-description')
+    await page.mouse.move(0, 0)
+    await expect(page.getByRole('tooltip')).toBeHidden()
+    await toolDescription.focus()
+    await page.keyboard.press('Tab')
+    await page.keyboard.press('Shift+Tab')
+    await expect(toolDescription).toBeFocused()
+    await expect(page.getByRole('tooltip')).toBeVisible()
+    await page.keyboard.press('Tab')
+    await expect(page.getByRole('tooltip')).toBeHidden()
     await page.setViewportSize({ width: 390, height: 844 })
     await capture('tool-permissions-mobile')
     assert(
diff --git a/apps/sim/scripts/test-browser-extension-e2e.ts b/apps/sim/scripts/test-browser-extension-e2e.ts
index 9c6dd18683e..e0a622741b0 100644
--- a/apps/sim/scripts/test-browser-extension-e2e.ts
+++ b/apps/sim/scripts/test-browser-extension-e2e.ts
@@ -2117,17 +2117,6 @@ try {
         .toBe(`/extension/o/${organizationId}`)
       await expect(frame().getByRole('textbox', { name: 'Ask Sim', exact: true })).toBeVisible()
       await expect(frame().getByRole('button', { name: 'Voice input', exact: true })).toBeVisible()
-      await expect(frame().locator('[data-platform-ui]')).toHaveCount(0)
-      await expect(frame().getByRole('region', { name: 'Email', exact: true })).toHaveCount(0)
-      assert.deepEqual(
-        await frame().evaluate(() =>
-          performance
-            .getEntriesByType('resource')
-            .map((entry) => entry.name)
-            .filter((name) => /\/home\/(email|calendar)|\/usage\/activity/.test(name))
-        ),
-        []
-      )
       await screenshot('organization-new-chat')
       await setPanelViewport(320, 844)
       await screenshot('organization-microphone-320')
diff --git a/apps/sim/scripts/test-org-redesign-e2e.ts b/apps/sim/scripts/test-org-redesign-e2e.ts
deleted file mode 100644
index 9d3e4c85913..00000000000
--- a/apps/sim/scripts/test-org-redesign-e2e.ts
+++ /dev/null
@@ -1,3379 +0,0 @@
-import assert from 'node:assert/strict'
-import { mkdirSync, writeFileSync } from 'node:fs'
-import { mkdir } from 'node:fs/promises'
-import { dirname, resolve } from 'node:path'
-import {
-  type Browser,
-  type BrowserContext,
-  expect as browserExpect,
-  chromium,
-  type Locator,
-  type Page,
-  type Request,
-} from '@playwright/test'
-import { assertDisposableTestDatabaseUrl } from '@sim/db/testing/test-infrastructure'
-import { createLogger } from '@sim/logger'
-import { createDeferred } from '@sim/testing/helpers/deferred'
-import { getErrorMessage } from '@sim/utils/errors'
-import { sleep } from '@sim/utils/helpers'
-import { escapeRegExp, truncate } from '@sim/utils/string'
-import { makeSignature } from 'better-auth/crypto'
-import postgres from 'postgres'
-import { mapWithConcurrency } from '@/lib/core/utils/concurrency'
-import {
-  ADMIN,
-  ADMIN_CHATS,
-  CONNECTED,
-  type EVERYONE,
-  GRANTS,
-  LINK_COUNT,
-  MEMBER,
-  MEMBER_ADMIN_WORKSPACE,
-  MEMBER_CHATS,
-  MEMBER_WRITE_WORKSPACE,
-  NAMED_LINKS,
-  NARROW,
-  ORGANIZATION_ID,
-  ORGANIZATION_NAME,
-  OUTSIDE_ORGANIZATION_ID,
-  OUTSIDER,
-  OWNER,
-  PASSWORD,
-  SEEDED_SOURCE,
-  STANDARD_GROUP_ID,
-  WORKSPACES,
-} from '@/scripts/org-redesign-e2e/fixture'
-import { SIDEBAR_WIDTH } from '@/stores/constants'
-
-/**
- * Acceptance for the organization view against a hosted production build, real Postgres and Redis,
- * and a scripted model. Walks what each persona could see and do before the redesign, as behaviour:
- * every section's rows are present and work, in both themes at both widths, with no runtime error
- * and no failed same-origin request. One failed check never stops the walk, so a run reports them
- * all. Google answers only to real credentials, so the widget reads are replaced at the browser's
- * network boundary; `home-widgets.integration.ts` proves the reads behind them.
- *
- * Requires ORG_REDESIGN_E2E_ORIGIN, ORG_REDESIGN_E2E_DATABASE_URL, ORG_REDESIGN_E2E_AUTH_SECRET and
- * ORG_REDESIGN_E2E_REPORT_PATH. ORG_REDESIGN_E2E_PHASE picks `main`, or `people` for an app started
- * with the People flag on.
- */
-const logger = createLogger('OrgRedesignE2E')
-const expect = browserExpect.configure({ timeout: 20_000 })
-
-function requiredEnvironment(name: string): string {
-  const value = process.env[name]
-  assert(value, `${name} must be explicitly provided`)
-  return value
-}
-
-const origin = new URL(requiredEnvironment('ORG_REDESIGN_E2E_ORIGIN')).origin
-const databaseUrl = assertDisposableTestDatabaseUrl(
-  requiredEnvironment('ORG_REDESIGN_E2E_DATABASE_URL')
-)
-const authSecret = requiredEnvironment('ORG_REDESIGN_E2E_AUTH_SECRET')
-const reportPath = resolve(requiredEnvironment('ORG_REDESIGN_E2E_REPORT_PATH'))
-const phase = process.env.ORG_REDESIGN_E2E_PHASE ?? 'main'
-const artifactDirectory = `${reportPath}.artifacts`
-const sql = postgres(databaseUrl.toString(), { max: 2 })
-const root = `/o/${ORGANIZATION_ID}`
-const url = (path: string) => `${origin}${path}`
-const orgUrl = (path: string) => url(`${root}${path}`)
-
-type Persona = (typeof EVERYONE)[number]
-type Status = 'passed' | 'failed' | 'skipped'
-type Theme = 'light' | 'dark'
-interface Viewport {
-  name: string
-  width: number
-  height: number
-}
-
-const DESKTOP: Viewport = { name: 'desktop', width: 1440, height: 900 }
-const PHONE: Viewport = { name: 'phone', width: 390, height: 844 }
-const CHECK_TIMEOUT_MS = 180_000
-const WALK_CONCURRENCY = 4
-
-interface Problem {
-  check: string
-  kind: 'runtime' | 'console' | 'http' | 'network'
-  url: string
-  detail: string
-}
-
-interface FirstPaint {
-  persona: string
-  page: string
-  firstPaintMs: number | null
-  firstContentfulPaintMs: number | null
-  primaryVisibleMs: number
-  apiRequests: string[]
-  totalRequestCount: number
-  duplicates: string[]
-  prefetchedAndRefetched: string[]
-}
-
-const checks: {
-  name: string
-  section: string
-  status: Status
-  durationMs: number
-  error?: string
-}[] = []
-const routes: {
-  persona: string
-  route: string
-  viewport: string
-  theme: Theme
-  status: number | null
-  finalPath: string
-  screenshot: string | null
-  platformSurfaces: number
-}[] = []
-const firstPaints: FirstPaint[] = []
-const unexpected: Problem[] = []
-let clientAddress = 0
-let currentCheck = 'Setup'
-let currentSection = 'Setup'
-/** What the running check expects to fail; everything else is reported. */
-let allowedFailures: RegExp[] = []
-
-const HANDLED_RUNTIME = /NEXT_REDIRECT|NEXT_HTTP_ERROR_FALLBACK/
-/** A Suspense boundary the server gave up on, which is only fine when it was a redirect or not-found. */
-const STREAMED_FAILURE = /Minified React error #419/
-const HIGH_VOLUME_REQUEST = /\/api\/mothership\/events|\/socket\.io\//
-
-const browser: Browser = await chromium.launch()
-
-function reportCounts() {
-  const counts = { passed: 0, failed: 0, skipped: 0 }
-  for (const entry of checks) counts[entry.status] += 1
-  return counts
-}
-
-/** Written as the run goes, so a job that runs out of time still leaves what it found. */
-function writeReport() {
-  mkdirSync(dirname(reportPath), { recursive: true })
-  writeFileSync(
-    reportPath,
-    `${JSON.stringify(
-      {
-        status: process.exitCode ? 'failed' : 'passed',
-        phase,
-        counts: reportCounts(),
-        checks,
-        unexpected,
-        firstPaints,
-        routes,
-        artifactDirectory,
-      },
-      null,
-      2
-    )}\n`
-  )
-}
-
-function isSameOrigin(address: string) {
-  try {
-    return new URL(address).origin === origin
-  } catch {
-    return false
-  }
-}
-
-function pathOf(address: string) {
-  const parsed = new URL(address)
-  return `${parsed.pathname}${parsed.search}`
-}
-
-function recordProblem(kind: Problem['kind'], address: string, detail: string) {
-  const signature = `${kind} ${address} ${detail}`
-  if (allowedFailures.some((pattern) => pattern.test(signature))) return
-  if (
-    unexpected.some(
-      (entry) => entry.check === currentCheck && entry.kind === kind && entry.detail === detail
-    )
-  )
-    return
-  unexpected.push({ check: currentCheck, kind, url: address, detail: truncate(detail, 500) })
-}
-
-class Session {
-  private readonly inflight = new Set<Request>()
-  private lastActivity = Date.now()
-  readonly requests: { method: string; path: string; type: string }[] = []
-
-  constructor(
-    readonly context: BrowserContext,
-    readonly page: Page
-  ) {
-    page.on('pageerror', (error) => {
-      if (!HANDLED_RUNTIME.test(error.message) && !STREAMED_FAILURE.test(error.message))
-        recordProblem('runtime', page.url(), error.message)
-    })
-    page.on('console', (message) => {
-      if (message.type() !== 'error') return
-      const text = message.text()
-      if (
-        /content security policy|hydrat|minified react error/i.test(text) &&
-        !HANDLED_RUNTIME.test(text) &&
-        !STREAMED_FAILURE.test(text)
-      )
-        recordProblem('console', page.url(), text)
-    })
-    page.on('request', (request) => {
-      if (HIGH_VOLUME_REQUEST.test(request.url())) return
-      this.inflight.add(request)
-      this.lastActivity = Date.now()
-      if (isSameOrigin(request.url()))
-        this.requests.push({
-          method: request.method(),
-          path: pathOf(request.url()),
-          type: request.resourceType(),
-        })
-    })
-    const settled = (request: Request) => {
-      this.inflight.delete(request)
-      this.lastActivity = Date.now()
-    }
-    page.on('requestfinished', settled)
-    page.on('requestfailed', (request) => {
-      settled(request)
-      const reason = request.failure()?.errorText ?? 'failed'
-      if (
-        isSameOrigin(request.url()) &&
-        reason !== 'net::ERR_ABORTED' &&
-        !HIGH_VOLUME_REQUEST.test(request.url())
-      )
-        recordProblem(
-          'network',
-          request.url(),
-          `${request.method()} ${pathOf(request.url())} ${reason}`
-        )
-    })
-    page.on('response', (response) => {
-      if (response.status() < 400 || !isSameOrigin(response.url())) return
-      recordProblem(
-        'http',
-        response.url(),
-        `${response.status()} ${response.request().method()} ${pathOf(response.url())}`
-      )
-    })
-  }
-
-  /** Quiet for 400ms, ignoring the SSE and socket connections that never finish. */
-  async settle(maxMs = 8_000) {
-    const deadline = Date.now() + maxMs
-    while (Date.now() < deadline) {
-      if (this.inflight.size === 0 && Date.now() - this.lastActivity > 400) return
-      await sleep(100)
-    }
-  }
-}
-
-async function cookieFor(persona: Persona) {
-  return encodeURIComponent(
-    `${persona.sessionToken}.${await makeSignature(persona.sessionToken, authSecret)}`
-  )
-}
-
-async function sessionCookie(persona: Persona) {
-  return {
-    name: 'better-auth.session_token',
-    value: await cookieFor(persona),
-    url: origin,
-    httpOnly: true,
-    sameSite: 'Lax' as const,
-  }
-}
-
-interface OpenOptions {
-  viewport?: Viewport
-  theme?: Theme
-}
-
-async function open(persona: Persona | null, options: OpenOptions = {}): Promise<Session> {
-  const viewport = options.viewport ?? DESKTOP
-  clientAddress += 1
-  const context = await browser.newContext({
-    // Better Auth limits by address, and hundreds of loads from one would be nobody's real traffic.
-    extraHTTPHeaders: {
-      'x-forwarded-for': `10.0.${Math.floor(clientAddress / 250)}.${clientAddress % 250}`,
-    },
-    viewport: { width: viewport.width, height: viewport.height },
-    colorScheme: options.theme ?? 'light',
-    hasTouch: viewport === PHONE,
-    isMobile: viewport === PHONE,
-  })
-  await context.exposeBinding(
-    'reportStreamedFailure',
-    (_source, address: string, message: string, digests: string[]) => {
-      if (!digests.some((digest) => HANDLED_RUNTIME.test(digest)))
-        recordProblem('runtime', address, `${message} digests: ${digests.join(', ')}`)
-    }
-  )
-  await context.addInitScript((pattern) => {
-    window.addEventListener('error', (event) => {
-      if (!new RegExp(pattern).test(event.message)) return
-      const digests = Array.from(document.querySelectorAll('template[data-dgst]')).map(
-        (template) => template.getAttribute('data-dgst') ?? ''
-      )
-      if (typeof event.error?.digest === 'string') digests.push(event.error.digest)
-      void (
-        window as typeof window & {
-          reportStreamedFailure: (...args: unknown[]) => Promise<void>
-        }
-      ).reportStreamedFailure(location.href, event.message, digests)
-    })
-  }, STREAMED_FAILURE.source)
-  // Plain HTTP has no Clipboard API, which production's HTTPS has; this records what the app copies.
-  await context.addInitScript(() => {
-    if (navigator.clipboard) return
-    let copied = ''
-    Object.defineProperty(navigator, 'clipboard', {
-      value: {
-        writeText: async (text: string) => {
-          copied = text
-        },
-        write: async () => {},
-        readText: async () => copied,
-      },
-    })
-  })
-  if (persona) await context.addCookies([await sessionCookie(persona)])
-  return new Session(context, await context.newPage())
-}
-
-async function withSession(
-  persona: Persona | null,
-  run: (session: Session) => Promise<void>,
-  options: OpenOptions = {}
-) {
-  const session = await open(persona, options)
-  try {
-    await run(session)
-  } catch (error) {
-    await session.page
-      .screenshot({
-        path: resolve(artifactDirectory, `failure-${checks.length + 1}.png`),
-        timeout: 5_000,
-      })
-      .catch(() => {})
-    throw error
-  } finally {
-    await session.context.close().catch(() => {})
-  }
-}
-
-function section(name: string) {
-  currentSection = name
-  writeReport()
-}
-
-interface CheckOptions {
-  /** Failures this check provokes on purpose. */
-  allow?: RegExp[]
-}
-
-function record(name: string, section: string, started: number, error?: string) {
-  checks.push({
-    name,
-    section,
-    status: error ? 'failed' : 'passed',
-    durationMs: Math.round(performance.now() - started),
-    ...(error ? { error } : {}),
-  })
-  if (error) logger.error(`FAIL ${section}: ${name}`, { error })
-  else logger.info(`PASS ${section}: ${name}`)
-}
-
-async function check(name: string, run: () => Promise<void>, options: CheckOptions = {}) {
-  currentCheck = `${currentSection}: ${name}`
-  allowedFailures = options.allow ?? []
-  const started = performance.now()
-  const timeout = createDeferred<never>()
-  const timer = setTimeout(
-    () => timeout.reject(new Error(`Timed out after ${CHECK_TIMEOUT_MS}ms`)),
-    CHECK_TIMEOUT_MS
-  )
-  try {
-    await Promise.race([run(), timeout.promise])
-    record(name, currentSection, started)
-  } catch (error) {
-    record(name, currentSection, started, truncate(getErrorMessage(error), 2000))
-  } finally {
-    clearTimeout(timer)
-    allowedFailures = []
-  }
-}
-
-/** A baseline row this environment cannot exercise, kept in the report with its reason. */
-function notProvable(name: string, reason: string) {
-  checks.push({ name, section: currentSection, status: 'skipped', durationMs: 0, error: reason })
-}
-
-/**
- * Fails a page's own read at its source, so its server seed stays out of hydration and the client
- * read fails too: the only way a seeded page reaches its error state. `restore` lets a check retry.
- */
-async function withTableHidden(
-  table: string,
-  run: (restore: () => Promise<void>) => Promise<void>
-) {
-  const hidden = `${table}_e2e_hidden`
-  await sql.unsafe(`alter table "${table}" rename to "${hidden}"`)
-  let restored = false
-  const restore = async () => {
-    if (restored) return
-    restored = true
-    await sql.unsafe(`alter table "${hidden}" rename to "${table}"`)
-  }
-  try {
-    await run(restore)
-  } finally {
-    await restore()
-  }
-}
-
-const menuEntry = (page: Page, name: string | RegExp) =>
-  page.getByRole('menuitem', { name, exact: typeof name === 'string' })
-
-const sidebar = (page: Page) => page.getByRole('complementary', { name: 'Organization sidebar' })
-const mainNav = (page: Page) => page.getByRole('navigation', { name: 'Main navigation' })
-const composer = (page: Page) => page.getByRole('textbox', { name: 'Ask Sim' })
-const searchField = (page: Page) => page.getByRole('textbox', { name: 'Search your sources' })
-const dialog = (page: Page, name: string | RegExp) => page.getByRole('dialog', { name })
-const orgChip = (page: Page) => page.getByRole('button', { name: 'Organization menu' })
-const orgCard = (page: Page) => dialog(page, 'Organization menu')
-const homeRegion = (page: Page, name: string) => page.getByRole('region', { name, exact: true })
-
-async function navLabels(page: Page) {
-  const links = mainNav(page).getByRole('link')
-  await expect(links.first()).toBeVisible()
-  return links.allInnerTexts()
-}
-
-async function expectPageNotFound(page: Page) {
-  await expect(page.getByRole('heading', { name: 'Page not found' })).toBeVisible()
-}
-
-/** A rail row's link. A workspace's name also reads through its avatar. */
-const railLink = (page: Page, label: string) =>
-  sidebar(page).getByRole('link', { name: new RegExp(`(^| )${escapeRegExp(label)}$`) })
-
-const accountChip = (page: Page) =>
-  sidebar(page).getByRole('button', { name: 'Account menu', exact: true })
-
-/** The row around a rail link: its status glyph sits beside the link, not in it. */
-const railRow = (page: Page, label: string) => railLink(page, label).locator('xpath=..')
-
-const railSection = (page: Page, name: string) =>
-  sidebar(page).locator('summary', { hasText: name })
-
-/** Opens a section row's options menu: the button appears on hover. */
-async function openRowMenu(page: Page, label: string) {
-  const link = railLink(page, label)
-  await link.hover()
-  await sidebar(page)
-    .getByRole('button', { name: `Actions for ${label}`, exact: true })
-    .click()
-  return page.getByRole('menu', { name: `Actions for ${label}` })
-}
-
-async function clipboard(page: Page) {
-  return page.evaluate(() => navigator.clipboard.readText())
-}
-
-async function assertNoHorizontalOverflow(page: Page, label: string) {
-  const { scrollWidth, width } = await page.evaluate(() => ({
-    scrollWidth: document.documentElement.scrollWidth,
-    width: innerWidth,
-  }))
-  assert(scrollWidth <= width + 1, `${label} overflows: ${scrollWidth}px in ${width}px`)
-}
-
-async function landingChecks() {
-  section('1 Where they land')
-  await check('a member signing in lands on Home, not Search', async () => {
-    await withSession(null, async ({ page }) => {
-      await page.goto(url('/login'))
-      await page.locator('#email').fill(MEMBER.email)
-      await page.locator('#password').fill(PASSWORD)
-      await page.getByRole('button', { name: 'Sign in', exact: true }).click()
-      await expect(page).toHaveURL(orgUrl('/home'), { timeout: 45_000 })
-      await expect(composer(page)).toBeVisible()
-    })
-  })
-  for (const persona of [MEMBER, ADMIN, OWNER, NARROW]) {
-    await check(
-      `${persona.key}: /o and /o/[id] and /home reach Home with no Search redirect`,
-      async () => {
-        await withSession(persona, async ({ page }) => {
-          for (const path of ['/o', root, '/home']) {
-            await page.goto(url(path))
-            await expect(page).toHaveURL(orgUrl('/home'))
-          }
-          await expect(composer(page)).toBeVisible()
-        })
-      }
-    )
-  }
-  await check('member: Search first load pins the saved mode into the URL', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/search'))
-      await expect(page).toHaveURL(orgUrl('/search?mode=search'))
-      await expect(searchField(page)).toBeVisible()
-    })
-  })
-  await check('assistant chats redirect into Search from /chat', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl(`/chat/${MEMBER_CHATS.assistant.id}`))
-      await expect(page).toHaveURL(orgUrl(`/search/chat/${MEMBER_CHATS.assistant.id}`))
-      await expect(
-        page.getByText(`Here is what I found about ${MEMBER_CHATS.assistant.title}.`)
-      ).toBeVisible()
-    })
-  })
-  await check(
-    'an agent chat is not found for a member and renders for an admin',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl(`/chat/${MEMBER_CHATS.agent.id}`))
-        await expectPageNotFound(page)
-        await page.goto(orgUrl(`/search/chat/${MEMBER_CHATS.agent.id}`))
-        await expectPageNotFound(page)
-      })
-      await withSession(ADMIN, async ({ page }) => {
-        await page.goto(orgUrl(`/search/chat/${ADMIN_CHATS.agent.id}`))
-        await expect(page).toHaveURL(orgUrl(`/chat/${ADMIN_CHATS.agent.id}`))
-        await expect(
-          page.getByText(`Here is what I found about ${ADMIN_CHATS.agent.title}.`)
-        ).toBeVisible()
-      })
-    },
-    { allow: [/404 GET \/(o|api\/mothership)\//] }
-  )
-  await check(
-    'a chat that is not theirs, or in another organization, is not found',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl(`/chat/${ADMIN_CHATS.agent.id}`))
-        await expectPageNotFound(page)
-        await page.goto(orgUrl(`/search/chat/${ADMIN_CHATS.assistant.id}`))
-        await expectPageNotFound(page)
-        await page.getByRole('link', { name: 'Return home', exact: true }).click()
-        await expect(page).toHaveURL(orgUrl('/home'))
-        await expect(composer(page)).toBeVisible()
-      })
-    },
-    { allow: [/404 GET \/(o|api\/mothership)\//] }
-  )
-  await check('signed out, every organization route goes to login', async () => {
-    await withSession(null, async ({ page }) => {
-      for (const path of [
-        '/home',
-        '/links',
-        '/integrations?connectorType=gmail&provider=gmail&connectionMode=live&optionId=gmail',
-      ]) {
-        await page.goto(orgUrl(`${path}`))
-        await expect(page).toHaveURL((address) => address.pathname === '/login')
-      }
-    })
-  })
-  notProvable(
-    'Signed out: callbackUrl keeps the org root or page',
-    'proxy.ts answers a cookieless request with a bare /login first; unchanged from staging'
-  )
-  await check('a non-member sees the denial and a way to their workspaces', async () => {
-    await withSession(OUTSIDER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await expect(page.getByRole('heading', { name: 'Organization access denied' })).toBeVisible()
-      await expect(page.getByRole('link', { name: 'View your workspaces' })).toBeVisible()
-      await expect(page.locator('[data-platform-ui]')).toHaveCount(0)
-    })
-  })
-  await check(
-    'settings redirects and aliases resolve, and unavailable sections are not found',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl('/settings'))
-        await expect(page).toHaveURL(orgUrl('/settings/general'))
-        await page.goto(orgUrl('/settings/authorized-apps'))
-        await expect(page).toHaveURL(
-          (address) =>
-            address.pathname === `${root}/settings/general` &&
-            address.searchParams.get('view') === 'authorized-apps'
-        )
-        await page.goto(orgUrl('/settings/team'))
-        await expect(page.getByPlaceholder('Search members...')).toBeVisible()
-        await page.goto(orgUrl('/access-requests'))
-        await expect(page).toHaveURL((address) => address.pathname === `${root}/settings/requests`)
-        await page.goto(orgUrl('/settings/audit-logs'))
-        await expectPageNotFound(page)
-      })
-    },
-    { allow: [/404 GET \/o\//] }
-  )
-  await check(
-    'People is not found with its flag off, and bad Integrations params are not found',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl('/people'))
-        await expectPageNotFound(page)
-        await page.goto(orgUrl('/integrations?connectorType=not-a-connector'))
-        await expectPageNotFound(page)
-        await page.goto(orgUrl('/integrations?slack=!!'))
-        await expectPageNotFound(page)
-      })
-    },
-    { allow: [/404 GET \/o\//] }
-  )
-}
-
-async function sidebarChecks() {
-  section('2 Sidebar: nav')
-  for (const persona of [MEMBER, ADMIN, OWNER, NARROW]) {
-    await check(`${persona.key}: nav rows in today's order, plus Home for members`, async () => {
-      await withSession(persona, async ({ page }) => {
-        await page.goto(orgUrl('/home'))
-        assert.deepEqual(await navLabels(page), ['Home', 'Search', 'Integrations', 'Links'])
-      })
-    })
-  }
-  await check('the current row is lit on descendants, and none on an agent chat', async () => {
-    await withSession(ADMIN, async ({ page }) => {
-      await page.goto(orgUrl(`/search/chat/${ADMIN_CHATS.assistant.id}`))
-      await expect(mainNav(page).getByRole('link', { name: 'Search' })).toHaveAttribute(
-        'aria-current',
-        'page'
-      )
-      await page.goto(orgUrl(`/chat/${ADMIN_CHATS.agent.id}`))
-      await expect(mainNav(page).locator('[aria-current="page"]')).toHaveCount(0)
-    })
-  })
-  await check(
-    'right click on a nav row: Open in new tab and Copy link with the full URL',
-    async () => {
-      await withSession(MEMBER, async ({ page, context }) => {
-        await page.goto(orgUrl('/home'))
-        const row = mainNav(page).getByRole('link', { name: 'Links', exact: true })
-        await row.click({ button: 'right' })
-        await menuEntry(page, 'Copy link').click()
-        await expect.poll(() => clipboard(page)).toBe(orgUrl('/links'))
-        await row.click({ button: 'right' })
-        const popup = context.waitForEvent('page')
-        await menuEntry(page, 'Open in new tab').click()
-        await expect(await popup).toHaveURL(orgUrl('/links'))
-      })
-    }
-  )
-  await check('hover warms Links and Integrations through their own reads', async () => {
-    await withSession(MEMBER, async (session) => {
-      const { page } = session
-      await page.goto(orgUrl('/home'))
-      await session.settle()
-      session.requests.length = 0
-      await mainNav(page).getByRole('link', { name: 'Links', exact: true }).hover()
-      await expect
-        .poll(() => session.requests.some(({ path }) => path.includes('/sim-links')))
-        .toBe(true)
-    })
-  })
-
-  section('2 Sidebar: rail chrome')
-  await check(
-    'collapse button and Mod+B toggle the icon rail, kept by cookie with no flash',
-    async () => {
-      await withSession(MEMBER, async ({ page, context }) => {
-        await page.goto(orgUrl('/home'))
-        const rail = sidebar(page)
-        await page.getByRole('button', { name: 'Collapse sidebar', exact: true }).click()
-        await expect(rail).toHaveAttribute('data-collapsed', 'true')
-        await expect
-          .poll(async () => Math.round((await rail.boundingBox())?.width ?? 0))
-          .toBe(SIDEBAR_WIDTH.COLLAPSED)
-        await expect
-          .poll(
-            async () => (await context.cookies()).find((c) => c.name === 'sidebar_collapsed')?.value
-          )
-          .toBe('1')
-        const html = await (await context.request.get(orgUrl('/home'))).text()
-        assert(/aria-label="Organization sidebar"/.test(html), 'The rail is in the document')
-        assert(
-          /data-collapsed="true"[^>]*aria-label="Organization sidebar"|aria-label="Organization sidebar"[^>]*data-collapsed="true"/.test(
-            html
-          ),
-          'The server rendered it collapsed'
-        )
-        await page.reload()
-        await expect(rail).toHaveAttribute('data-collapsed', 'true')
-        await page.locator('body').click({ position: { x: 700, y: 20 } })
-        await page.keyboard.press('Control+b')
-        await expect(rail).not.toHaveAttribute('data-collapsed', 'true')
-        await composer(page).click()
-        await page.keyboard.press('Control+b')
-        await expect(rail).not.toHaveAttribute('data-collapsed', 'true')
-      })
-    }
-  )
-  await check(
-    'collapsed: tooltips name the rows, flyouts show every row, keyboard expands',
-    async () => {
-      await withSession(ADMIN, async ({ page }) => {
-        await page.goto(orgUrl('/home'))
-        await page.getByRole('button', { name: 'Collapse sidebar', exact: true }).click()
-        await mainNav(page).getByRole('link', { name: 'Search', exact: true }).hover()
-        await expect(page.getByRole('tooltip').filter({ hasText: 'Search' })).toBeVisible()
-        await sidebar(page).getByRole('button', { name: 'Workspaces', exact: true }).hover()
-        const flyout = dialog(page, 'Workspaces')
-        await expect(flyout).toBeVisible()
-        for (const { name } of WORKSPACES)
-          await expect(flyout.getByText(name, { exact: true })).toBeVisible()
-        await expect(flyout.getByText('New workspace')).toBeVisible()
-        await page.mouse.move(800, 500)
-        await sidebar(page).getByRole('button', { name: 'Chats', exact: true }).hover()
-        const chats = dialog(page, 'Chats')
-        await expect(chats.getByText(ADMIN_CHATS.agent.title)).toBeVisible()
-        await page.mouse.move(800, 500)
-        const edge = sidebar(page).getByRole('button', { name: 'Expand sidebar' }).last()
-        await edge.focus()
-        await page.keyboard.press('Enter')
-        await expect(sidebar(page)).not.toHaveAttribute('data-collapsed', 'true')
-      })
-    }
-  )
-  await check('a collapsed member flyout omits New workspace', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await page.getByRole('button', { name: 'Collapse sidebar', exact: true }).click()
-      await sidebar(page).getByRole('button', { name: 'Workspaces', exact: true }).hover()
-      const flyout = dialog(page, 'Workspaces')
-      await expect(flyout.getByText(MEMBER_ADMIN_WORKSPACE.name)).toBeVisible()
-      await expect(flyout.getByText('New workspace')).toHaveCount(0)
-    })
-  })
-  await check('dragging the edge resizes the rail', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      const edge = sidebar(page).getByRole('separator', { name: 'Resize sidebar' })
-      const before = (await sidebar(page).boundingBox())?.width ?? 0
-      const box = await edge.boundingBox()
-      assert(box, 'The edge is on screen')
-      await page.mouse.move(box.x + box.width / 2, box.y + 200)
-      await page.mouse.down()
-      await page.mouse.move(box.x + 80, box.y + 200, { steps: 8 })
-      await page.mouse.up()
-      await expect
-        .poll(async () => (await sidebar(page).boundingBox())?.width ?? 0)
-        .toBeGreaterThan(before + 30)
-    })
-  })
-  await check('on a phone the rail is a drawer that opens and closes', async () => {
-    await withSession(
-      MEMBER,
-      async ({ page }) => {
-        await page.goto(orgUrl('/home'))
-        await expect(composer(page)).toBeVisible()
-        await expect(
-          page.getByRole('button', { name: 'Collapse sidebar', exact: true })
-        ).toBeHidden()
-        const toggle = page.getByRole('button', { name: /open (sidebar|menu|navigation)/i }).first()
-        await toggle.tap()
-        await expect(mainNav(page).getByRole('link', { name: 'Links', exact: true })).toBeVisible()
-        await mainNav(page).getByRole('link', { name: 'Links', exact: true }).tap()
-        await expect(page).toHaveURL(orgUrl('/links'))
-        await expect(page.getByRole('heading', { name: 'Links' })).toBeVisible()
-      },
-      { viewport: PHONE }
-    )
-  })
-  await check('the rail swaps to Settings navigation and back', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/settings/general'))
-      await expect(mainNav(page)).toHaveCount(0)
-      await expect(sidebar(page).getByRole('link', { name: 'Members', exact: true })).toBeVisible()
-      await sidebar(page).getByRole('button', { name: 'Back', exact: true }).click()
-      await expect(page).toHaveURL(orgUrl('/home'))
-      await expect(composer(page)).toBeVisible()
-    })
-  })
-  notProvable('Hover peek on the macOS desktop app', 'Needs the packaged desktop app on macOS')
-  notProvable('Impersonation banner', 'Needs an admin impersonation session')
-
-  section('2 Sidebar: org card')
-  await check(
-    'chip names the organization; a member gets a read-only card with Settings',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl('/home'))
-        const chip = orgChip(page)
-        await expect(chip).toContainText(ORGANIZATION_NAME)
-        await chip.click()
-        const card = orgCard(page)
-        await expect(card.getByText(/\d+ members?/)).toBeVisible()
-        await expect(card.getByRole('button', { name: 'Rename organization' })).toHaveCount(0)
-        await expect(card.getByRole('button', { name: 'Change organization logo' })).toHaveCount(0)
-        await expect(card.getByRole('button', { name: 'Invite', exact: true })).toHaveCount(0)
-        await card.getByRole('button', { name: 'Settings', exact: true }).click()
-        await expect(page).toHaveURL(orgUrl('/settings/members'))
-      })
-    }
-  )
-  await check(
-    'an admin renames inline: Enter saves, Escape cancels, and it survives reload',
-    async () => {
-      await withSession(ADMIN, async ({ page }) => {
-        await page.goto(orgUrl('/home'))
-        const chip = orgChip(page)
-        const card = orgCard(page)
-        async function startRename() {
-          if (!(await card.isVisible())) await chip.click()
-          await card.getByRole('button', { name: 'Rename organization' }).click()
-          return card.getByRole('textbox', { name: 'Organization name' })
-        }
-        const renamed = `${ORGANIZATION_NAME} Group`
-        const field = await startRename()
-        await field.fill('Discarded name')
-        await field.press('Escape')
-        await expect(card.getByText(ORGANIZATION_NAME, { exact: true })).toBeVisible()
-        const again = await startRename()
-        await again.fill(renamed)
-        await again.press('Enter')
-        await expect(chip).toContainText(renamed)
-        await page.reload()
-        await expect(chip).toContainText(renamed)
-        const restore = await startRename()
-        await restore.fill(ORGANIZATION_NAME)
-        await restore.press('Enter')
-        await expect
-          .poll(
-            async () =>
-              (await sql`select name from organization where id = ${ORGANIZATION_ID}`)[0]?.name
-          )
-          .toBe(ORGANIZATION_NAME)
-        await expect(chip).toContainText(ORGANIZATION_NAME)
-      })
-    }
-  )
-  await check(
-    'a failed rename shows inline and holds the menu open',
-    async () => {
-      await withSession(ADMIN, async ({ page }) => {
-        await page.route(`**/api/organizations/${ORGANIZATION_ID}`, (route) =>
-          route.request().method() === 'PATCH' || route.request().method() === 'PUT'
-            ? route.fulfill({ status: 400, json: { error: 'That name is taken' } })
-            : route.continue()
-        )
-        await page.goto(orgUrl('/home'))
-        await orgChip(page).click()
-        const card = orgCard(page)
-        await card.getByRole('button', { name: 'Rename organization' }).click()
-        const field = card.getByRole('textbox', { name: 'Organization name' })
-        await field.fill('Taken name')
-        await field.press('Enter')
-        await expect(card.getByRole('alert')).toBeVisible()
-        await expect(card).toBeVisible()
-      })
-    },
-    { allow: [/400 (PATCH|PUT) \/api\/organizations\//] }
-  )
-  await check(
-    'an admin can change the logo from the card',
-    async () => {
-      await withSession(ADMIN, async ({ page }) => {
-        await page.goto(orgUrl('/home'))
-        await orgChip(page).click()
-        const card = orgCard(page)
-        await expect(card.getByRole('button', { name: 'Change organization logo' })).toBeEnabled()
-        const upload = page.waitForRequest(
-          (request) =>
-            request.method() !== 'GET' && /\/api\/(files|organizations)\//.test(request.url())
-        )
-        await page.getByLabel('Organization logo').setInputFiles({
-          name: 'logo.png',
-          mimeType: 'image/png',
-          buffer: Buffer.from(
-            'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==',
-            'base64'
-          ),
-        })
-        await upload
-      })
-    },
-    { allow: [/\/api\/files\//] }
-  )
-  await check('Invite follows the default group, and an admin invites when it allows', async () => {
-    await withSession(ADMIN, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await orgChip(page).click()
-      await expect(orgCard(page).getByRole('button', { name: 'Invite', exact: true })).toHaveCount(
-        0
-      )
-      await sql`update permission_group set config = config - 'disableInvitations' where id = ${STANDARD_GROUP_ID}`
-      await page.reload()
-      await orgChip(page).click()
-      await orgCard(page).getByRole('button', { name: 'Invite', exact: true }).click()
-      const modal = dialog(page, 'Invite people')
-      await expect(modal).toBeVisible()
-      const field = modal.getByRole('textbox', { name: 'Email addresses' })
-      await field.fill(`invitee@org-redesign.test`)
-      await field.press('Enter')
-      await expect(
-        modal.getByRole('combobox', { name: 'Role' }).or(modal.getByLabel('Role'))
-      ).toBeVisible()
-      await field.fill('refused@org-redesign.test')
-      await field.press('Enter')
-      await expect(modal.getByRole('button', { name: 'Send invites' })).toBeEnabled()
-      await page.route('**/api/workspaces/invitations/batch', (route) =>
-        route.fulfill({
-          json: {
-            success: false,
-            successful: ['invitee@org-redesign.test'],
-            added: [],
-            failed: [{ email: 'refused@org-redesign.test', error: 'Seat limit reached' }],
-            invitations: [],
-          },
-        })
-      )
-      await modal.getByRole('button', { name: 'Send invites' }).click()
-      await expect(modal.getByRole('alert')).toBeVisible()
-      await expect(modal.getByText('refused@org-redesign.test')).toBeVisible()
-      await expect(modal.getByText('invitee@org-redesign.test')).toHaveCount(0)
-      await modal.getByRole('button', { name: 'Cancel' }).click()
-      await expect(modal).toHaveCount(0)
-    }).finally(
-      () =>
-        sql`update permission_group set config = config || '{"disableInvitations":true}'::jsonb where id = ${STANDARD_GROUP_ID}`
-    )
-  })
-
-  section('2 Sidebar: workspaces')
-  await check('a member sees only their workspaces; + is disabled and says why', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await expect(
-        sidebar(page).getByRole('link', { name: MEMBER_ADMIN_WORKSPACE.name })
-      ).toBeVisible()
-      await expect(
-        sidebar(page).getByRole('link', { name: MEMBER_WRITE_WORKSPACE.name })
-      ).toBeVisible()
-      await expect(railLink(page, 'Finance')).toHaveCount(0)
-      await expect(
-        sidebar(page).getByRole('button', {
-          name: /Only organization owners and admins can create organization workspaces/,
-        })
-      ).toBeDisabled()
-    })
-  })
-  await check('no workspaces says so', async () => {
-    await withSession(NARROW, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await expect(sidebar(page).getByText('No workspaces yet')).toBeVisible()
-    })
-  })
-  await check('an admin pages through workspaces and the section collapses', async () => {
-    await withSession(ADMIN, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      const rail = sidebar(page)
-      await expect(rail.getByRole('link', { name: WORKSPACES[4].name })).toBeVisible()
-      await expect(rail.getByRole('link', { name: WORKSPACES[6].name })).toHaveCount(0)
-      await rail.getByRole('button', { name: 'See more' }).click()
-      await expect(rail.getByRole('link', { name: WORKSPACES[6].name })).toBeVisible()
-      await rail.getByRole('button', { name: 'See less' }).click()
-      await expect(rail.getByRole('link', { name: WORKSPACES[6].name })).toHaveCount(0)
-      await railSection(page, 'Workspaces').click()
-      await expect(railLink(page, WORKSPACES[0].name)).toBeHidden()
-    })
-  })
-  await check(
-    'workspace menu: Open in new tab, Pin, Rename gated, nothing destructive',
-    async () => {
-      await withSession(MEMBER, async ({ page, context }) => {
-        await page.goto(orgUrl('/home'))
-        const writeMenu = await openRowMenu(page, MEMBER_WRITE_WORKSPACE.name)
-        await expect(menuEntry(page, 'Rename')).toBeDisabled()
-        await expect(writeMenu.getByRole('menuitem')).toHaveText([
-          'Open in new tab',
-          'Pin',
-          'Rename',
-        ])
-        await page.keyboard.press('Escape')
-        await openRowMenu(page, MEMBER_ADMIN_WORKSPACE.name)
-        await expect(menuEntry(page, 'Rename')).toBeEnabled()
-        await menuEntry(page, 'Pin').click()
-        await expect(
-          railRow(page, MEMBER_ADMIN_WORKSPACE.name).getByRole('img', { name: 'Pinned' })
-        ).toBeVisible()
-        await openRowMenu(page, MEMBER_ADMIN_WORKSPACE.name)
-        await menuEntry(page, 'Unpin').click()
-        await openRowMenu(page, MEMBER_ADMIN_WORKSPACE.name)
-        const popup = context.waitForEvent('page')
-        await menuEntry(page, 'Open in new tab').click()
-        await expect(await popup).toHaveURL((address) =>
-          address.pathname.startsWith(`/workspace/${MEMBER_ADMIN_WORKSPACE.id}`)
-        )
-      })
-    }
-  )
-  await check('an admin creates a workspace and enters it', async () => {
-    await withSession(ADMIN, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await sidebar(page).getByRole('button', { name: 'New workspace', exact: true }).click()
-      const modal = dialog(page, 'Create workspace')
-      await modal.getByRole('textbox', { name: 'Name' }).fill('Created in acceptance')
-      await modal.getByRole('button', { name: 'Create', exact: true }).click()
-      await expect(page).toHaveURL((address) => address.pathname.startsWith('/workspace/'), {
-        timeout: 45_000,
-      })
-    })
-  })
-  await check('rename a workspace from its menu', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await openRowMenu(page, MEMBER_ADMIN_WORKSPACE.name)
-      await menuEntry(page, 'Rename').click()
-      const modal = dialog(page, 'Rename workspace')
-      const field = modal.getByRole('textbox', { name: 'Name' })
-      await field.fill('Operations East')
-      await modal.getByRole('button', { name: 'Save', exact: true }).click()
-      await expect(sidebar(page).getByRole('link', { name: 'Operations East' })).toBeVisible()
-      await openRowMenu(page, 'Operations East')
-      await menuEntry(page, 'Rename').click()
-      await dialog(page, 'Rename workspace')
-        .getByRole('textbox', { name: 'Name' })
-        .fill(MEMBER_ADMIN_WORKSPACE.name)
-      await dialog(page, 'Rename workspace')
-        .getByRole('button', { name: 'Save', exact: true })
-        .click()
-      await expect(
-        sidebar(page).getByRole('link', { name: MEMBER_ADMIN_WORKSPACE.name })
-      ).toBeVisible()
-    })
-  })
-
-  section('2 Sidebar: chats')
-  await check('rows link by mode, and an empty list says so', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await expect(
-        sidebar(page).getByRole('link', { name: MEMBER_CHATS.assistant.title })
-      ).toHaveAttribute('href', `${root}/search/chat/${MEMBER_CHATS.assistant.id}`)
-    })
-    await withSession(ADMIN, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await expect(
-        sidebar(page).getByRole('link', { name: ADMIN_CHATS.agent.title })
-      ).toHaveAttribute('href', `${root}/chat/${ADMIN_CHATS.agent.id}`)
-    })
-    await withSession(NARROW, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await expect(sidebar(page).getByText('No chats yet')).toBeVisible()
-    })
-  })
-  await check('unread dot, hidden on the chat itself; Mark as read and unread work', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      const row = railRow(page, MEMBER_CHATS.unread.title)
-      await expect(row.getByRole('img', { name: 'Unread' })).toBeVisible()
-      await openRowMenu(page, MEMBER_CHATS.unread.title)
-      await menuEntry(page, 'Mark as read').click()
-      await expect(row.getByRole('img', { name: 'Unread' })).toHaveCount(0)
-      await openRowMenu(page, MEMBER_CHATS.unread.title)
-      await menuEntry(page, 'Mark as unread').click()
-      await expect(row.getByRole('img', { name: 'Unread' })).toBeVisible()
-      await railLink(page, MEMBER_CHATS.unread.title).click()
-      await expect(page).toHaveURL(
-        (address) => address.pathname === `${root}/search/chat/${MEMBER_CHATS.unread.id}`
-      )
-      await expect(row.getByRole('img', { name: 'Unread' })).toHaveCount(0)
-    })
-  })
-  await check('menu: Copy link, Pin, Rename inline, right click opens the same menu', async () => {
-    await withSession(MEMBER, async ({ page, context }) => {
-      await page.goto(orgUrl('/home'))
-      const title = MEMBER_CHATS.assistant.title
-      const row = railLink(page, title)
-      await row.click({ button: 'right' })
-      await expect(page.getByRole('menu').getByRole('menuitem')).toHaveText([
-        'Open in new tab',
-        'Copy link',
-        'Mark as unread',
-        'Pin',
-        'Rename',
-        'Delete',
-      ])
-      await menuEntry(page, 'Copy link').click()
-      await expect
-        .poll(() => clipboard(page))
-        .toBe(orgUrl(`/search/chat/${MEMBER_CHATS.assistant.id}`))
-      await openRowMenu(page, title)
-      await menuEntry(page, 'Pin').click()
-      await expect(railRow(page, title).getByRole('img', { name: 'Pinned' })).toBeVisible()
-      await openRowMenu(page, title)
-      await menuEntry(page, 'Unpin').click()
-      await openRowMenu(page, title)
-      await menuEntry(page, 'Rename').click()
-      const modal = dialog(page, 'Rename chat')
-      await modal.getByRole('textbox', { name: 'Chat name' }).fill(`${title} renamed`)
-      await modal.getByRole('button', { name: 'Save', exact: true }).click()
-      await expect(sidebar(page).getByRole('link', { name: `${title} renamed` })).toBeVisible()
-      await openRowMenu(page, `${title} renamed`)
-      const popup = context.waitForEvent('page')
-      await menuEntry(page, 'Open in new tab').click()
-      await expect(await popup).toHaveURL(orgUrl(`/search/chat/${MEMBER_CHATS.assistant.id}`))
-      await openRowMenu(page, `${title} renamed`)
-      await menuEntry(page, 'Rename').click()
-      await modal.getByRole('textbox', { name: 'Chat name' }).fill(title)
-      await modal.getByRole('button', { name: 'Save', exact: true }).click()
-      await expect(sidebar(page).getByRole('link', { name: title, exact: true })).toBeVisible()
-    })
-  })
-  await check('deleting the open chat returns to where its mode lives', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl(`/search/chat/${MEMBER_CHATS.removable.id}`))
-      await openRowMenu(page, MEMBER_CHATS.removable.title)
-      await menuEntry(page, 'Delete').click()
-      const modal = dialog(page, 'Delete chat')
-      await expect(modal.getByText(MEMBER_CHATS.removable.title)).toBeVisible()
-      await modal.getByRole('button', { name: 'Delete', exact: true }).click()
-      await expect(page).toHaveURL((address) => address.pathname === `${root}/search`)
-      await expect(
-        sidebar(page).getByRole('link', { name: MEMBER_CHATS.removable.title })
-      ).toHaveCount(0)
-    })
-  })
-  await check(
-    'shift click selects a range, background click clears, bulk delete keeps failed rows',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl('/home'))
-        const first = sidebar(page).getByRole('link', { name: MEMBER_CHATS.bulkOne.title })
-        const second = sidebar(page).getByRole('link', { name: MEMBER_CHATS.bulkTwo.title })
-        await first.click({ modifiers: ['Shift'] })
-        await second.click({ modifiers: ['Shift'] })
-        await second.click({ button: 'right' })
-        await expect(page.getByRole('menu').getByRole('menuitem')).toHaveText(['Delete 2 chats'])
-        await page.keyboard.press('Escape')
-        await sidebar(page)
-          .locator('nav')
-          .first()
-          .evaluate((node) => node.parentElement?.click())
-        await second.click({ button: 'right' })
-        await expect(menuEntry(page, 'Delete 2 chats')).toHaveCount(0)
-        await page.keyboard.press('Escape')
-        await first.click({ modifiers: ['Shift'] })
-        await page.route(`**/api/mothership/chats/${MEMBER_CHATS.bulkTwo.id}`, (route) =>
-          route.request().method() === 'DELETE'
-            ? route.fulfill({ status: 500, json: { error: 'No' } })
-            : route.continue()
-        )
-        await second.click({ button: 'right' })
-        await menuEntry(page, 'Delete 2 chats').click()
-        const modal = dialog(page, 'Delete 2 chats')
-        await modal.getByRole('button', { name: 'Delete', exact: true }).click()
-        await expect(first).toHaveCount(0)
-        await expect(second).toBeVisible()
-        await expect(dialog(page, 'Delete chat')).toBeVisible()
-        await page.unrouteAll()
-        await dialog(page, 'Delete chat')
-          .getByRole('button', { name: 'Delete', exact: true })
-          .click()
-        await expect(second).toHaveCount(0)
-      })
-    },
-    { allow: [/500 DELETE \/api\/mothership\/chats\//] }
-  )
-
-  section('2 Sidebar: footer')
-  await check('account chip and menu: Settings and Sign out', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      const chip = accountChip(page)
-      await expect(chip).toContainText(MEMBER.name)
-      await chip.click()
-      const menu = dialog(page, 'Account menu')
-      await expect(menu.getByRole('button', { name: 'Sign out', exact: true })).toBeVisible()
-      await menu.getByRole('button', { name: 'Settings', exact: true }).click()
-      await expect(page).toHaveURL(orgUrl('/settings/general'))
-    })
-  })
-  await check('sign out ends the session', async () => {
-    await withSession(CONNECTED, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await accountChip(page).click()
-      await dialog(page, 'Account menu')
-        .getByRole('button', { name: 'Sign out', exact: true })
-        .click()
-      await expect(page).toHaveURL(
-        (address) => address.pathname === '/login' || address.pathname === '/',
-        { timeout: 30_000 }
-      )
-    })
-    await sql`insert into session (id, token, user_id, active_organization_id, expires_at, created_at, updated_at)
-      values (${`org-redesign-session-row-${CONNECTED.key}`}, ${CONNECTED.sessionToken}, ${CONNECTED.userId}, ${ORGANIZATION_ID}, now() + interval '1 day', now(), now())
-      on conflict (id) do nothing`
-  })
-  await check(
-    'Help menu: Docs, Join Slack, and a support request posted with its fields',
-    async () => {
-      await withSession(MEMBER, async ({ page, context }) => {
-        await context.route(/docs\.sim\.ai|sim\.ai\/slack|slack\.com/, (route) =>
-          route.fulfill({ status: 200, contentType: 'text/html', body: 'stand-in' })
-        )
-        await page.goto(orgUrl('/home'))
-        const help = sidebar(page).getByRole('button', { name: 'Help', exact: true })
-        await help.click()
-        await expect(menuEntry(page, 'Join Slack')).toBeVisible()
-        const docs = context.waitForEvent('page')
-        await menuEntry(page, 'Docs').click()
-        await (await docs).close()
-        await help.click()
-        await menuEntry(page, 'Contact support').click()
-        const modal = dialog(page, 'Contact support')
-        await page.route('**/api/help', (route) =>
-          route.fulfill({ status: 200, json: { success: true } })
-        )
-        await modal.getByRole('textbox', { name: 'Subject' }).fill('A question')
-        await modal.getByRole('textbox', { name: 'Message' }).fill('The details')
-        const sent = page.waitForRequest((request) => request.url().endsWith('/api/help'))
-        await modal.getByRole('button', { name: 'Send', exact: true }).click()
-        const request = await sent
-        assert.match(request.headers()['content-type'] ?? '', /multipart\/form-data/)
-        await expect(modal).toHaveCount(0)
-      })
-    }
-  )
-  notProvable(
-    'Help menu: desktop update row',
-    'Needs the packaged desktop app with an update pending'
-  )
-}
-
-/** Replies the same Google stand-in every test sees for a viewer's connected accounts. */
-async function stubConnectedHome(page: Page) {
-  const today = new Date().toISOString().slice(0, 10)
-  const account = (credentialId: string) => ({
-    credentialId,
-    displayName: CONNECTED.email,
-    state: 'ready',
-  })
-  await page.route(`**/api/organizations/${ORGANIZATION_ID}/home/email**`, (route) =>
-    route.fulfill({
-      json: {
-        accounts: [account(GRANTS.gmail.credentialId)],
-        threads: [
-          {
-            id: 'thread-1',
-            credentialId: GRANTS.gmail.credentialId,
-            sender: 'Grace Hopper',
-            subject: 'Parts recall notice',
-            excerpt: 'The draft is ready for review',
-            receivedAt: new Date(Date.now() - 3_600_000).toISOString(),
-            messageCount: 3,
-            url: 'https://mail.google.com/mail/u/0/#inbox/thread-1',
-          },
-        ],
-      },
-    })
-  )
-  await page.route(`**/api/organizations/${ORGANIZATION_ID}/home/calendar**`, (route) => {
-    const date = new URL(route.request().url()).searchParams.get('date') ?? today
-    return route.fulfill({
-      json: {
-        accounts: [account(GRANTS['google-calendar'].credentialId)],
-        window: { startAt: `${date}T00:00:00.000Z`, endAt: `${date}T23:59:59.000Z` },
-        events: [
-          {
-            id: `event-${date}`,
-            credentialId: GRANTS['google-calendar'].credentialId,
-            title: `Standup ${date}`,
-            allDay: false,
-            startAt: `${date}T15:00:00.000Z`,
-            endAt: `${date}T15:30:00.000Z`,
-            people: [{ name: 'Grace Hopper' }],
-          },
-        ],
-      },
-    })
-  })
-}
-
-async function homeChecks() {
-  section('3 Home: member')
-  await check(
-    'Home renders the greeting, the Assistant composer, and no Build/Search picker',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl('/home'))
-        await expect(page).toHaveURL(orgUrl('/home'))
-        await expect(page.getByRole('heading', { level: 1 })).toContainText(', Mia')
-        await expect(page.getByText('Ask about your company’s knowledge.')).toBeVisible()
-        await expect(composer(page)).toHaveAttribute('placeholder', 'Ask about your sources')
-        await expect(page.getByRole('radio', { name: 'Search' })).toHaveCount(0)
-        await expect(page.getByRole('combobox', { name: 'Conversation mode' })).toHaveCount(0)
-        await expect(page.getByRole('button', { name: 'Add resources' })).toHaveCount(0)
-      })
-    }
-  )
-  await check(
-    'the Assistant composer sends to the assistant route and lands under Search',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl('/home'))
-        await composer(page).fill('Say hello from Home')
-        const posted = page.waitForRequest(
-          (request) => request.method() === 'POST' && request.url().endsWith('/api/mothership/chat')
-        )
-        await composer(page).press('Enter')
-        const body = (await posted).postDataJSON()
-        assert.equal(body.mode, 'assistant')
-        assert.equal(body.organizationId, ORGANIZATION_ID)
-        assert.equal(body.createNewChat, true)
-        assert.equal(body.message, 'Say hello from Home')
-        await expect(page).toHaveURL(/\/search\/chat\/[^/?]+/, { timeout: 30_000 })
-        await expect(page.getByText('Hello from the scripted agent.')).toBeVisible({
-          timeout: 30_000,
-        })
-        const chatId = new URL(page.url()).pathname.split('/').at(-1)
-        await expect(page.getByRole('navigation', { name: 'Search views' })).toBeVisible()
-        await composer(page).fill('An unsent follow-up')
-        await page
-          .getByRole('navigation', { name: 'Search views' })
-          .getByRole('button', { name: 'Search' })
-          .click()
-        await expect(page).toHaveURL(new RegExp(`/search/chat/${chatId}\\?mode=search`))
-        await expect(searchField(page)).toBeVisible()
-        await page
-          .getByRole('navigation', { name: 'Search views' })
-          .getByRole('button', { name: 'Assistant' })
-          .click()
-        await expect(page.getByText('Hello from the scripted agent.')).toBeVisible()
-        await expect(
-          sidebar(page)
-            .getByRole('link', { name: /Scripted chat|Say hello/ })
-            .first()
-        ).toHaveAttribute('href', `${root}/search/chat/${chatId}`)
-      })
-    }
-  )
-  await check('New chat on a chat started from Home returns to an empty Home', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await composer(page).fill('Say hello again from Home')
-      await composer(page).press('Enter')
-      await expect(page).toHaveURL(/\/search\/chat\/[^/?]+/, { timeout: 30_000 })
-      await page.getByRole('button', { name: 'New chat', exact: true }).click()
-      await expect(page).toHaveURL(/\/home$/)
-      await expect(composer(page)).toHaveValue('')
-    })
-  })
-  await check('Home, Search and the agent keep separate drafts', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await composer(page).fill('A draft on Home')
-      await page.goto(orgUrl('/search?mode=assistant'))
-      await expect(composer(page)).toHaveValue('')
-      await composer(page).fill('A draft in Search')
-      await page.goto(orgUrl('/home'))
-      await expect(composer(page)).toHaveValue('A draft on Home')
-      await page.goto(orgUrl('/search?mode=assistant'))
-      await expect(composer(page)).toHaveValue('A draft in Search')
-      await page.goto(orgUrl('/home'))
-      await composer(page).fill('')
-    })
-  })
-  await check(
-    'Email and Calendar prompt to connect, with only the providers on offer',
-    async () => {
-      await withSession(MEMBER, async ({ page, context }) => {
-        await context.route('https://accounts.google.com/**', (route) =>
-          route.fulfill({ status: 200, contentType: 'text/html', body: 'Google stand-in' })
-        )
-        await page.goto(orgUrl('/home'))
-        const email = homeRegion(page, 'Email')
-        await expect(email.getByText('Connect your email', { exact: true })).toBeVisible()
-        await expect(email.getByRole('button', { name: 'Gmail', exact: true })).toBeEnabled()
-        await expect(email.getByRole('button', { name: 'Outlook', exact: true })).toHaveCount(0)
-        const calendar = homeRegion(page, 'Calendar')
-        await expect(calendar.getByText('Connect your calendar', { exact: true })).toBeVisible()
-        await expect(
-          calendar.getByRole('button', { name: 'Google Calendar', exact: true })
-        ).toBeEnabled()
-        await expect(calendar.getByRole('button', { name: 'Outlook', exact: true })).toHaveCount(0)
-        const authorization = context.waitForEvent('request', (request) =>
-          request.url().startsWith('https://accounts.google.com/')
-        )
-        await email.getByRole('button', { name: 'Gmail', exact: true }).click()
-        const target = new URL((await authorization).url())
-        assert.equal(target.searchParams.get('client_id'), process.env.GOOGLE_CLIENT_ID)
-      })
-    }
-  )
-  await check('Connected members see their mail and schedule, and can change the day', async () => {
-    await withSession(CONNECTED, async ({ page }) => {
-      await stubConnectedHome(page)
-      await page.goto(orgUrl('/home'))
-      const email = homeRegion(page, 'Email')
-      await expect(email.getByText('Parts recall notice')).toBeVisible()
-      await expect(email.getByText('Connect your email')).toHaveCount(0)
-      await expect(page.getByRole('region', { name: 'Calendar schedule' })).toBeVisible()
-      const calendar = homeRegion(page, 'Calendar')
-      const standup = calendar.getByText(/^Standup /)
-      await expect(standup).toBeVisible()
-      const today = await standup.innerText()
-      await calendar.getByRole('button', { name: 'Next day', exact: true }).click()
-      await expect(page).toHaveURL((address) => address.searchParams.has('day'))
-      await expect(standup).not.toHaveText(today)
-      await expect(standup).toBeVisible()
-    })
-  })
-  await check('a member gets no Tasks run chart rather than a broken one', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await expect(homeRegion(page, 'Email')).toBeVisible()
-      await expect(homeRegion(page, 'Tasks run')).toHaveCount(0)
-    })
-  })
-  await check('Recents list real history and × removes it for good', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      const recents = homeRegion(page, 'Recents')
-      const row = recents.getByRole('link', { name: SEEDED_SOURCE.title })
-      await expect(row).toBeVisible()
-      await row.hover()
-      await recents
-        .getByRole('button', { name: `Remove ${SEEDED_SOURCE.title} from recents` })
-        .click()
-      await expect(row).toHaveCount(0)
-      await page.reload()
-      await expect(homeRegion(page, 'Email')).toBeVisible()
-      await expect(recents.getByRole('link', { name: SEEDED_SOURCE.title })).toHaveCount(0)
-    })
-  })
-  await check('Unread chats need attention and open under Search', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await sql`update copilot_chats set last_seen_at = null where id = ${MEMBER_CHATS.bulkOne.id}`
-      await page.goto(orgUrl('/home'))
-      const attention = homeRegion(page, 'Needs your attention')
-      await expect(attention.getByText(MEMBER_CHATS.unread.title)).toBeVisible()
-    })
-  })
-  await check('Get started keeps its steps, with Integrations for a member', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      const started = homeRegion(page, 'Get started')
-      await expect(started.getByRole('link', { name: /Connect an integration/ })).toHaveAttribute(
-        'href',
-        `${root}/integrations`
-      )
-      await expect(started.getByRole('link', { name: /Sim Search MCP/ })).toBeVisible()
-    })
-  })
-  await check('Customize Home hides a widget, and Undo brings it back', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await page.getByRole('button', { name: 'Customize Home' }).click()
-      await page.getByRole('menuitemcheckbox', { name: 'Email' }).click()
-      await page.keyboard.press('Escape')
-      await expect(homeRegion(page, 'Email')).toHaveCount(0)
-      await page.getByRole('button', { name: 'Undo' }).click()
-      await expect(homeRegion(page, 'Email')).toBeVisible()
-    })
-  })
-  await check('widget reads refuse another organization', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      const response = await page.request.get(
-        url(`/api/organizations/${OUTSIDE_ORGANIZATION_ID}/home/email`)
-      )
-      assert.equal(response.status(), 404)
-    })
-  })
-
-  section('3 Home: narrow group')
-  await check('A narrow group has Home with no dead Connect button', async () => {
-    await withSession(NARROW, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await expect(composer(page)).toBeVisible()
-      for (const title of ['Email', 'Calendar']) {
-        const widget = homeRegion(page, title)
-        await expect(widget.getByRole('status', { name: /Loading/i })).toHaveCount(0)
-        const buttons = widget.getByRole('button').filter({ hasNotText: 'options' })
-        for (const button of await buttons.all()) {
-          const name = (await button.getAttribute('aria-label')) ?? (await button.innerText())
-          if (!/options$/.test(name)) await expect(button).toBeEnabled()
-        }
-      }
-    })
-  })
-
-  section('3 Home: admin')
-  await check(
-    'the agent composer with its tools and the Tasks run chart, without Suggested actions',
-    async () => {
-      await withSession(ADMIN, async ({ page }) => {
-        await page.goto(orgUrl('/home'))
-        await expect(page).toHaveURL(orgUrl('/home'))
-        await expect(page.getByRole('heading', { level: 1 })).toContainText(', Ada')
-        await expect(composer(page)).toBeVisible()
-        await expect(page.getByRole('button', { name: 'Add resources' })).toBeVisible()
-        await expect(page.getByRole('button', { name: 'Attach file' })).toBeVisible()
-        await expect(page.getByRole('button', { name: /Skills/ }).first()).toBeVisible()
-        await expect(page.getByText('Suggested actions', { exact: true })).toHaveCount(0)
-        await expect(homeRegion(page, 'Tasks run')).toBeVisible()
-        await expect(page.getByRole('button', { name: 'Send', exact: true })).toBeDisabled()
-      })
-    }
-  )
-  await check('an agent turn streams, keeps its route, and Stop ends it', async () => {
-    await withSession(ADMIN, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      await composer(page).fill('Count slowly from 1 to 50, one number per line.')
-      const posted = page.waitForRequest(
-        (request) => request.method() === 'POST' && request.url().endsWith('/api/mothership/chat')
-      )
-      await composer(page).press('Enter')
-      const body = (await posted).postDataJSON()
-      assert.equal(body.mode ?? 'agent', 'agent')
-      await expect(page).toHaveURL(/\/chat\/[^/?]+/, { timeout: 30_000 })
-      const stop = page.getByRole('button', { name: 'Stop generation' })
-      await expect(stop).toBeVisible()
-      await stop.click()
-      await expect(page.getByRole('button', { name: 'Send', exact: true })).toBeVisible({
-        timeout: 30_000,
-      })
-    })
-  })
-  await check('the handoff search params restore a results tab on Home', async () => {
-    await withSession(ADMIN, async ({ page }) => {
-      await stubSearch(page)
-      await page.goto(orgUrl('/home?q=parts'))
-      await expect(composer(page)).toBeVisible()
-      await expect(page.getByText('Service bulletin', { exact: true }).first()).toBeVisible()
-    })
-  })
-  notProvable('Plan chip', 'Only for platform superusers, which needs a platform admin fixture')
-  notProvable('Mic with permission help', 'Headless Chromium exposes no speech recognition to test')
-}
-
-async function chatChecks() {
-  section('3 Chat')
-  await check(
-    'assistant conversation under Search: switch, New chat, follow-up composer',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl(`/search/chat/${MEMBER_CHATS.assistant.id}`))
-        const views = page.getByRole('navigation', { name: 'Search views' })
-        await expect(views.getByRole('button', { name: 'Assistant', exact: true })).toHaveAttribute(
-          'aria-current',
-          'page'
-        )
-        await expect(page.getByRole('button', { name: 'New chat', exact: true })).toBeVisible()
-        await expect(composer(page)).toHaveAttribute('placeholder', 'Ask a follow-up')
-        await expect(
-          page
-            .getByRole('button', { name: 'Attach image' })
-            .or(page.getByRole('button', { name: 'Add resources' }))
-        ).toBeHidden()
-        await page.getByRole('button', { name: 'New chat', exact: true }).click()
-        await expect(page).toHaveURL(orgUrl('/search?mode=assistant'))
-      })
-    }
-  )
-  await check(
-    'a stream survives switching to the Search view: Assistant stays mounted, inert',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl('/search?mode=assistant'))
-        await composer(page).fill('Count slowly from 1 to 50, one number per line.')
-        await composer(page).press('Enter')
-        await expect(page).toHaveURL(/\/search\/chat\/[^/?]+/, { timeout: 30_000 })
-        const stop = page.getByRole('button', { name: 'Stop generation' })
-        await expect(stop).toBeVisible()
-        const views = page.getByRole('navigation', { name: 'Search views' })
-        await views.getByRole('button', { name: 'Search', exact: true }).click()
-        await expect(page).toHaveURL((address) => address.searchParams.get('mode') === 'search')
-        await expect(searchField(page)).toBeVisible()
-        await expect(
-          page.locator('[inert]').getByRole('textbox', { name: 'Ask Sim', includeHidden: true })
-        ).toHaveCount(1)
-        await sleep(2_500)
-        await views.getByRole('button', { name: 'Assistant', exact: true }).click()
-        await expect(stop).toBeVisible()
-        await expect(page.getByText(/(^|\s)4(\s|$)/).first()).toBeVisible()
-        await stop.click()
-        await expect(page.getByRole('button', { name: 'Send', exact: true })).toBeVisible({
-          timeout: 30_000,
-        })
-      })
-    }
-  )
-  await check('a message during a turn queues; up arrow recalls the tail', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/search?mode=assistant'))
-      await composer(page).fill('Count slowly from 1 to 50, one number per line.')
-      await composer(page).press('Enter')
-      await expect(page.getByRole('button', { name: 'Stop generation' })).toBeVisible({
-        timeout: 30_000,
-      })
-      await composer(page).fill('And then say done.')
-      await composer(page).press('Enter')
-      await expect(page.getByText('And then say done.')).toBeVisible()
-      await expect(composer(page)).toHaveValue('')
-      await composer(page).press('ArrowUp')
-      await expect(composer(page)).toHaveValue('And then say done.')
-      await page.getByRole('button', { name: 'Stop generation' }).click()
-    })
-  })
-  notProvable('Assistant action approval review cards', 'Covered by the assistant-actions suite')
-  notProvable(
-    'Citations, Sources panel, feedback',
-    'Covered by organization-search, unchanged code'
-  )
-}
-
-const searchResult = (query: string) => ({
-  success: true,
-  data: {
-    query,
-    retrieval: { status: 'complete', timedOutLegs: [] },
-    results: [
-      {
-        documentId: 'bulletin-1',
-        knowledgeBaseId: 'kb-1',
-        knowledgeBaseName: 'Google Drive',
-        documentName: 'Service bulletin',
-        sourceUrl: NAMED_LINKS.handbook.url,
-        connectorType: 'google_drive',
-        sourceModifiedAt: new Date().toISOString(),
-        author: 'Grace Hopper',
-        content: `The bulletin about ${query} is ready.`,
-        chunkIndex: 0,
-        similarity: 1,
-      },
-      {
-        documentId: 'bulletin-2',
-        knowledgeBaseId: 'kb-1',
-        knowledgeBaseName: 'Confluence',
-        documentName: 'Recall playbook',
-        sourceUrl: 'https://wiki.example.com/recall',
-        connectorType: 'confluence',
-        sourceModifiedAt: new Date().toISOString(),
-        author: 'Grace Hopper',
-        content: `The playbook about ${query}.`,
-        chunkIndex: 0,
-        similarity: 0.9,
-      },
-    ],
-  },
-})
-
-async function stubSearch(page: Page) {
-  await page.route('**/api/knowledge/search', async (route) => {
-    const body = route.request().postDataJSON()
-    await route.fulfill({ json: searchResult(body.query) })
-  })
-}
-
-async function searchChecks() {
-  section('3 Search: Search view')
-  await check('switch, landing heading, focused field, and history', async () => {
-    await withSession(ADMIN, async ({ page }) => {
-      await page.goto(orgUrl('/search'))
-      const views = page.getByRole('navigation', { name: 'Search views' })
-      await expect(views.getByRole('button', { name: 'Search', exact: true })).toHaveAttribute(
-        'aria-current',
-        'page'
-      )
-      await expect(views.getByRole('button', { name: 'Assistant', exact: true })).toBeVisible()
-      await expect(page.getByRole('heading', { name: `Search ${ORGANIZATION_NAME}` })).toBeVisible()
-      await expect(searchField(page)).toBeFocused()
-      const recent = page.getByRole('region', { name: 'Recent activity' })
-      await expect(
-        recent.getByRole('group', { name: 'History type' }).getByText('Recently viewed')
-      ).toBeVisible()
-      await expect(
-        recent.getByRole('group', { name: 'History type' }).getByText('Recent searches')
-      ).toBeVisible()
-      await expect(recent.getByText(SEEDED_SOURCE.title, { exact: true })).toBeVisible()
-      await recent.getByText('Recent searches').click()
-      await stubSearch(page)
-      await recent.getByRole('button', { name: SEEDED_SOURCE.query }).click()
-      await expect(page).toHaveURL(
-        (address) => address.searchParams.get('q') === SEEDED_SOURCE.query
-      )
-    })
-  })
-  await check('Back returns across a mode switch, and the mode survives a reload', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/search'))
-      await expect(page).toHaveURL(orgUrl('/search?mode=search'))
-      const views = page.getByRole('navigation', { name: 'Search views' })
-      await views.getByRole('button', { name: 'Assistant', exact: true }).click()
-      await expect(page).toHaveURL(orgUrl('/search?mode=assistant'))
-      await page.goBack()
-      await expect(page).toHaveURL(orgUrl('/search?mode=search'))
-      await expect(searchField(page)).toBeVisible()
-      await views.getByRole('button', { name: 'Assistant', exact: true }).click()
-      await page.goto(orgUrl('/search'))
-      await expect(page).toHaveURL(orgUrl('/search?mode=assistant'))
-      await views.getByRole('button', { name: 'Search', exact: true }).click()
-    })
-  })
-  await check('field grows on Shift+Enter, Enter submits, a query docks the field', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await stubSearch(page)
-      await page.goto(orgUrl('/search?mode=search'))
-      const field = searchField(page)
-      await field.fill('Parts')
-      const before = (await field.boundingBox())?.height ?? 0
-      await field.press('Shift+Enter')
-      await field.pressSequentially('recall')
-      await expect
-        .poll(async () => (await field.boundingBox())?.height ?? 0)
-        .toBeGreaterThan(before)
-      await field.press('Enter')
-      await expect(page).toHaveURL(
-        (address) => address.searchParams.get('q')?.includes('Parts') ?? false
-      )
-      await expect(page.getByRole('heading', { name: `Search ${ORGANIZATION_NAME}` })).toHaveCount(
-        0
-      )
-      await expect(page.getByRole('button', { name: 'New search', exact: true })).toBeVisible()
-      await page.getByRole('button', { name: 'New search', exact: true }).click()
-      await expect(page).toHaveURL(orgUrl('/search?mode=search'))
-      await expect(searchField(page)).toHaveValue('')
-    })
-  })
-  await check('an unconnected member gets the connect prompt, not an empty result', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/search?mode=search&q=warranty'))
-      await expect(page.getByText('No connected apps are available for this search.')).toBeVisible()
-      await expect(page.getByRole('link', { name: 'Connect apps' })).toHaveAttribute(
-        'href',
-        `${root}/integrations`
-      )
-    })
-  })
-  await check('results: filters, row menu, new tab link, keyboard movement', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await stubSearch(page)
-      await page.goto(orgUrl('/search?mode=search&q=recall'))
-      const results = page.getByRole('region', { name: 'Search results' })
-      await expect(results.getByText('Service bulletin', { exact: true }).first()).toBeVisible()
-      const links = page.locator('a[data-source-link]')
-      await expect(links.first()).toHaveAttribute('target', '_blank')
-      const filters = page.getByRole('group', { name: 'Search filters' })
-      await filters.getByRole('combobox', { name: /Filter by date/ }).click()
-      await page.getByRole('option', { name: 'Past week' }).click()
-      await expect(page).toHaveURL((address) => address.searchParams.get('updated') === '7d')
-      await filters.getByRole('combobox', { name: /Filter by source/ }).click()
-      await page.keyboard.press('Escape')
-      await links.first().focus()
-      await page.keyboard.press('ArrowDown')
-      await expect(links.nth(1)).toBeFocused()
-    })
-  })
-  await check('Summarize moves to Assistant and sends a turn scoped to that document', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await stubSearch(page)
-      await page.goto(orgUrl('/search?mode=search&q=recall'))
-      await page.getByRole('button', { name: 'Actions for Service bulletin', exact: true }).click()
-      const posted = page.waitForRequest(
-        (request) => request.method() === 'POST' && request.url().endsWith('/api/mothership/chat')
-      )
-      await menuEntry(page, 'Summarize').click()
-      const body = (await posted).postDataJSON()
-      assert.deepEqual(body.assistantSearch?.documentIds, ['bulletin-1'])
-      assert.equal(body.mode, 'assistant')
-      await expect(page).toHaveURL((address) => address.searchParams.get('mode') === 'assistant', {
-        timeout: 30_000,
-      })
-    })
-  })
-  await check(
-    'row menu: Copy link, Copy sim/name when a link exists, Create link when not, none on failure',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await stubSearch(page)
-        await page.goto(orgUrl('/search?mode=search&q=recall'))
-        await page
-          .getByRole('button', { name: 'Actions for Service bulletin', exact: true })
-          .click()
-        await expect(menuEntry(page, `Copy sim/${NAMED_LINKS.handbook.name}`)).toBeVisible()
-        await menuEntry(page, 'Copy link').click()
-        await expect.poll(() => clipboard(page)).toBe(NAMED_LINKS.handbook.url)
-        await page
-          .getByRole('button', { name: /Link copied|Actions for Service bulletin/ })
-          .first()
-          .click()
-        await menuEntry(page, `Copy sim/${NAMED_LINKS.handbook.name}`).click()
-        await expect.poll(() => clipboard(page)).toContain(`sim/${NAMED_LINKS.handbook.name}`)
-        await page.getByRole('button', { name: 'Actions for Recall playbook', exact: true }).click()
-        const create = menuEntry(page, 'Create link')
-        await expect(create).toBeEnabled()
-        await create.click()
-        const form = page.getByRole('dialog').filter({ hasText: 'Destination URL' })
-        await expect(form).toBeVisible()
-        await expect(form.getByRole('textbox', { name: 'Destination URL' })).toHaveValue(
-          'https://wiki.example.com/recall'
-        )
-        await page.keyboard.press('Escape')
-        await page.route(`**/api/organizations/${ORGANIZATION_ID}/sim-links?**`, (route) =>
-          route.fulfill({ status: 500, json: { error: 'No' } })
-        )
-        await page.goto(orgUrl('/search?mode=search&q=other'))
-        await page.getByRole('button', { name: 'Actions for Recall playbook', exact: true }).click()
-        await expect(menuEntry(page, 'Copy link')).toBeVisible()
-        await expect(menuEntry(page, 'Create link')).toHaveCount(0, { timeout: 15_000 })
-      })
-    },
-    { allow: [/500 GET .*\/sim-links\?/] }
-  )
-  await check(
-    'states: failure with Try again, partial coverage, no results, custom range',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        let failing = true
-        let partial = false
-        await page.route('**/api/knowledge/search', async (route) => {
-          if (failing) return route.fulfill({ status: 503, json: { error: 'Unavailable' } })
-          const query = route.request().postDataJSON().query
-          if (query === 'nothing')
-            return route.fulfill({
-              json: {
-                success: true,
-                data: { query, results: [], retrieval: { status: 'complete', timedOutLegs: [] } },
-              },
-            })
-          const answer = searchResult(query)
-          return route.fulfill({
-            json: partial
-              ? {
-                  ...answer,
-                  data: {
-                    ...answer.data,
-                    retrieval: { status: 'partial', timedOutLegs: [] },
-                    live: {
-                      backend: 'live',
-                      guidance: '',
-                      accounts: [
-                        {
-                          accountId: 'a',
-                          provider: 'confluence',
-                          displayName: 'x',
-                          status: 'timeout',
-                        },
-                      ],
-                    },
-                  },
-                }
-              : answer,
-          })
-        })
-        await page.goto(orgUrl('/search?mode=search&q=recall'))
-        await expect(page.getByText('Search couldn’t run.')).toBeVisible()
-        failing = false
-        await page.getByRole('button', { name: 'Try again', exact: true }).click()
-        await expect(page.getByText('Service bulletin', { exact: true }).first()).toBeVisible()
-        partial = true
-        await page.goto(orgUrl('/search?mode=search&q=partial'))
-        await expect(
-          page.getByText('Some apps couldn’t be searched. Showing available results.')
-        ).toBeVisible()
-        partial = false
-        await page.goto(orgUrl('/search?mode=search&q=nothing'))
-        await expect(page.getByText(/Search found no results|No connected apps/)).toBeVisible()
-        await page.goto(orgUrl('/search?mode=search&q=recall&updated=custom'))
-        await expect(page.getByText('Choose the days to search.')).toBeVisible()
-      })
-    },
-    { allow: [/503 POST \/api\/knowledge\/search/] }
-  )
-  await check(
-    'history states: failure retries, Clear history empties',
-    async () => {
-      await withSession(ADMIN, async ({ page }) => {
-        await withTableHidden('organization_search_history', async (restore) => {
-          await page.goto(orgUrl('/search?mode=search'))
-          await expect(page.getByText('Recent activity couldn’t load.')).toBeVisible({
-            timeout: 40_000,
-          })
-          await restore()
-          await page.getByRole('button', { name: 'Try again', exact: true }).click()
-        })
-        const clear = page.getByRole('button', { name: 'Clear history', exact: true })
-        await expect(clear).toBeVisible()
-        await clear.click()
-        const confirm = page.getByRole('dialog')
-        if (await confirm.isVisible().catch(() => false))
-          await confirm.getByRole('button', { name: /Clear/ }).click()
-        await expect(page.getByRole('region', { name: 'Recent activity' })).toHaveCount(0)
-      })
-    },
-    { allow: [/500 GET \/api\//] }
-  )
-  await check('a query keeps its edited draft on return', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await stubSearch(page)
-      await page.goto(orgUrl('/search?mode=search&q=recall'))
-      await searchField(page).fill('recall edits')
-      await page.goto(orgUrl('/search?mode=search&q=recall'))
-      await expect(searchField(page)).toHaveValue('recall edits')
-    })
-  })
-
-  section('3 Search: Assistant view')
-  await check('landing heading, composer, and Get started, not in the Search view', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/search?mode=assistant'))
-      await expect(page.getByRole('heading', { name: `Search ${ORGANIZATION_NAME}` })).toBeVisible()
-      await expect(composer(page)).toHaveAttribute('placeholder', 'Ask about your sources')
-      await expect(page.getByText('Get started', { exact: true })).toBeVisible()
-      await expect(page.getByRole('link', { name: /Connect an integration/ })).toHaveAttribute(
-        'href',
-        `${root}/integrations`
-      )
-      await page.goto(orgUrl('/search?mode=search'))
-      await expect(searchField(page)).toBeVisible()
-      await expect(page.getByText('Get started', { exact: true })).toHaveCount(0)
-    })
-  })
-  await check('chat URL keeps filters and mode', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/search?mode=assistant&q=recall&source=slack&updated=7d'))
-      await composer(page).fill('Filtered question')
-      await composer(page).press('Enter')
-      await expect(page).toHaveURL(/\/search\/chat\/[^/?]+/, { timeout: 30_000 })
-      const parsed = new URL(page.url())
-      assert.equal(parsed.searchParams.get('source'), 'slack')
-      assert.equal(parsed.searchParams.get('updated'), '7d')
-      assert.equal(parsed.searchParams.get('q'), 'recall')
-    })
-  })
-}
-
-async function integrationChecks() {
-  section('3 Integrations')
-  await check('title, search, and every approved provider, with no Microsoft row', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/integrations'))
-      await expect(page.getByRole('heading', { level: 1, name: 'Integrations' })).toBeVisible()
-      for (const name of [
-        'Gmail',
-        'Google Calendar',
-        'Google Drive',
-        'Jira',
-        'Confluence',
-        'GitLab',
-        'Slack',
-        'Coda',
-        'Lucid',
-      ])
-        await expect(page.getByRole('link', { name: new RegExp(`^${name}`) }).first()).toBeVisible()
-      await expect(page.getByRole('link', { name: /^Outlook/ })).toHaveCount(0)
-      await expect(page.getByRole('region', { name: 'Your accounts' })).toHaveCount(0)
-      await expect(
-        page
-          .getByRole('region', { name: 'Available to connect' })
-          .getByRole('link', { name: /^Gmail/ })
-      ).toContainText('Not connected')
-      await expect(
-        page
-          .getByRole('region', { name: 'Managed by your organization' })
-          .getByRole('link', { name: /^GitLab/ })
-      ).toContainText('Organization managed')
-    })
-  })
-  await check(
-    'search filters by name and is kept in the URL through a detail and back',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl('/integrations'))
-        const field = page.getByRole('searchbox', { name: 'Search integrations' })
-        await field.fill('jira')
-        await expect(page).toHaveURL((address) => address.searchParams.get('q') === 'jira')
-        await expect(page.getByRole('link', { name: /^Gmail/ })).toHaveCount(0)
-        await page.getByRole('link', { name: /^Jira/ }).click()
-        await expect(page).toHaveURL((address) => address.pathname === `${root}/integrations/jira`)
-        await page
-          .getByRole('navigation', { name: 'Integration navigation' })
-          .getByRole('link')
-          .click()
-        await expect(page).toHaveURL(
-          (address) =>
-            address.pathname === `${root}/integrations` && address.searchParams.get('q') === 'jira'
-        )
-        await field.fill('zzzz-nothing')
-        await expect(page.getByText('No matching integrations')).toBeVisible()
-      })
-    }
-  )
-  await check(
-    'the document carries referrer no-referrer, which protects the Slack token',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        for (const path of ['/integrations', '/integrations/gmail']) {
-          await page.goto(orgUrl(`${path}`))
-          await expect(page.locator('meta[name="referrer"]')).toHaveAttribute(
-            'content',
-            'no-referrer'
-          )
-        }
-      })
-    }
-  )
-  await check('legacy ?integration= links reach the detail with their account', async () => {
-    await withSession(CONNECTED, async ({ page }) => {
-      await page.goto(orgUrl('/integrations?integration=source:gmail&q=g'))
-      await expect(page).toHaveURL(
-        (address) =>
-          address.pathname === `${root}/integrations/gmail` && address.searchParams.get('q') === 'g'
-      )
-      await expect(page.getByRole('heading', { level: 1, name: 'Gmail' })).toBeVisible()
-    })
-  })
-  await check(
-    'detail: Connect starts managed authorization; a managed provider has no button',
-    async () => {
-      await withSession(MEMBER, async ({ page, context }) => {
-        await context.route('https://accounts.google.com/**', (route) =>
-          route.fulfill({ status: 200, contentType: 'text/html', body: 'Google stand-in' })
-        )
-        await page.goto(orgUrl('/integrations/gitlab'))
-        await expect(page.getByRole('heading', { level: 1, name: 'GitLab' })).toBeVisible()
-        await expect(page.getByRole('button', { name: 'GitLab', exact: true })).toHaveCount(0)
-        await page.goto(orgUrl('/integrations/gmail'))
-        await expect(page.getByText('Connect your Gmail account')).toBeVisible()
-        const authorization = context.waitForEvent('request', (request) =>
-          request.url().startsWith('https://accounts.google.com/')
-        )
-        await page.getByRole('button', { name: 'Gmail', exact: true }).click()
-        assert((await authorization).url().includes('client_id='))
-      })
-    }
-  )
-  await check(
-    'a connected account: listed first, auto-selected, Manage has Reconnect and Disconnect',
-    async () => {
-      await withSession(CONNECTED, async ({ page }) => {
-        await page.goto(orgUrl('/integrations'))
-        await expect(
-          page.getByRole('region', { name: 'Your accounts' }).getByRole('link', { name: /^Gmail/ })
-        ).toContainText('1 account')
-        await page
-          .getByRole('region', { name: 'Your accounts' })
-          .getByRole('link', { name: /^Gmail/ })
-          .click()
-        await expect(page.getByRole('heading', { level: 1, name: 'Gmail' })).toBeVisible()
-        await expect(page.getByText(CONNECTED.email).first()).toBeVisible()
-        await page.getByRole('button', { name: `Manage ${CONNECTED.email}` }).click()
-        await expect(menuEntry(page, 'Reconnect account')).toBeVisible()
-        await menuEntry(page, 'Disconnect account').click()
-        const modal = dialog(page, 'Disconnect Gmail')
-        await expect(
-          modal.getByText(/Workflows using this account will also lose access/)
-        ).toBeVisible()
-        await modal.getByRole('button', { name: 'Cancel', exact: true }).click()
-      })
-    }
-  )
-  await check(
-    'several accounts: listed together, each managed alone, and another can be added',
-    async () => {
-      const second = 'second.account@example.test'
-      const secondId = 'org-redesign-grant-gmail-second'
-      await sql`insert into credential (id, created_by, credential_group_enrollment_id, credential_group_option_id, organization_id, type, display_name, provider_id, managed_oauth_status, managed_oauth_scope_version, granted_scopes, provider_subject_id, authorization_app_id, encrypted_oauth_token_set, access_token_expires_at, granted_at)
-        select ${secondId}, created_by, credential_group_enrollment_id, credential_group_option_id, organization_id, type, ${second}, provider_id, 'needs_reauth', managed_oauth_scope_version, granted_scopes, ${secondId}, authorization_app_id, encrypted_oauth_token_set, access_token_expires_at, granted_at
-        from credential where id = ${GRANTS.gmail.credentialId}`
-      try {
-        await withSession(CONNECTED, async ({ page, context }) => {
-          await context.route('https://accounts.google.com/**', (route) =>
-            route.fulfill({ status: 200, contentType: 'text/html', body: 'Google stand-in' })
-          )
-          await page.goto(orgUrl('/integrations/gmail'))
-          const accounts = page.getByRole('region', { name: 'Connected accounts' })
-          await expect(accounts.getByText(CONNECTED.email).first()).toBeVisible()
-          await expect(accounts.getByText(second).first()).toBeVisible()
-          await expect(accounts.getByRole('button', { name: `Reconnect ${second}` })).toBeVisible()
-          await expect(
-            accounts.getByRole('button', { name: `Reconnect ${CONNECTED.email}` })
-          ).toHaveCount(0)
-          await page.screenshot({
-            path: resolve(artifactDirectory, 'integration-several-accounts.png'),
-            fullPage: true,
-            animations: 'disabled',
-          })
-          await page.setViewportSize({ width: 390, height: 844 })
-          await page.screenshot({
-            path: resolve(artifactDirectory, 'integration-several-accounts-mobile.png'),
-            fullPage: true,
-            animations: 'disabled',
-          })
-          await page.setViewportSize({ width: 1280, height: 800 })
-
-          await accounts.getByRole('button', { name: `Manage ${second}` }).click()
-          await menuEntry(page, 'Disconnect account').click()
-          const modal = dialog(page, 'Disconnect Gmail')
-          await expect(modal).toContainText(second)
-          await expect(modal).not.toContainText(CONNECTED.email)
-          await modal.getByRole('button', { name: 'Cancel', exact: true }).click()
-
-          const authorization = context.waitForEvent('request', (request) =>
-            request.url().startsWith('https://accounts.google.com/')
-          )
-          await accounts.getByRole('button', { name: 'Add account', exact: true }).click()
-          const prompt = new URL((await authorization).url()).searchParams.get('prompt')
-          assert(prompt?.includes('select_account'), 'Add account must offer an account chooser')
-        })
-      } finally {
-        await sql`delete from credential where id = ${secondId}`
-      }
-    }
-  )
-  await check('a stale ?account= says so', async () => {
-    await withSession(CONNECTED, async ({ page }) => {
-      await page.goto(orgUrl('/integrations/gmail?account=gone'))
-      await expect(page.getByText('This account is no longer connected.')).toBeVisible()
-    })
-  })
-  await check('an unknown provider says it is no longer available', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/integrations/not-a-provider'))
-      await expect(page.getByText('This integration is no longer available.')).toBeVisible()
-    })
-  })
-  await check('a connection deep link shows its request', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(
-        url(
-          `${root}/integrations?connectorType=gmail&provider=gmail&connectionMode=live&optionId=gmail`
-        )
-      )
-      await expect(page.getByRole('heading', { level: 1, name: 'Integrations' })).toBeVisible()
-      await expect(page.getByText(/Gmail/).first()).toBeVisible()
-    })
-  })
-  await check(
-    'the inventory and Search reads fail separately, each with its retry',
-    async () => {
-      const retry = (page: Page) => page.getByRole('button', { name: /Retry|Try again/ }).first()
-      await withSession(MEMBER, async ({ page }) => {
-        await withTableHidden('credential_group', async (restore) => {
-          await page.goto(orgUrl('/integrations'))
-          await expect(page.getByText('Could not load your connections')).toBeVisible({
-            timeout: 40_000,
-          })
-          await restore()
-          await retry(page).click()
-          await expect(page.getByRole('link', { name: /^Gmail/ })).toBeVisible()
-        })
-      })
-      await withSession(MEMBER, async ({ page }) => {
-        await withTableHidden('organization_search_integration', async (restore) => {
-          await page.goto(orgUrl('/integrations'))
-          await expect(page.getByText('Could not load Search connections')).toBeVisible({
-            timeout: 40_000,
-          })
-          await restore()
-          await retry(page).click()
-          await expect(page.getByText('Could not load Search connections')).toHaveCount(0)
-        })
-      })
-    },
-    { allow: [/500 GET \/api\//] }
-  )
-
-  section('3 Tool permissions')
-  await check(
-    'member: approval notice, Allow disabled, Ask and Block selectable, saves with revision',
-    async () => {
-      await withSession(CONNECTED, async ({ page }) => {
-        await page.goto(orgUrl('/integrations/gmail'))
-        const panel = page.getByRole('region', { name: 'Tool permissions' })
-        await expect(
-          panel.getByText('Your organization requires approval before tools run.')
-        ).toBeVisible()
-        await expect(panel.getByRole('searchbox', { name: 'Search tools' })).toBeVisible()
-        await expect(panel.getByRole('heading', { name: /Read-only tools/ })).toBeVisible()
-        await expect(panel.getByRole('heading', { name: /Write tools/ })).toBeVisible()
-        const group = panel.getByRole('group', { name: 'Write tools permission' })
-        await expect(group.getByRole('radio', { name: 'Allow', exact: true })).toBeDisabled()
-        await expect(group.getByRole('radio', { name: 'Block', exact: true })).toBeEnabled()
-        const saved = page.waitForRequest(
-          (request) => request.method() !== 'GET' && request.url().includes('permissions')
-        )
-        await group.getByRole('radio', { name: 'Block', exact: true }).click({ force: true })
-        const body = (await saved).postDataJSON()
-        assert(
-          JSON.stringify(body).includes('revision') || body.expectedRevision !== undefined,
-          'The save carries a revision'
-        )
-        await expect(group.getByRole('radio', { name: 'Block', exact: true })).toBeChecked()
-        await group.getByRole('radio', { name: 'Ask', exact: true }).click({ force: true })
-      })
-    }
-  )
-  await check('the account route still opens its permissions', async () => {
-    await withSession(CONNECTED, async ({ page }) => {
-      await page.goto(orgUrl(`/integrations/accounts/${GRANTS.gmail.credentialId}`))
-      await expect(page.getByRole('region', { name: 'Tool permissions' })).toBeVisible()
-    })
-  })
-
-  section('3 Generic Secrets')
-  await check('member mode opens the personal editor and keeps q on the way back', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/integrations?q=secret'))
-      const row = page
-        .getByRole('main')
-        .getByRole('link')
-        .filter({ hasText: /Secrets/ })
-      await expect(row).toContainText('Personal secrets')
-      await row.click()
-      await expect(page).toHaveURL(
-        (address) =>
-          address.pathname === `${root}/integrations/secrets` &&
-          address.searchParams.get('q') === 'secret'
-      )
-      await page.getByRole('button', { name: 'Integrations', exact: true }).click()
-      await expect(page).toHaveURL(
-        (address) =>
-          address.pathname === `${root}/integrations` && address.searchParams.get('q') === 'secret'
-      )
-    })
-  })
-  await check('organization mode lists a read-only view under the organization', async () => {
-    await sql`update organization_secret_source set mode = 'organization' where organization_id = ${ORGANIZATION_ID}`
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/integrations?q=secret'))
-      const row = page
-        .getByRole('region', { name: 'Managed by your organization' })
-        .getByRole('link')
-        .filter({ hasText: /Secrets/ })
-      await expect(row).toContainText('Organization managed')
-      await row.click()
-      await expect(page).toHaveURL(
-        (address) => address.pathname === `${root}/integrations/generic-secrets`
-      )
-      await expect(page.getByRole('heading', { level: 1 })).toContainText('Secrets')
-    }).finally(
-      () =>
-        sql`update organization_secret_source set mode = 'member' where organization_id = ${ORGANIZATION_ID}`
-    )
-  })
-  notProvable(
-    'Slack onboarding ?slack= actions',
-    'A valid token needs a Slack workspace install; invalid tokens are asserted as not found'
-  )
-  notProvable('Desktop OAuth listener', 'Needs the packaged desktop app')
-}
-
-async function linksChecks() {
-  const linksUrl = orgUrl('/links')
-  const rowFor = (page: Page, name: string) =>
-    page.getByRole('row').filter({ has: page.getByText(name, { exact: true }) })
-  const search = (page: Page) => page.getByRole('searchbox', { name: 'Search links' })
-
-  section('3 Links')
-  await check('header, Chrome install, columns, and the list copes with 183 links', async () => {
-    await withSession(MEMBER, async ({ page, context }) => {
-      await context.route('https://chromewebstore.google.com/**', (route) =>
-        route.fulfill({ status: 200, contentType: 'text/html', body: 'store stand-in' })
-      )
-      await page.goto(linksUrl)
-      await expect(page.getByRole('heading', { level: 1, name: 'Links' })).toBeVisible()
-      const headers = await page.getByRole('columnheader').allInnerTexts()
-      for (const label of ['Name', 'Destination', 'Description', 'Created by', 'Access', 'Updated'])
-        assert(
-          headers.some((text) => text.includes(label)),
-          `Missing column ${label}: ${headers}`
-        )
-      const store = context.waitForEvent('page')
-      await page.getByRole('button', { name: 'Install Sim for Chrome' }).click()
-      await expect(await store).toHaveURL(/chromewebstore\.google\.com/)
-      await expect(rowFor(page, NAMED_LINKS.handbook.name)).toBeVisible()
-      const pages: string[] = []
-      page.on('request', (request) => {
-        if (request.url().includes('/sim-links') && request.url().includes('cursor='))
-          pages.push(request.url())
-      })
-      const scroller = page.getByRole('region', { name: 'Links' })
-      for (let index = 0; index < 40 && (await rowFor(page, 'timesheet').count()) === 0; index++) {
-        await scroller.evaluate((node) => {
-          const target =
-            [node, ...node.querySelectorAll('*')].find(
-              (element) => element.scrollHeight > element.clientHeight + 20
-            ) ?? node
-          target.scrollTop = target.scrollHeight
-        })
-        await sleep(200)
-      }
-      await expect(rowFor(page, 'timesheet')).toBeVisible()
-      assert(pages.length > 0, 'Rows past the first page load as the list scrolls')
-    })
-  })
-  await check('the API serves every link the member can see', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(linksUrl)
-      let names: string[] = []
-      let cursor: string | undefined
-      do {
-        const response = await page.request.get(
-          url(
-            `/api/organizations/${ORGANIZATION_ID}/sim-links${cursor ? `?cursor=${encodeURIComponent(cursor)}` : ''}`
-          )
-        )
-        const body = await response.json()
-        names = [...names, ...body.links.map((link: { name: string }) => link.name)]
-        cursor = body.nextCursor ?? undefined
-      } while (cursor)
-      assert.equal(names.length, LINK_COUNT - 1, 'Everything but another person’s unlisted link')
-      assert(!names.includes(NAMED_LINKS.unlisted.name))
-    })
-    await withSession(ADMIN, async ({ page }) => {
-      await page.goto(linksUrl)
-      await search(page).fill(NAMED_LINKS.unlisted.name)
-      await expect(rowFor(page, NAMED_LINKS.unlisted.name)).toContainText('Unlisted')
-      await search(page).fill(NAMED_LINKS.restricted.name)
-      await expect(rowFor(page, NAMED_LINKS.restricted.name)).toContainText('Restricted')
-    })
-  })
-  await check(
-    'search over name and description, sim/ prefix, debounce, URL, and Clear',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(linksUrl)
-        await search(page).fill('sim/handbook')
-        await expect(page).toHaveURL(
-          (address) => address.searchParams.get('search') === 'sim/handbook'
-        )
-        await expect(rowFor(page, NAMED_LINKS.handbook.name)).toBeVisible()
-        await expect(rowFor(page, 'resource-001')).toHaveCount(0)
-        await search(page).fill('Weekly hours')
-        await expect(rowFor(page, NAMED_LINKS.mostUsed.name)).toBeVisible()
-        await search(page).fill('zzzz-nothing')
-        await expect(page.getByText('Searched every link you can see.')).toBeVisible()
-        await page.getByRole('button', { name: 'Clear search', exact: true }).last().click()
-        await expect(search(page)).toHaveValue('')
-        await expect(rowFor(page, NAMED_LINKS.handbook.name)).toBeVisible()
-        await page.goto(`${linksUrl}?search=timesheet`)
-        await expect(search(page)).toHaveValue('timesheet')
-        await expect(rowFor(page, NAMED_LINKS.mostUsed.name)).toBeVisible()
-      })
-    }
-  )
-  await check(
-    'sort by Opens, with direction in the URL, and clearing returns to name',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(linksUrl)
-        await page.getByRole('button', { name: 'Sort', exact: true }).click()
-        await expect(menuEntry(page, 'Name')).toBeVisible()
-        await menuEntry(page, 'Opens').click()
-        await expect(page).toHaveURL((address) => address.searchParams.get('sort') === 'popular')
-        await expect(page.getByRole('button', { name: 'Sort: Opens' })).toBeVisible()
-        await expect(page.getByRole('row').nth(1)).toContainText(NAMED_LINKS.mostUsed.name)
-        await page.getByRole('button', { name: 'Sort: Opens' }).click()
-        await menuEntry(page, 'Clear sort').click()
-        await expect(page).toHaveURL((address) => address.searchParams.get('sort') === null)
-      })
-    }
-  )
-  await check(
-    'row click opens sim/name in a new tab, not an editor; right click and kebab menus',
-    async () => {
-      await withSession(MEMBER, async ({ page, context }) => {
-        await context.route(/^https:\/\/(example\.com|payroll\.example\.com)\//, (route) =>
-          route.fulfill({ status: 200, contentType: 'text/html', body: 'destination stand-in' })
-        )
-        await page.goto(`${linksUrl}?search=handbook`)
-        const row = rowFor(page, NAMED_LINKS.handbook.name)
-        const popup = context.waitForEvent('page')
-        await row.getByText(NAMED_LINKS.handbook.name, { exact: true }).click()
-        const opened = await popup
-        await opened.waitForLoadState('domcontentloaded')
-        assert(/handbook/.test(opened.url()), `Opened ${opened.url()}`)
-        await opened.close()
-        await expect(page.getByRole('dialog')).toHaveCount(0)
-        await row.click({ button: 'right' })
-        await expect(
-          page.getByRole('menu', { name: 'Link actions' }).getByRole('menuitem')
-        ).toHaveText(['Open', 'Copy link', 'Edit', 'Delete'])
-        await menuEntry(page, 'Copy link').click()
-        await expect.poll(() => clipboard(page)).toBe(url(`/sim/${NAMED_LINKS.handbook.name}`))
-        await expect(page.getByText('Link copied')).toBeVisible()
-        await row.getByRole('button', { name: `${NAMED_LINKS.handbook.name} actions` }).click()
-        await expect(menuEntry(page, 'Edit')).toBeVisible()
-      })
-    }
-  )
-  await check('a restricted link gives a member only Open and Copy link', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(`${linksUrl}?search=${NAMED_LINKS.restricted.name}`)
-      await rowFor(page, NAMED_LINKS.restricted.name).click({ button: 'right' })
-      await expect(
-        page.getByRole('menu', { name: 'Link actions' }).getByRole('menuitem')
-      ).toHaveText(['Open', 'Copy link'])
-    })
-  })
-  await check(
-    'canEdit without canManage: edits save while Access stays disabled, with why',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(`${linksUrl}?search=${NAMED_LINKS.handbook.name}`)
-        await rowFor(page, NAMED_LINKS.handbook.name).click({ button: 'right' })
-        await menuEntry(page, 'Edit').click()
-        const modal = dialog(page, `Edit ${NAMED_LINKS.handbook.name}`)
-        await expect(
-          modal.getByText('Only the creator or an organization admin can change access.')
-        ).toBeVisible()
-        await expect(
-          modal.getByRole('checkbox', { name: 'Hide from the Links page' })
-        ).toBeDisabled()
-        await expect(
-          modal.getByRole('checkbox', { name: 'Only the creator and admins can edit' })
-        ).toBeDisabled()
-        await modal.getByRole('textbox', { name: 'Description' }).fill('The company handbook')
-        await modal.getByRole('button', { name: 'Save', exact: true }).click()
-        await expect(modal).toHaveCount(0)
-        await expect(rowFor(page, NAMED_LINKS.handbook.name)).toContainText('The company handbook')
-      })
-    }
-  )
-  await check(
-    'create: field order, normalized name, variable destination, conflict on Name',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(linksUrl)
-        await page.getByRole('button', { name: 'New link', exact: true }).first().click()
-        await expect(page).toHaveURL((address) => address.searchParams.has('create'))
-        const modal = dialog(page, 'New link')
-        const fields = await modal
-          .getByRole('textbox')
-          .evaluateAll((nodes) =>
-            nodes.map(
-              (node) =>
-                node.getAttribute('aria-label') ??
-                node.closest('label')?.textContent ??
-                (node as HTMLInputElement).labels?.[0]?.textContent ??
-                ''
-            )
-          )
-        assert(fields[0]?.startsWith('Destination URL'), `Fields ${fields}`)
-        assert(fields[1]?.startsWith('Name'), `Fields ${fields}`)
-        assert(fields[2]?.startsWith('Description'), `Fields ${fields}`)
-        await expect(modal.getByRole('textbox', { name: 'Default destination' })).toHaveCount(0)
-        await modal
-          .getByRole('textbox', { name: 'Destination URL' })
-          .fill('https://parts.example.com/{*}')
-        await expect(modal.getByRole('textbox', { name: 'Default destination' })).toBeVisible()
-        await expect(modal.getByText(/Opens when no value fills/)).toBeVisible()
-        await modal
-          .getByRole('textbox', { name: 'Default destination' })
-          .fill('https://parts.example.com')
-        await modal.getByRole('textbox', { name: 'Name' }).fill('Hand Book')
-        await expect(modal.getByRole('textbox', { name: 'Name' })).not.toHaveValue('Hand Book')
-        await modal.getByRole('textbox', { name: 'Name' }).fill(NAMED_LINKS.handbook.name)
-        await modal.getByRole('button', { name: 'Create', exact: true }).click()
-        await expect(modal.getByText(/already exists/)).toBeVisible()
-        await modal.getByRole('textbox', { name: 'Name' }).fill('parts-lookup')
-        await expect(
-          modal.getByRole('checkbox', { name: 'Hide from the Links page' })
-        ).toBeEnabled()
-        await modal.getByRole('button', { name: 'Create', exact: true }).click()
-        await expect(modal).toHaveCount(0)
-        await expect(page).toHaveURL((address) => !address.searchParams.has('create'))
-        await search(page).fill('parts-lookup')
-        await expect(rowFor(page, 'parts-lookup')).toBeVisible()
-        const opened = await page.request.get(url('/sim/parts-lookup/123'), { maxRedirects: 0 })
-        assert.equal(opened.headers().location, 'https://parts.example.com/123')
-      })
-    },
-    { allow: [/409 POST .*\/sim-links/] }
-  )
-  await check('?create= prefills the name, and an unknown sim/ link offers it', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(`${linksUrl}?create=brand-new`)
-      const modal = dialog(page, 'New link')
-      await expect(modal.getByRole('textbox', { name: 'Name' })).toHaveValue('brand-new')
-      await modal.getByRole('button', { name: 'Cancel', exact: true }).click()
-      await expect(page).toHaveURL((address) => !address.searchParams.has('create'))
-      await page.goto(url('/sim/brand-new'))
-      await expect(page.locator('[data-platform-ui]')).toHaveCount(0)
-      await expect(page.locator(`a[href*="links?create=brand-new"]`).first()).toBeVisible()
-    })
-  })
-  await check(
-    'a validation problem shows on its field, and the modal holds while saving',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(`${linksUrl}?create=held-link`)
-        const modal = dialog(page, 'New link')
-        await modal.getByRole('button', { name: 'Create', exact: true }).click()
-        await expect(modal.getByRole('textbox', { name: 'Destination URL' })).toHaveAttribute(
-          'aria-invalid',
-          'true'
-        )
-        await modal
-          .getByRole('textbox', { name: 'Destination URL' })
-          .fill('https://held.example.com')
-        const release = createDeferred<void>()
-        await page.route(`**/api/organizations/${ORGANIZATION_ID}/sim-links`, async (route) => {
-          await release.promise
-          await route.continue()
-        })
-        await modal.getByRole('button', { name: 'Create', exact: true }).click()
-        await page.keyboard.press('Escape')
-        await sleep(300)
-        await expect(modal).toBeVisible()
-        release.resolve()
-        await expect(modal).toHaveCount(0)
-      })
-    }
-  )
-  await check(
-    'the creator manages Access; delete warns everyone and stops the link working',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(`${linksUrl}?search=${NAMED_LINKS.mostUsed.name}`)
-        await rowFor(page, NAMED_LINKS.mostUsed.name).click({ button: 'right' })
-        await menuEntry(page, 'Edit').click()
-        const editor = dialog(page, `Edit ${NAMED_LINKS.mostUsed.name}`)
-        await expect(
-          editor.getByRole('checkbox', { name: 'Hide from the Links page' })
-        ).toBeEnabled()
-        await editor.getByRole('button', { name: 'Cancel', exact: true }).click()
-        await page.goto(`${linksUrl}?search=parts-lookup`)
-        await rowFor(page, 'parts-lookup').click({ button: 'right' })
-        await menuEntry(page, 'Delete').click()
-        const modal = dialog(page, 'Delete link')
-        await expect(
-          modal.getByText('parts-lookup will stop working for everyone in your organization.')
-        ).toBeVisible()
-        await modal.getByRole('button', { name: 'Delete', exact: true }).click()
-        await expect(modal).toHaveCount(0)
-        await expect(rowFor(page, 'parts-lookup')).toHaveCount(0)
-      })
-    }
-  )
-  await check(
-    'loading, failure with Retry, and the empty state',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl('/home'))
-        const hold = createDeferred<void>()
-        await page.route(
-          (address) => address.pathname === `${root}/links` && address.searchParams.has('_rsc'),
-          async (route) => {
-            await hold.promise
-            await route.continue()
-          }
-        )
-        await mainNav(page).getByRole('link', { name: 'Links', exact: true }).click()
-        await expect(page.getByRole('status', { name: 'Loading links' })).toBeVisible()
-        await expect(page.getByRole('button', { name: 'New link', exact: true })).toBeVisible()
-        hold.resolve()
-        await expect(rowFor(page, NAMED_LINKS.handbook.name)).toBeVisible()
-      })
-      await withSession(MEMBER, async ({ page }) => {
-        await withTableHidden('sim_link', async (restore) => {
-          await page.goto(linksUrl)
-          const retry = page.getByRole('button', { name: /Retry/ })
-          await expect(retry).toBeVisible({ timeout: 40_000 })
-          await restore()
-          await retry.click()
-          await expect(rowFor(page, NAMED_LINKS.handbook.name)).toBeVisible()
-        })
-      })
-      await withSession(OUTSIDER, async ({ page }) => {
-        await page.goto(url(`/o/${OUTSIDE_ORGANIZATION_ID}/links`))
-        await expect(page.getByText('Create short links like handbook')).toBeVisible()
-        await page.getByRole('button', { name: 'New link', exact: true }).last().click()
-        await expect(dialog(page, 'New link')).toBeVisible()
-      })
-    },
-    { allow: [/500 GET \/api\//] }
-  )
-  await check('the phone keeps Links usable', async () => {
-    await withSession(
-      MEMBER,
-      async ({ page }) => {
-        await page.goto(linksUrl)
-        await expect(rowFor(page, NAMED_LINKS.handbook.name)).toBeVisible()
-        await assertNoHorizontalOverflow(page, 'Links at 390px')
-        await page.getByRole('button', { name: 'New link', exact: true }).first().tap()
-        await expect(dialog(page, 'New link')).toBeVisible()
-      },
-      { viewport: PHONE }
-    )
-  })
-}
-
-const MEMBER_SETTINGS = ['General', 'Members', 'Recently deleted', 'Requests', 'Search MCP']
-const ADMIN_SETTINGS = [
-  'General',
-  'Subscription',
-  'Members',
-  'Credential Groups',
-  'Insights',
-  'White-labeling',
-  'Recently deleted',
-  'Requests',
-  'Audit logs',
-  'Permission groups',
-  'Single sign-on',
-  'Security',
-  'Data retention',
-  'Data drains',
-  'Sources',
-  'Search MCP',
-  'Sim Search in Slack',
-]
-
-async function settingsChecks() {
-  section('3 Settings')
-  for (const [persona, expected] of [
-    [MEMBER, MEMBER_SETTINGS],
-    [ADMIN, ADMIN_SETTINGS],
-  ] as const) {
-    await check(`${persona.key}: the same sections, in order`, async () => {
-      await withSession(persona, async ({ page }) => {
-        await page.goto(orgUrl('/settings/general'))
-        const links = sidebar(page).getByRole('link')
-        await expect(links.first()).toBeVisible()
-        const labels = (await links.allInnerTexts()).map((text) => text.trim()).filter(Boolean)
-        assert.deepEqual(
-          labels.filter((label) => expected.includes(label)),
-          expected
-        )
-      })
-    })
-  }
-  await check('the settings shell renders correctly around legacy content', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/settings/general'))
-      await expect(page.getByRole('button', { name: 'Sign out', exact: true })).toBeVisible()
-      await expect(page.getByRole('button', { name: 'Reset password', exact: true })).toBeVisible()
-      await expect(sidebar(page).locator('[data-platform-ui]').first()).toBeVisible()
-    })
-  })
-  await check(
-    'Members: roster and search for a member; Leave present, Invite and seats hidden',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl('/settings/members'))
-        await expect(page.getByPlaceholder('Search members...')).toBeVisible()
-        await expect(page.getByText(ADMIN.email).first()).toBeVisible()
-        await expect(page.getByRole('button', { name: 'Leave organization' })).toBeVisible()
-        await expect(page.getByRole('button', { name: 'Invite', exact: true })).toHaveCount(0)
-      })
-      await withSession(OWNER, async ({ page }) => {
-        await page.goto(orgUrl('/settings/members'))
-        await expect(page.getByRole('button', { name: 'Invite', exact: true })).toBeVisible()
-        await expect(page.getByRole('button', { name: 'Leave organization' })).toHaveCount(0)
-      })
-    }
-  )
-  await check('Recently deleted restores an owned chat', async () => {
-    await withSession(ADMIN, async ({ page }) => {
-      await page.goto(orgUrl('/settings/recently-deleted'))
-      await expect(page.getByPlaceholder('Search deleted chats')).toBeVisible()
-      await expect(page.getByText(ADMIN_CHATS.deleted.title)).toBeVisible()
-      await page
-        .getByRole('button', { name: /Restore/ })
-        .first()
-        .click()
-      await expect(page.getByText(ADMIN_CHATS.deleted.title)).toHaveCount(0)
-    })
-  })
-  await check('Requests and Search MCP render for a member', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/settings/requests'))
-      await expect(
-        page.getByText('No requests yet. Requests you send will appear here.')
-      ).toBeVisible()
-      await page.goto(orgUrl('/settings/search-mcp'))
-      await expect(
-        page
-          .getByRole('button', { name: /Copy configuration/ })
-          .or(page.getByText(/Server URL|Terminal command/).first())
-      ).toBeVisible()
-    })
-  })
-  await check('Back from Settings returns to the remembered page', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/links'))
-      await accountChip(page).click()
-      await dialog(page, 'Account menu')
-        .getByRole('button', { name: 'Settings', exact: true })
-        .click()
-      await expect(page).toHaveURL(orgUrl('/settings/general'))
-      await sidebar(page).getByRole('button', { name: 'Back', exact: true }).click()
-      await expect(page).toHaveURL(orgUrl('/links'))
-    })
-  })
-  notProvable(
-    'Settings leave guard: dirty state',
-    'Only White-labeling has a dirty form, covered by its own surface'
-  )
-  await check('admin settings sections all open', async () => {
-    await withSession(ADMIN, async ({ page }) => {
-      for (const path of [...SETTINGS_FOR_ADMIN, 'search-mcp']) {
-        const response = await page.goto(orgUrl(`/settings/${path}`))
-        assert((response?.status() ?? 500) < 400, `settings/${path} ${response?.status()}`)
-        await expect(sidebar(page)).toBeVisible()
-      }
-    })
-  })
-}
-
-async function blastRadiusChecks() {
-  section('Blast radius')
-  const workspaceHome = `/workspace/${MEMBER_ADMIN_WORKSPACE.id}/home`
-  await check('/workspace has no platform surface and its usual nav', async () => {
-    await withSession(ADMIN, async ({ page }) => {
-      await page.goto(url(workspaceHome))
-      const rail = page.getByRole('complementary', { name: 'Workspace sidebar' })
-      await expect(rail).toBeVisible()
-      for (const label of ['Integrations', 'Tables', 'Files', 'Knowledge bases', 'Logs'])
-        await expect(rail.getByRole('link', { name: label, exact: true })).toBeVisible()
-      await expect(page.locator('[data-platform-ui]')).toHaveCount(0)
-    })
-  })
-  await check(
-    'client navigation from /o to /workspace leaves legacy controls unchanged',
-    async () => {
-      const sample = (page: Page) =>
-        page.evaluate(() => {
-          const props = [
-            'font-family',
-            'font-size',
-            'font-weight',
-            'line-height',
-            'letter-spacing',
-            'color',
-            'background-color',
-            'border-top-color',
-            'border-top-width',
-            'border-top-style',
-            'border-top-left-radius',
-            'padding-top',
-            'padding-left',
-            'height',
-            'box-shadow',
-            'outline-style',
-          ]
-          const tokens = [
-            '--bg',
-            '--surface-1',
-            '--surface-3',
-            '--text-primary',
-            '--text-muted',
-            '--border',
-            '--font-sans',
-            '--font-mono',
-            '--color-border',
-            '--color-accent',
-            '--color-background',
-            '--color-secondary',
-            '--text-caption',
-          ]
-          const rootStyle = getComputedStyle(document.documentElement)
-          const output: Record<string, string> = {}
-          for (const token of tokens)
-            output[`:root ${token}`] = rootStyle.getPropertyValue(token).trim()
-          for (const prop of props)
-            output[`body ${prop}`] = getComputedStyle(document.body).getPropertyValue(prop)
-          const seen = new Map<string, number>()
-          const rail = document.querySelector('[aria-label="Workspace sidebar"]')
-          const controls = rail
-            ? rail.querySelectorAll('a, button, input, textarea, [role="button"], h1, h2, p, span')
-            : []
-          for (const element of Array.from(controls).slice(0, 200)) {
-            const text = (element.textContent ?? '').trim().slice(0, 24)
-            const base = `${element.tagName} ${element.getAttribute('aria-label') ?? text}`
-            const count = seen.get(base) ?? 0
-            seen.set(base, count + 1)
-            const key = `${base} #${count}`
-            const style = getComputedStyle(element)
-            output[key] = props.map((prop) => style.getPropertyValue(prop)).join(' | ')
-          }
-          return output
-        })
-      for (const theme of ['light', 'dark'] as const) {
-        let fresh: Record<string, string> = {}
-        await withSession(
-          ADMIN,
-          async (session) => {
-            await session.page.goto(url(workspaceHome))
-            await expect(
-              session.page.getByRole('complementary', { name: 'Workspace sidebar' })
-            ).toBeVisible()
-            await session.settle()
-            fresh = await sample(session.page)
-          },
-          { theme }
-        )
-        await withSession(
-          ADMIN,
-          async (session) => {
-            const { page } = session
-            for (const path of ['links', 'integrations', 'search?mode=search', 'home']) {
-              await page.goto(orgUrl(`/${path}`))
-              await session.settle()
-            }
-            await page.evaluate((href) => {
-              ;(
-                window as unknown as { next: { router: { push: (href: string) => void } } }
-              ).next.router.push(href)
-            }, workspaceHome)
-            await expect(page).toHaveURL(url(workspaceHome), { timeout: 45_000 })
-            await expect(
-              page.getByRole('complementary', { name: 'Workspace sidebar' })
-            ).toBeVisible()
-            await session.settle()
-            await expect(page.locator('[data-platform-ui]')).toHaveCount(0)
-            const carried = await sample(page)
-            const differences = Object.keys(fresh)
-              .filter((key) => key in carried && carried[key] !== fresh[key])
-              .map((key) => `${key}: fresh ${fresh[key]} vs carried ${carried[key]}`)
-            assert(Object.keys(fresh).length > 20, 'The sample found the rail controls')
-            assert.deepEqual(
-              differences,
-              [],
-              `${differences.length} computed styles moved in ${theme}`
-            )
-          },
-          { theme }
-        )
-      }
-    }
-  )
-  await check(
-    'legacy Settings content is styled the same under /o as under /workspace',
-    async () => {
-      const sampleContent = (page: Page) =>
-        page.evaluate(() => {
-          const props = [
-            'font-family',
-            'font-size',
-            'font-weight',
-            'letter-spacing',
-            'color',
-            'background-color',
-            'border-top-left-radius',
-          ]
-          const output: Record<string, string> = {}
-          const controls = Array.from(
-            document.querySelectorAll('h1, h2, h3, label, input, button, p')
-          ).filter((element) => !element.closest('aside') && (element as HTMLElement).offsetParent)
-          for (const element of controls.slice(0, 80)) {
-            const key = `${element.tagName} ${(element.textContent ?? '').trim().slice(0, 32)}`
-            const style = getComputedStyle(element)
-            output[key] = props.map((prop) => style.getPropertyValue(prop)).join(' | ')
-          }
-          return output
-        })
-      await withSession(ADMIN, async (session) => {
-        const { page } = session
-        await page.goto(url(`/workspace/${MEMBER_ADMIN_WORKSPACE.id}/settings/general`))
-        await expect(
-          page.getByRole('button', { name: 'Reset password', exact: true })
-        ).toBeVisible()
-        await session.settle()
-        const workspace = await sampleContent(page)
-        await page.goto(orgUrl('/settings/general'))
-        await expect(
-          page.getByRole('button', { name: 'Reset password', exact: true })
-        ).toBeVisible()
-        await session.settle()
-        const organization = await sampleContent(page)
-        const shared = Object.keys(workspace).filter((key) => key in organization)
-        assert(shared.length > 5, `Only ${shared.length} shared controls`)
-        assert.deepEqual(
-          shared
-            .filter((key) => workspace[key] !== organization[key])
-            .map((key) => `${key}: ${workspace[key]} vs ${organization[key]}`),
-          []
-        )
-      })
-    },
-    // The workspace shell reads its inbox whatever the group's hideInboxTab says.
-    { allow: [/403 GET .*\/inbox/] }
-  )
-  await check('the extension panel has no platform surface and reads no Home data', async () => {
-    await withSession(
-      MEMBER,
-      async (session) => {
-        const { page } = session
-        // Opened outside the extension's frame, where a chrome-extension target has no meaning.
-        await page.addInitScript(() => {
-          const post = window.postMessage.bind(window)
-          window.postMessage = ((...args: Parameters<typeof post>) => {
-            if (!String(args[1]).startsWith('chrome-extension://')) post(...args)
-          }) as typeof window.postMessage
-        })
-        const consoleErrors: string[] = []
-        page.on('console', (message) => {
-          if (message.type() === 'error') consoleErrors.push(message.text())
-        })
-        await page.goto(url(`/extension/o/${ORGANIZATION_ID}`))
-        await expect(composer(page))
-          .toBeVisible()
-          .catch((error) => {
-            throw new Error(`${getErrorMessage(error)}\nConsole: ${consoleErrors.join('\n')}`)
-          })
-        await session.settle()
-        await expect(page.locator('[data-platform-ui]')).toHaveCount(0)
-        const home = session.requests.filter(({ path }) => /\/home\/|\/usage\/activity/.test(path))
-        assert.deepEqual(home, [])
-        await expect(page.getByRole('region', { name: 'Email', exact: true })).toHaveCount(0)
-        await page.goto(url('/extension/create-link'))
-        await expect(page.locator('[data-platform-ui]')).toHaveCount(0)
-      },
-      { viewport: { name: 'panel', width: 400, height: 800 } }
-    )
-  })
-  await check(
-    '/sim, /sim-links, /invite, login and marketing have no platform surface',
-    async () => {
-      await withSession(MEMBER, async ({ page, context }) => {
-        await context.route(/^https:\/\/example\.com\//, (route) =>
-          route.fulfill({ status: 200, contentType: 'text/html', body: 'stand-in' })
-        )
-        for (const path of ['/sim/no-such-link', '/invite/not-a-token']) {
-          await page.goto(url(path))
-          await expect(page.locator('[data-platform-ui]')).toHaveCount(0)
-        }
-      })
-      await withSession(null, async ({ page }) => {
-        for (const path of ['/login', '/', '/platform']) {
-          await page.goto(url(path))
-          await expect(page.locator('[data-platform-ui]')).toHaveCount(0)
-        }
-      })
-    },
-    { allow: [/404 GET \/(sim|invite|platform)/] }
-  )
-  await check('the surface defines its caption token without reaching :root', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      const { onRoot, onSurface } = await page.evaluate(() => {
-        const read = (element: Element | null) =>
-          element ? getComputedStyle(element).getPropertyValue('--text-caption').trim() : null
-        return {
-          onRoot: read(document.documentElement),
-          onSurface: read(document.querySelector('[data-platform-ui]')),
-        }
-      })
-      assert(onSurface, 'Home mounts the surface, which defines the token')
-      assert.notEqual(onRoot, onSurface, 'The surface token reached :root')
-    })
-  })
-}
-
-const PREFETCHED_ON_LAYOUT = [
-  { label: 'chat list', pattern: /^\/api\/mothership\/chats\?(?=.*organizationId=)/ },
-  { label: 'profile', pattern: /^\/api\/users\/me\/profile/ },
-  { label: 'workspace list', pattern: /^\/api\/workspaces(\?|$)/ },
-]
-const PREFETCHED_INVENTORY = [
-  { label: 'connected accounts', pattern: /\/connected-accounts(\?|$)/ },
-  { label: 'search integrations', pattern: /\/api\/knowledge\/sim-search\/integrations/ },
-]
-const PREFETCHED_HISTORY = [{ label: 'search history', pattern: /\/search\/history(\?|$)/ }]
-const PREFETCHED_SECRET_SOURCE = [
-  { label: 'secret source', pattern: /\/secrets\/source|\/secret-source/ },
-]
-const PREFETCHED_LINKS = [{ label: 'links first page', pattern: /\/sim-links(\?(?!.*cursor=)|$)/ }]
-
-async function firstPaintChecks() {
-  section('6 First paint')
-  const pages = [
-    {
-      name: 'Home',
-      path: 'home',
-      primary: (page: Page) => composer(page),
-      prefetched: [...PREFETCHED_ON_LAYOUT, ...PREFETCHED_INVENTORY, ...PREFETCHED_HISTORY],
-    },
-    {
-      name: 'Search',
-      path: 'search?mode=search',
-      primary: (page: Page) => searchField(page),
-      prefetched: [...PREFETCHED_ON_LAYOUT, ...PREFETCHED_HISTORY],
-    },
-    {
-      name: 'Integrations',
-      path: 'integrations',
-      primary: (page: Page) => page.getByRole('link', { name: /^Gmail/ }),
-      prefetched: [...PREFETCHED_ON_LAYOUT, ...PREFETCHED_INVENTORY, ...PREFETCHED_SECRET_SOURCE],
-    },
-    {
-      name: 'Links',
-      path: 'links',
-      primary: (page: Page) => page.getByRole('row').nth(1),
-      prefetched: [...PREFETCHED_ON_LAYOUT, ...PREFETCHED_LINKS],
-    },
-    {
-      name: 'Links by opens',
-      path: 'links?sort=popular&dir=desc',
-      primary: (page: Page) => page.getByRole('row').nth(1),
-      prefetched: [...PREFETCHED_ON_LAYOUT, ...PREFETCHED_LINKS],
-    },
-  ] satisfies {
-    name: string
-    path: string
-    primary: (page: Page) => Locator
-    prefetched: { label: string; pattern: RegExp }[]
-  }[]
-  await check(
-    'Links paints its first page from the server, even with the client read refused',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        const reads: string[] = []
-        await page.route(`**/api/organizations/${ORGANIZATION_ID}/sim-links**`, (route) => {
-          reads.push(route.request().url())
-          return route.fulfill({ status: 500, json: { error: 'The client must not need this' } })
-        })
-        await page.goto(orgUrl('/links'))
-        await expect(
-          page.getByRole('row').filter({ hasText: NAMED_LINKS.handbook.name })
-        ).toBeVisible()
-        await expect(page.getByRole('button', { name: /Retry/ })).toHaveCount(0)
-        assert.deepEqual(
-          reads.filter((address) => !address.includes('cursor=')),
-          [],
-          'The seeded first page was fetched again'
-        )
-        await page.goto(orgUrl('/links?sort=popular&dir=desc'))
-        await expect(page.getByRole('row').nth(1)).toContainText(NAMED_LINKS.mostUsed.name)
-        await page.goto(orgUrl(`/links?search=${NAMED_LINKS.mostUsed.name}`))
-        await expect(page.getByRole('row').nth(1)).toContainText(NAMED_LINKS.mostUsed.name)
-        assert.deepEqual(
-          reads.filter((address) => !address.includes('cursor=')),
-          [],
-          'A seeded view of the URL was fetched again'
-        )
-      })
-    },
-    { allow: [/500 GET .*\/sim-links/] }
-  )
-  await check('the Links document already carries the first page of rows', async () => {
-    await withSession(MEMBER, async ({ page, context }) => {
-      await page.goto(orgUrl('/home'))
-      const html = await (await context.request.get(orgUrl('/links'))).text()
-      assert(html.includes(NAMED_LINKS.handbook.url), 'The document holds the seeded rows')
-    })
-  })
-  for (const persona of [MEMBER, ADMIN]) {
-    for (const entry of pages) {
-      await check(
-        `${persona.key} ${entry.name}: measured, no duplicate or prefetched-key fetch`,
-        async () => {
-          await withSession(persona, async (session) => {
-            const { page } = session
-            // A returning member's browser already holds the app's scripts.
-            await page.goto(orgUrl(`/${entry.path}`))
-            await entry.primary(page).first().waitFor({ timeout: 30_000 })
-            await session.settle()
-            session.requests.length = 0
-            const started = performance.now()
-            await page.goto(orgUrl(`/${entry.path}`), { waitUntil: 'commit' })
-            await entry.primary(page).first().waitFor({ timeout: 30_000 })
-            const primaryVisibleMs = Math.round(performance.now() - started)
-            await session.settle()
-            const paints = await page.evaluate(() =>
-              Object.fromEntries(
-                performance
-                  .getEntriesByType('paint')
-                  .map((item) => [item.name, Math.round(item.startTime)])
-              )
-            )
-            const api = session.requests.filter(({ path }) => path.startsWith('/api/'))
-            const labelled = api.map(({ method, path }) => `${method} ${path}`)
-            const counts = new Map<string, number>()
-            for (const label of labelled) counts.set(label, (counts.get(label) ?? 0) + 1)
-            const duplicates = [...counts.entries()]
-              .filter(([, count]) => count > 1)
-              .map(([label, count]) => `${label} x${count}`)
-            const refetched = entry.prefetched.flatMap(({ label, pattern }) =>
-              api.some(({ method, path }) => method === 'GET' && pattern.test(path)) ? [label] : []
-            )
-            firstPaints.push({
-              persona: persona.key,
-              page: entry.name,
-              firstPaintMs: paints['first-paint'] ?? null,
-              firstContentfulPaintMs: paints['first-contentful-paint'] ?? null,
-              primaryVisibleMs,
-              apiRequests: labelled,
-              totalRequestCount: session.requests.length,
-              duplicates,
-              prefetchedAndRefetched: refetched,
-            })
-            assert.deepEqual(duplicates, [], 'A read was fetched twice on first paint')
-            assert.deepEqual(refetched, [], 'A prefetched key was fetched again on first paint')
-          })
-        }
-      )
-    }
-  }
-}
-
-const SETTINGS_FOR_ALL = ['general', 'members', 'recently-deleted', 'requests', 'search-mcp']
-const SETTINGS_FOR_ADMIN = [
-  'subscription',
-  'credential-groups',
-  'usage',
-  'whitelabeling',
-  'audit-logs',
-  'access-control',
-  'sso',
-  'security',
-  'data-retention',
-  'data-drains',
-  'integrations',
-  'slack-search',
-]
-
-const settingsRoutes = (sections: readonly string[]) =>
-  sections.map((section) => ({ name: `settings-${section}`, path: `settings/${section}` }))
-
-function routesFor(persona: Persona): { name: string; path: string }[] {
-  const shared = [
-    { name: 'home', path: 'home' },
-    { name: 'search', path: 'search?mode=search' },
-    { name: 'search-empty-query', path: 'search?mode=search&q=warranty' },
-    { name: 'assistant', path: 'search?mode=assistant' },
-    { name: 'integrations', path: 'integrations' },
-    { name: 'integration-gmail', path: 'integrations/gmail' },
-    { name: 'integration-gitlab', path: 'integrations/gitlab' },
-    { name: 'generic-secrets', path: 'integrations/secrets' },
-    { name: 'links', path: 'links' },
-    { name: 'links-new', path: 'links?create=new-link' },
-    ...settingsRoutes(SETTINGS_FOR_ALL),
-  ]
-  if (persona === MEMBER)
-    return [...shared, { name: 'assistant-chat', path: `search/chat/${MEMBER_CHATS.assistant.id}` }]
-  if (persona === ADMIN || persona === OWNER)
-    return [
-      ...shared,
-      ...(persona === ADMIN ? [{ name: 'agent-chat', path: `chat/${ADMIN_CHATS.agent.id}` }] : []),
-      ...settingsRoutes(SETTINGS_FOR_ADMIN),
-    ]
-  if (persona === CONNECTED)
-    return [
-      { name: 'home', path: 'home' },
-      { name: 'integrations', path: 'integrations' },
-      { name: 'integration-gmail', path: 'integrations/gmail' },
-      { name: 'tool-permissions', path: `integrations/accounts/${GRANTS.gmail.credentialId}` },
-    ]
-  return shared
-}
-
-/** The app scrolls inside its own panes, so the viewport grows to what they hold before the shot. */
-async function fullPageScreenshot(page: Page, path: string, viewport: Viewport) {
-  const height = await page.evaluate(() => {
-    let tallest = innerHeight
-    for (const element of Array.from(document.querySelectorAll('body *'))) {
-      const overflow = element.scrollHeight - element.clientHeight
-      if (overflow > 1) tallest = Math.max(tallest, innerHeight + overflow)
-    }
-    return Math.min(tallest, 3600)
-  })
-  const grows = height > viewport.height
-  if (grows) {
-    await page.setViewportSize({ width: viewport.width, height })
-    await sleep(150)
-  }
-  await page.screenshot({
-    path,
-    fullPage: true,
-    animations: 'disabled',
-    style: 'nextjs-portal { display: none; }',
-    timeout: 20_000,
-  })
-  if (grows) await page.setViewportSize({ width: viewport.width, height: viewport.height })
-}
-
-async function walkOne(persona: Persona, viewport: Viewport, theme: Theme) {
-  const name = `${persona.key} ${viewport.name} ${theme}: every route renders healthy`
-  const started = performance.now()
-  try {
-    await withSession(
-      persona,
-      async (session) => {
-        const { page } = session
-        const failures: string[] = []
-        if (persona === CONNECTED) await stubConnectedHome(page)
-        for (const route of routesFor(persona)) {
-          const response = await page.goto(orgUrl(`/${route.path}`), { timeout: 60_000 })
-          await session.settle()
-          if (route.name === 'home')
-            await composer(page)
-              .waitFor({ timeout: 20_000 })
-              .catch(() => failures.push('home never left its skeleton'))
-          const screenshot = `${persona.key}__${route.name}__${viewport.name}__${theme}.png`
-          const path = resolve(artifactDirectory, screenshot)
-          await fullPageScreenshot(page, path, viewport)
-            // A client redirect can land after the page has settled.
-            .catch(() => session.settle().then(() => fullPageScreenshot(page, path, viewport)))
-            .catch((error) => failures.push(`${route.name} screenshot: ${getErrorMessage(error)}`))
-          const facts = await page.evaluate(() => ({
-            dark: document.documentElement.classList.contains('dark'),
-            font: getComputedStyle(document.body).fontFamily,
-            overflow: document.documentElement.scrollWidth - innerWidth,
-            surfaces: document.querySelectorAll('[data-platform-ui]').length,
-            text: (
-              document.querySelector('main')?.textContent ??
-              document.body.textContent ??
-              ''
-            ).trim().length,
-          }))
-          routes.push({
-            persona: persona.key,
-            route: route.path,
-            viewport: viewport.name,
-            theme,
-            status: response?.status() ?? null,
-            finalPath: pathOf(page.url()),
-            screenshot,
-            platformSurfaces: facts.surfaces,
-          })
-          if ((response?.status() ?? 500) >= 400)
-            failures.push(`${route.name} status ${response?.status()}`)
-          if (facts.dark !== (theme === 'dark')) failures.push(`${route.name} wrong theme`)
-          if (/Times/.test(facts.font)) failures.push(`${route.name} has no stylesheet`)
-          if (facts.overflow > 1) failures.push(`${route.name} overflows by ${facts.overflow}px`)
-          if (facts.text === 0) failures.push(`${route.name} rendered an empty shell`)
-        }
-        assert.deepEqual(failures, [])
-      },
-      { viewport, theme }
-    )
-    record(name, 'Route walk', started)
-  } catch (error) {
-    record(name, 'Route walk', started, truncate(getErrorMessage(error), 2000))
-  }
-}
-
-async function walkRoutes(personas: Persona[]) {
-  section('Route walk')
-  currentCheck = 'Route walk'
-  // The token route limits per user, and one persona opens a hundred pages here within minutes.
-  allowedFailures = [/429 POST \/api\/auth\/socket-token/]
-  const plan = personas.flatMap((persona) =>
-    [DESKTOP, PHONE].flatMap((viewport) =>
-      (['light', 'dark'] as const).map((theme) => ({ persona, viewport, theme }))
-    )
-  )
-  await mapWithConcurrency(plan, WALK_CONCURRENCY, ({ persona, viewport, theme }) =>
-    walkOne(persona, viewport, theme)
-  )
-}
-
-async function peoplePhaseChecks() {
-  section('People with its flag on')
-  await check('nav: People sits after Search', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/home'))
-      assert.deepEqual(await navLabels(page), ['Home', 'Search', 'People', 'Integrations', 'Links'])
-    })
-  })
-  await check(
-    'a member reads that an organization admin connects the directory, and no name',
-    async () => {
-      await withSession(MEMBER, async ({ page }) => {
-        await page.goto(orgUrl('/people'))
-        await expect(page.getByRole('button', { name: 'Org chart' })).toBeVisible()
-        await expect(page.getByText(/organization admin/i).first()).toBeVisible()
-        await expect(page.getByRole('button', { name: 'Directory sync' })).toHaveCount(0)
-        await expect(page.getByRole('button', { name: 'Import', exact: true })).toHaveCount(0)
-        await expect(page.getByRole('button', { name: 'Connect Okta' })).toHaveCount(0)
-      })
-    }
-  )
-  await check('an admin can sync and import from the empty state', async () => {
-    await withSession(ADMIN, async ({ page }) => {
-      await page.goto(orgUrl('/people'))
-      await expect(page.getByRole('button', { name: 'Connect Okta' })).toBeVisible()
-      await expect(page.getByRole('button', { name: 'Import profiles' })).toBeVisible()
-    })
-  })
-  await check('the directory lists the organization', async () => {
-    await withSession(MEMBER, async ({ page }) => {
-      await page.goto(orgUrl('/people?view=directory'))
-      await expect(page.getByText(ADMIN.name).first()).toBeVisible()
-    })
-  })
-  await walkPeopleRoutes()
-}
-
-async function walkPeopleRoutes() {
-  for (const persona of [MEMBER, ADMIN]) {
-    for (const theme of ['light', 'dark'] as const) {
-      await check(`${persona.key} ${theme}: People screenshots`, async () => {
-        await withSession(
-          persona,
-          async (session) => {
-            for (const viewport of [DESKTOP, PHONE]) {
-              await session.page.setViewportSize({ width: viewport.width, height: viewport.height })
-              for (const [name, path] of [
-                ['chart', 'people'],
-                ['directory', 'people?view=directory'],
-              ]) {
-                await session.page.goto(orgUrl(`/${path}`))
-                await session.settle()
-                await fullPageScreenshot(
-                  session.page,
-                  resolve(
-                    artifactDirectory,
-                    `${persona.key}__people-${name}__${viewport.name}__${theme}.png`
-                  ),
-                  viewport
-                )
-              }
-            }
-          },
-          { theme }
-        )
-      })
-    }
-  }
-}
-
-async function run() {
-  await mkdir(artifactDirectory, { recursive: true })
-  if (phase === 'people') {
-    await peoplePhaseChecks()
-    return
-  }
-  await landingChecks()
-  await sidebarChecks()
-  await homeChecks()
-  await chatChecks()
-  await searchChecks()
-  await integrationChecks()
-  await linksChecks()
-  await settingsChecks()
-  await firstPaintChecks()
-  await blastRadiusChecks()
-  await walkRoutes([MEMBER, ADMIN, OWNER, CONNECTED, NARROW])
-  section('Health')
-  await check('no unexpected browser runtime errors or failed same-origin requests', async () => {
-    assert.deepEqual(unexpected, [])
-  })
-}
-
-await run()
-  .catch((error) => {
-    logger.error('Org redesign E2E aborted', { error: getErrorMessage(error) })
-    process.exitCode = 1
-  })
-  .finally(async () => {
-    await browser.close().catch(() => {})
-    await sql.end({ timeout: 5 }).catch(() => {})
-    const { failed } = reportCounts()
-    if (failed > 0 || checks.length === 0) process.exitCode = 1
-    writeReport()
-    logger.info(`Org redesign E2E: ${JSON.stringify(reportCounts())}`)
-  })
diff --git a/apps/sim/scripts/test-organization-search-e2e.ts b/apps/sim/scripts/test-organization-search-e2e.ts
index 0956517dadc..8606ca7c6de 100644
--- a/apps/sim/scripts/test-organization-search-e2e.ts
+++ b/apps/sim/scripts/test-organization-search-e2e.ts
@@ -932,13 +932,13 @@ try {
         )
         await expect(wikiResult).toBeVisible()
         await capture('search-populated-desktop')
-        await page.getByRole('combobox', { name: 'Filter by source: All sources' }).click()
+        await page.getByRole('button', { name: 'Filter by source: All sources' }).click()
         await capture('search-source-filter')
-        await page.getByRole('option', { name: 'Google Drive', exact: true }).click()
+        await page.getByRole('menuitem', { name: 'Google Drive', exact: true }).click()
         await expect(page).toHaveURL((url) => url.searchParams.get('source') === 'google_drive')
         await expect(wikiResult).toHaveCount(0)
         await capture('search-filtered')
-        await page.getByRole('combobox', { name: 'Filter by date: Any time' }).click()
+        await page.getByRole('button', { name: 'Filter by date: Any time' }).click()
         await capture('search-date-filter')
         await page.keyboard.press('Escape')
         await page.setViewportSize({ width: 390, height: 844 })
@@ -1021,17 +1021,13 @@ try {
     }
   )
   await check(
-    'Search-only members have Home with the Assistant and their history, but no agent chat',
+    'Search-only members can reopen assistant history without access to Home chat',
     async () => {
       await sql`insert into permission_group (id, organization_id, name, config, created_by, is_default)
       values (${generateId()}, ${organizationId}, 'Search only',
         ${sql.json({ disableWorkspaceCreation: true })}, ${userId}, true)`
       await page.goto(`${baseUrl.origin}${root}/home`)
-      await expect(page).toHaveURL((url) => url.pathname === `${root}/home`)
-      await expect(page.getByRole('textbox', { name: 'Ask Sim' })).toBeVisible()
-      await page.goto(`${baseUrl.origin}${root}/chat/${agentId}`)
-      await expect(page.getByRole('heading', { name: 'Page not found' })).toBeVisible()
-      await expect(page.getByRole('textbox', { name: 'Ask Sim' })).toHaveCount(0)
+      await expect(page).toHaveURL((url) => url.pathname === `${root}/search`)
       await page.goto(`${baseUrl.origin}${root}/search/chat/${assistantId}`)
       await expect(page.getByText(answer, { exact: true })).toBeVisible()
     }
@@ -1055,14 +1051,11 @@ try {
     const deniedRecoveries = browserErrorEvents.filter(
       (event) =>
         event.digest === 'NEXT_HTTP_ERROR_FALLBACK;404' &&
-        ((event.url === `${baseUrl.origin}${root}/search/chat/${deniedChatId}` &&
-          [
-            'Assistant history rejects a chat from another organization',
-            'A streamed denied chat remains navigable after hydration',
-          ].includes(event.stage)) ||
-          (event.url === `${baseUrl.origin}${root}/chat/${agentId}` &&
-            event.stage ===
-              'Search-only members have Home with the Assistant and their history, but no agent chat'))
+        event.url === `${baseUrl.origin}${root}/search/chat/${deniedChatId}` &&
+        [
+          'Assistant history rejects a chat from another organization',
+          'A streamed denied chat remains navigable after hydration',
+        ].includes(event.stage)
     )
     const recoveryCount = deniedRecoveries.reduce((total, event) => total + event.count, 0)
     assert.equal(
diff --git a/apps/sim/scripts/test-people-e2e.ts b/apps/sim/scripts/test-people-e2e.ts
index 1d52aa65a1a..b90de740bf1 100644
--- a/apps/sim/scripts/test-people-e2e.ts
+++ b/apps/sim/scripts/test-people-e2e.ts
@@ -566,40 +566,31 @@ async function run() {
           waitUntil: 'domcontentloaded',
           timeout: 180_000,
         })
-        const trail = page.getByRole('navigation', { name: 'Reporting path' })
-        const focused = (name: string) => trail.getByRole('heading', { name, exact: true })
-        const profileOf = (name: string) =>
+        const focused = (name: string) =>
           page.getByRole('link', { name: `View profile for ${name}` })
-        const viewTab = (name: string) =>
-          page
-            .getByRole('navigation', { name: 'People view' })
-            .getByRole('button', { name, exact: true })
         await expect(focused('Maya Chen')).toBeVisible({ timeout: 120_000 })
         await expect(page.getByRole('button', { name: 'Explore Felix Ward' })).toBeVisible()
         const longTitleLabel = page
           .getByRole('button', { name: 'Explore Amara Cole' })
           .getByText(longTitle, { exact: true })
-        await longTitleLabel.hover({ position: { x: 4, y: 4 } })
-        await expect(page.locator('[role=tooltip]').filter({ hasText: longTitle })).toBeVisible()
+        await longTitleLabel.hover()
+        await expect(
+          page.locator('[data-native-surface-overlay]').filter({ hasText: longTitle })
+        ).toBeVisible()
         await page.mouse.move(0, 0)
-        await expect(page.getByRole('button', { name: 'Import', exact: true })).toBeVisible()
-        await page.getByRole('button', { name: 'Directory sync', exact: true }).click()
-        await page.getByRole('heading', { name: 'Directory sync', level: 1 }).waitFor()
-        await page.goBack()
-        await expect(focused('Maya Chen')).toBeVisible()
         await page.screenshot({ path: join(screenshotDir, 'desktop.png') })
-        const card = page.getByRole('button', { name: 'Explore Felix Ward' })
+        const card = focused('Maya Chen')
         const cardWidth = await card.evaluate((node) => node.getBoundingClientRect().width)
         await page.getByRole('button', { name: 'Zoom in' }).click()
         await expect
           .poll(() => card.evaluate((node) => node.getBoundingClientRect().width))
           .toBeGreaterThan(cardWidth)
         await page.getByRole('button', { name: 'Fit chart' }).click()
-        const cardColor = () =>
-          card.evaluate((node) => getComputedStyle(node.parentElement as Element).backgroundColor)
-        const lightCardColor = await cardColor()
+        const lightCardColor = await card.evaluate((node) => getComputedStyle(node).backgroundColor)
         await page.emulateMedia({ colorScheme: 'dark' })
-        await expect.poll(cardColor).not.toBe(lightCardColor)
+        await expect
+          .poll(() => card.evaluate((node) => getComputedStyle(node).backgroundColor))
+          .not.toBe(lightCardColor)
         await page.screenshot({ path: join(screenshotDir, 'desktop-dark.png') })
         await page.emulateMedia({ colorScheme: 'light' })
         await page.getByRole('button', { name: 'Next reports' }).focus()
@@ -632,8 +623,8 @@ async function run() {
           (text) => navigator.clipboard.writeText(text),
           `${boundedPaste}${'界'.repeat(4096)}`
         )
-        const pickerSearch = page.getByRole('combobox', { name: 'Find a person' })
-        await pickerSearch.click()
+        await page.getByLabel('Find a person').click()
+        const pickerSearch = page.getByPlaceholder('Search name, title or email…')
         await pickerSearch.focus()
         await pickerSearch.press('ControlOrMeta+v')
         await expect(pickerSearch).toHaveValue(boundedPaste, { timeout: 5_000 })
@@ -648,6 +639,8 @@ async function run() {
         try {
           await pickerSearch.fill(pagedSearch)
           await expect(page.getByRole('option', { name: /^Directory colleague 001/ })).toBeVisible()
+          const more = page.getByRole('button', { name: 'Load more', exact: true })
+          await expect(more).toBeVisible({ timeout: 5_000 })
           await Promise.all([
             page.waitForResponse((response) => {
               const url = new URL(response.url())
@@ -658,15 +651,14 @@ async function run() {
                 response.ok()
               )
             }),
-            page
-              .getByRole('listbox', { name: 'Find a person' })
-              .evaluate((list) => list.scrollTo(0, list.scrollHeight)),
+            more.click(),
           ])
+          await more.scrollIntoViewIfNeeded()
           await page.getByRole('option', { name: /^Directory colleague 100/ }).click()
           await expect(
             page.getByText('No reporting lines for Directory colleague 100', { exact: true })
           ).toBeVisible()
-          assert.equal(requestedPages.length, 2, 'Reaching the end loads one additional page')
+          assert.equal(requestedPages.length, 2, 'One click loads exactly one additional page')
           assert.equal(requestedPages[0], null)
           assert(requestedPages[1], 'Page two resumes with a cursor')
           await page.goBack()
@@ -674,19 +666,17 @@ async function run() {
         } finally {
           await sql`delete from people_directory_sync where organization_id = ${teamOrg} and source_target = 'picker.okta.com'`
         }
-        await pickerSearch.click()
-        await pickerSearch.fill(' Engineering ')
-        await page.getByRole('option', { name: /^Ben Ortega.*Design Lead/ }).click()
-        await expect(focused('Ben Ortega')).toBeVisible()
-        await expect(pickerSearch).toHaveValue('')
-        await profileOf('Ben Ortega').click()
+        await page.getByLabel('Find a person').click()
+        await page.getByPlaceholder('Search name, title or email…').fill(' Engineering ')
+        await page.getByText(/Ben Ortega · Design Lead/).click()
+        await focused('Ben Ortega').click()
         await page.getByRole('link', { name: 'View in org chart' }).click()
         await expect(focused('Ben Ortega')).toBeVisible()
-        await page.getByRole('combobox', { name: 'Browse top-level teams' }).click()
-        await page.getByRole('option', { name: /^Maya Chen · VP Engineering/ }).click()
+        await page.getByLabel('Browse top-level teams').click()
+        await page.getByText(/Maya Chen · VP Engineering/).click()
         await expect(focused('Maya Chen')).toBeVisible()
-        await viewTab('Directory').click()
-        const directorySearch = page.getByRole('searchbox', { name: 'Search people' })
+        await page.getByRole('radio', { name: 'Directory' }).click()
+        const directorySearch = page.getByRole('textbox', { name: 'Search people...', exact: true })
         await directorySearch.focus()
         await directorySearch.press('ControlOrMeta+v')
         await expect(directorySearch).toHaveValue(boundedPaste)
@@ -702,12 +692,12 @@ async function run() {
           'People sent an oversized search'
         )
         await directorySearch.fill('Amara')
-        const profileLink = page.getByRole('link', { name: /^Amara Cole/ })
+        const profileLink = page.getByRole('link', { name: 'Amara Cole', exact: true })
         await profileLink.focus()
         await page.keyboard.press('Enter')
         await page.getByRole('link', { name: 'Open Maya Chen' }).click()
         const backToResults = page
-          .getByRole('link', { name: 'Back to directory', exact: true })
+          .getByRole('link', { name: 'People', exact: true })
           .and(page.locator('a[href*="search=Amara"]'))
         await backToResults.click()
         await expect(directorySearch).toHaveValue('Amara')
@@ -718,9 +708,9 @@ async function run() {
         chartOrigin.searchParams.set('search', 'Amara')
         chartOrigin.searchParams.set('department', 'Engineering')
         await page.goto(chartOrigin.href)
-        await profileOf('Maya Chen').click()
+        await focused('Maya Chen').click()
         await page
-          .getByRole('link', { name: 'Back to org chart', exact: true })
+          .getByRole('link', { name: 'People', exact: true })
           .and(page.locator('a[href*="department=Engineering"]'))
           .click()
         await page.waitForURL(
@@ -736,8 +726,8 @@ async function run() {
         await page.waitForURL(
           (url) => url.searchParams.get('view') === 'directory' && !url.searchParams.get('search')
         )
-        await expect(viewTab('Directory')).toHaveAttribute('aria-current', 'page')
-        await viewTab('Org chart').click()
+        await expect(page.getByRole('radio', { name: 'Directory' })).toBeChecked()
+        await page.getByRole('radio', { name: 'Org chart' }).click()
         await page.goto(new URL(`${path}?focus=${unlinked.memberId}`, baseUrl).href)
         await page.getByText('No reporting lines for Rae Dunn').waitFor()
         await page.getByRole('button', { name: 'Explore a team' }).click()
@@ -751,20 +741,15 @@ async function run() {
             { name: 'better-auth.session_token', value: outsider.cookie, url: baseUrl.origin },
           ])
         await empty.goto(new URL(`/o/${outsider.orgId}/people`, baseUrl).href)
-        await empty.getByText('Bring your organization into view', { exact: true }).waitFor()
+        await empty.getByText('No reporting lines yet', { exact: true }).waitFor()
         await empty.screenshot({ path: join(screenshotDir, 'empty-chart.png') })
-        await empty.getByRole('button', { name: 'Connect Okta', exact: true }).waitFor()
-        await expect(empty.getByRole('button', { name: 'Connect SCIM provisioning' })).toHaveCount(
-          0
-        )
-        await empty.getByRole('button', { name: 'Import profiles', exact: true }).click()
-        const importDialog = empty.getByRole('dialog', { name: 'Import profiles' })
-        await importDialog.getByRole('combobox', { name: 'Source' }).click()
-        await empty.getByRole('option', { name: 'Okta', exact: true }).waitFor()
-        await expect(empty.getByRole('option', { name: 'SCIM provisioning' })).toHaveCount(0)
+        await empty.getByRole('button', { name: 'Import people', exact: true }).click()
+        const picker = empty.getByRole('dialog', { name: 'Import people data' })
+        await picker.getByRole('button', { name: 'Okta', exact: true }).waitFor()
+        await expect(picker.getByRole('button', { name: 'SCIM provisioning' })).toHaveCount(0)
         await empty.screenshot({ path: join(screenshotDir, 'import-sources.png') })
-        await empty.getByRole('option', { name: 'Microsoft Entra ID' }).click()
-        await importDialog.getByLabel('Access token', { exact: true }).waitFor()
+        await picker.getByRole('button', { name: 'Microsoft Entra ID' }).click()
+        await empty.getByRole('dialog', { name: 'Import from Microsoft Entra ID' }).waitFor()
         await empty.close()
         const mobile = await browser.newPage({
           isMobile: true,
@@ -796,11 +781,11 @@ async function run() {
         }
         await mobile.getByRole('button', { name: 'Explore Amara Cole' }).tap()
         await mobile.getByRole('button', { name: 'Explore June Evans' }).tap()
-        const mobileTrail = mobile.getByRole('navigation', { name: 'Reporting path' })
-        const heading = mobileTrail.getByRole('heading', { name: 'June Evans' })
+        const trail = mobile.getByRole('navigation', { name: 'Reporting path' })
+        const heading = trail.getByRole('heading', { name: 'June Evans' })
         await heading.scrollIntoViewIfNeeded()
         await expect(heading).toBeInViewport()
-        const manager = mobileTrail.getByRole('button', { name: 'Maya Chen' })
+        const manager = trail.getByRole('button', { name: 'Maya Chen' })
         await manager.scrollIntoViewIfNeeded()
         await expect(manager).toBeInViewport()
         await manager.tap()
@@ -839,7 +824,7 @@ async function run() {
           })
           await page.clock.install()
           await page.goto(new URL(`/o/${teamOrg}/people?panel=sync`, baseUrl).href)
-          await page.getByRole('button', { name: 'Update connection' }).click()
+          await page.getByRole('button', { name: 'Update credentials' }).click()
           const token = page
             .getByRole('dialog', { name: 'Update Okta credentials' })
             .getByLabel('API token', { exact: true })
diff --git a/apps/sim/scripts/test-scim-e2e.ts b/apps/sim/scripts/test-scim-e2e.ts
index e099685ba5c..146887ddb52 100644
--- a/apps/sim/scripts/test-scim-e2e.ts
+++ b/apps/sim/scripts/test-scim-e2e.ts
@@ -421,16 +421,18 @@ async function run() {
             waitUntil: 'domcontentloaded',
             timeout: 180_000,
           })
-          await page.getByRole('button', { name: /^Import( profiles)?$/ }).click()
-          const importDialog = page.getByRole('dialog', { name: 'Import profiles' })
-          await importDialog.getByRole('combobox', { name: 'Source' }).click()
-          await page.getByRole('option', { name: 'SCIM provisioning' }).click()
-          await importDialog.getByRole('button', { name: 'Preview import' }).click()
-          const modal = page.getByRole('dialog', { name: 'Review profile import' })
-          await expect(modal.getByText('To update', { exact: true })).toBeVisible()
+          await page.getByRole('button', { name: 'Import people', exact: true }).click()
+          const picker = page.getByRole('dialog', { name: 'Import people data' })
+          await picker.getByRole('button', { name: 'SCIM provisioning' }).click()
+          await page
+            .getByRole('dialog', { name: 'Import from SCIM provisioning' })
+            .getByRole('button', { name: 'Preview import' })
+            .click()
+          const modal = page.getByRole('dialog', { name: 'Review import' })
+          await expect(modal.getByText(/1 profile will be updated/)).toBeVisible()
           await mkdir(screenshotDir, { recursive: true })
           await page.screenshot({ path: join(screenshotDir, 'provisioned-import.png') })
-          await modal.getByRole('button', { name: 'Import 1 profile', exact: true }).click()
+          await modal.getByRole('button', { name: 'Import', exact: true }).click()
           await expect(modal).toHaveCount(0)
         } finally {
           await browser.close()
@@ -535,33 +537,30 @@ async function run() {
             .addCookies([
               { name: 'better-auth.session_token', value: primary.cookie, url: baseUrl.origin },
             ])
+          await page.goto(
+            new URL(`/o/${primary.orgId}/people?focus=${aliceMemberId}`, baseUrl).href
+          )
           const statusUrl = new URL(syncPath, baseUrl).href
           await page.route(statusUrl, (route) =>
             route.fulfill({ status: 503, json: { error: 'Unavailable' } })
           )
-          await page.goto(
-            new URL(`/o/${primary.orgId}/people?focus=${aliceMemberId}`, baseUrl).href
-          )
-          const openSync = page.getByRole('button', { name: 'Directory sync', exact: true })
-          await openSync.click()
-          await page.getByRole('heading', { name: 'Directory sync', level: 1 }).waitFor()
-          await page.getByRole('button', { name: 'Retry', exact: true }).waitFor()
+          await page.getByRole('button', { name: 'Directory sync', exact: true }).click()
+          const modal = page.getByRole('dialog', { name: 'Directory sync', exact: true })
+          await modal.getByRole('button', { name: 'Retry connection' }).waitFor()
           await page.unroute(statusUrl)
-          await expect(page.getByText('Sync failed', { exact: true })).toBeVisible({
+          await expect(modal.getByText('Sync failed', { exact: true })).toBeVisible({
             timeout: 60_000,
           })
-          await expect(page.getByText(/reporting loop/)).toBeVisible()
+          await expect(modal.getByText(/reporting loop/)).toBeVisible()
           await page.screenshot({ path: join(screenshotDir, 'sync-failure.png') })
-          await page.getByRole('button', { name: 'Retry sync' }).click()
-          await expect(page.getByText('Connected', { exact: true })).toBeVisible()
-          await expect(page.getByText('Last successful sync')).toBeVisible()
+          await modal.getByRole('button', { name: 'Retry sync' }).click()
+          await expect(modal.getByText('Connected', { exact: true })).toBeVisible()
+          await expect(modal.getByText('Last successful sync')).toBeVisible()
           await page.setViewportSize({ width: 390, height: 844 })
           await page.screenshot({ path: join(screenshotDir, 'sync-recovered-mobile.png') })
-          assert(
-            await page.evaluate(() => document.documentElement.scrollWidth <= window.innerWidth)
-          )
+          const dialogBox = await modal.boundingBox()
+          assert(dialogBox && dialogBox.x >= 0 && dialogBox.x + dialogBox.width <= 391)
           assert.equal(record((await chart()).manager).email, bobEmail)
-          await page.getByRole('button', { name: 'Back to people' }).click()
           await expect(page.getByText('Principal Engineer', { exact: true })).toBeAttached()
           await patch(token, `/Users/${aliceId}`, [
             { op: 'replace', path: 'title', value: 'Staff Platform Engineer' },
@@ -570,20 +569,20 @@ async function run() {
           await expect(page.getByText('Staff Platform Engineer', { exact: true })).toBeAttached({
             timeout: 60_000,
           })
-          await openSync.click()
-          await page.getByRole('button', { name: 'Disconnect SCIM provisioning' }).click()
+          await modal.getByRole('button', { name: 'Disconnect', exact: true }).click()
           await page
             .getByRole('dialog', { name: 'Disconnect directory' })
             .getByRole('button', { name: 'Disconnect', exact: true })
             .click()
-          const connectScim = page.getByRole('button', { name: 'Connect SCIM provisioning' })
-          await expect(connectScim).toBeVisible()
-          await connectScim.click()
+          await expect(
+            modal.getByRole('button', { name: 'Connect SCIM provisioning' })
+          ).toBeVisible()
+          await modal.getByRole('button', { name: 'Connect SCIM provisioning' }).click()
           await page
             .getByRole('dialog', { name: 'Connect SCIM provisioning' })
             .getByRole('button', { name: 'Connect and sync' })
             .click()
-          await expect(page.getByText('Connected', { exact: true })).toBeVisible()
+          await expect(modal.getByText('Connected', { exact: true })).toBeVisible()
         } finally {
           await browser.close()
         }
diff --git a/apps/sim/stores/organization-home/store.ts b/apps/sim/stores/organization-home/store.ts
deleted file mode 100644
index ac92ab7a6cf..00000000000
--- a/apps/sim/stores/organization-home/store.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { create } from 'zustand'
-import { devtools, persist } from 'zustand/middleware'
-import { registerUserDataReset } from '@/stores/user-data-reset-registry'
-
-const STORAGE_KEY = 'organization-home:v1'
-
-export type OrganizationHomeWidget = 'Activity' | 'Email' | 'Calendar'
-
-interface OrganizationHomeState {
-  /** What each viewer hid from Customize Home, keyed by user and organization. */
-  hiddenWidgets: Record<string, OrganizationHomeWidget[]>
-  setWidgetHidden: (viewer: string, widget: OrganizationHomeWidget, hidden: boolean) => void
-  reset: () => void
-}
-
-export const useOrganizationHomeStore = create<OrganizationHomeState>()(
-  devtools(
-    persist(
-      (set) => ({
-        hiddenWidgets: {},
-        setWidgetHidden: (viewer, widget, hidden) =>
-          set((state) => {
-            const others = (state.hiddenWidgets[viewer] ?? []).filter((item) => item !== widget)
-            return {
-              hiddenWidgets: {
-                ...state.hiddenWidgets,
-                [viewer]: hidden ? [...others, widget] : others,
-              },
-            }
-          }),
-        reset: () => set({ hiddenWidgets: {} }),
-      }),
-      {
-        name: STORAGE_KEY,
-        partialize: (state) => ({ hiddenWidgets: state.hiddenWidgets }),
-      }
-    ),
-    { name: 'organization-home-store' }
-  )
-)
-
-registerUserDataReset(STORAGE_KEY, () => {
-  useOrganizationHomeStore.getState().reset()
-  void useOrganizationHomeStore.persist.clearStorage()
-})
diff --git a/apps/sim/turbo.json b/apps/sim/turbo.json
index 4caaea1ee81..5e69d34014e 100644
--- a/apps/sim/turbo.json
+++ b/apps/sim/turbo.json
@@ -28,9 +28,6 @@
         "!scripts/test-desktop-inbox-e2e.ts",
         "!scripts/test-assistant-actions-e2e.ts",
         "!scripts/test-organization-search-e2e.ts",
-        "!scripts/test-org-redesign-e2e.ts",
-        "!scripts/org-redesign-seed.ts",
-        "!scripts/org-redesign-e2e/**",
         "!scripts/test-docs-search-provider-e2e.ts",
         "!scripts/test-file-*-e2e.ts",
         "!scripts/test-landing-seo-e2e.ts",
@@ -66,8 +63,6 @@
         "!**/AGENTS.md",
         "!**/CLAUDE.md",
         "!scripts/test-*-e2e.ts",
-        "!scripts/org-redesign-seed.ts",
-        "!scripts/org-redesign-e2e/**",
         "!vitest.*",
         "!test-results/**"
       ],
@@ -84,8 +79,6 @@
         "!**/AGENTS.md",
         "!**/CLAUDE.md",
         "!scripts/test-*-e2e.ts",
-        "!scripts/org-redesign-seed.ts",
-        "!scripts/org-redesign-e2e/**",
         "!vitest.*",
         "!test-results/**"
       ],
@@ -142,15 +135,6 @@
       "inputs": ["scripts/test-organization-search-e2e.ts"],
       "cache": false
     },
-    "ci:e2e-org-redesign": {
-      "dependsOn": ["ci:server", "ci:ui", "@sim/realtime#ci:runtime"],
-      "inputs": [
-        "scripts/test-org-redesign-e2e.ts",
-        "scripts/org-redesign-seed.ts",
-        "scripts/org-redesign-e2e/**"
-      ],
-      "cache": false
-    },
     "ci:e2e-docs-platform": {
       "dependsOn": ["ci:server", "docs#build"],
       "inputs": ["scripts/test-docs-search-provider-e2e.ts"],
@@ -193,9 +177,6 @@
         "!scripts/test-desktop-inbox-e2e.ts",
         "!scripts/test-assistant-actions-e2e.ts",
         "!scripts/test-organization-search-e2e.ts",
-        "!scripts/test-org-redesign-e2e.ts",
-        "!scripts/org-redesign-seed.ts",
-        "!scripts/org-redesign-e2e/**",
         "!scripts/test-docs-search-provider-e2e.ts",
         "!scripts/test-file-*-e2e.ts",
         "!scripts/test-landing-seo-e2e.ts",
@@ -225,8 +206,6 @@
         "!**/AGENTS.md",
         "!**/CLAUDE.md",
         "!scripts/test-*-e2e.ts",
-        "!scripts/org-redesign-seed.ts",
-        "!scripts/org-redesign-e2e/**",
         "!vitest.*",
         "!test-results/**",
         "!ee/README.md",
diff --git a/bun.lock b/bun.lock
index c7b71214eee..3b889529258 100644
--- a/bun.lock
+++ b/bun.lock
@@ -26,7 +26,6 @@
         "lint-staged": "16.4.0",
         "opentype.js": "1.3.4",
         "pdf-lib": "1.17.1",
-        "postcss": "8.5.30",
         "react": "19.2.4",
         "remark-gfm": "4.0.1",
         "remark-parse": "11.0.0",
@@ -251,7 +250,6 @@
         "@aws-sdk/s3-request-presigner": "3.1150.0",
         "@azure/communication-email": "1.1.0",
         "@azure/storage-blob": "12.27.0",
-        "@base-ui/react": "1.9.0",
         "@better-auth/oauth-provider": "1.6.27",
         "@better-auth/sso": "1.6.27",
         "@better-auth/stripe": "1.6.27",
@@ -362,7 +360,6 @@
         "croner": "^9.0.0",
         "cronstrue": "3.3.0",
         "csv-parse": "7.0.3",
-        "d3-shape": "3.2.0",
         "date-fns": "4.4.0",
         "decimal.js": "10.6.0",
         "diff": "9.0.0",
@@ -443,7 +440,6 @@
         "typebox": "1.3.27",
         "undici": "7.30.1",
         "unified": "11.0.5",
-        "use-sync-external-store": "1.6.0",
         "word-extractor": "1.0.4",
         "ws": "8.21.3",
         "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
@@ -466,7 +462,6 @@
         "@types/archiver": "8.0.0",
         "@types/busboy": "1.5.4",
         "@types/chrome": "0.3.6",
-        "@types/d3-shape": "3.1.8",
         "@types/hast": "3.0.5",
         "@types/heic-convert": "2.1.1",
         "@types/html-to-text": "9.0.4",
@@ -1216,10 +1211,6 @@
 
     "@babel/types": ["@babel/types@7.29.8", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg=="],
 
-    "@base-ui/react": ["@base-ui/react@1.9.0", "", { "dependencies": { "@babel/runtime": "^7.29.7 || ^8.0.0", "@base-ui/utils": "0.5.0", "@floating-ui/react-dom": "^2.1.9", "@floating-ui/utils": "^0.2.12", "use-sync-external-store": "^1.7.0" }, "peerDependencies": { "@date-fns/tz": "^1.2.0", "@types/react": "^17 || ^18 || ^19", "date-fns": "^4.0.0", "react": "^17 || ^18 || ^19", "react-dom": "^17 || ^18 || ^19" }, "optionalPeers": ["@date-fns/tz", "@types/react", "date-fns"] }, "sha512-S8CSYosASBKtpL8SWUfS78rFElfLijiCgA7oHOK22jCJ95FULsYyKwBNFOgudt0RA+/7yNc7F81bOvQnRgbBiQ=="],
-
-    "@base-ui/utils": ["@base-ui/utils@0.5.0", "", { "dependencies": { "@babel/runtime": "^7.29.7 || ^8.0.0", "@floating-ui/utils": "^0.2.12", "reselect": "^5.3.0", "use-sync-external-store": "^1.7.0" }, "peerDependencies": { "@types/react": "^17 || ^18 || ^19", "react": "^17 || ^18 || ^19", "react-dom": "^17 || ^18 || ^19" }, "optionalPeers": ["@types/react"] }, "sha512-dYGGcEttjkYiMoa5nHm8vLaJ2UcuTWxo3BFAwOYXeRg/q7UVVvA6cacEIXEs3FgBfK1CGtW1ptElqs7wsx+t9A=="],
-
     "@bcoe/v8-coverage": ["@bcoe/v8-coverage@1.0.2", "", {}, "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA=="],
 
     "@better-auth/core": ["@better-auth/core@1.6.27", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.39.0", "@standard-schema/spec": "^1.1.0", "zod": "^4.3.6" }, "peerDependencies": { "@better-auth/utils": "0.4.2", "@better-fetch/fetch": "1.3.1", "@cloudflare/workers-types": ">=4", "@opentelemetry/api": "^1.9.0", "better-call": "1.4.0", "jose": "^6.1.0", "kysely": "^0.28.5 || ^0.29.0", "nanostores": "^1.0.1" }, "optionalPeers": ["@cloudflare/workers-types", "@opentelemetry/api"] }, "sha512-A6/mQW4AT2kSHCRZDh9+k8jPUqnCUUCymzBgIroK0l60wLioMtJdcmZiTwrAn6KVUw+4XWw64MgaRn7LOie3wg=="],
@@ -1428,9 +1419,9 @@
 
     "@floating-ui/dom": ["@floating-ui/dom@1.7.6", "", { "dependencies": { "@floating-ui/core": "^1.7.5", "@floating-ui/utils": "^0.2.11" } }, "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ=="],
 
-    "@floating-ui/react-dom": ["@floating-ui/react-dom@2.1.9", "", { "dependencies": { "@floating-ui/dom": "^1.8.0" }, "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-JDjEFGCpImxDCA7JJKviA0M9+RtmJdj0m/NVU5IMgBK+AmZouAQQ7/+2GLH0GXXY0YMw9oXPB8hKdbPYg5QLYg=="],
+    "@floating-ui/react-dom": ["@floating-ui/react-dom@2.1.8", "", { "dependencies": { "@floating-ui/dom": "^1.7.6" }, "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A=="],
 
-    "@floating-ui/utils": ["@floating-ui/utils@0.2.12", "", {}, "sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww=="],
+    "@floating-ui/utils": ["@floating-ui/utils@0.2.11", "", {}, "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg=="],
 
     "@google-cloud/paginator": ["@google-cloud/paginator@5.0.2", "", { "dependencies": { "arrify": "^2.0.0", "extend": "^3.0.2" } }, "sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg=="],
 
@@ -4220,8 +4211,6 @@
 
     "resedit": ["resedit@1.7.2", "", { "dependencies": { "pe-library": "^0.4.1" } }, "sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA=="],
 
-    "reselect": ["reselect@5.3.0", "", {}, "sha512-XGoLeRAVzUTcJ1qkxPQhDJyIZ5d6zzZD9nT7AEZOaaU9UbWclhycElmhO+VD5bFeLuzhPBaOV2oXC8uG35ZSpg=="],
-
     "resend": ["resend@6.32.1", "", { "dependencies": { "postal-mime": "2.7.6", "standardwebhooks": "1.1.1" }, "peerDependencies": { "@react-email/render": "*" }, "optionalPeers": ["@react-email/render"] }, "sha512-Z9DxkIZt5uvVNkjxjc+r4rCPI0MdDIJ7H+GvU50o9GkhrD0tVTwP6caE8KYEco90sos312l6R72jAEMCBFBiFQ=="],
 
     "resolve-alpn": ["resolve-alpn@1.2.1", "", {}, "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="],
@@ -4924,10 +4913,6 @@
 
     "@babel/traverse/@babel/types": ["@babel/types@7.29.7", "", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA=="],
 
-    "@base-ui/react/use-sync-external-store": ["use-sync-external-store@1.7.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-6L+EeigHMQhdaIPNIFUKwfWJSwWFQ8gJbJ2DLOs5sDIegTwR9fRxvnM3uciHKjIZhFz+KAv2emhWMRvDmMcY8A=="],
-
-    "@base-ui/utils/use-sync-external-store": ["use-sync-external-store@1.7.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-6L+EeigHMQhdaIPNIFUKwfWJSwWFQ8gJbJ2DLOs5sDIegTwR9fRxvnM3uciHKjIZhFz+KAv2emhWMRvDmMcY8A=="],
-
     "@better-auth/core/@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.41.1", "", {}, "sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA=="],
 
     "@better-auth/sso/tldts": ["tldts@6.1.86", "", { "dependencies": { "tldts-core": "^6.1.86" }, "bin": { "tldts": "bin/cli.js" } }, "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ=="],
@@ -4996,12 +4981,6 @@
 
     "@esbuild-kit/esm-loader/get-tsconfig": ["get-tsconfig@4.14.0", "", { "dependencies": { "resolve-pkg-maps": "^1.0.0" } }, "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA=="],
 
-    "@floating-ui/core/@floating-ui/utils": ["@floating-ui/utils@0.2.11", "", {}, "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg=="],
-
-    "@floating-ui/dom/@floating-ui/utils": ["@floating-ui/utils@0.2.11", "", {}, "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg=="],
-
-    "@floating-ui/react-dom/@floating-ui/dom": ["@floating-ui/dom@1.8.0", "", { "dependencies": { "@floating-ui/core": "^1.8.0", "@floating-ui/utils": "^0.2.12" } }, "sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg=="],
-
     "@google-cloud/storage/google-auth-library": ["google-auth-library@9.15.1", "", { "dependencies": { "base64-js": "^1.3.0", "ecdsa-sig-formatter": "^1.0.11", "gaxios": "^6.1.1", "gcp-metadata": "^6.1.0", "gtoken": "^7.0.0", "jws": "^4.0.0" } }, "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng=="],
 
     "@grpc/proto-loader/yargs": ["yargs@17.7.2", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="],
@@ -5032,8 +5011,6 @@
 
     "@peculiar/webcrypto/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
-    "@radix-ui/react-popper/@floating-ui/react-dom": ["@floating-ui/react-dom@2.1.8", "", { "dependencies": { "@floating-ui/dom": "^1.7.6" }, "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A=="],
-
     "@radix-ui/react-use-escape-keydown/@radix-ui/react-use-callback-ref": ["@radix-ui/react-use-callback-ref@1.1.2", "", { "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-xCso9j1/u8sEgP1RNHjFrXJLApL8LiqOkI1R4ywuN00rxWdYg4oQXuwKLS3i0j5NWLromUD27/4nlxj2UFVvIw=="],
 
     "@react-email/components/@react-email/render": ["@react-email/render@2.0.6", "", { "dependencies": { "html-to-text": "^9.0.5", "prettier": "^3.5.3" }, "peerDependencies": { "react": "^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^18.0 || ^19.0 || ^19.0.0-rc" } }, "sha512-xOzaYkH3jLZKqN5MqrTXYnmqBYUnZSVbkxdb5PGGmDcK6sKDVMliaDiSwfXajRC9JtSHTcGc2tmGLHWuCgVpog=="],
@@ -5586,8 +5563,6 @@
 
     "@esbuild-kit/core-utils/esbuild/@esbuild/win32-x64": ["@esbuild/win32-x64@0.18.20", "", { "os": "win32", "cpu": "x64" }, "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="],
 
-    "@floating-ui/react-dom/@floating-ui/dom/@floating-ui/core": ["@floating-ui/core@1.8.0", "", { "dependencies": { "@floating-ui/utils": "^0.2.12" } }, "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ=="],
-
     "@google-cloud/storage/google-auth-library/gcp-metadata": ["gcp-metadata@6.1.1", "", { "dependencies": { "gaxios": "^6.1.1", "google-logging-utils": "^0.0.2", "json-bigint": "^1.0.0" } }, "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A=="],
 
     "@grpc/proto-loader/yargs/cliui": ["cliui@8.0.1", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="],
diff --git a/knip.jsonc b/knip.jsonc
index d43ad5b18b2..9490adf34c9 100644
--- a/knip.jsonc
+++ b/knip.jsonc
@@ -37,11 +37,6 @@
         "lib/execution/sandbox/bundles/*.{ts,cjs}",
         // Bundled by build:xlsx-worker and spawned as a worker thread by filename.
         "lib/file-parsers/xlsx-worker-entry.ts",
-        // The design system's public surface: a snapshot consumers pick from, kept whole so it stays
-        // identical to its source and rebases cleanly.
-        "platform/design-system/**/*.{ts,tsx}",
-        // CSS Modules reach this through `@reference`, which knip does not follow.
-        "platform/design-system/styles/theme.css",
         // Compile-time fixture compatibility assertion, included by tsconfig.
         "lib/table/fixture-contract.ts",
         // scripts/generate-docs.ts imports this through pathToFileURL.
@@ -83,9 +78,6 @@
         "app/(landing)/customers/components/customer-story-page/index.ts": ["files"]
       },
       "ignoreDependencies": [
-        // Holds the hoisted copy at the version zustand/traditional resolved to before @base-ui/react
-        // required ^1.7.0, which it now takes as a nested copy.
-        "use-sync-external-store",
         // docker/app.Dockerfile invokes this binary to rebuild isolated-vm.
         "node-gyp",
         // Imported inside the generated source string in sandbox/bundles/build.ts.
diff --git a/package.json b/package.json
index 45995bb270d..2e8d36189b4 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,6 @@
     "check:explicit-any": "bun run scripts/check-explicit-any.ts",
     "check:file-names": "bun run scripts/check-file-names.ts",
     "check:source-conventions": "bun run scripts/check-source-conventions.ts",
-    "check:platform-css": "bun run scripts/check-platform-css.ts",
     "check:test-types": "bun run scripts/check-test-types.ts",
     "desktop-bridge-contract:update": "bun run scripts/check-desktop-bridge-contract.ts --update",
     "mship-contracts:generate": "bun run scripts/sync-mothership-stream-contract.ts",
@@ -204,7 +203,6 @@
     "lint-staged": "16.4.0",
     "opentype.js": "1.3.4",
     "pdf-lib": "1.17.1",
-    "postcss": "8.5.30",
     "react": "19.2.4",
     "remark-gfm": "4.0.1",
     "remark-parse": "11.0.0",
diff --git a/scripts/check-platform-css.test.ts b/scripts/check-platform-css.test.ts
deleted file mode 100644
index ece04b0a842..00000000000
--- a/scripts/check-platform-css.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * @vitest-environment node
- */
-import postcss from 'postcss'
-import { describe, expect, it } from 'vitest'
-import embed from '@/lib/postcss/platform-embed.cjs'
-import { findEntryEscapes, findModuleEscapes } from './check-platform-css'
-
-const ENTRY = '/repo/apps/sim/platform/design-system/styles/embedded.css'
-
-const scoped = async (css: string, from = ENTRY) =>
-  (await postcss([embed()]).process(css, { from })).css
-
-describe('findEntryEscapes', () => {
-  it.each([
-    ':root { --spacing: 1px; }',
-    'html { color: red; }',
-    '[data-platform-ui] html { color: red; }',
-    '.flex { display: flex; }',
-    '[data-material="shell"] { color: red; }',
-    '@layer utilities { [data-platform-ui] .flex { display: flex; } }',
-    '@property --tw-shadow { syntax: "*"; inherits: false; }',
-    '@keyframes spin { to { rotate: 1turn; } }',
-    '@media (width > 1px) { .flex { display: flex; } }',
-  ])('flags %s', (css) => {
-    expect(findEntryEscapes(css, '')).not.toEqual([])
-  })
-
-  it('flags a font family the host stylesheet names', () => {
-    expect(findEntryEscapes('@font-face { font-family: "Geist"; }', 'font: "Geist"')).not.toEqual(
-      []
-    )
-  })
-
-  it('passes what the embed plugin emits', async () => {
-    const css = await scoped(
-      '[data-platform-ui] { color: red; } [data-material="shell"] { color: red; } ' +
-        '[data-platform-ui][data-theme="dark"] svg { color: red; } :focus, a { color: red; }'
-    )
-    expect(findEntryEscapes(css, '')).toEqual([])
-    expect(css).toContain(':where([data-platform-ui]) [data-material="shell"]')
-    expect(css).toContain(':where(html.dark) [data-platform-ui][data-theme="system"] svg')
-  })
-
-  it('leaves any other stylesheet to the host', async () => {
-    const css = '.flex { display: flex; }'
-    expect(await scoped(css, '/repo/apps/sim/app/_styles/globals.css')).toBe(css)
-  })
-})
-
-describe('findModuleEscapes', () => {
-  it.each([
-    'button { color: red; }',
-    '[data-platform-ui] { color: red; }',
-    ':global(.flex) { display: flex; }',
-    '.local, body { color: red; }',
-    '@layer base { .local { color: red; } }',
-    '@font-face { font-family: "X"; }',
-    '@property --x { syntax: "*"; inherits: false; }',
-  ])('flags %s', (css) => {
-    expect(findModuleEscapes(css, 'x.module.css')).not.toEqual([])
-  })
-
-  it('passes local classes and their keyframes', () => {
-    const css =
-      '.local:hover, textarea.input { color: red; } @media (width > 1px) { .local { color: red; } } ' +
-      '@keyframes spin { from { rotate: 0; } to { rotate: 1turn; } }'
-    expect(findModuleEscapes(css, 'x.module.css')).toEqual([])
-  })
-})
diff --git a/scripts/check-platform-css.ts b/scripts/check-platform-css.ts
deleted file mode 100644
index f01182c28e3..00000000000
--- a/scripts/check-platform-css.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-#!/usr/bin/env bun
-/**
- * Proves the embedded design system cannot change a legacy page.
- *
- * Next keeps route CSS loaded after client navigation, so one global rule from a flagged page keeps
- * applying on every legacy page the viewer opens afterwards. Three rules hold that line:
- *
- * - `entry-escape`: `platform/design-system/styles/embedded.css`, compiled through the app's real
- *   PostCSS config, may only contain selectors under `[data-platform-ui]` and `@font-face` faces
- *   the host's global stylesheet never names. Any other at-rule fails: `@layer`, `@property`, and
- *   `@keyframes` are all global, and `@theme` or `@import` left over means the pipeline changed.
- * - `module-escape`: every rule in a `platform/**` CSS Module needs a local (hashed) class, and
- *   nothing may opt out through `:global`.
- * - `route-reach`: only routes under `app/o/[organizationId]/` may load the design system. No other
- *   Next entry (`/workspace`, the extension's embedded panel, landing, auth) may reach `platform/`
- *   through any import, static or dynamic. Dynamic counts because Next attaches a dynamically
- *   imported module's CSS to a Server Component's route whether or not it renders.
- *
- * Run: `bun run check:platform-css`
- */
-import { readdirSync, readFileSync, statSync } from 'node:fs'
-import { createRequire } from 'node:module'
-import path from 'node:path'
-import postcss, { type AcceptedPlugin, type AtRule } from 'postcss'
-
-const ROOT = path.resolve(import.meta.dirname, '..')
-const APP = path.join(ROOT, 'apps/sim')
-const PLATFORM = path.join(APP, 'platform')
-const ENTRY = path.join(PLATFORM, 'design-system/styles/embedded.css')
-const HOST_GLOBALS = path.join(APP, 'app/_styles/globals.css')
-
-const SCOPED =
-  /^(?::where\(html\.dark\) )?(?:\[data-sim-desktop-title-bar\] )?(?:\[data-platform-ui\]|:where\(\[data-platform-ui\]\))/
-const GLOBAL_TARGET = /(?:^|[\s>+~(,])(?::root|:host|html|body)(?![\w-])/
-const ENTRY_AT_RULES = new Set(['media', 'container', 'supports', 'font-face'])
-const MODULE_AT_RULES = new Set(['media', 'container', 'supports', 'keyframes'])
-const ORGANIZATION_ROUTES = path.join('app', 'o', '[organizationId]') + path.sep
-const NEXT_ENTRY =
-  /^(?:page|layout|template|loading|error|global-error|not-found|default|route)\.[jt]sx?$/
-const ROOT_ENTRIES = ['proxy.ts', 'instrumentation.ts', 'instrumentation-node.ts', 'bootstrap.ts']
-const CODE_FILE = /\.[jt]sx?$/
-const CSS_MODULE = /\.module\.css$/
-const TEST_FILE = /\.(?:test|spec)\.[jt]sx?$|\.integration\.ts$/
-const SKIPPED_FOLDERS = new Set(['node_modules', '.next', 'dist', 'public'])
-const RESOLVE_SUFFIXES = ['', '.ts', '.tsx', '.js', '.jsx', '.cjs', '/index.ts', '/index.tsx']
-
-export interface Finding {
-  rule: 'entry-escape' | 'module-escape' | 'route-reach'
-  detail: string
-}
-
-/** Checks compiled entry CSS. `hostGlobals` is the host stylesheet a new font face must not alter. */
-export function findEntryEscapes(css: string, hostGlobals: string): Finding[] {
-  const findings: Finding[] = []
-  const root = postcss.parse(css)
-  root.walkAtRules((atRule) => {
-    if (!ENTRY_AT_RULES.has(atRule.name)) {
-      findings.push({ rule: 'entry-escape', detail: `@${atRule.name} ${atRule.params}`.trim() })
-      return
-    }
-    if (atRule.name !== 'font-face') return
-    atRule.walkDecls('font-family', (declaration) => {
-      const family = declaration.value.replace(/["']/g, '')
-      if (hostGlobals.includes(family)) {
-        findings.push({
-          rule: 'entry-escape',
-          detail: `@font-face "${family}" is named by the host's global stylesheet`,
-        })
-      }
-    })
-  })
-  root.walkRules((rule) => {
-    for (const selector of rule.selectors) {
-      const unscoped = !SCOPED.test(selector)
-      const targetsDocument = GLOBAL_TARGET.test(selector.replace(/^:where\(html\.dark\) /, ''))
-      if (unscoped || targetsDocument) findings.push({ rule: 'entry-escape', detail: selector })
-    }
-  })
-  return findings
-}
-
-export function findModuleEscapes(css: string, file: string): Finding[] {
-  const findings: Finding[] = []
-  const root = postcss.parse(css)
-  root.walkAtRules((atRule) => {
-    if (!MODULE_AT_RULES.has(atRule.name)) {
-      findings.push({ rule: 'module-escape', detail: `${file}: @${atRule.name} ${atRule.params}` })
-    }
-  })
-  root.walkRules((rule) => {
-    const { parent } = rule
-    if (parent?.type === 'rule' || (parent as AtRule | undefined)?.name === 'keyframes') return
-    for (const selector of rule.selectors) {
-      if (selector.includes(':global') || !/\.-?[_a-zA-Z]/.test(selector)) {
-        findings.push({ rule: 'module-escape', detail: `${file}: ${selector}` })
-      }
-    }
-  })
-  return findings
-}
-
-function walk(directory: string, pattern: RegExp, files: string[] = []): string[] {
-  for (const entry of readdirSync(directory, { withFileTypes: true })) {
-    if (SKIPPED_FOLDERS.has(entry.name)) continue
-    const full = path.join(directory, entry.name)
-    if (entry.isDirectory()) walk(full, pattern, files)
-    else if (pattern.test(entry.name) && !TEST_FILE.test(entry.name)) files.push(full)
-  }
-  return files
-}
-
-function resolveSpecifier(specifier: string, from: string): string | null {
-  const base = specifier.startsWith('@/')
-    ? path.join(APP, specifier.slice(2))
-    : specifier.startsWith('.')
-      ? path.resolve(path.dirname(from), specifier)
-      : null
-  if (!base) return null
-  for (const suffix of RESOLVE_SUFFIXES) {
-    const candidate = `${base}${suffix}`
-    if (statSync(candidate, { throwIfNoEntry: false })?.isFile()) return candidate
-  }
-  return null
-}
-
-/** Walks importers back from `platform/`, so each module is visited once however the graph cycles. */
-function findRouteReach(): Finding[] {
-  const insidePlatform = (file: string) => file.startsWith(`${PLATFORM}${path.sep}`)
-  const files = walk(APP, CODE_FILE).filter((file) => !insidePlatform(file))
-  const tsTranspiler = new Bun.Transpiler({ loader: 'ts' })
-  const tsxTranspiler = new Bun.Transpiler({ loader: 'tsx' })
-  const importers = new Map<string, string[]>()
-  const queue: string[] = []
-  /** Maps a module that reaches `platform/` to its next step on the way there. */
-  const nextStep = new Map<string, string>()
-  for (const file of files) {
-    const transpiler = file.endsWith('x') ? tsxTranspiler : tsTranspiler
-    for (const { path: specifier } of transpiler.scan(readFileSync(file, 'utf8')).imports) {
-      const target = resolveSpecifier(specifier, file)
-      if (!target) continue
-      if (insidePlatform(target)) {
-        if (!nextStep.has(file)) queue.push(file)
-        nextStep.set(file, target)
-      } else if (importers.has(target)) {
-        importers.get(target)?.push(file)
-      } else {
-        importers.set(target, [file])
-      }
-    }
-  }
-  for (const file of queue) {
-    for (const importer of importers.get(file) ?? []) {
-      if (nextStep.has(importer)) continue
-      nextStep.set(importer, file)
-      queue.push(importer)
-    }
-  }
-
-  const findings: Finding[] = []
-  for (const file of files) {
-    const relative = path.relative(APP, file)
-    const isNextEntry =
-      relative.startsWith(`app${path.sep}`) && NEXT_ENTRY.test(path.basename(file))
-    if (!isNextEntry && !ROOT_ENTRIES.includes(relative)) continue
-    if (relative.startsWith(ORGANIZATION_ROUTES) || !nextStep.has(file)) continue
-    const chain = [relative]
-    for (let step = nextStep.get(file); step; step = nextStep.get(step)) {
-      chain.push(path.relative(APP, step))
-    }
-    findings.push({ rule: 'route-reach', detail: chain.join(' -> ') })
-  }
-  return findings
-}
-
-async function loadAppPostcssPlugins(): Promise<AcceptedPlugin[]> {
-  const require = createRequire(path.join(APP, 'package.json'))
-  const { default: config } = await import(path.join(APP, 'postcss.config.mjs'))
-  return Object.entries(config.plugins as Record<string, object>).map(([name, options]) =>
-    require(name)(options)
-  )
-}
-
-if (import.meta.main) {
-  const plugins = await loadAppPostcssPlugins()
-  const compile = async (file: string) =>
-    (await postcss(plugins).process(readFileSync(file, 'utf8'), { from: file })).css
-
-  const entryCss = await compile(ENTRY)
-  const entryRoot = postcss.parse(entryCss)
-  let selectorCount = 0
-  entryRoot.walkRules((rule) => {
-    selectorCount += rule.selectors.length
-  })
-  const findings = findEntryEscapes(entryCss, readFileSync(HOST_GLOBALS, 'utf8'))
-
-  const modules = walk(PLATFORM, CSS_MODULE)
-  for (const file of modules) {
-    findings.push(...findModuleEscapes(await compile(file), path.relative(APP, file)))
-  }
-  findings.push(...findRouteReach())
-
-  if (findings.length > 0) {
-    console.error(`check:platform-css found ${findings.length} escape(s):`)
-    for (const finding of findings) console.error(`  [${finding.rule}] ${finding.detail}`)
-    process.exit(1)
-  }
-  console.log(
-    `check:platform-css ok: ${selectorCount} entry selectors scoped, ${modules.length} CSS Modules ` +
-      'hashed, only organization routes reach platform/'
-  )
-}
diff --git a/scripts/check-unused-exports.baseline.json b/scripts/check-unused-exports.baseline.json
index 94ea932da0a..bc1a0fedf63 100644
--- a/scripts/check-unused-exports.baseline.json
+++ b/scripts/check-unused-exports.baseline.json
@@ -365,14 +365,12 @@
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/index.ts#SourceCard",
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/index.ts#SourceChip",
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/index.ts#SpecialTags",
-  "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/index.ts#highlightTerms",
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/index.ts#isAgentGroupResolved",
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/index.ts#parseSpecialTags",
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/index.ts#sourceLabel",
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/interaction-card.tsx#INTERACTION_CARD_TEXT_INPUT_CLASSES",
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/interaction-card.tsx#InteractionCardRecapItem",
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/question/index.ts#formatQuestionAnswerMessage",
-  "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/source-card/index.ts#highlightTerms",
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/index.ts#CREDENTIAL_TAG_TYPES",
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/index.ts#CredentialItemData",
   "apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/index.ts#CredentialTagData",
diff --git a/scripts/ci-changes.test.ts b/scripts/ci-changes.test.ts
index c9702d14fb2..9328f57d2c5 100644
--- a/scripts/ci-changes.test.ts
+++ b/scripts/ci-changes.test.ts
@@ -264,7 +264,6 @@ describe('CI task attribution through real Turborepo', () => {
       'browser-extension-composer',
       'browser-extension-navigation',
       'mobile',
-      'org-redesign',
       'organization-search',
       'seo',
     ])
@@ -421,7 +420,6 @@ describe('CI task attribution through real Turborepo', () => {
     ['test-desktop-inbox-e2e.ts', 'desktop-inbox'],
     ['test-assistant-actions-e2e.ts', 'assistant-actions'],
     ['test-organization-search-e2e.ts', 'organization-search'],
-    ['test-org-redesign-e2e.ts', 'org-redesign'],
   ])('selects the owning organization acceptance job for %s', (file, group) => {
     const plan = classifyFiles([`apps/sim/scripts/${file}`])
     expect(plan.fallback).toBeUndefined()
@@ -479,7 +477,6 @@ describe('CI task attribution through real Turborepo', () => {
       'cli',
       'desktop-inbox',
       'mobile',
-      'org-redesign',
       'organization-search',
       'project-files',
       'scim',