Keep each accepted chat message with its chosen model and effort

config/scripts/vitest-sqlite-runtime-files.mjs

@@ -122,6 +122,7 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/native-chat/agent-session-wire/structured-agent-session-legacy-handoff-record.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-live-turn-window.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-main-agent-working-agreement.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-message-choices.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-newer-content-host.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-option-settlement.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-owed-work-release.test.ts',
@@ -137,6 +138,7 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/native-chat/agent-session-wire/structured-agent-session-ready-operation-order.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-queued-action-receipts.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-queued-gate.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-queued-newer-orca.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause-lift.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-queued-repeat-press.test.ts',
@@ -167,6 +169,7 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/native-chat/agent-session-wire/structured-agent-session-send-idempotency.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-send-open-stale-turn.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-send.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-settled-attach-retry.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-shutdown-cut-row.test.ts',

mobile/src/session/mobile-native-chat-merged-snapshot-parity-hooks.test.tsx

@@ -90,6 +90,7 @@ const HOST_SUPPORT = {
   queuedMessages: true,
   queuedCommands: false,
   statusFeed: true,
+  messageChoices: false,
   quietRepeatedStop: true
 }
 

mobile/src/session/mobile-structured-agent-session-host-support.test.ts

@@ -4,6 +4,7 @@ import {
   AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY,
   AGENT_SESSION_QUEUED_COMMANDS_RUNTIME_CAPABILITY,
   AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY,
+  AGENT_SESSION_MESSAGE_CHOICES_RUNTIME_CAPABILITY,
   AGENT_SESSION_STATUS_FEED_RUNTIME_CAPABILITY,
   AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY
 } from '../../../src/shared/protocol-version'
