fix(native-chat): a message sent while Stopping waits at the end of the queue, and a person's Stop never holds another agent's mail

mobile/src/session/MobileNativeChatView.test.ts

@@ -170,10 +170,10 @@ describe('MobileNativeChatView', () => {
   })
 
   it.each([
-    ['queue', 'Queue a message to run after the stop'],
+    ['queue', 'Message, @files, /commands'],
     ['send', 'Send a message to run after the stop']
   ] as const)(
-    'tells the composer a message sent now runs after the stop (%s)',
+    'tells the composer whether a message sent now runs after the stop (%s)',
     async (afterStop, placeholder) => {
       await render({
         structuredActivityUi: true,

mobile/src/session/mobile-structured-queued-message-cards.test.ts

@@ -7,6 +7,7 @@ import {
   QUEUED_MESSAGE_PAUSED_SEND_FAILED
 } from '../../../src/shared/agent-session-wire'
 import type { AgentSessionQueuedMessage } from '../../../src/shared/agent-session-wire'
+import type { AgentMessageSource } from '../../../src/shared/agent-session-message-source'
 import {
   mobileQueueHasResumableCard,
   mobileQueuePauseLabel,
@@ -19,6 +20,15 @@ function returnedAs(fact: Parameters<typeof agentSessionFailureWords>[0]) {
   return { state: 'returned' as const, returnedReason: reason, returnedRejection: rejection }
 }
 
+/** Another agent's message, which names its sender on its body. */
+const AGENT_FROM: AgentMessageSource = {
+  kind: 'agent',
+  senders: [],
+  orchestration: { message: 'mail-notice', mailbox: 'run:r1', dispatchId: null, messages: [] }
+}
+
+const STOPPED = { reason: 'stopped' } as const
+
 function draft(overrides: Partial<AgentSessionQueuedMessage> & { messageId: string }) {
   return {
     position: 1,
@@ -32,6 +42,11 @@ function draft(overrides: Partial<AgentSessionQueuedMessage> & { messageId: stri
   }
 }
 
+function mailDraft(messageId: string, position: number) {
+  const base = draft({ messageId, position })
+  return { ...base, body: { ...base.body, from: AGENT_FROM } }
+}
+
 describe('mobileQueuedMessageCards', () => {
   it('renders nothing without a published list', () => {
     expect(mobileQueuedMessageCards(null, [], { pendingPrompt: false })).toEqual([])
@@ -63,21 +78,31 @@ describe('mobileQueuedMessageCards', () => {
   it('captions nothing on a waiting card of a paused queue; its pause row explains', () => {
     const [card] = mobileQueuedMessageCards([draft({ messageId: 'a' })], [], {
       pendingPrompt: false,
-      queuePaused: true
+      queuePause: STOPPED
     })
     expect(card?.caption).toBeNull()
     expect(card?.paused).toBe(false)
     expect(card?.needsAttention).toBe(false)
   })
 
+  // Another agent's mail runs when the stop lands: only a person's card waits on the Stop's pause.
+  it("captions mail as an ordinary waiting card under a person's Stop", () => {
+    const cards = mobileQueuedMessageCards(
+      [draft({ messageId: 'typed' }), mailDraft('mail', 2)],
+      [],
+      { pendingPrompt: true, queuePause: STOPPED }
+    )
+    expect(cards.map((card) => card.caption)).toEqual([null, 'Waiting for your answer'])
+  })
+
   it("keeps a card's own failed send and reads a prompt's wait as queued under a paused queue", () => {
     const cards = mobileQueuedMessageCards(
       [
         draft({ messageId: 'a', paused: true, pausedReason: QUEUED_MESSAGE_PAUSED_SEND_FAILED }),
         draft({ messageId: 'b', position: 2 })
       ],
       [],
-      { pendingPrompt: true, queuePaused: true }
+      { pendingPrompt: true, queuePause: STOPPED }
     )
     expect(cards.map((card) => card.caption)).toEqual(["Couldn't send — tap Send to retry", null])
     expect(cards[0]?.paused).toBe(true)
@@ -86,7 +111,7 @@ describe('mobileQueuedMessageCards', () => {
   it('finds something for Resume to send only in a waiting card with no hold, ahead of a returned one', () => {
     const resumable = (drafts: AgentSessionQueuedMessage[]) =>
       mobileQueueHasResumableCard(
-        mobileQueuedMessageCards(drafts, [], { pendingPrompt: false, queuePaused: true })
+        mobileQueuedMessageCards(drafts, [], { pendingPrompt: false, queuePause: STOPPED })
       )
     const returned = draft({
       messageId: 'r',

mobile/src/session/mobile-structured-queued-message-cards.ts

@@ -10,6 +10,7 @@ import { structuredAgentSessionAttemptFailureParts } from '../../../src/shared/s
 import {
   QUEUED_MESSAGE_PAUSED_KEPT,
   QUEUED_MESSAGE_PAUSED_SEND_FAILED,
+  queuePauseHoldsCard,
   type AgentSessionQueuedMessage,
   type AgentSessionQueuePause
 } from '../../../src/shared/agent-session-wire'
@@ -99,7 +100,7 @@ export function mobileQueuePauseLabel(pause: Pick<AgentSessionQueuePause, 'reaso
 export function mobileQueuedMessageCards(
   queuedMessages: readonly AgentSessionQueuedMessage[] | null,
   submissions: readonly Pick<AgentJournalSubmission, 'queuedMessageId' | 'dispatchState'>[],
-  facts: { pendingPrompt: boolean; queuePaused?: boolean }
+  facts: { pendingPrompt: boolean; queuePause?: AgentSessionQueuePause | null }
 ): MobileQueuedMessageCard[] {
   if (!queuedMessages || queuedMessages.length === 0) {
     return []
@@ -125,7 +126,7 @@ export function mobileQueuedMessageCards(
           ? pausedCaption(draft.pausedReason)
           : behindReturned
             ? 'Waiting — a message ahead needs attention'
-            : facts.queuePaused
+            : queuePauseHoldsCard(facts.queuePause, draft)
               ? // The pause row says why and offers Resume; the card promises no send time.
                 null
               : facts.pendingPrompt

mobile/src/session/use-mobile-native-chat-input-lease.test.ts

@@ -114,16 +114,18 @@ describe('useSettledMobileNativeChatInputLock', () => {
 })
 
 describe("the phone chat composer's placeholder", () => {
-  it('says a message runs after the stop while the chat reads Stopping', () => {
-    expect(mobileNativeChatComposerPlaceholder(null, 'queue')).toBe(
-      'Queue a message to run after the stop'
-    )
-    // Where the host does not queue sends, it holds the message until the stop lands.
+  // Where the host does not queue sends, it holds the message until the stop lands.
+  it('says a message runs after the stop while the chat reads Stopping and sends are not queued', () => {
     expect(mobileNativeChatComposerPlaceholder(null, 'send')).toBe(
       'Send a message to run after the stop'
     )
   })
 
+  // A queued one is a card the Stop holds until Resume: nothing promises it runs after the stop.
+  it('reads as usual while Stopping where a send is queued', () => {
+    expect(mobileNativeChatComposerPlaceholder(null, 'queue')).toBe('Message, @files, /commands')
+  })
+
   it('reads as usual otherwise', () => {
     expect(mobileNativeChatComposerPlaceholder(null, undefined)).toBe('Message, @files, /commands')
   })

mobile/src/session/use-mobile-native-chat-input-lease.ts

@@ -95,7 +95,8 @@ export function useSettledMobileNativeChatInputLock(
 }
 
 /** What the composer says while the input lease blocks it, else that a message sent now runs
- *  after a Stop the chat reads as stopping, else its normal prompt. */
+ *  after a Stop the chat reads as stopping, else its normal prompt. A queued one is a card the
+ *  Stop holds until Resume, so it gets the normal prompt. */
 export function mobileNativeChatComposerPlaceholder(
   lockReason: MobileNativeChatInputLockReason | null,
   /** While stopping: whether a message sent now is queued, or sent for the host to hold. */
@@ -107,10 +108,8 @@ export function mobileNativeChatComposerPlaceholder(
   if (lockReason === 'waiting') {
     return 'Waiting for terminal…'
   }
-  if (afterStop) {
-    return afterStop === 'queue'
-      ? NATIVE_CHAT_TURN_STATUS_COPY.queueAfterStop
-      : NATIVE_CHAT_TURN_STATUS_COPY.sendAfterStop
+  if (afterStop === 'send') {
+    return NATIVE_CHAT_TURN_STATUS_COPY.sendAfterStop
   }
   return 'Message, @files, /commands'
 }

mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx

@@ -173,6 +173,32 @@ describe('mobile structured queued messages', () => {
       )
     })
 
+    // Nothing is left to steer into while a Stop ends the turn: the send runs after it, as a card.
+    it('queues a send made while this phone reads Stopping', async () => {
+      sendRequest.mockImplementation(async (method) => {
+        if (method === 'agentSession.cancel') {
+          return new Promise<RpcResponse>(() => {})
+        }
+        if (method === 'agentSession.send') {
+          return mutationOk({
+            clientMessageId: 'client-1',
+            queued: { messageId: 'client-1', position: 1, state: 'waiting' }
+          })
+        }
+        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
+      })
+      await mountSession(CAPABLE, snapshotEvent({ runningTurn: true }))
+      act(() => hook!.cancel())
+      await vi.waitFor(() => expect(hook!.turnIndicator.stopping).toBe(true))
+
+      await act(async () => {
+        expect(await hook!.sendWithOutcome('run this after the stop')).toBe('queued')
+      })
+
+      expect(calls('agentSession.send')).toHaveLength(1)
+      expect(requestOf('agentSession.send').params.delivery).toBe('queue-if-active')
+    })
+
     it('keeps today’s request exactly against an incapable host', async () => {
       sendRequest.mockImplementation(async (method) => {
         if (method === 'agentSession.send') {

mobile/src/session/use-mobile-structured-queued-message-controls.ts

@@ -73,7 +73,7 @@ export function useMobileStructuredQueuedMessageControls(args: {
     () =>
       mobileQueuedMessageCards(queuedMessages, submissions, {
         pendingPrompt,
-        queuePaused: queuePause !== null
+        queuePause
       }),
     [pendingPrompt, queuePause, queuedMessages, submissions]
   )