Default Plan chats to independently saved Opus 5.5 Medium preferences

Author: Sg312

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

@@ -4,7 +4,10 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import type { useSpeechToText } from '@/hooks/use-speech-to-text'
-import { useMothershipEffortStore } from '@/stores/mothership-effort/store'
+import {
+  useMothershipEffortStore,
+  useMothershipPlanEffortStore,
+} from '@/stores/mothership-effort/store'
 
 const mocks = vi.hoisted(() => ({
   live: false,
@@ -95,6 +98,7 @@ let queryClient: QueryClient
 
 beforeEach(() => {
   mocks.advanced = false
+  useMothershipPlanEffortStore.getState().reset()
   useMothershipEffortStore.setState({
     effort: 'high',
     modelSelection: { model: 'gpt-6-astra', fastMode: false },
@@ -189,7 +193,7 @@ afterEach(async () => {
 async function render(
   isInitialView: boolean,
   initialValue = 'Summarize',
-  requestMode: 'agent' | 'assistant' = 'assistant',
+  requestMode: 'agent' | 'assistant' | 'plan' = 'assistant',
   controls: Pick<
     ComponentProps<typeof Composer>,
     'isSending' | 'showModeSelector' | 'onModeChange' | 'restoredContexts' | 'onSendQueuedHead'
@@ -366,3 +370,22 @@ it.each([
     expect(input.value).toBe('')
   }
 )
+
+it('renders and restores separate Plan and Build model preferences when changing modes', async () => {
+  mocks.plan = true
+  mocks.advanced = true
+  await render(false, '', 'plan')
+  expect(container.textContent).toContain('Opus 5.5')
+  expect(container.textContent).toContain('Medium')
+  await act(async () => {
+    useMothershipPlanEffortStore.getState().setModel('gpt-6-astra')
+    useMothershipPlanEffortStore.getState().setEffort('xhigh')
+  })
+  expect(container.textContent).toContain('GPT-6 Astra')
+  expect(container.textContent).toContain('Extra High')
+  await render(false, '', 'agent')
+  expect(container.textContent).toContain('GPT-6 Astra')
+  expect(container.textContent).not.toContain('Extra High')
+  await render(false, '', 'plan')
+  expect(container.textContent).toContain('Extra High')
+})

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

@@ -308,6 +308,7 @@ export function Composer({
         />
       ) : (
         <InputToolbar
+          plan={requestMode === 'plan'}
           leadingControls={leadingControls}
           voiceControl={voiceControl}
           submitControl={submitControl}

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

@@ -7,6 +7,7 @@ import { ModelSelector } from '@/app/workspace/[workspaceId]/home/components/use
 interface InputToolbarProps {
   leadingControls: ReactNode
   showModelSelector?: boolean
+  plan?: boolean
   selectionControl?: ReactNode
   voiceControl?: ReactNode
   beforeSubmitControl?: ReactNode
@@ -22,6 +23,7 @@ interface InputToolbarProps {
 export function InputToolbar({
   leadingControls,
   showModelSelector = true,
+  plan = false,
   selectionControl,
   voiceControl,
   beforeSubmitControl,
@@ -69,7 +71,7 @@ export function InputToolbar({
           <>
             {(selectionControl || showModelSelector || voiceControl) && (
               <div className='flex items-center gap-[inherit]'>
-                {selectionControl ?? (showModelSelector && <ModelSelector />)}
+                {selectionControl ?? (showModelSelector && <ModelSelector plan={plan} />)}
                 {voiceControl}
               </div>
             )}

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

@@ -17,23 +17,33 @@ import {
 import { FastModeToggle } from '@/app/workspace/[workspaceId]/home/components/user-input/components/fast-mode-toggle'
 import { ModelSettingTrigger } from '@/app/workspace/[workspaceId]/home/components/user-input/components/model-setting-trigger'
 import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
-import { useMothershipEffortStore } from '@/stores/mothership-effort/store'
+import {
+  useMothershipEffortStore,
+  useMothershipPlanEffortStore,
+} from '@/stores/mothership-effort/store'
+
+interface ModelSelectorProps {
+  plan?: boolean
+}
 
-/** Model, reasoning effort, and Fast mode for Build chat composers. */
-export function ModelSelector() {
+/** Mode-specific preferences keep planning choices separate from Build chats. */
+export function ModelSelector({ plan = false }: ModelSelectorProps) {
+  const usePreferenceStore = plan ? useMothershipPlanEffortStore : useMothershipEffortStore
   const advanced = useFeatureFlag('mothership-model-selector')
-  const selection = useMothershipEffortStore((state) => state.modelSelection)
-  const setModel = useMothershipEffortStore((state) => state.setModel)
-  const setFastMode = useMothershipEffortStore((state) => state.setFastMode)
-  const storedEffort = useMothershipEffortStore((state) => state.effort)
+  const selection = usePreferenceStore((state) => state.modelSelection)
+  const setModel = usePreferenceStore((state) => state.setModel)
+  const setFastMode = usePreferenceStore((state) => state.setFastMode)
+  const storedEffort = usePreferenceStore((state) => state.effort)
   const { effort, modelSelection } = resolveMothershipModelSettings(
     { effort: storedEffort, modelSelection: selection },
-    advanced
+    advanced,
+    plan
   )
-  const options = advanced
-    ? mothershipEffortOptions(modelSelection.model)
-    : MOTHERSHIP_SIMPLE_EFFORT_OPTIONS
-  const setEffort = useMothershipEffortStore((state) => state.setEffort)
+  const options =
+    advanced || plan
+      ? mothershipEffortOptions(modelSelection.model)
+      : MOTHERSHIP_SIMPLE_EFFORT_OPTIONS
+  const setEffort = usePreferenceStore((state) => state.setEffort)
   const effortLabel = options.find((option) => option.value === effort)?.label ?? effort
   const modelLabel =
     MOTHERSHIP_MODEL_OPTIONS.find((option) => option.value === modelSelection.model)?.label ??

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

@@ -585,6 +585,7 @@ const UserInputImpl = forwardRef<UserInputHandle, UserInputProps>(function UserI
       />
 
       <InputToolbar
+        plan={requestMode === 'plan'}
         leadingControls={
           <>
             <Tooltip.Root>

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

@@ -122,7 +122,10 @@ import { getWorkflowById, getWorkflows } from '@/hooks/queries/utils/workflow-ca
 import { getWorkflowListQueryOptions } from '@/hooks/queries/utils/workflow-list-query'
 import { workflowKeys } from '@/hooks/queries/workflows'
 import { snapAllSmoothText } from '@/hooks/use-smooth-text'
-import { useMothershipEffortStore } from '@/stores/mothership-effort/store'
+import {
+  useMothershipEffortStore,
+  useMothershipPlanEffortStore,
+} from '@/stores/mothership-effort/store'
 import { useMothershipQueueStore } from '@/stores/mothership-queue/store'
 import type {
   QueuedMothershipMessage,
@@ -3673,8 +3676,12 @@ export function useChat(
             ...(options?.requestMode !== 'assistant'
               ? {
                   ...resolveMothershipModelSettings(
-                    useMothershipEffortStore.getState(),
-                    modelSelectorEnabled
+                    (options?.requestMode === 'plan'
+                      ? useMothershipPlanEffortStore
+                      : useMothershipEffortStore
+                    ).getState(),
+                    modelSelectorEnabled,
+                    options?.requestMode === 'plan'
                   ),
                 }
               : {}),

apps/sim/lib/mothership/chat/post.test.ts

@@ -841,6 +841,33 @@ describe('handleUnifiedChatPost', () => {
     }
   )
 
+  it.each([false, true])(
+    'defaults Plan admission to Opus Medium with model selection %s',
+    async (advanced) => {
+      flags.models.mockResolvedValue(advanced)
+      flags.plan.mockResolvedValue(true)
+      const response = await handleUnifiedChatPost(
+        new NextRequest('http://localhost/api/mothership/chat', {
+          method: 'POST',
+          body: JSON.stringify({
+            message: 'Plan this automation',
+            workspaceId: 'ws-1',
+            mode: 'plan',
+          }),
+        })
+      )
+      expect(response.status).toBe(200)
+      expect(buildCopilotRequestPayload).toHaveBeenCalledWith(
+        expect.objectContaining({
+          mode: 'plan',
+          effort: 'medium',
+          modelSelection: { model: 'claude-opus-5-5', fastMode: false },
+        }),
+        expect.anything()
+      )
+    }
+  )
+
   it('routes workflow-attached chat requests through the copilot backend path', async () => {
     const response = await handleUnifiedChatPost(
       new NextRequest('http://localhost/api/copilot/chat', {

apps/sim/lib/mothership/chat/post.ts

@@ -998,7 +998,10 @@ export async function handleUnifiedChatPost(req: NextRequest) {
         isMothershipModelSelectorEnabled(),
         body.mode === 'plan' ? isPlanModeEnabled() : false,
       ])
-      Object.assign(body, resolveMothershipModelSettings(body, modelSelectorEnabled))
+      Object.assign(
+        body,
+        resolveMothershipModelSettings(body, modelSelectorEnabled, body.mode === 'plan')
+      )
       if (body.mode === 'plan' && !planEnabled)
         return createBadRequestResponse('Plan mode is disabled')
     }

apps/sim/lib/mothership/model-options.test.ts

@@ -0,0 +1,32 @@
+/** @vitest-environment node */
+import { describe, expect, it } from 'vitest'
+import { resolveMothershipModelSettings } from '@/lib/mothership/model-options'
+
+describe('Plan model defaults', () => {
+  it.each([true, false])('defaults Plan to Opus Medium with advanced=%s', (advanced) => {
+    expect(resolveMothershipModelSettings({}, advanced, true)).toEqual({
+      effort: 'medium',
+      modelSelection: { model: 'claude-opus-5-5', fastMode: false },
+    })
+    expect(resolveMothershipModelSettings({}, advanced)).toEqual({
+      effort: 'high',
+      modelSelection: { model: 'gpt-6-astra', fastMode: false },
+    })
+  })
+
+  it.each(['low', 'medium', 'high', 'xhigh', 'max'] as const)(
+    'preserves the visible Plan effort %s with model selection hidden',
+    (effort) => expect(resolveMothershipModelSettings({ effort }, false, true).effort).toBe(effort)
+  )
+
+  it('preserves an explicit Plan comparison choice when model selection is enabled', () => {
+    const chosen = {
+      effort: 'xhigh' as const,
+      modelSelection: { model: 'gpt-6-astra' as const, fastMode: false },
+    }
+    expect(resolveMothershipModelSettings(chosen, true, true)).toEqual(chosen)
+    expect(resolveMothershipModelSettings(chosen, false, true).modelSelection.model).toBe(
+      'claude-opus-5-5'
+    )
+  })
+})

apps/sim/lib/mothership/model-options.ts

@@ -33,15 +33,22 @@ export function mothershipEffortOptions(model: ModelSelection['model']) {
 /** Shared by the visible controls, send path and server admission so hidden preferences cannot leak. */
 export function resolveMothershipModelSettings(
   settings: { effort?: MothershipEffort; modelSelection?: ModelSelection },
-  advanced: boolean
+  advanced: boolean,
+  plan = false
 ): { effort: MothershipEffort; modelSelection: ModelSelection } {
-  let effort = settings.effort ?? 'high'
+  let effort = settings.effort ?? (plan ? 'medium' : 'high')
   if (!advanced) {
-    if (effort === 'none' || effort === 'low') effort = 'medium'
-    if (effort === 'max') effort = 'xhigh'
-    return { effort, modelSelection: { model: 'gpt-6-astra', fastMode: false } }
+    if (effort === 'none' || (!plan && effort === 'low')) effort = 'medium'
+    if (!plan && effort === 'max') effort = 'xhigh'
+    return {
+      effort,
+      modelSelection: { model: plan ? 'claude-opus-5-5' : 'gpt-6-astra', fastMode: false },
+    }
+  }
+  const stored = settings.modelSelection ?? {
+    model: plan ? 'claude-opus-5-5' : 'gpt-6-astra',
+    fastMode: false,
   }
-  const stored = settings.modelSelection ?? { model: 'gpt-6-astra', fastMode: false }
   const model = stored.model === 'claude-opus-5' ? 'claude-opus-5-5' : stored.model
   if (effort === 'none' && model !== 'gpt-6-sol') effort = 'medium'
   return {