Keep the Platform zone absent for an organization the flag has not reached

With the zone built and the flag off, /org still rendered the full Platform for anyone who opened it; only the legacy redirect read the flag. The surface read now says whether the zone is open, and the shell answers not found when it is not. Undeployed runs with no base path keep working.

Author: waleedlatif1

.github/scripts/http-e2e.sh

@@ -448,7 +448,7 @@ JS
     run_platform_live zone platform-live || live_status=$?
     stop_app
     start_app platform-live-flag-off 3027 'Platform main, flag off' record-http-status
-    PLATFORM_LIVE_ZONE=1 run_platform_live flag-off platform-live-flag-off || live_status=$?
+    run_platform_live flag-off platform-live-flag-off || live_status=$?
     exit "$live_status"
     ;;
 

.github/workflows/platform-design.yml

@@ -156,6 +156,12 @@ jobs:
       - name: Run the live suite
         working-directory: apps/sim
         run: bash ../../.github/scripts/http-e2e.sh platform-live-${{ matrix.topology }}
+      - name: Hold the parity ledger to this run
+        if: always() && matrix.topology == 'zone'
+        run: >-
+          bun run scripts/check-platform-parity.ts
+          --report "$RUNNER_TEMP/e2e/platform-live/report.json"
+          --report "$RUNNER_TEMP/e2e/platform-live-flag-off/report.json"
       - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         if: always()
         with:

apps/sim/lib/api/contracts/organization.ts

