fix(mothership): resolve model and Plan controls from AppConfig

Author: Sg312

apps/sim/app/o/[organizationId]/home/components/composer/composer.test.tsx

@@ -40,8 +40,6 @@ vi.mock('@/lib/core/config/deployment-shape', () => ({
   useDeploymentShape: () => ({
     features: {
       liveEnterpriseSearch: mocks.live,
-      planMode: mocks.plan,
-      mothershipModelSelector: mocks.advanced,
     },
   }),
   getDeploymentShape: () => ({ features: { liveEnterpriseSearch: mocks.live } }),
@@ -89,6 +87,7 @@ vi.mock('@/app/o/[organizationId]/providers/organization-provider', () => ({
 }))
 
 import { Composer } from '@/app/o/[organizationId]/home/components/composer/composer'
+import { FeatureFlagsProvider } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import { useFileAttachments } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments'
 
 let root: Root
@@ -228,7 +227,15 @@ async function render(
   await act(async () =>
     root.render(
       <QueryClientProvider client={queryClient}>
-        <Harness />
+        <FeatureFlagsProvider
+          flags={{
+            'table-row-ttl': false,
+            'mothership-model-selector': mocks.advanced,
+            'mothership-plan-mode': mocks.plan,
+          }}
+        >
+          <Harness />
+        </FeatureFlagsProvider>
       </QueryClientProvider>
     )
   )
@@ -479,7 +486,15 @@ it('keeps restored queued skills scoped when replacing a draft', async () => {
   await act(async () =>
     root.render(
       <QueryClientProvider client={queryClient}>
-        <Harness />
+        <FeatureFlagsProvider
+          flags={{
+            'table-row-ttl': false,
+            'mothership-model-selector': mocks.advanced,
+            'mothership-plan-mode': mocks.plan,
+          }}
+        >
+          <Harness />
+        </FeatureFlagsProvider>
       </QueryClientProvider>
     )
   )

apps/sim/app/o/[organizationId]/home/organization-home.test.tsx

@@ -30,9 +30,12 @@ const mocks = vi.hoisted(() => ({
   selectResource: vi.fn(),
   activeResource: null as string | null,
 }))
+vi.mock('@/app/workspace/[workspaceId]/providers/feature-flags-provider', () => ({
+  useFeatureFlag: (name: string) => (name === 'mothership-plan-mode' ? mocks.plan : false),
+}))
 vi.mock('@/lib/core/config/deployment-shape', () => ({
   useDeploymentShape: () => ({
-    features: { liveEnterpriseSearch: mocks.live, planMode: mocks.plan },
+    features: { liveEnterpriseSearch: mocks.live },
   }),
   getDeploymentShape: () => ({ features: { liveEnterpriseSearch: mocks.live } }),
 }))

apps/sim/app/o/[organizationId]/home/organization-home.tsx

@@ -9,7 +9,7 @@ import { requestJson } from '@/lib/api/client/request'
 import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
 import { getWorkspaceHostContextContract } from '@/lib/api/contracts/workspaces'
 import { useSession } from '@/lib/auth/auth-client'
-import { getDeploymentShape, useDeploymentShape } from '@/lib/core/config/deployment-shape'
+import { getDeploymentShape } from '@/lib/core/config/deployment-shape'
 import { MothershipHandoffStorage } from '@/lib/core/utils/browser-storage'
 import { getMothershipAttachmentPreviewUrl } from '@/lib/mothership/chat/attachment-preview'
 import { createSearchResource } from '@/lib/mothership/resources/search'
@@ -35,6 +35,7 @@ import type {
   FileAttachmentForApi,
   WorkspaceResourceRef,
 } from '@/app/workspace/[workspaceId]/home/types'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import { useFileAttachments } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments'
 import { mentionifyIntegrations } from '@/blocks/integration-matcher'
 import { useMarkMothershipChatRead } from '@/hooks/queries/mothership-chats'
@@ -80,7 +81,7 @@ function OrganizationHomeContent({
   )
   const rememberMode = useOrganizationChatModeStore((state) => state.setMode)
   const [selectedMode, setSelectedMode] = useState<ChatRequestMode | null>(null)
-  const planEnabled = useDeploymentShape().features.planMode === true
+  const planEnabled = useFeatureFlag('mothership-plan-mode')
   const requestMode =
     selectedMode ??
     (urlSearchLevel && searchAccess.memberScoped && !chatId ? 'assistant' : undefined) ??

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

@@ -3,6 +3,7 @@ import { cookies } from 'next/headers'
 import { redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
 import { getActiveOrganizationId } from '@/lib/auth/session-response'
+import { isMothershipModelSelectorEnabled, isPlanModeEnabled } from '@/lib/mothership/feature-flags'
 import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
 import { isTableRowTtlEnabled } from '@/lib/table/ttl-availability'
@@ -53,20 +54,28 @@ export default async function OrganizationLayout({
   if (!context.mothershipAvailable && !context.searchAccess.memberScoped)
     redirect(WORKSPACE_SETTINGS_PATH)
 
-  const [, tableRowTtlEnabled] = await Promise.all([
+  const [, tableRowTtlEnabled, modelSelectorEnabled, planModeEnabled] = await Promise.all([
     prefetchOrganizationSidebar(
       queryClient,
       organizationId,
       { kind: 'session', userId: session.user.id, sessionId: session.session.id },
       getActiveOrganizationId(session)
     ),
     isTableRowTtlEnabled(),
+    isMothershipModelSelectorEnabled(),
+    isPlanModeEnabled(),
   ])
   const initialSidebarCollapsed = cookieStore.get('sidebar_collapsed')?.value === '1'
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
-      <FeatureFlagsProvider flags={{ 'table-row-ttl': tableRowTtlEnabled }}>
+      <FeatureFlagsProvider
+        flags={{
+          'table-row-ttl': tableRowTtlEnabled,
+          'mothership-model-selector': modelSelectorEnabled,
+          'mothership-plan-mode': planModeEnabled,
+        }}
+      >
         <OrganizationProvider context={context}>
           <GlobalCommandsProvider>
             <div className='workspace-root flex h-screen w-full flex-col overflow-hidden bg-[var(--surface-1)]'>

apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/conversation-mode-selector.tsx

@@ -3,8 +3,8 @@
 import { useState } from 'react'
 import { ChipDropdown, cn, Tooltip } from '@sim/emcn'
 import { Search } from '@sim/emcn/icons'
-import { useDeploymentShape } from '@/lib/core/config/deployment-shape'
 import type { ChatRequestMode } from '@/app/workspace/[workspaceId]/home/types'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 
 interface ConversationModeSelectorProps {
   value: ChatRequestMode
@@ -18,7 +18,7 @@ export function ConversationModeSelector({
   searchEnabled = false,
   onChange,
 }: ConversationModeSelectorProps) {
-  const planEnabled = useDeploymentShape().features.planMode === true
+  const planEnabled = useFeatureFlag('mothership-plan-mode')
   const [open, setOpen] = useState(false)
   const search = value === 'assistant'
   const options = [

apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/model-selector.tsx

@@ -9,19 +9,19 @@ import {
   DropdownMenuRadioGroup,
   DropdownMenuTrigger,
 } from '@sim/emcn'
-import { useDeploymentShape } from '@/lib/core/config/deployment-shape'
 import {
   MOTHERSHIP_MODEL_OPTIONS,
   MOTHERSHIP_SIMPLE_EFFORT_OPTIONS,
   mothershipEffortOptions,
   resolveMothershipModelSettings,
 } from '@/lib/mothership/model-options'
 import { FastModeToggle } from '@/app/workspace/[workspaceId]/home/components/user-input/components/fast-mode-toggle'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import { useMothershipEffortStore } from '@/stores/mothership-effort/store'
 
 /** Reasoning effort and Fast mode for Build chat composers. */
 export function ModelSelector() {
-  const advanced = useDeploymentShape().features.mothershipModelSelector === true
+  const advanced = useFeatureFlag('mothership-model-selector')
   const selection = useMothershipEffortStore((state) => state.modelSelection)
   const setModel = useMothershipEffortStore((state) => state.setModel)
   const setFastMode = useMothershipEffortStore((state) => state.setFastMode)

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.mount-send.test.tsx

@@ -43,6 +43,10 @@ const { mockRequestJson, mockExecuteWorkflow, navigationMocks } = vi.hoisted(()
   },
 }))
 
+vi.mock('@/app/workspace/[workspaceId]/providers/feature-flags-provider', () => ({
+  useFeatureFlag: () => false,
+}))
+
 vi.mock('next/navigation', () => navigationMocks)
 vi.mock('@/lib/auth/auth-client', async (importOriginal) => ({
   ...(await importOriginal<typeof import('@/lib/auth/auth-client')>()),

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.test.ts

@@ -21,6 +21,10 @@ import {
 } from '@/app/workspace/[workspaceId]/home/hooks/use-chat'
 import type { ContentBlock } from '@/app/workspace/[workspaceId]/home/types'
 
+vi.mock('@/app/workspace/[workspaceId]/providers/feature-flags-provider', () => ({
+  useFeatureFlag: () => false,
+}))
+
 vi.mock('next/navigation', () => ({
   usePathname: () => '/workspace/workspace-1/home',
   useRouter: () => ({

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -106,6 +106,7 @@ import {
 } from '@/app/workspace/[workspaceId]/home/hooks/stream'
 import { useNativeActiveTabIds } from '@/app/workspace/[workspaceId]/home/hooks/use-desktop-tab-resources'
 import { resolveEffectiveResourceId } from '@/app/workspace/[workspaceId]/home/resource-view-policy'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import {
   fetchMothershipChatHistory,
   type MothershipChatHistory,
@@ -652,6 +653,7 @@ export function useChat(
   initialChatId?: string,
   options?: UseChatOptions
 ): UseChatReturn {
+  const modelSelectorEnabled = useFeatureFlag('mothership-model-selector')
   const workspaceId = typeof owner === 'string' ? owner : undefined
   const organizationId = typeof owner === 'string' ? undefined : owner.organizationId
   const scopeKey = typeof owner === 'string' ? owner : `organization:${owner.organizationId}`
@@ -3673,7 +3675,7 @@ export function useChat(
               ? {
                   ...resolveMothershipModelSettings(
                     useMothershipEffortStore.getState(),
-                    getDeploymentShape().features.mothershipModelSelector === true
+                    modelSelectorEnabled
                   ),
                 }
               : {}),
@@ -3882,6 +3884,7 @@ export function useChat(
       scopeKey,
       queryClient,
       upsertChatHistory,
+      modelSelectorEnabled,
       processSSEStream,
       finalize,
       resumeOrFinalize,

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

@@ -3,6 +3,7 @@ import { cookies } from 'next/headers'
 import { redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
 import { getActiveOrganizationId } from '@/lib/auth/session-response'
+import { isMothershipModelSelectorEnabled, isPlanModeEnabled } from '@/lib/mothership/feature-flags'
 import { isTableRowTtlEnabled } from '@/lib/table/ttl-availability'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
 import { ImpersonationBanner } from '@/app/workspace/[workspaceId]/components/impersonation-banner'
@@ -48,7 +49,14 @@ export default async function WorkspaceLayout({
   }
 
   const activeOrganizationId = getActiveOrganizationId(session)
-  const [cookieStore, initialOrgSettings, , tableRowTtlEnabled] = await Promise.all([
+  const [
+    cookieStore,
+    initialOrgSettings,
+    ,
+    tableRowTtlEnabled,
+    modelSelectorEnabled,
+    planModeEnabled,
+  ] = await Promise.all([
     cookies(),
     hostContext.hostOrganizationId
       ? getOrgWhitelabelSettings(hostContext.hostOrganizationId)
@@ -61,6 +69,8 @@ export default async function WorkspaceLayout({
       activeOrganizationId
     ),
     isTableRowTtlEnabled(),
+    isMothershipModelSelectorEnabled(),
+    isPlanModeEnabled(),
     prefetchWorkspaceAccess(queryClient, workspaceId, {
       kind: 'session',
       userId: session.user.id,
@@ -71,7 +81,13 @@ export default async function WorkspaceLayout({
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
-      <FeatureFlagsProvider flags={{ 'table-row-ttl': tableRowTtlEnabled }}>
+      <FeatureFlagsProvider
+        flags={{
+          'table-row-ttl': tableRowTtlEnabled,
+          'mothership-model-selector': modelSelectorEnabled,
+          'mothership-plan-mode': planModeEnabled,
+        }}
+      >
         <WorkspaceHostProvider workspaceId={workspaceId} initialContext={hostContext}>
           <BrandingProvider
             hostOrganizationId={hostContext.hostOrganizationId}