A chat's model, effort and Fast belong to the chat, not to a model

mobile/src/session/use-mobile-host-model-catalog-upgrade.ts

@@ -1,7 +1,7 @@
 import { useEffect, type MutableRefObject } from 'react'
 import type { AgentSessionModelCatalogResult } from '../../../src/shared/agent-session-wire'
 import type { AgentSessionOptionCatalog } from '../../../src/shared/agent-session-option-catalog'
-import type { NativeChatSessionOptionRecord } from '../../../src/shared/native-chat-session-option-state'
+import type { StructuredAgentSessionOptionRecord } from '../../../src/shared/structured-agent-session-option-state'
 import {
   applyStructuredAgentSessionModelCatalog,
   settleStructuredAgentSessionBuiltinCatalog,
@@ -31,7 +31,7 @@ export function useMobileHostModelCatalogUpgrade(args: {
   worktree?: string
   fence: number | null
   optionCatalog: AgentSessionOptionCatalog | null
-  activeOptionRecordRef: MutableRefObject<NativeChatSessionOptionRecord>
+  activeOptionRecordRef: MutableRefObject<StructuredAgentSessionOptionRecord>
   /** A listing landed after the chat's options were read, which answered without it. */
   onListingLanded?: () => void
   updateOptionState: (

mobile/src/session/use-mobile-structured-agent-options.test.ts

@@ -146,6 +146,7 @@ type ProbeProps = {
   sessionId: string | null
   fence: number | null
   mutate: StructuredAgentSessionMutate
+  optionStamp?: string
   onRender: (controller: Controller) => void
 }
 
@@ -158,6 +159,7 @@ function Probe(props: ProbeProps): null {
       enabled: true,
       fence: props.fence,
       mutate: props.mutate,
+      ...(props.optionStamp ? { optionStamp: props.optionStamp } : {}),
       hostSupport: { permissionModes: true }
     })
   )
@@ -671,3 +673,72 @@ describe('useMobileStructuredAgentOptions host catalog', () => {
     await harness.unmount()
   })
 })
+
+describe('useMobileStructuredAgentOptions after a lost pick reply', () => {
+  const tiers = (value: string, label: string) => [{ value, label }]
+  const answer = (model: string, serviceTier: string): AgentSessionOptionsResult => ({
+    models: [
+      {
+        id: 'm1',
+        label: 'M1',
+        isDefault: true,
+        efforts: [],
+        serviceTiers: tiers('priority', 'Fast')
+      },
+      { id: 'm2', label: 'M2', isDefault: false, efforts: [], serviceTiers: tiers('flex', 'Flex') }
+    ],
+    listedModelIds: ['m1', 'm2'],
+    current: { model, serviceTier, confirmed: ['model'] }
+  })
+  const speed = (controller: Controller) => {
+    const kind = descriptorFor(controller.optionSnapshot, 'serviceTier')?.kind
+    return kind?.type === 'select'
+      ? { value: kind.currentValue, choices: kind.choices.map((choice) => choice.value) }
+      : null
+  }
+
+  it('draws the tier the host reconciled to, stays usable through a failed read, and takes the reconnect read', async () => {
+    const pendingRead = deferred<AgentSessionOptionsResult>()
+    const reads = [
+      () => Promise.resolve(answer('m1', 'priority')),
+      () => Promise.reject(new Error('offline')),
+      () => pendingRead.promise,
+      () => Promise.resolve(answer('m2', 'flex'))
+    ]
+    const client = optionsClient(() => reads.shift()!())
+    const { mutate } = recordingMutate(async () => ({ status: 'unknown' }))
+    const harness = await mountOptions({ ...BASE, client: client.client, mutate })
+    expect(speed(harness.current())?.value).toBe('priority')
+
+    // The host switched and set Standard, but its reply never arrived.
+    await act(async () => {
+      await harness.current().setStructuredOption('model', 'm2')
+    })
+    expect(currentValueOf(harness.current().optionSnapshot, 'model')).toBe('m2')
+    expect(speed(harness.current())).toEqual({ value: 'default', choices: ['default', 'flex'] })
+    expect(harness.current().pendingOptionId).toBeNull()
+
+    // The status-triggered read fails: nothing changes.
+    await harness.rerender({ optionStamp: 'status-1' })
+    expect(speed(harness.current())?.value).toBe('default')
+
+    // A read in flight when the user picks Flex answers for the old state and is dropped.
+    await harness.rerender({ optionStamp: 'status-2' })
+    let picked = false
+    await act(async () => {
+      picked = await harness.current().setStructuredOption('serviceTier', 'flex')
+    })
+    expect(picked).toBe(true)
+    await act(async () => pendingRead.resolve(answer('m1', 'priority')))
+    await settle()
+    expect(currentValueOf(harness.current().optionSnapshot, 'model')).toBe('m2')
+    expect(speed(harness.current())?.value).toBe('flex')
+
+    // Reconnected, the host's answer stands.
+    await harness.rerender({ optionStamp: 'status-3' })
+    expect(currentValueOf(harness.current().optionSnapshot, 'model')).toBe('m2')
+    expect(speed(harness.current())?.value).toBe('flex')
+    expect(client.optionReads()).toBe(4)
+    await harness.unmount()
+  })
+})