@@ -15,6 +16,7 @@ describe('structuredAgentSessionHostSupport', () => {
       promptCancel: false,
       questionAnswers: false,
       queuedMessages: false,
+      messageChoices: false,
       queuedCommands: false,
       quietRepeatedStop: false,
       statusFeed: false
@@ -29,6 +31,9 @@ describe('structuredAgentSessionHostSupport', () => {
     expect(
       structuredAgentSessionHostSupport([AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY])
     ).toEqual({ ...none, queuedMessages: true })
+    expect(
+      structuredAgentSessionHostSupport([AGENT_SESSION_MESSAGE_CHOICES_RUNTIME_CAPABILITY])
+    ).toEqual({ ...none, messageChoices: true })
     expect(
       structuredAgentSessionHostSupport([AGENT_SESSION_QUEUED_COMMANDS_RUNTIME_CAPABILITY])
     ).toEqual({ ...none, queuedCommands: true })

mobile/src/session/mobile-structured-agent-session-host-support.ts

@@ -3,6 +3,7 @@ import {
   AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY,
   AGENT_SESSION_QUEUED_COMMANDS_RUNTIME_CAPABILITY,
   AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY,
+  AGENT_SESSION_MESSAGE_CHOICES_RUNTIME_CAPABILITY,
   AGENT_SESSION_STATUS_FEED_RUNTIME_CAPABILITY,
   AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY
 } from '../../../src/shared/protocol-version'
@@ -13,6 +14,7 @@ export type StructuredAgentSessionHostSupport = {
   questionAnswers: boolean
   /** Mid-turn sends queue as host-held drafts; an older host keeps today's immediate path. */
   queuedMessages: boolean
+  messageChoices: boolean
   /** A /compact sent while the agent works waits as a card; an older host refuses it. */
   queuedCommands: boolean
   /** The host publishes every session's status on one stream. A host from before phones could
@@ -29,6 +31,7 @@ export function structuredAgentSessionHostSupport(
     promptCancel: capabilities.includes(AGENT_SESSION_PROMPT_CANCEL_RUNTIME_CAPABILITY),
     questionAnswers: capabilities.includes(AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY),
     queuedMessages: capabilities.includes(AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY),
+    messageChoices: capabilities.includes(AGENT_SESSION_MESSAGE_CHOICES_RUNTIME_CAPABILITY),
     queuedCommands: capabilities.includes(AGENT_SESSION_QUEUED_COMMANDS_RUNTIME_CAPABILITY),
     statusFeed: capabilities.includes(AGENT_SESSION_STATUS_FEED_RUNTIME_CAPABILITY),
     quietRepeatedStop: capabilities.includes(AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY)

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

@@ -125,6 +125,8 @@ export async function requestStructuredAgentSessionMutation<TValue>(args: {
   sessionId: string
   expectedRuntimeFence: number
   fields: Record<string, unknown>
+  /** Sent beside the request, excluded from the operation fingerprint. */
+  unfingerprintedFields?: Record<string, unknown>
   clientOperationId?: string
   timeoutMs?: number
 }): Promise<StructuredAgentSessionMutationCallResult<TValue>> {
@@ -135,6 +137,7 @@ export async function requestStructuredAgentSessionMutation<TValue>(args: {
     sessionId,
     expectedRuntimeFence,
     fields,
+    unfingerprintedFields,
     clientOperationId,
     timeoutMs
   } = args
@@ -153,7 +156,8 @@ export async function requestStructuredAgentSessionMutation<TValue>(args: {
             fields
           })
         },
-        ...fields
+        ...fields,
+        ...unfingerprintedFields
       },
       timeoutMs
     )

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

@@ -1,4 +1,5 @@
 import type { AgentSessionSendResult } from '../../../src/shared/agent-session-wire'
+import type { AgentSessionExecutionOptions } from '../../../src/shared/agent-session-execution-options'
 import {
   structuredAgentSessionSendBody,
   type StructuredAgentSessionAttachment
@@ -20,6 +21,7 @@ export async function sendMobileStructuredAgentSessionMessage(input: {
   attachments: readonly StructuredAgentSessionAttachment[]
   /** Sent only when the host advertises `agent-session.queued-messages.v1`. */
   delivery?: 'queue-if-active'
+  executionOptions?: AgentSessionExecutionOptions
   deadline?: number
   /** The id the host records the message under. */
   clientMessageId: string
@@ -41,6 +43,9 @@ export async function sendMobileStructuredAgentSessionMessage(input: {
       body: structuredAgentSessionSendBody(input.text, input.attachments),
       ...(input.delivery ? { delivery: input.delivery } : {})
     },
+    ...(input.executionOptions
+      ? { unfingerprintedFields: { executionOptions: input.executionOptions } }
+      : {}),
     clientOperationId: input.clientMessageId,
     timeoutMs
   })

mobile/src/session/mobile-structured-option-snapshot.ts

@@ -0,0 +1,27 @@
+import { createNativeChatSessionOptionRecord } from '../../../src/shared/native-chat-session-option-state'
+import type { SessionOptionDescriptor } from '../../../src/shared/native-chat-session-options'
+import {
+  commitStructuredAgentSessionOptionValues,
+  structuredAgentSessionOptionSnapshot,
+  type StructuredAgentSessionOptionState
+} from '../../../src/shared/structured-agent-session-options'
+
+/** The host's saved choice with this phone's still-pending pick on top. */
+export function mobileStructuredOptionSnapshot(
+  agent: string,
+  state: StructuredAgentSessionOptionState,
+  hostSelection: Readonly<Record<string, string>> | undefined
+): SessionOptionDescriptor[] {
+  const selected = hostSelection
+    ? commitStructuredAgentSessionOptionValues(
+        { ...state, record: createNativeChatSessionOptionRecord(agent) },
+        hostSelection
+      )
+    : state
+  const pending = state.pendingPick
+  return structuredAgentSessionOptionSnapshot(
+    pending
+      ? commitStructuredAgentSessionOptionValues(selected, { [pending.id]: pending.value })
+      : selected
+  )
+}

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

@@ -1,6 +1,6 @@
 import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
-import { describe, expect, it, vi } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import type { AgentSessionModelCatalogResult } from '../../../src/shared/agent-session-wire'
 import type { SessionOptionDescriptor } from '../../../src/shared/native-chat-session-options'
 import type { RpcClient } from '../transport/rpc-client'
@@ -9,7 +9,10 @@ import { useMobileStructuredAgentOptions } from './use-mobile-structured-agent-o
 
 const HOST_LIST: AgentSessionModelCatalogResult = {
   origin: 'probe',
-  models: [{ id: 'gpt-host', label: 'GPT Host', isDefault: true, efforts: [] }],
+  models: [
+    { id: 'gpt-host', label: 'GPT Host', isDefault: true, efforts: [] },
+    { id: 'gpt-alt', label: 'GPT Alt', isDefault: false, efforts: [] }
+  ],
   fetchedAt: 1_000
 }
 
@@ -36,21 +39,27 @@ function modelChoices(snapshot: readonly SessionOptionDescriptor[]): string[] {
   return model?.kind.type === 'select' ? model.kind.choices.map((choice) => choice.value) : []
 }
 
-type Props = { rpc: RpcClient; fence: number }
+type Props = { rpc: RpcClient; fence: number; hostSelection?: Readonly<Record<string, string>> }
 
 async function mount(initial: Props) {
   const frames: string[][] = []
-  const mutate: StructuredAgentSessionMutate = vi.fn()
+  const snapshots: SessionOptionDescriptor[][] = []
+  const mutate: StructuredAgentSessionMutate = async () => new Promise(() => {})
+  let pick: ReturnType<typeof useMobileStructuredAgentOptions>['setStructuredOption'] = async () =>
+    false
   function Probe(props: Props): null {
     const options = useMobileStructuredAgentOptions({
       agent: 'codex',
       client: props.rpc,
       sessionId: 'session-1',
       enabled: true,
       fence: props.fence,
+      hostSelection: props.hostSelection,
       mutate
     })
     frames.push(modelChoices(options.optionSnapshot))
+    snapshots.push(options.optionSnapshot)
+    pick = options.setStructuredOption
     return null
   }
   let renderer: ReactTestRenderer | null = null
@@ -59,6 +68,8 @@ async function mount(initial: Props) {
   })
   return {
     frames,
+    snapshots,
+    pick: (id: string, value: string) => pick(id, value),
     update: (next: Props) =>
       act(async () => {
         renderer?.update(createElement(Probe, next))
@@ -74,10 +85,10 @@ describe('the phone picker’s first frame', () => {
     const harness = await mount({ rpc, fence: 1 })
     expect(harness.frames.every((choices) => choices.length === 0)).toBe(true)
     await act(async () => answer(HOST_LIST))
-    expect(harness.frames.at(-1)).toEqual(['gpt-host'])
+    expect(harness.frames.at(-1)).toEqual(['gpt-host', 'gpt-alt'])
     // Only the host's list was ever offered.
     expect(harness.frames.filter((choices) => choices.length > 0)).toEqual(
-      harness.frames.filter((choices) => choices.length > 0).map(() => ['gpt-host'])
+      harness.frames.filter((choices) => choices.length > 0).map(() => ['gpt-host', 'gpt-alt'])
     )
     await harness.unmount()
   })
@@ -86,7 +97,7 @@ describe('the phone picker’s first frame', () => {
     let reads = 0
     const rpc = client(() => (reads++ === 0 ? Promise.resolve(HOST_LIST) : new Promise(() => {})))
     const harness = await mount({ rpc, fence: 1 })
-    expect(harness.frames.at(-1)).toEqual(['gpt-host'])
+    expect(harness.frames.at(-1)).toEqual(['gpt-host', 'gpt-alt'])
     const before = harness.frames.length
     await harness.update({ rpc, fence: 2 })
     expect(harness.frames.slice(before).every((choices) => choices[0] === 'gpt-host')).toBe(true)
@@ -99,4 +110,23 @@ describe('the phone picker’s first frame', () => {
     expect(harness.frames.at(-1)?.length).toBeGreaterThan(0)
     await harness.unmount()
   })
+
+  it('uses the host’s live selection when the options read has not answered', async () => {
+    const rpc = client(() => Promise.resolve(HOST_LIST))
+    const harness = await mount({ rpc, fence: 1, hostSelection: { model: 'gpt-host' } })
+    const model = harness.snapshots.at(-1)?.find((entry) => entry.id === 'model')
+    expect(model?.kind.currentValue).toBe('gpt-host')
+    await harness.unmount()
+  })
+
+  it('includes a pick still waiting for the host in the next message snapshot', async () => {
+    const rpc = client(() => Promise.resolve(HOST_LIST))
+    const harness = await mount({ rpc, fence: 1, hostSelection: { model: 'gpt-host' } })
+    await act(async () => {
+      void harness.pick('model', 'gpt-alt')
+    })
+    const model = harness.snapshots.at(-1)?.find((entry) => entry.id === 'model')
+    expect(model?.kind.currentValue).toBe('gpt-alt')
+    await harness.unmount()
+  })
 })

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

@@ -34,6 +34,7 @@ import {
   mobileCreatedStructuredSession
 } from './mobile-created-structured-sessions'
 import { encodeStructuredAgentSessionOptionValue } from '../../../src/shared/structured-agent-session-option-codec'
+import { mobileStructuredOptionSnapshot } from './mobile-structured-option-snapshot'
 
 type StructuredOptionsController = {
   optionPickerRequest: { id: string; sequence: number } | null
@@ -56,8 +57,9 @@ export function useMobileStructuredAgentOptions(args: {
   mutate: StructuredAgentSessionMutate
   /** Moves when the host's status says a session option changed; each move re-reads them. */
   optionStamp?: string
+  hostSelection?: Readonly<Record<string, string>>
 }): StructuredOptionsController {
-  const { agent, client, enabled, fence, mutate, optionStamp, sessionId } = args
+  const { agent, client, enabled, fence, mutate, optionStamp, hostSelection, sessionId } = args
   // Every agent's seed, as on the desktop: a built-in list or the provider-default pill.
   const optionCatalog = useMemo(
     () => (agent ? structuredAgentSessionSeedCatalog(agent) : null),
@@ -68,7 +70,6 @@ export function useMobileStructuredAgentOptions(args: {
   )
   const optionStateRef = useRef(optionState)
   const activeOptionRecordRef = useRef(optionState.record)
-  const pendingOptionRef = useRef<string | null>(null)
   const optionMutationGeneration = useRef(0)
   const updateOptionState = useCallback(
     (update: (current: StructuredAgentSessionOptionState) => StructuredAgentSessionOptionState) => {
@@ -106,7 +107,6 @@ export function useMobileStructuredAgentOptions(args: {
     // The chat's own, which a restart for a new mode keeps: the pill never blanks between them.
     const next = sameSession ? { ...kept, permissionMode: previous.permissionMode } : kept
     optionMutationGeneration.current += 1
-    pendingOptionRef.current = null
     optionStateRef.current = next
     activeOptionRecordRef.current = next.record
     setOptionState(next)
@@ -173,16 +173,15 @@ export function useMobileStructuredAgentOptions(args: {
   ])
 
   const optionSnapshot = useMemo(
-    () => structuredAgentSessionOptionSnapshot(optionState),
-    [optionState]
+    () => mobileStructuredOptionSnapshot(agent ?? 'codex', optionState, hostSelection),
+    [agent, hostSelection, optionState]
   )
 
   const setStructuredOption = useCallback(
     async (id: string, value: SessionOptionValue): Promise<boolean> => {
       const currentState = optionStateRef.current
       const encoded = encodeStructuredAgentSessionOptionValue(id, value)
       if (
-        pendingOptionRef.current !== null ||
         !client ||
         !sessionId ||
         !optionCatalog ||
@@ -204,10 +203,8 @@ export function useMobileStructuredAgentOptions(args: {
             ? commitStructuredAgentSessionOption(current, id, encoded)
             : current
         )
-      } else {
-        pendingOptionRef.current = id
-        updateOptionState((current) => ({ ...current, pendingId: id }))
       }
+      updateOptionState((current) => ({ ...current, pendingPick: { id, value: encoded } }))
       // A same-fence accepted write, or a shown one that failed, reads back what the host now holds.
       let readsBack = shownAtOnce
       try {
@@ -266,10 +263,9 @@ export function useMobileStructuredAgentOptions(args: {
             .catch(() => undefined)
         }
         if (isCurrent()) {
-          pendingOptionRef.current = null
           updateOptionState((current) =>
-            current.record === targetRecord && current.pendingId === id
-              ? { ...current, pendingId: null }
+            current.record === targetRecord && current.pendingPick?.id === id
+              ? { ...current, pendingPick: null }
               : current
           )
         }
@@ -316,7 +312,7 @@ export function useMobileStructuredAgentOptions(args: {
       (agent !== null && isAgentSessionHandleProvider(agent)),
     optionSnapshot,
     optionSurface,
-    pendingOptionId: optionState.pendingId,
+    pendingOptionId: optionState.pendingPick?.id ?? null,
     setStructuredOption,
     invokeStructuredOption
   }

mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx

@@ -124,6 +124,7 @@ function Harness({
       queuedMessages: false,
       queuedCommands: false,
       statusFeed: false,
+      messageChoices: false,
       quietRepeatedStop: false
     },
     onSendError: vi.fn()

mobile/src/session/use-mobile-structured-agent-session-queued.test-fixture.ts

@@ -18,6 +18,7 @@ export const CAPABLE: StructuredAgentSessionHostSupport = {
   queuedMessages: true,
   queuedCommands: false,
   statusFeed: false,
+  messageChoices: false,
   quietRepeatedStop: false
 }
 export const LEGACY: StructuredAgentSessionHostSupport = { ...CAPABLE, queuedMessages: false }