Default Plan chats to independently saved Opus 5.5 Medium preferences

Author: Sg312

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

@@ -15,7 +15,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(() => ({
   plan: false,
@@ -103,6 +106,7 @@ let queryClient: QueryClient
 beforeEach(() => {
   mocks.advanced = false
   useMothershipEffortStore.getState().reset()
+  useMothershipPlanEffortStore.getState().reset()
   mocks.plan = false
   vi.clearAllMocks()
   mocks.workspaces = [
@@ -191,7 +195,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'
@@ -476,3 +480,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

@@ -313,6 +313,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

@@ -23,14 +23,15 @@ import {
   useMothershipChatHistory,
   useSetMothershipChatEffort,
 } from '@/hooks/queries/mothership-chats'
-import { useMothershipEffortStore } from '@/stores/mothership-effort/store'
+import { useMothershipEffortStore, useMothershipPlanEffortStore } from '@/stores/mothership-effort/store'
 
 /** Model, reasoning effort, and Fast mode for Build chat composers. */
-export function ModelSelector() {
+export function ModelSelector({ plan = false }: { plan?: boolean }) {
+  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 selection = usePreferenceStore((state) => state.modelSelection)
+  const setModel = usePreferenceStore((state) => state.setModel)
+  const setFastMode = usePreferenceStore((state) => state.setFastMode)
   const { chatId } = useChatSurface()
   const { data: chatHistory } = useMothershipChatHistory(chatId)
   const chatPick = useMothershipEffortStore((state) =>
@@ -42,7 +43,8 @@ export function ModelSelector() {
   const effortChoice = chatId ? (chatPick ?? chatHistory?.effort) : newChatEffort
   const { effort, modelSelection } = resolveMothershipModelSettings(
     { effort: effortChoice ?? undefined, modelSelection: selection },
-    advanced
+    advanced,
+    plan
   )
   const options = modelSelection ? MOTHERSHIP_EFFORT_OPTIONS : MOTHERSHIP_SIMPLE_EFFORT_OPTIONS
   const setEffort = (choice: MothershipEffort) => {

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

@@ -598,6 +598,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

@@ -136,7 +136,7 @@ import { getWorkflowListQueryOptions } from '@/hooks/queries/utils/workflow-list
 import { workflowKeys } from '@/hooks/queries/workflows'
 import { snapAllSmoothText } from '@/hooks/use-smooth-text'
 import { useChatPanelStore } from '@/stores/chat-panel/store'
-import { useMothershipEffortStore } from '@/stores/mothership-effort/store'
+import { useMothershipEffortStore, useMothershipPlanEffortStore } from '@/stores/mothership-effort/store'
 import {
   liveQueueKey,
   liveQueuePosition,
@@ -3940,8 +3940,12 @@ export function useChat(
             ...(options?.requestMode !== 'assistant'
               ? {
                   modelSelection: resolveMothershipModelSettings(
-                    useMothershipEffortStore.getState(),
-                    modelSelectorEnabled
+                    (options?.requestMode === 'plan'
+                      ? useMothershipPlanEffortStore
+                      : useMothershipEffortStore
+                    ).getState(),
+                    modelSelectorEnabled,
+                    options?.requestMode === 'plan'
                   ).modelSelection,
                   ...(effortChoice ? { effort: effortChoice } : {}),
                 }