fix(native-chat): a failed start is shown on its message and retried, and later messages go ahead

mobile/src/session/MobileNativeChatQueuedMessages.test.tsx

@@ -35,6 +35,7 @@ function card(
     state: 'waiting',
     paused: false,
     needsAttention: false,
+    holdsQueue: overrides.state === 'returned',
     caption: null,
     ...overrides
   }

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

@@ -3,7 +3,8 @@ import {
   AGENT_SESSION_PROMPT_CANCEL_RUNTIME_CAPABILITY,
   AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY,
   AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY,
-  AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY
+  AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY,
+  AGENT_SESSION_RETRY_MESSAGE_RUNTIME_CAPABILITY
 } from '../../../src/shared/protocol-version'
 import { structuredAgentSessionHostSupport } from './mobile-structured-agent-session-host-support'
 
@@ -13,39 +14,53 @@ describe('structuredAgentSessionHostSupport', () => {
       promptCancel: false,
       questionAnswers: false,
       queuedMessages: false,
-      quietRepeatedStop: false
+      quietRepeatedStop: false,
+      retryMessage: false
     })
     expect(
       structuredAgentSessionHostSupport([AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY])
     ).toEqual({
       promptCancel: false,
       questionAnswers: true,
       queuedMessages: false,
-      quietRepeatedStop: false
+      quietRepeatedStop: false,
+      retryMessage: false
     })
     expect(
       structuredAgentSessionHostSupport([AGENT_SESSION_PROMPT_CANCEL_RUNTIME_CAPABILITY])
     ).toEqual({
       promptCancel: true,
       questionAnswers: false,
       queuedMessages: false,
-      quietRepeatedStop: false
+      quietRepeatedStop: false,
+      retryMessage: false
     })
     expect(
       structuredAgentSessionHostSupport([AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY])
     ).toEqual({
       promptCancel: false,
       questionAnswers: false,
       queuedMessages: true,
-      quietRepeatedStop: false
+      quietRepeatedStop: false,
+      retryMessage: false
     })
     expect(
       structuredAgentSessionHostSupport([AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY])
     ).toEqual({
       promptCancel: false,
       questionAnswers: false,
       queuedMessages: false,
-      quietRepeatedStop: true
+      quietRepeatedStop: true,
+      retryMessage: false
+    })
+    expect(
+      structuredAgentSessionHostSupport([AGENT_SESSION_RETRY_MESSAGE_RUNTIME_CAPABILITY])
+    ).toEqual({
+      promptCancel: false,
+      questionAnswers: false,
+      queuedMessages: false,
+      quietRepeatedStop: false,
+      retryMessage: true
     })
   })
 })

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

@@ -2,7 +2,8 @@ import {
   AGENT_SESSION_PROMPT_CANCEL_RUNTIME_CAPABILITY,
   AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY,
   AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY,
-  AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY
+  AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY,
+  AGENT_SESSION_RETRY_MESSAGE_RUNTIME_CAPABILITY
 } from '../../../src/shared/protocol-version'
 
 /** Structured-session features the connected host advertised; null until the status probe answers. */
@@ -13,6 +14,8 @@ export type StructuredAgentSessionHostSupport = {
   queuedMessages: boolean
   /** A Stop that stopped nothing adds no row, so a repeated Stop is quiet. */
   quietRepeatedStop: boolean
+  /** A message whose start failed for good can be queued again; an older host's stay hidden. */
+  retryMessage: boolean
 }
 
 export function structuredAgentSessionHostSupport(
@@ -22,6 +25,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),
-    quietRepeatedStop: capabilities.includes(AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY)
+    quietRepeatedStop: capabilities.includes(AGENT_SESSION_REPEATED_STOP_RUNTIME_CAPABILITY),
+    retryMessage: capabilities.includes(AGENT_SESSION_RETRY_MESSAGE_RUNTIME_CAPABILITY)
   }
 }

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

@@ -45,6 +45,7 @@ describe('mobileQueuedMessageCards', () => {
       state: 'waiting',
       paused: false,
       needsAttention: false,
+      holdsQueue: false,
       caption: null
     })
   })