@@ -556,6 +556,8 @@ const organizationSurfaceResponseSchema = z.object({
   deployment: deploymentShapeSchema,
   /** Which destinations the viewer's navigation lists; none of these authorizes the page behind it. */
   navFlags: z.object({
+    /** Whether the Platform zone is open to this organization at all. */
+    platformOrgUi: z.boolean(),
     people: z.boolean(),
     simLinks: z.boolean(),
     benchmark: z.boolean(),

apps/sim/lib/organizations/application/surface.ts

@@ -16,6 +16,7 @@ import {
 import { resolveOrganizationSurfaceFlags } from '@/lib/organizations/surface-flags'
 import { canBrowsePeople } from '@/lib/people/feature-flag'
 import { isPlatformAdmin } from '@/lib/permissions/super-user'
+import { isPlatformOrgUiEnabled } from '@/lib/platform/rollout'
 import { isSimLinksEnabled } from '@/lib/sim-links/feature-flag'
 import { organizationSurfaceSettingsNavigation } from '@/app/o/[organizationId]/settings/navigation'
 
@@ -48,18 +49,20 @@ export const readOrganizationSurface: OperationUseCase<
     const context = await getOrganizationSurfaceContext(organizationId, userId)
     if (!context) throw new OrganizationMembershipNotFoundError()
 
-    const [{ flags, benchmarkEnabled }, people, simLinks, platformAdmin] = await Promise.all([
-      resolveOrganizationSurfaceFlags(organizationId, userId),
-      canBrowsePeople(organizationId, context.viewer.role),
-      isSimLinksEnabled(organizationId),
-      // Decides which links are drawn; the pages behind them authorize for themselves.
-      isPlatformAdmin(userId).catch((error: unknown) => {
-        logger.warn('Could not resolve platform administration navigation', {
-          error: getErrorMessage(error),
-        })
-        return false
-      }),
-    ])
+    const [{ flags, benchmarkEnabled }, people, simLinks, platformAdmin, platformOrgUi] =
+      await Promise.all([
+        resolveOrganizationSurfaceFlags(organizationId, userId),
+        canBrowsePeople(organizationId, context.viewer.role),
+        isSimLinksEnabled(organizationId),
+        // Decides which links are drawn; the pages behind them authorize for themselves.
+        isPlatformAdmin(userId).catch((error: unknown) => {
+          logger.warn('Could not resolve platform administration navigation', {
+            error: getErrorMessage(error),
+          })
+          return false
+        }),
+        isPlatformOrgUiEnabled(organizationId),
+      ])
 
     return {
       organization: context.organization,
@@ -71,6 +74,7 @@ export const readOrganizationSurface: OperationUseCase<
       settingsFeatures: context.settingsFeatures,
       deployment: context.deployment,
       navFlags: {
+        platformOrgUi,
         people,
         simLinks,
         benchmark: benchmarkEnabled,

apps/sim/platform/app/(shell)/_components/live-shell/live-shell.tsx

@@ -1,6 +1,6 @@
 import { type ReactNode, Suspense } from 'react'
 import { cookies } from 'next/headers'
-import { redirect } from 'next/navigation'
+import { notFound, redirect } from 'next/navigation'
 import { AccessDenied, SurfaceUnavailable } from '@/platform/app/_components/shell-gate/shell-gate'
 import { resolveLiveDestinations } from '@/platform/app/(shell)/_components/destinations'
 import { LiveComposerHost } from '@/platform/app/(shell)/_components/live-shell/live-composer-host'
@@ -26,6 +26,10 @@ export async function LiveShell({ children }: { children: ReactNode }) {
   }
 
   const { organization } = surface
+  // Deployed, the zone exists only for an organization the rollout has reached.
+  if (process.env.NEXT_PUBLIC_SIM_PLATFORM_BASE_PATH && !organization.navFlags.platformOrgUi) {
+    notFound()
+  }
   const cookieStore = await cookies()
   if (!hasOrganizationSurface(organization)) redirect(legacyRoutes(organization).workspaceSettings)
 

apps/sim/platform/checks/live/flag-off/legacy-surface.spec.ts

@@ -2,11 +2,9 @@ import { expect, type Page, test } from '@playwright/test'
 import { adminEmail, organizationId, signIn } from '@/platform/checks/live/session'
 
 /**
- * `PLATFORM_LIVE_ZONE=1` means the app was built with `SIM_PLATFORM_ORIGIN` and is running with the
- * flag off; unset, there is no zone at all, even with the flag on.
+ * Runs twice: built with no `SIM_PLATFORM_ORIGIN`, with the flag on; and built with the zone, with
+ * the flag off. Neither may change anything for the organization.
  */
-const zoneBuilt = process.env.PLATFORM_LIVE_ZONE === '1'
-
 const LEGACY_ROUTES = ['home', 'settings/members', 'people'] as const
 
 async function expectLegacySurface(page: Page, route: string) {
@@ -33,12 +31,11 @@ test('a client navigation stays on the legacy surface too', async ({ page }) =>
   await expect(page.locator('[data-platform-ui]')).toHaveCount(0)
 })
 
-test('with no zone built, /org is absent', async ({ page }) => {
-  test.skip(zoneBuilt, 'This build has a zone; its /org is exercised by the zone project')
+test('/org is absent', async ({ page }) => {
   for (const path of ['/org', '/org/home', '/org/settings/members']) {
     await signIn(page, adminEmail(), `/o/${organizationId()}/home`)
     const response = await page.goto(path)
     expect(response?.status(), path).toBe(404)
-    await expect(page.locator('[data-platform-ui]')).toHaveCount(0)
+    await expect(page.getByRole('button', { name: 'Organization menu' })).toHaveCount(0)
   }
 })

package.json

@@ -48,6 +48,7 @@
     "check:actorless-executor-operations": "bun run scripts/check-actorless-executor-operations.ts",
     "check:permission-group-enforcement": "bun run scripts/check-permission-group-enforcement.ts",
     "check:platform-design": "bun run scripts/check-platform-design.ts",
+    "check:platform-parity": "bun run scripts/check-platform-parity.ts",
     "check:platform-integration-metadata": "bun run scripts/sync-platform-integration-metadata.ts --check",
     "check:integration-access": "bun run scripts/check-integration-access.ts",
     "check:capability-subject": "bun run scripts/check-capability-subject.ts",