improvement(mothership): relabel the Sol pick GPT-6.1 Sol and retire the none effort

Author: waleedlatif1

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

@@ -10,10 +10,10 @@ import {
 } from '@sim/emcn'
 import { Brain, Check, Sparkles } from '@sim/emcn/icons'
 import {
+  MOTHERSHIP_EFFORT_OPTIONS,
   MOTHERSHIP_MODEL_OPTIONS,
   MOTHERSHIP_SIMPLE_EFFORT_OPTIONS,
   type MothershipEffort,
-  mothershipEffortOptions,
   resolveMothershipModelSettings,
 } from '@/lib/mothership/model-options'
 import { useChatSurface } from '@/app/workspace/[workspaceId]/home/components/chat-surface-context'
@@ -45,9 +45,7 @@ export function ModelSelector() {
     { effort: effortChoice ?? undefined, modelSelection: selection },
     advanced
   )
-  const options = modelSelection
-    ? mothershipEffortOptions(modelSelection.model)
-    : MOTHERSHIP_SIMPLE_EFFORT_OPTIONS
+  const options = modelSelection ? MOTHERSHIP_EFFORT_OPTIONS : MOTHERSHIP_SIMPLE_EFFORT_OPTIONS
   const setEffort = (choice: MothershipEffort) => {
     if (chatId) saveChatEffort(choice)
     else setNewChatEffort(choice)

apps/sim/lib/mothership/chat/application/set-effort.integration.ts

@@ -99,6 +99,11 @@ describe('a chat keeps the effort its owner picked', () => {
     expect(await nextTurnEffort(chatId)).toBe('high')
   })
 
+  it('runs a chat whose stored pick is the retired none effort at low', async () => {
+    const chatId = await createChat({ effort: 'none' })
+    expect(await nextTurnEffort(chatId)).toBe('low')
+  })
+
   it("refuses to change another user's chat in a shared workspace", async () => {
     const chatId = await createChat(null)
     await expect(

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

@@ -815,7 +815,7 @@ describe('handleUnifiedChatPost', () => {
     ['xhigh', 'xhigh'],
     ['max', 'xhigh'],
     ['low', 'low'],
-    ['none', 'high'],
+    ['none', 'low'],
   ])(
     'leaves the model to the worker and enforces the effort range on submitted %s effort',
     async (effort, expected) => {
@@ -838,16 +838,19 @@ describe('handleUnifiedChatPost', () => {
     }
   )
 
+  const solSelection = { model: 'gpt-6-sol', fastMode: false } as const
   it.each([
-    { stored: null, sent: undefined, runs: 'high' },
-    { stored: 'medium', sent: undefined, runs: 'medium' },
-    { stored: 'low', sent: undefined, runs: 'low' },
-    { stored: 'high', sent: 'low', runs: 'low' },
-    { stored: 'high', sent: 'max', runs: 'xhigh' },
+    { stored: null, sent: undefined, runs: 'high', modelSelection: undefined },
+    { stored: 'medium', sent: undefined, runs: 'medium', modelSelection: undefined },
+    { stored: 'low', sent: undefined, runs: 'low', modelSelection: undefined },
+    { stored: 'high', sent: 'low', runs: 'low', modelSelection: undefined },
+    { stored: 'high', sent: 'max', runs: 'xhigh', modelSelection: undefined },
+    { stored: 'none', sent: undefined, runs: 'low', modelSelection: solSelection },
+    { stored: 'high', sent: 'none', runs: 'low', modelSelection: solSelection },
   ] as const)(
-    'runs a chat whose stored effort choice is $stored at $runs when the send names $sent',
-    async ({ stored, sent, runs }) => {
-      flags.models.mockResolvedValue(false)
+    'runs a chat whose stored effort choice is $stored at $runs when the send names $sent with $modelSelection',
+    async ({ stored, sent, runs, modelSelection }) => {
+      flags.models.mockResolvedValue(Boolean(modelSelection))
       resolveOrCreateChat.mockResolvedValue({
         chatId: 'chat-1',
         chat: { id: 'chat-1', effort: stored },
@@ -860,13 +863,14 @@ describe('handleUnifiedChatPost', () => {
             message: 'Continue',
             workspaceId: 'ws-1',
             chatId: 'chat-1',
+            ...(modelSelection ? { modelSelection } : {}),
             ...(sent ? { effort: sent } : {}),
           }),
         })
       )
       expect(response.status).toBe(200)
       expect(buildCopilotRequestPayload).toHaveBeenCalledWith(
-        expect.objectContaining({ effort: runs })
+        expect.objectContaining({ effort: runs, modelSelection })
       )
       expect(admitTurn.mock.calls[0][0].input.effortChoice).toBe(sent && runs)
     }

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

@@ -13,7 +13,7 @@ export const MOTHERSHIP_EFFORT_OPTIONS: Array<{ value: MothershipEffort; label:
 
 export const MOTHERSHIP_MODEL_OPTIONS = [
   { value: 'gpt-6-astra', label: 'GPT-6 Astra' },
-  { value: 'gpt-6-sol', label: 'GPT-6 Sol' },
+  { value: 'gpt-6-sol', label: 'GPT-6.1 Sol' },
   { value: 'claude-opus-5-5', label: 'Opus 5.5' },
 ] satisfies Array<{ value: ModelSelection['model']; label: string }>
 
@@ -32,12 +32,6 @@ export const MOTHERSHIP_SIMPLE_EFFORT_OPTIONS = MOTHERSHIP_EFFORT_OPTIONS.filter
   SIMPLE_EFFORT_VALUES.has(option.value)
 )
 
-export function mothershipEffortOptions(model: ModelSelection['model']) {
-  return model === 'gpt-6-sol'
-    ? [{ value: 'none' as const, label: 'None' }, ...MOTHERSHIP_EFFORT_OPTIONS]
-    : MOTHERSHIP_EFFORT_OPTIONS
-}
-
 /**
  * Shared by the visible controls, send path and server admission so hidden preferences cannot leak.
  * Without the model picker no selection is sent, so the worker routes every model role itself.
@@ -47,15 +41,15 @@ export function resolveMothershipModelSettings(
   advanced: boolean
 ): { effort: MothershipEffort; modelSelection: ModelSelection | undefined } {
   let effort = settings.effort ?? DEFAULT_MOTHERSHIP_EFFORT
+  // No served model reasons at `none`; a pick stored before it was retired runs at the nearest effort.
+  if (effort === 'none') effort = 'low'
   if (!advanced) {
-    if (effort === 'none') effort = DEFAULT_MOTHERSHIP_EFFORT
     if (effort === 'max') effort = 'xhigh'
     return { effort, modelSelection: undefined }
   }
   const modelSelection = normalizeModelSelection(
     settings.modelSelection ?? { model: 'gpt-6-astra', fastMode: false }
   )
-  if (effort === 'none' && modelSelection.model !== 'gpt-6-sol') effort = DEFAULT_MOTHERSHIP_EFFORT
   return { effort, modelSelection }
 }