@@ -139,6 +140,21 @@ describe('mobileQueuedMessageCards', () => {
     expect(cards[1]?.needsAttention).toBe(false)
   })
 
+  it('holds nothing behind a card returned because its agent failed to start', () => {
+    const drafts = [
+      draft({ messageId: 'a', ...returnedAs(agentSessionFailureFact('providerStartFailed')) }),
+      draft({ messageId: 'b', position: 2 })
+    ]
+    const cards = mobileQueuedMessageCards(drafts, [], { pendingPrompt: false })
+    expect(cards[0]).toMatchObject({ state: 'returned', needsAttention: true, holdsQueue: false })
+    expect(cards[1]?.caption).toBeNull()
+    expect(
+      mobileQueueHasResumableCard(
+        mobileQueuedMessageCards(drafts, [], { pendingPrompt: false, queuePaused: true })
+      )
+    ).toBe(true)
+  })
+
   it('hides a waiting card once its hand-off arrived, never a returned one', () => {
     const cards = mobileQueuedMessageCards(
       [

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

@@ -5,7 +5,10 @@
 import { readWholeAgentSessionFailureFact } from '../../../src/shared/agent-session-failure'
 import type { AgentJournalSubmission } from '../../../src/shared/agent-session-journal-types'
 import { agentSessionWriteNoticeEnglish } from '../../../src/shared/agent-session-refusal-notice'
-import { dispatchWasWithdrawn } from '../../../src/shared/structured-agent-session-dispatch-rejection'
+import {
+  dispatchWasWithdrawn,
+  queuedCardHoldsQueue
+} from '../../../src/shared/structured-agent-session-dispatch-rejection'
 import { structuredAgentSessionAttemptFailureParts } from '../../../src/shared/structured-agent-session-send-disposition'
 import {
   QUEUED_MESSAGE_PAUSED_SEND_FAILED,
@@ -21,6 +24,8 @@ export type MobileQueuedMessageCard = {
   paused: boolean
   /** Returned, or its own send failed: the row leads with an alert. */
   needsAttention: boolean
+  /** Returned for something only the person can resolve: the cards behind it wait. */
+  holdsQueue: boolean
   /** Status under the text; null for a card plainly waiting its turn, the paused queue's too. */
   caption: string | null
 }
@@ -64,10 +69,11 @@ const QUEUE_PAUSE_LABELS: Readonly<Record<string, string>> = {
 }
 
 /** Whether Resume would send anything: a waiting card with no hold of its own, ahead of any
- *  returned card. The drain stops at a returned card, so cards behind one never go. */
+ *  returned card that holds the queue. The drain stops at such a card, so cards behind it never
+ *  go. */
 export function mobileQueueHasResumableCard(cards: readonly MobileQueuedMessageCard[]): boolean {
   for (const card of cards) {
-    if (card.state === 'returned') {
+    if (card.holdsQueue) {
       return false
     }
     if (!card.paused) {
@@ -123,6 +129,7 @@ export function mobileQueuedMessageCards(
               : facts.pendingPrompt
                 ? 'Waiting for your answer'
                 : null
+    const holdsQueue = queuedCardHoldsQueue(draft)
     cards.push({
       messageId: draft.messageId,
       text: queuedMessageBodyText(draft.body),
@@ -131,11 +138,10 @@ export function mobileQueuedMessageCards(
       needsAttention:
         draft.state === 'returned' ||
         (paused && draft.pausedReason === QUEUED_MESSAGE_PAUSED_SEND_FAILED),
+      holdsQueue,
       caption
     })
-    if (draft.state === 'returned') {
-      behindReturned = true
-    }
+    behindReturned = behindReturned || holdsQueue
   }
   return cards
 }

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

@@ -13,7 +13,9 @@
 //
 //   accepted/pending — the send happened. The id is spent; a later identical
 //     message is a new message and must carry a new id.
-//   rejected — a terminal refusal or rejected submission spends a fresh id. A
+//   rejected — a terminal refusal or rejected submission spends a fresh id (a
+//     desktop's Retry may queue that same message again on the host; the phone
+//     never resends under it). A
 //     pending-admission refusal, or any refusal after earlier transport doubt,
 //     keeps it because neither proves a retained delivery did not happen. Two
 //     exceptions spend it anyway, because the host can never accept the replay

mobile/src/session/use-mobile-native-chat-queued-slot.test.tsx

@@ -33,6 +33,7 @@ const CARD = {
   state: 'waiting' as const,
   paused: false,
   needsAttention: false,
+  holdsQueue: false,
   caption: null
 }
 

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

@@ -125,7 +125,8 @@ function Harness({
       promptCancel: promptCancelSupported,
       questionAnswers: questionAnswersSupported,
       queuedMessages: false,
-      quietRepeatedStop: false
+      quietRepeatedStop: false,
+      retryMessage: false
     },
     onSendError: vi.fn()
   })

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

@@ -16,7 +16,8 @@ export const CAPABLE: StructuredAgentSessionHostSupport = {
   promptCancel: false,
   questionAnswers: false,
   queuedMessages: true,
-  quietRepeatedStop: false
+  quietRepeatedStop: false,
+  retryMessage: false
 }
 export const LEGACY: StructuredAgentSessionHostSupport = { ...CAPABLE, queuedMessages: false }
 

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

@@ -533,6 +533,7 @@ describe('mobile structured queued messages', () => {
           state: 'waiting',
           paused: false,
           needsAttention: false,
+          holdsQueue: false,
           caption: null
         }
       ])

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

@@ -173,9 +173,10 @@ export function useMobileStructuredAgentSession(args: {
     // Off: the phone hands a rejected message back to its composer, so a row would show it twice.
     () =>
       projectStructuredAgentSessionMessages(transcriptItems, [], state.submissions, {
-        rejectedInPlace: false
+        rejectedInPlace: false,
+        showsFailedStartsSentElsewhere: hostSupport?.retryMessage === true
       }),
-    [transcriptItems, state.submissions]
+    [transcriptItems, state.submissions, hostSupport?.retryMessage]
   )
   const turnId = activeStructuredAgentSessionTurnId(state.items)
   const turnTiming = useMobileStructuredAgentTurnTiming(

src/main/claude/claude-structured-auth-parity.test.ts

@@ -107,7 +107,8 @@ describe('claude structured auth parity with the terminal preflight', () => {
       })
     ).rejects.toMatchObject({
       message: CLAUDE_AUTH_ENV_CONFLICT_MESSAGE,
-      reason: 'managedAccountEnvOverride'
+      reason: 'managedAccountEnvOverride',
+      needsUser: true
     })
   })
 
@@ -119,7 +120,8 @@ describe('claude structured auth parity with the terminal preflight', () => {
       })({ identity: IDENTITY })
     ).rejects.toMatchObject({
       message: CLAUDE_AUTH_ENV_CONFLICT_MESSAGE,
-      reason: 'managedAccountEnvOverride'
+      reason: 'managedAccountEnvOverride',
+      needsUser: true
     })
   })
 
@@ -169,7 +171,8 @@ describe('claude structured auth parity with the terminal preflight', () => {
       resolverFor({ stripAuthEnv: true, authSwitchSettleTimeoutMs: 20 })({ identity: IDENTITY })
     ).rejects.toMatchObject({
       message: CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE,
-      reason: 'accountSwitchInProgress'
+      reason: 'accountSwitchInProgress',
+      needsUser: false
     })
   })
 
@@ -194,7 +197,8 @@ describe('claude structured auth parity with the terminal preflight', () => {
       adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9' })
     ).rejects.toMatchObject({
       message: CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE,
-      reason: 'accountSwitchInProgress'
+      reason: 'accountSwitchInProgress',
+      needsUser: false
     })
     // Nothing was spawned, so the refusal must not have opened a connection.
     expect(claude.connections).toHaveLength(0)
@@ -241,7 +245,8 @@ describe('claude structured auth parity with the terminal preflight', () => {
       adapter.acquire({ identity: identityFor(), fence: 8, spawnToken: 'spawn-10' })
     ).rejects.toMatchObject({
       message: CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE,
-      reason: 'accountSwitchInProgress'
+      reason: 'accountSwitchInProgress',
+      needsUser: false
     })
     // No replacement child was opened, so nothing is left running unowned.
     expect(claude.connections).toHaveLength(1)