mobile/src/session/use-mobile-structured-agent-options.ts

@@ -18,6 +18,7 @@ import {
 } from '../../../src/shared/structured-agent-session-options'
 import {
   structuredAgentSessionOptionView,
+  structuredAgentSessionSendSelection,
   structuredAgentSessionShownSnapshot
 } from '../../../src/shared/structured-agent-session-option-view'
 import {
@@ -151,7 +152,9 @@ export function useMobileStructuredAgentOptions(args: {
           setConversationSupport({ sessionId, commands: result.conversationCommands ?? [] })
           updateOptionState((current) =>
             current.record === activeOptionRecordRef.current
-              ? applyStructuredAgentSessionOptions(current, optionCatalog, result)
+              ? applyStructuredAgentSessionOptions(current, optionCatalog, result, {
+                  newLaunch: createdHere !== undefined
+                })
               : current
           )
         }
@@ -162,6 +165,7 @@ export function useMobileStructuredAgentOptions(args: {
     }
   }, [
     client,
+    createdHere,
     enabled,
     optionCatalog,
     optionStamp,
@@ -269,7 +273,9 @@ export function useMobileStructuredAgentOptions(args: {
               if (isCurrent()) {
                 updateOptionState((latest) =>
                   latest.record === targetRecord
-                    ? applyStructuredAgentSessionOptions(latest, optionCatalog, refreshed)
+                    ? applyStructuredAgentSessionOptions(latest, optionCatalog, refreshed, {
+                        newLaunch: createdHere !== undefined
+                      })
                     : latest
                 )
               }
@@ -286,9 +292,14 @@ export function useMobileStructuredAgentOptions(args: {
         }
       }
     },
-    [agent, client, mutate, optionCatalog, sessionId, updateOptionState]
+    [agent, client, createdHere, mutate, optionCatalog, sessionId, updateOptionState]
   )
 
+  // Read, not rendered: what the chat holds when the send goes out.
+  const sendSelection = useCallback(
+    () => structuredAgentSessionSendSelection(optionStateRef.current),
+    []
+  )
   const { optionPickerRequest, invokeStructuredOption, optionSurface } =
     useMobileStructuredOptionSurface({
       optionSnapshot,
@@ -308,6 +319,7 @@ export function useMobileStructuredAgentOptions(args: {
     optionSurface,
     pendingOptionId: optionState.pendingId,
     setStructuredOption,
-    invokeStructuredOption
+    invokeStructuredOption,
+    sendSelection
   }
 }

mobile/src/session/use-mobile-structured-agent-session.ts

@@ -199,7 +199,7 @@ export function useMobileStructuredAgentSession(
     commandPending: commandPendingRef,
     controller: sendController,
     onSendError,
-    carriesOptions: hostSupport?.sendOptions === true
+    sendOptions: hostSupport?.sendOptions === true ? options.sendSelection : undefined
   })
   const turnIndicator = useMemo(
     () => ({

mobile/src/session/use-mobile-structured-send-with-outcome.ts

@@ -21,7 +21,6 @@ import { sendMobileStructuredAgentSessionMessage } from './mobile-structured-age
 import type { MobileStructuredSends } from './use-mobile-structured-sends'
 import { structuredSessionOperationId } from './structured-session-operation-id'
 import { timeoutForDeadline } from './mobile-structured-agent-session-rpc'
-import { structuredAgentSessionSendSelection } from '../../../src/shared/structured-agent-session-option-view'
 import { nativeChatTextWithFileReferences } from './mobile-native-chat-file-attachment'
 import {
   actionableStructuredApproval,
@@ -64,8 +63,8 @@ export function useMobileStructuredSendWithOutcome(args: {
     'snapshot' | 'setOption' | 'invokeAction' | 'conversationCommands'
   >
   onSendError: MobileNativeChatSendErrorReporter
-  /** Each send carries the model and effort the picker shows; an older host takes neither. */
-  carriesOptions?: boolean
+  /** The chat's own model and effort each send carries; absent for an older host, which takes neither. */
+  sendOptions?: () => Readonly<Record<string, string>> | undefined
 }): (
   text: string,
   images?: string[],
@@ -83,7 +82,7 @@ export function useMobileStructuredSendWithOutcome(args: {
     hold,
     onSendError,
     queueCapable,
-    carriesOptions,
+    sendOptions,
     sessionId,
     stateRef,
     stopping
@@ -157,11 +156,8 @@ export function useMobileStructuredSendWithOutcome(args: {
         queuedAt: Date.now(),
         ...(stopping ? { sentWhileStopping: true as const } : {})
       }
-      // A pick on its way holds the send, so the picker shows what the chat holds.
-      const options =
-        carriesOptions && agent
-          ? structuredAgentSessionSendSelection(agent, controller.snapshot)
-          : undefined
+      // A pick on its way holds the send, so the chat's values are what it holds.
+      const options = sendOptions?.()
       const outcome = await sendMobileStructuredAgentSessionMessage({
         client,
         sessionId,
@@ -194,7 +190,7 @@ export function useMobileStructuredSendWithOutcome(args: {
       hold,
       onSendError,
       queueCapable,
-      carriesOptions,
+      sendOptions,
       sessionId,
       stateRef,
       stopping

src/main/claude/claude-adapter-capture-replay.test.ts

@@ -171,7 +171,7 @@ async function replayCapture(name: string): Promise<Replay> {
         requestedAt: nowMs,
         fence: 7
       })
-      expect(outcome).toEqual({ state: 'admitted' })
+      expect(outcome).toMatchObject({ state: 'admitted' })
       const sent = claude.connections[0]!.sent.at(-1)?.uuid
       if (typeof sent !== 'string' || before.has(sent)) {
         throw new Error('replay could not read the dispatched uuid')

src/main/claude/claude-command-lifecycle.test.ts

@@ -205,7 +205,7 @@ async function replayCapture(
           body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: event.text }] },
           fence: 7
         })
-      ).resolves.toEqual({ state: 'admitted' })
+      ).resolves.toMatchObject({ state: 'admitted' })
       uuidMap.set(event.sentUuid, String(connection.sent.at(-1)!.uuid))
     } else if (event.kind === 'control') {
       const answerAt = capture.findIndex(

src/main/claude/claude-fold-steer-receipt.test.ts

@@ -130,7 +130,7 @@ async function riggedAdapter(
         requestedAt: nowMs,
         fence: 7
       })
-      expect(outcome).toEqual({ state: 'admitted' })
+      expect(outcome).toMatchObject({ state: 'admitted' })
       const sentUuid = claude.connections[0]!.sent.at(-1)?.uuid
       if (typeof sentUuid !== 'string') {
         throw new Error('the fake connection recorded no sent uuid')

src/main/claude/claude-structured-conversation-stop.test.ts

@@ -18,7 +18,7 @@ async function written(claude: ReturnType<typeof fakeClaude>) {
       body: USER_MESSAGE,
       fence: 7
     })
-  ).resolves.toEqual({ state: 'admitted' })
+  ).resolves.toMatchObject({ state: 'admitted' })
   return adapter
 }
 
@@ -95,7 +95,7 @@ describe('Claude Stop that names no turn', () => {
         body: USER_MESSAGE,
         fence: 7
       })
-    ).resolves.toEqual({ state: 'admitted' })
+    ).resolves.toMatchObject({ state: 'admitted' })
     expect(connection.sent).toHaveLength(2)
   })
 })

src/main/claude/claude-structured-effort-default-at-rest.test.ts

@@ -15,6 +15,7 @@ import { agentModelCatalogFingerprintForRecord } from '../native-chat/agent-mode
 import { AgentModelCatalogStore } from '../native-chat/agent-model-catalog/agent-model-catalog-store'
 import type { StructuredAgentSessionMutationContext } from '../native-chat/agent-session-wire/structured-agent-session-host-mutations'
 import { readStructuredAgentSessionOptions } from '../native-chat/agent-session-wire/structured-agent-session-options-read'
+import { structuredAgentSessionSendSelection } from '../../shared/structured-agent-session-option-view'
 import { claudeAndCodexAgents } from '../native-chat/agent-session-wire/structured-agent-session-adapter-router-test-support'
 import { composeCodexSessionOptionCatalog } from '../codex/codex-structured-model-catalog'
 import {
@@ -139,11 +140,15 @@ async function startChild(
   return adapter
 }
 
-function restingRecord(options: Record<string, string>): AgentSessionRecord {
+function restingRecord(
+  options: Record<string, string>,
+  providerHandleChain: { origin: string }[] = []
+): AgentSessionRecord {
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resting read and the catalog key touch only these fields.
   return {
     provider: 'claude',
     accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: ACCOUNT_HOME },
+    providerHandleChain,
     location: { executionHostId: 'local', wslDistro: null },
     // Why released: a chat at rest has no live claim, so its next start reads the current account.
     lease: { claimStatus: 'released' },
@@ -174,7 +179,13 @@ function readAtRest(store: AgentModelCatalogStore, record: AgentSessionRecord) {
   const resting = {
     child: null,
     params: { provider: 'claude' },
-    journal: { threadGoal: () => null, contextUsage: () => null, context: { floor: () => null } }
+    journal: {
+      threadGoal: () => null,
+      visitItems: () => {},
+      submissions: () => [],
+      contextUsage: () => null,
+      context: { floor: () => null }
+    }
   }
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resting read touches only these members.
   const context = {
@@ -232,6 +243,30 @@ describe('Claude effort default at rest', () => {
     expect(pickerEffort(result)).toBe('medium')
   })
 
+  it('names the default for a reopened chat with no saved model, and its run reports that row', async () => {
+    const store = new AgentModelCatalogStore()
+    const child = await startChild(store)
+    const seed = getAgentSessionOptionCatalog('claude')!
+    const picker = (answer: Awaited<ReturnType<typeof readAtRest>>) => {
+      const state = applyStructuredAgentSessionOptions(
+        createStructuredAgentSessionOptionState('claude', seed),
+        seed,
+        answer
+      )
+      const row = structuredAgentSessionOptionSnapshot(state).find((entry) => entry.id === 'model')
+      const shown = row?.kind.type === 'select' ? row.kind.currentValue : undefined
+      return { shown, sends: structuredAgentSessionSendSelection(state)?.model }
+    }
+    const reopened = await readAtRest(store, restingRecord({}, [{ origin: 'adopted' }]))
+    expect(reopened.current).toMatchObject({ model: 'opus[1m]', defaulted: ['model', 'effort'] })
+    expect(picker(reopened)).toEqual({ shown: 'opus[1m]', sends: undefined })
+
+    // Its first turn runs what the CLI reports (claude-opus-5-5[1m]), as that row.
+    const ran = (await child.readOptions({ sessionId: SESSION, fence: 7 })).current
+    expect(ran).toMatchObject({ model: 'opus[1m]' })
+    expect(ran.defaulted ?? []).not.toContain('model')
+  })
+
   it("shows the user's pick at rest over the default", async () => {
     const store = new AgentModelCatalogStore()
     await startChild(store)
@@ -282,6 +317,7 @@ describe('Claude effort default at rest', () => {
     const record = {
       provider: 'codex',
       accountHome: { variable: 'CODEX_HOME', path: '/accounts/codex' },
+      providerHandleChain: [],
       location: { executionHostId: 'local', wslDistro: null },
       options: { model: 'gpt-unlisted', effort: 'high' }
     } as unknown as AgentSessionRecord
@@ -364,6 +400,7 @@ describe('Claude effort default at rest', () => {
     const record = {
       provider: 'codex',
       accountHome: { variable: 'CODEX_HOME', path: '/accounts/codex' },
+      providerHandleChain: [],
       location: { executionHostId: 'local', wslDistro: null },
       options: { model: 'gpt-5.5', effort: 'high' }
     } as unknown as AgentSessionRecord
@@ -381,6 +418,7 @@ describe('Claude effort default at rest', () => {
     const record = {
       provider: 'codex',
       accountHome: { variable: 'CODEX_HOME', path: '/accounts/codex' },
+      providerHandleChain: [],
       location: { executionHostId: 'local', wslDistro: null },
       options: { model: 'gpt-5.5' }
     } as unknown as AgentSessionRecord
@@ -407,7 +445,7 @@ describe('Claude effort default at rest', () => {
 
     const result = await readAtRest(store, record)
 
-    expect(result.current).toEqual({ model: 'gpt-5.5', permissionMode: 'ask' })
+    expect(result.current).toEqual({ model: 'gpt-5.5', defaulted: [], permissionMode: 'ask' })
   })
 
   it("never saves the applied effort as the chat's pick, yet shows it at rest", async () => {