Merge wip/platform-org-wiring into the architecture pass

Author: waleedlatif1

apps/sim/lib/navigation/paths.ts

@@ -87,13 +87,13 @@ export function isAppSurfacePath(pathname: string): boolean {
 }
 
 /**
- * Non-app routes that must never appear in search results: the Platform zone,
+ * Non-app routes that must never appear in search results: the Platform zone at `/org`,
  * deployed chats, paused-run resume links, invitations, unsubscribe links, shared
  * files, the legacy `/w` redirects, the design playground, and account, self-host,
  * and upgrade utility pages.
  */
 const NOINDEX_PATH_ROOTS = [
-  '/platform',
+  '/org',
   '/sim',
   '/chat',
   '/extension',

apps/sim/lib/platform/rollout.ts

@@ -7,10 +7,11 @@ const logger = createLogger('PlatformRollout')
 
 /**
  * Whether this organization's legacy routes hand off to the Platform. The flag is never read on a
- * deployment with no Platform zone. A failed read keeps the organization on the legacy surface.
+ * deployment with no Platform zone, including an image built without the rewrite, whose handoff
+ * would land on a 404. A failed read keeps the organization on the legacy surface.
  */
 export async function isPlatformOrgUiEnabled(organizationId: string): Promise<boolean> {
-  if (!env.SIM_PLATFORM_ORIGIN) return false
+  if (!env.SIM_PLATFORM_ORIGIN || process.env.SIM_PLATFORM_ZONE_REWRITE !== '1') return false
   try {
     return await isFeatureEnabled('platform-org-ui', { orgId: organizationId })
   } catch (error) {

apps/sim/lib/platform/routes.test.ts

@@ -0,0 +1,25 @@
+import { existsSync, readdirSync } from 'node:fs'
+import path from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { isNoindexPath } from '@/lib/navigation/paths'
+import { mapLegacyOrganizationUrl } from '@/lib/platform/routes'
+
+const APP_ROOT = path.resolve(__dirname, '../../app')
+
+describe('Platform zone mount', () => {
+  it('leaves the marketing /platform page indexable', () => {
+    expect(isNoindexPath('/platform')).toBe(false)
+    expect(isNoindexPath('/org/home')).toBe(true)
+  })
+
+  it('owns a path no main-app page serves, since a static page beats an afterFiles rewrite', () => {
+    const groups = readdirSync(APP_ROOT).filter((entry) => entry.startsWith('('))
+    for (const root of ['.', ...groups]) {
+      expect(existsSync(path.join(APP_ROOT, root, 'org'))).toBe(false)
+    }
+  })
+
+  it('hands legacy organization routes to the mount', () => {
+    expect(mapLegacyOrganizationUrl('/o/org-1/home', 'org-1')).toBe('/org/home')
+  })
+})

apps/sim/lib/platform/routes.ts

@@ -3,8 +3,8 @@
  * server components, and client code all read it.
  */
 
-/** Where the main app's `/platform` rewrite in `next.config.ts` mounts the zone. */
-const PLATFORM_BASE_PATH = '/platform'
+/** Where the main app's `/org` rewrite in `next.config.ts` mounts the zone. */
+const PLATFORM_BASE_PATH = '/org'
 
 /**
  * Carries the requested `/o/...` URL from the proxy to the organization layout, which Next gives no

apps/sim/next.config.ts

@@ -32,6 +32,8 @@ const MARKDOWN_REQUEST = {
 const PLATFORM_ORIGIN = env.SIM_PLATFORM_ORIGIN ? new URL(env.SIM_PLATFORM_ORIGIN).origin : null
 
 const nextConfig: NextConfig = {
+  /** Lets the runtime handoff check that this build actually has the Platform rewrite. */
+  env: { SIM_PLATFORM_ZONE_REWRITE: PLATFORM_ORIGIN ? '1' : '' },
   devIndicators: false,
   poweredByHeader: false,
   // Safe here since this repo's source is already fully public on GitHub -
@@ -728,8 +730,8 @@ const nextConfig: NextConfig = {
         ...(PLATFORM_ORIGIN
           ? [
               {
-                source: '/platform/:path*',
-                destination: `${PLATFORM_ORIGIN}/platform/:path*`,
+                source: '/org/:path*',
+                destination: `${PLATFORM_ORIGIN}/org/:path*`,
               },
             ]
           : []),

apps/sim/platform/README.md

@@ -25,14 +25,14 @@ The same app serves three modes, resolved on the server:
 | `live` | `SIM_PLATFORM_API_ORIGIN`, `NEXT_PUBLIC_APP_URL` | The viewer's real organization, over the main app's `/api` |
 | `none` | Neither | Empty routes |
 
-Deployed, the Platform is a zone at `/platform` on the main app's origin, so it shares the session cookie, `/api` and security headers:
+Deployed, the Platform is a zone at `/org` on the main app's origin, so it shares the session cookie, `/api` and security headers:
 
 | Variable | Set on | Purpose |
 | --- | --- | --- |
-| `SIM_PLATFORM_BASE_PATH=/platform` | Platform, at build | Prefixes routes and assets |
+| `SIM_PLATFORM_BASE_PATH=/org` | Platform, at build | Prefixes routes and assets |
 | `SIM_PLATFORM_API_ORIGIN` | Platform, at runtime | Where server reads go, with the viewer's cookies |
 | `NEXT_PUBLIC_APP_URL` | Platform, at runtime | The main app's public origin, for login and legacy links |
-| `SIM_PLATFORM_ORIGIN` | Main app, at build and runtime | The `/platform` rewrite is baked at build; the organization redirect reads it at runtime |
+| `SIM_PLATFORM_ORIGIN` | Main app, at build and runtime | The `/org` rewrite is baked at build; the organization redirect reads it at runtime |
 | `platform-org-ui` flag | AppConfig, or `PLATFORM_ORG_UI` | Which organizations the legacy layout redirects here |
 
 With none of these set, nothing changes for either app. The legacy layout redirects only flagged members, keeps its query string, and leaves unmapped routes on the legacy surface. To run live locally without the zone, start the main app, sign in at its origin, then start this app with `SIM_PLATFORM_API_ORIGIN=http://localhost:3000` and `NEXT_PUBLIC_APP_URL=http://localhost:3000`; with no base path it proxies `/api` itself.

apps/sim/platform/app/(shell)/_components/chat/cards/assistant-review.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import { useState } from 'react'
+import { getErrorMessage } from '@sim/utils/errors'
 import styles from '@/platform/app/(shell)/_components/chat/cards/cards.module.css'
 import type {
   AssistantReceipt,
@@ -146,7 +147,7 @@ export function AssistantReview({ turnId }: { turnId: string }) {
         Object.fromEntries(Object.entries(current).filter(([id]) => !ids.includes(id)))
       )
     } catch (error) {
-      setFailure(error instanceof Error ? error.message : 'Could not save this review')
+      setFailure(getErrorMessage(error, 'Could not save this review'))
     }
   }
   if (status === 'error')

apps/sim/platform/checks/live/chat.spec.ts

@@ -7,7 +7,7 @@ function requireEnv(name: string): string {
 }
 
 async function signIn(page: Page) {
-  await page.goto('/platform/home')
+  await page.goto('/org/home')
   await page.locator('#email').fill(requireEnv('PLATFORM_LIVE_EMAIL'))
   await page.locator('#password').fill(requireEnv('PLATFORM_LIVE_PASSWORD'))
   await page.getByRole('button', { name: 'Sign in', exact: true }).click()
@@ -37,21 +37,21 @@ test('A chat outside the viewer’s access is not found rather than an empty cha
   page,
 }) => {
   await signIn(page)
-  const response = await page.goto('/platform/chat/00000000-0000-4000-8000-000000000000')
+  const response = await page.goto('/org/chat/00000000-0000-4000-8000-000000000000')
   expect(response?.status()).toBe(404)
 })
 
 test('A resource in the URL survives a reload of the chat route', async ({ page }) => {
   await signIn(page)
-  await page.goto('/platform/chat?resource=stale-id')
+  await page.goto('/org/chat?resource=stale-id')
   await expect(page.getByRole('textbox')).toBeVisible()
   await expect(page).toHaveURL(/resource=stale-id/)
 })
 
 test('A running turn streams, stops, and keeps what arrived', async ({ page }) => {
   test.skip(!orchestrator, 'Needs PLATFORM_LIVE_ORCHESTRATOR=1')
   await signIn(page)
-  await page.goto('/platform/chat')
+  await page.goto('/org/chat')
   await page.getByRole('textbox').fill('Count slowly from 1 to 50, one number per line.')
   await page.getByRole('button', { name: 'Send message' }).click()
   await expect(page).toHaveURL(/\/platform\/chat\/[^/?]+/, { timeout: 30_000 })
@@ -73,7 +73,7 @@ test('A message sent during a running turn waits in the queue and can be removed
 }) => {
   test.skip(!orchestrator, 'Needs PLATFORM_LIVE_ORCHESTRATOR=1')
   await signIn(page)
-  await page.goto('/platform/chat')
+  await page.goto('/org/chat')
   const field = page.getByRole('textbox')
   await field.fill('Count slowly from 1 to 50, one number per line.')
   await page.getByRole('button', { name: 'Send message' }).click()
@@ -92,7 +92,7 @@ test('A gated tool holds the turn until the prompt is answered', async ({ page }
     'Needs an orchestrator and a prompt that triggers a gated tool'
   )
   await signIn(page)
-  await page.goto('/platform/chat')
+  await page.goto('/org/chat')
   await page.getByRole('textbox').fill(requireEnv('PLATFORM_LIVE_APPROVAL_PROMPT'))
   await page.getByRole('button', { name: 'Send message' }).click()
   const allow = page.getByRole('button', { name: 'Allow', exact: true })

apps/sim/platform/checks/live/home.spec.ts

@@ -7,7 +7,7 @@ function requireEnv(name: string): string {
 }
 
 async function signIn(page: Page) {
-  await page.goto('/platform/home')
+  await page.goto('/org/home')
   await page.locator('#email').fill(requireEnv('PLATFORM_LIVE_EMAIL'))
   await page.locator('#password').fill(requireEnv('PLATFORM_LIVE_PASSWORD'))
   await page.getByRole('button', { name: 'Sign in', exact: true }).click()
@@ -24,7 +24,7 @@ async function organizationId(page: Page): Promise<string> {
 test.describe('Home on real data', () => {
   test.beforeEach(async ({ page }) => {
     await signIn(page)
-    await page.goto('/platform/home')
+    await page.goto('/org/home')
   })
 
   test('the Email and Calendar widgets each settle in a state the member can act on', async ({

apps/sim/platform/checks/live/members.spec.ts

@@ -7,7 +7,7 @@ import { requireEnv, signIn } from '@/platform/checks/live/session'
  * flips and flips back, `PLATFORM_LIVE_REMOVABLE_EMAIL` someone reseeded before each run, and
  * `PLATFORM_LIVE_REFUSED_INVITE_EMAIL` an address the batch invite always refuses.
  */
-const MEMBERS = '/platform/settings/members'
+const MEMBERS = '/org/settings/members'
 const password = () => requireEnv('PLATFORM_LIVE_PASSWORD')
 
 async function signInAsAdmin(page: Page) {