Share benchmark super-user eligibility with Plan and knowledge graphs

Author: Sg312

apps/sim/app/o/[organizationId]/layout.tsx

@@ -78,9 +78,9 @@ export default async function OrganizationLayout({
     ),
     isTableRowTtlEnabled(),
     isMothershipModelSelectorEnabled(),
-    isPlanModeEnabled(),
+    isPlanModeEnabled(session.user.id),
     isDashboardsEnabled(organizationId),
-    isMemorySpacesEnabled(),
+    isMemorySpacesEnabled(session.user.id),
     canUseBenchmarks(session.user.id),
   ])
   const initialSidebarCollapsed = cookieStore.get('sidebar_collapsed')?.value === '1'

apps/sim/app/workspace/[workspaceId]/layout.tsx

@@ -81,7 +81,7 @@ export default async function WorkspaceLayout({
     ),
     isTableRowTtlEnabled(),
     isMothershipModelSelectorEnabled(),
-    isPlanModeEnabled(),
+    isPlanModeEnabled(session.user.id),
     resolveOrganizationEntryPath(session),
     isDashboardsEnabled(hostContext.hostOrganizationId),
     prefetchWorkspaceAccess(queryClient, workspaceId, principal),

apps/sim/bootstrap.ts

@@ -6,9 +6,6 @@
 import { loadRuntimeSecrets } from '@sim/runtime-secrets'
 
 await loadRuntimeSecrets()
-// Explicit runtime configuration wins over deployment defaults.
-process.env.MSHIP_PLAN_MODE ??=
-  process.env.MSHIP_PLAN_MODE_DEFAULT ?? (process.env.NODE_ENV === 'development' ? 'true' : 'false')
 // `server.js` is the Next standalone build artifact, a sibling of this file in
 // the image; it does not exist at type-check time, so the specifier is held in a
 // variable to keep it out of static module resolution.

apps/sim/lib/core/config/env.ts

@@ -600,7 +600,6 @@ export const env = createEnv({
     // AgentMail - Mothership Email Inbox
     AGENTMAIL_API_KEY:                     z.string().min(1).optional(),           // AgentMail API key for mothership email inbox
     AGENTMAIL_DOMAIN:                      z.string().optional(),                  // Custom domain for AgentMail inboxes (default: agentmail.to)
-    MSHIP_PLAN_MODE: z.boolean().optional(),
     DASHBOARDS: z.boolean().optional(),
     MSHIP_COMPUTER_USE: z.boolean().optional(),
     MSHIP_MODEL_SELECTOR: z.boolean().optional(),

apps/sim/lib/core/config/feature-flags.test.ts

@@ -43,7 +43,6 @@ setEnv({
   TABLES_V2_API: undefined,
   TABLE_ROW_TTL: undefined,
   MSHIP_MODEL_SELECTOR: undefined,
-  MSHIP_PLAN_MODE: undefined,
   MSHIP_COMPUTER_USE: undefined,
   AGENT_MEMORY_HISTORY: undefined,
   CREDENTIAL_GROUPS: undefined,
@@ -378,20 +377,16 @@ describe('table-row-ttl flag', () => {
   })
 })
 
-describe('Mothership model and Plan flags', () => {
+describe('Mothership model selector flag', () => {
   beforeEach(() => {
     setEnvFlags({ isAppConfigEnabled: false })
     envRef.MSHIP_MODEL_SELECTOR = undefined
-    envRef.MSHIP_PLAN_MODE = undefined
   })
 
   it('defaults off without AppConfig and accepts explicit self-hosted settings', async () => {
     expect(await isFeatureEnabled('mothership-model-selector')).toBe(false)
-    expect(await isFeatureEnabled('mothership-plan-mode')).toBe(false)
     envRef.MSHIP_MODEL_SELECTOR = true
-    envRef.MSHIP_PLAN_MODE = true
     expect(await isFeatureEnabled('mothership-model-selector')).toBe(true)
-    expect(await isFeatureEnabled('mothership-plan-mode')).toBe(true)
   })
 
   it.each(['sim-dev', 'sim-staging', 'sim-production'])(
@@ -403,10 +398,8 @@ describe('Mothership model and Plan flags', () => {
         for (const value of [true, false]) {
           withAppConfig({
             'mothership-model-selector': { enabled: value },
-            'mothership-plan-mode': { enabled: value },
           })
           expect(await isFeatureEnabled('mothership-model-selector')).toBe(value)
-          expect(await isFeatureEnabled('mothership-plan-mode')).toBe(value)
         }
       } finally {
         envRef.APPCONFIG_APPLICATION = previous

apps/sim/lib/core/config/feature-flags.ts

@@ -68,16 +68,6 @@ const FEATURE_FLAGS = {
       'models. Global on/off only; disabled uses Astra with simplified effort labels.',
     fallback: 'MSHIP_MODEL_SELECTOR',
   },
-  'mothership-memory-spaces': {
-    description: 'Enable private Graphiti memory and its graph-management settings in Mothership.',
-    fallback: null,
-  },
-  'mothership-plan-mode': {
-    description:
-      'Show and admit Mothership Plan conversations. Global on/off only, shared by organization ' +
-      'and workspace surfaces.',
-    fallback: 'MSHIP_PLAN_MODE',
-  },
   'agent-memory-history': {
     description:
       'Capture durable Workflow Agent tool history and continue existing retries. Supports workspace rollout targeting; version-aware memory storage remains active when capture is disabled.',

apps/sim/lib/mothership/chat/application/admit-turn.test.ts

@@ -1,4 +1,4 @@
-import { copilotChats, copilotRuns, member } from '@sim/db/schema'
+import { copilotChats, copilotRuns, member, settings, user } from '@sim/db/schema'
 import {
   dbChainMockFns,
   queueTableRows,
@@ -122,6 +122,9 @@ describe('organization turn admission through current private-chat authorization
   it.each(['agent', 'assistant', 'plan'] as const)(
     'switches the same chat to %s atomically with turn admission',
     async (mode) => {
+      setEnvFlags({ isMothershipBenchmarkEnabled: true })
+      queueTableRows(user, [{ role: 'admin' }])
+      queueTableRows(settings, [{ superUserModeEnabled: true }])
       queueTableRows(copilotChats, [{ ...chat, mode: mode === 'agent' ? 'assistant' : 'agent' }])
       queueTableRows(member, [{ role: 'owner' }])
       if (mode !== 'assistant') queueTableRows(member, [{ role: 'owner' }])

apps/sim/lib/mothership/chat/application/create-workspace-chat.ts

@@ -3,8 +3,10 @@ import { db } from '@sim/db'
 import { copilotChats } from '@sim/db/schema'
 import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application/authorized-workspace-use-case'
 import { defineWorkspaceOperation } from '@/lib/core/application/workspace-operation'
+import { OrchestrationError } from '@/lib/core/orchestration/types'
 import { publishChatStatusChanged } from '@/lib/mothership/chat-status'
 import { MOTHERSHIP_CHAT_DEFAULT_MODEL } from '@/lib/mothership/constants'
+import { isPlanModeEnabled } from '@/lib/mothership/feature-flags'
 import { selectedMemorySpaceForNewChat } from '@/lib/mothership/memory/spaces'
 import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context'
 
@@ -25,6 +27,8 @@ export const createWorkspaceChat = defineAuthorizedWorkspaceUseCase({
   authorizationOptions: {},
   async execute({ principal, context, input }) {
     const userId = requirePrincipalSubjectUserId(principal)
+    if (input.mode === 'plan' && !(await isPlanModeEnabled(userId)))
+      throw new OrchestrationError('not_found', 'Plan mode is unavailable')
     const [chat] = await db
       .insert(copilotChats)
       .values({

apps/sim/lib/mothership/chat/organization-chats.test.ts

@@ -1,4 +1,11 @@
-import { dbChainMockFns, resetDbChainMock, resetEnvFlagsMock, setEnvFlags } from '@sim/testing'
+import { settings, user } from '@sim/db/schema'
+import {
+  dbChainMockFns,
+  queueTableRows,
+  resetDbChainMock,
+  resetEnvFlagsMock,
+  setEnvFlags,
+} from '@sim/testing'
 import { createSessionPrincipal } from '@sim/testing/factories/principal.factory'
 import {
   knowledgeAvailabilityMock,
@@ -207,10 +214,12 @@ describe('organization Build admission', () => {
     async ({ role, billing, denied, allowed }) => {
       authorize.mockResolvedValue({ userId: 'member-1', organizationId: 'org-1', role })
       permissionConfig.mockResolvedValue({ disableWorkspaceCreation: denied })
-      setEnvFlags({ isBillingEnabled: billing })
+      setEnvFlags({ isBillingEnabled: billing, isMothershipBenchmarkEnabled: true })
       dbChainMockFns.returning.mockResolvedValue([{ id: 'new-chat' }])
       for (const mode of ['agent', 'plan'] as const) {
         for (const operation of [authorizeOrganizationChat, createOrganizationChat]) {
+          queueTableRows(user, [{ role: 'admin' }])
+          queueTableRows(settings, [{ superUserModeEnabled: true }])
           const result = operation.execute({
             principal: session,
             input: { organizationId: 'org-1', mode },

apps/sim/lib/mothership/chat/organization-chats.ts

@@ -10,6 +10,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types'
 import { listMothershipChats } from '@/lib/mothership/chat/list-mothership-chats'
 import { publishChatStatusChanged } from '@/lib/mothership/chat-status'
 import { MOTHERSHIP_CHAT_DEFAULT_MODEL } from '@/lib/mothership/constants'
+import { isPlanModeEnabled } from '@/lib/mothership/feature-flags'
 import { selectedMemorySpaceForNewChat } from '@/lib/mothership/memory/spaces'
 import { ORGANIZATION_SECRETS_AUDIENCE } from '@/lib/organization-secrets/application/operations'
 import { getUserPermissionConfigForOrganization } from '@/lib/permission-groups/resolve.server'
@@ -72,6 +73,8 @@ export const authorizeOrganizationChat = {
     )
     if (input.mode === 'agent' || input.mode === 'plan')
       await requireOrganizationBuildPermission(context)
+    if (input.mode === 'plan' && !(await isPlanModeEnabled(context.userId)))
+      throw new OrchestrationError('not_found', 'Plan mode is unavailable')
     return context
   },
 }
@@ -122,6 +125,8 @@ export const createOrganizationChat = {
     )
     if (input.mode === 'agent' || input.mode === 'plan')
       await requireOrganizationBuildPermission(context)
+    if (input.mode === 'plan' && !(await isPlanModeEnabled(context.userId)))
+      throw new OrchestrationError('not_found', 'Plan mode is unavailable')
     return createOrganizationChatRecord(context, input.mode ?? 'assistant')
   },
 }