Recover native chat messages when terminal delivery is unconfirmed

mobile/src/session/MobileNativeChatDeliveryRecoveryNotice.tsx

@@ -0,0 +1,37 @@
+import { Pressable, Text, View } from 'react-native'
+import { AlertTriangle } from 'lucide-react-native'
+import { colors } from '../theme/mobile-theme'
+import { styles } from './mobile-native-chat-view-styles'
+
+export function MobileNativeChatDeliveryRecoveryNotice({
+  onShowTerminal
+}: {
+  onShowTerminal?: () => void
+}): React.JSX.Element {
+  return (
+    <View
+      style={styles.deliveryRecovery}
+      accessibilityRole="alert"
+      accessibilityLiveRegion="assertive"
+    >
+      <View style={styles.deliveryRecoveryHeader}>
+        <View style={styles.deliveryRecoveryIcon}>
+          <AlertTriangle size={16} color={colors.textMuted} strokeWidth={2} />
+        </View>
+        <View style={styles.deliveryRecoveryCopy}>
+          <Text style={styles.deliveryRecoveryTitle}>Message wasn’t sent</Text>
+          <Text style={styles.deliveryRecoveryDescription}>
+            The terminal may be waiting for input. Your message is still in the composer.
+          </Text>
+        </View>
+      </View>
+      <Pressable
+        style={({ pressed }) => [styles.deliveryRecoveryButton, pressed && styles.pressed]}
+        onPress={onShowTerminal}
+        accessibilityRole="button"
+      >
+        <Text style={styles.deliveryRecoveryButtonText}>Show terminal</Text>
+      </Pressable>
+    </View>
+  )
+}

mobile/src/session/MobileNativeChatOverlay.tsx

@@ -97,6 +97,8 @@ export function MobileNativeChatOverlay({
         inputLockReason={inputLockReason}
         sendErrorMessage={sendErrorMessage}
         onClearSendError={onClearSendError}
+        deliveryFailed={controller.nativeChatDeliveryFailed}
+        onShowTerminal={controller.showNativeChatTerminal}
         filePaths={controller.nativeChatFilePaths}
         onNeedFiles={controller.loadNativeChatFiles}
         sessionOptions={controller.nativeChatSessionOptions}

mobile/src/session/MobileNativeChatView.test.ts

@@ -31,6 +31,7 @@ vi.mock('react-native-gesture-handler', () => {
 })
 
 vi.mock('lucide-react-native', () => ({
+  AlertTriangle: 'AlertTriangle',
   ArrowDown: 'ArrowDown',
   ChevronsDownUp: 'ChevronsDownUp',
   ChevronsUpDown: 'ChevronsUpDown',
@@ -71,6 +72,8 @@ type Overrides = {
   onClearSendError?: () => void
   inputLockReason?: 'disconnected' | 'waiting' | null
   onSend?: (text: string) => Promise<boolean>
+  deliveryFailed?: boolean
+  onShowTerminal?: () => void
 }
 
 function suppressRendererWarning(): () => void {
@@ -170,6 +173,22 @@ describe('MobileNativeChatView', () => {
     expect(bannerText()).toContain('Permission reply failed')
   })
 
+  it('shows persistent delivery recovery with a terminal action', async () => {
+    const onShowTerminal = vi.fn()
+    await render({ deliveryFailed: true, onShowTerminal })
+
+    expect(bannerText()).toContain('Message wasn’t sent')
+    expect(bannerText()).toContain('Your message is still in the composer.')
+    const action = renderer!.root.find(
+      (node) =>
+        node.type === 'Pressable' &&
+        node.findAll((child) => child.type === 'Text' && child.props.children === 'Show terminal')
+          .length > 0
+    )
+    act(() => action.props.onPress())
+    expect(onShowTerminal).toHaveBeenCalledOnce()
+  })
+
   it('does not duplicate the route banner when the composer rejects', async () => {
     const onClearSendError = vi.fn()
     await render({

mobile/src/session/MobileNativeChatView.tsx

@@ -23,6 +23,7 @@ import { useMobileNativeChatPinchGesture } from './use-mobile-native-chat-pinch-
 import { MobileAgentWorkingIndicator } from './MobileAgentWorkingIndicator'
 import type { PendingNativeChatImage } from './mobile-native-chat-image-attachment'
 import { MobileNativeChatComposer } from './MobileNativeChatComposer'
+import { MobileNativeChatDeliveryRecoveryNotice } from './MobileNativeChatDeliveryRecoveryNotice'
 import type { MobileNativeChatSessionOptionPickersProps } from './MobileNativeChatSessionOptionPickers'
 import { MobileNativeChatMessage } from './MobileNativeChatMessage'
 import { MobileNativeChatAsk } from './MobileNativeChatAsk'
@@ -85,6 +86,8 @@ type Props = {
   sendErrorMessage?: string | null
   /** Clears `sendErrorMessage` once a later send is accepted. */
   onClearSendError?: () => void
+  deliveryFailed?: boolean
+  onShowTerminal?: () => void
   filePaths?: string[]
   onNeedFiles?: (query: string) => void
   /** Model/session-option pickers for the composer action row (desktop parity). */
@@ -143,6 +146,8 @@ export function MobileNativeChatView({
   inputLockReason,
   sendErrorMessage,
   onClearSendError,
+  deliveryFailed,
+  onShowTerminal,
   filePaths,
   onNeedFiles,
   sessionOptions,
@@ -429,6 +434,7 @@ export function MobileNativeChatView({
           <Text style={styles.sendErrorText}>{sendErrorMessage}</Text>
         </View>
       ) : null}
+      {deliveryFailed && <MobileNativeChatDeliveryRecoveryNotice onShowTerminal={onShowTerminal} />}
       <MobileNativeChatComposer
         value={composerText}
         onChangeText={onComposerTextChange}

mobile/src/session/mobile-native-chat-controller-contract.ts

@@ -19,6 +19,8 @@ export type MobileNativeChatController = {
   setChatComposerText: Dispatch<SetStateAction<string>>
   chatPending: MobileNativeChatPendingMessage[]
   chatImagePreviewsByMessageId: Record<string, string[]>
+  nativeChatDeliveryFailed: boolean
+  showNativeChatTerminal: () => void
   nativeChatSession: ReturnType<typeof useMobileNativeChatSession>
   nativeChatAgentWorking: boolean
   nativeChatStreamingText?: string

mobile/src/session/mobile-native-chat-pending-echo.ts

@@ -1,3 +1,5 @@
+import type { AgentPromptSubmissionOccurrence } from '../../../src/shared/agent-status-types'
+
 export type MobileNativeChatPendingMessage = {
   id: string
   text: string
@@ -13,6 +15,8 @@ export type MobileNativeChatSendOrigin = {
   normalizedText: string
   baselineOccurrences: number
   baselineTailMessageId: string | null
+  /** Latest hook occurrence observed before dispatch starts. */
+  promptSubmissionBaseline?: AgentPromptSubmissionOccurrence
 }
 
 type PendingByKey = Record<string, MobileNativeChatPendingMessage[]>

mobile/src/session/mobile-native-chat-prompt-delivery.test.ts

@@ -0,0 +1,117 @@
+import { createHash } from 'node:crypto'
+import { describe, expect, it } from 'vitest'
+import {
+  assignMobileNativeChatPromptSubmissions,
+  mobileNativeChatPromptDigest,
+  mobileNativeChatPromptWasAcknowledged,
+  type MobileNativeChatDeliveryCheck
+} from './mobile-native-chat-prompt-delivery'
+
+describe('mobile native chat prompt delivery', () => {
+  it('matches the desktop full-prompt digest contract', () => {
+    const prompt = `  ${'long '.repeat(60)}\nemoji 🚀  `
+    expect(mobileNativeChatPromptDigest(prompt)).toBe(
+      `sha256:${createHash('sha256').update(prompt).digest('hex')}`
+    )
+  })
+
+  it('requires an exact newer occurrence', () => {
+    const check: MobileNativeChatDeliveryCheck = {
+      pendingId: 'pending-1',
+      draftKey: 'draft',
+      pendingKey: 'pending',
+      text: 'hello',
+      normalizedText: 'hello',
+      baselineTailMessageId: null,
+      submittedAt: 20,
+      expectedDigest: mobileNativeChatPromptDigest('hello'),
+      baseline: { streamId: 'stream', sequence: 2, digest: 'old', receivedAt: 10 },
+      deadline: null
+    }
+    expect(
+      mobileNativeChatPromptWasAcknowledged(check, [
+        { streamId: 'stream', sequence: 2, digest: check.expectedDigest, receivedAt: 21 }
+      ])
+    ).toBe(false)
+    expect(
+      mobileNativeChatPromptWasAcknowledged(check, [
+        { streamId: 'stream', sequence: 3, digest: check.expectedDigest, receivedAt: 21 }
+      ])
+    ).toBe(true)
+  })
+
+  it('accepts only a newer host occurrence from a newly observed stream', () => {
+    const check: MobileNativeChatDeliveryCheck = {
+      pendingId: 'pending-1',
+      draftKey: 'draft',
+      pendingKey: 'pending',
+      text: 'hello',
+      normalizedText: 'hello',
+      baselineTailMessageId: null,
+      submittedAt: 9_000,
+      expectedDigest: mobileNativeChatPromptDigest('hello'),
+      baseline: { streamId: 'old-stream', sequence: 8, digest: 'old', receivedAt: 8_000 },
+      deadline: null
+    }
+
+    expect(
+      mobileNativeChatPromptWasAcknowledged(check, [
+        {
+          streamId: 'new-stream',
+          sequence: 1,
+          digest: check.expectedDigest,
+          receivedAt: 100
+        }
+      ])
+    ).toBe(false)
+    expect(
+      mobileNativeChatPromptWasAcknowledged(check, [
+        {
+          streamId: 'new-stream',
+          sequence: 2,
+          digest: check.expectedDigest,
+          receivedAt: 8_001
+        }
+      ])
+    ).toBe(true)
+  })
+
+  it('assigns one occurrence to only one repeated pending send', () => {
+    const digest = mobileNativeChatPromptDigest('repeat')
+    const base = {
+      draftKey: 'draft',
+      pendingKey: 'pending',
+      text: 'repeat',
+      normalizedText: 'repeat',
+      baselineTailMessageId: null,
+      submittedAt: 20,
+      expectedDigest: digest,
+      deadline: null
+    }
+    const occurrence = {
+      streamId: 'stream',
+      sequence: 1,
+      digest,
+      receivedAt: 21
+    }
+
+    expect([
+      ...assignMobileNativeChatPromptSubmissions(
+        [
+          { ...base, pendingId: 'first' },
+          { ...base, pendingId: 'second' }
+        ],
+        [occurrence]
+      ).keys()
+    ]).toEqual(['first'])
+    expect([
+      ...assignMobileNativeChatPromptSubmissions(
+        [
+          { ...base, pendingId: 'first', acknowledgedBy: occurrence },
+          { ...base, pendingId: 'second' }
+        ],
+        [occurrence]
+      ).keys()
+    ]).toEqual(['first'])
+  })
+})

mobile/src/session/mobile-native-chat-prompt-delivery.ts

@@ -0,0 +1,76 @@
+import { sha256 } from '@noble/hashes/sha256'
+import type { AgentPromptSubmissionOccurrence } from '../../../src/shared/agent-status-types'
+
+export const MOBILE_NATIVE_CHAT_DELIVERY_CONFIRMATION_MS = 8_000
+
+export type MobileNativeChatDeliveryCheck = {
+  pendingId: string
+  draftKey: string
+  pendingKey: string | null
+  text: string
+  normalizedText: string
+  baselineTailMessageId: string | null
+  expectedDigest: string
+  baseline?: AgentPromptSubmissionOccurrence
+  deadline: ReturnType<typeof setTimeout> | null
+  acknowledgedBy?: AgentPromptSubmissionOccurrence
+}
+
+function bytesToHex(bytes: Uint8Array): string {
+  return Array.from(bytes, (byte) => byte.toString(16).padStart(2, '0')).join('')
+}
+
+export function mobileNativeChatPromptDigest(text: string): string {
+  return `sha256:${bytesToHex(sha256(new TextEncoder().encode(text)))}`
+}
+
+export function mobileNativeChatPromptWasAcknowledged(
+  check: MobileNativeChatDeliveryCheck,
+  occurrences: readonly AgentPromptSubmissionOccurrence[]
+): boolean {
+  return occurrences.some((occurrence) => {
+    if (occurrence.digest !== check.expectedDigest) {
+      return false
+    }
+    if (!check.baseline) {
+      return true
+    }
+    if (occurrence.streamId === check.baseline.streamId) {
+      return occurrence.sequence > check.baseline.sequence
+    }
+    return occurrence.receivedAt > check.baseline.receivedAt
+  })
+}
+
+function occurrenceKey(occurrence: AgentPromptSubmissionOccurrence): string {
+  return `${occurrence.streamId}\0${occurrence.sequence}`
+}
+
+/** Assign each hook occurrence to at most one pending send. */
+export function assignMobileNativeChatPromptSubmissions(
+  checks: readonly MobileNativeChatDeliveryCheck[],
+  occurrences: readonly AgentPromptSubmissionOccurrence[]
+): Map<string, AgentPromptSubmissionOccurrence> {
+  const assignments = new Map<string, AgentPromptSubmissionOccurrence>()
+  const claimed = new Set<string>()
+  for (const check of checks) {
+    if (check.acknowledgedBy) {
+      assignments.set(check.pendingId, check.acknowledgedBy)
+      claimed.add(occurrenceKey(check.acknowledgedBy))
+    }
+  }
+  for (const check of checks) {
+    if (check.acknowledgedBy) {
+      continue
+    }
+    const occurrence = occurrences.find(
+      (item) =>
+        !claimed.has(occurrenceKey(item)) && mobileNativeChatPromptWasAcknowledged(check, [item])
+    )
+    if (occurrence) {
+      assignments.set(check.pendingId, occurrence)
+      claimed.add(occurrenceKey(occurrence))
+    }
+  }
+  return assignments
+}

mobile/src/session/mobile-native-chat-view-styles.ts

@@ -39,6 +39,54 @@ export const styles = StyleSheet.create({
     fontSize: typography.metaSize,
     fontWeight: '600'
   },
+  deliveryRecovery: {
+    gap: spacing.sm,
+    marginHorizontal: spacing.md,
+    marginBottom: spacing.sm,
+    padding: spacing.md,
+    borderRadius: 12,
+    borderWidth: StyleSheet.hairlineWidth,
+    borderColor: colors.borderSubtle,
+    backgroundColor: colors.bgRaised
+  },
+  deliveryRecoveryHeader: {
+    flexDirection: 'row',
+    alignItems: 'flex-start',
+    gap: spacing.sm
+  },
+  deliveryRecoveryIcon: {
+    width: 34,
+    height: 34,
+    alignItems: 'center',
+    justifyContent: 'center',
+    borderRadius: 8,
+    backgroundColor: colors.bgPanel
+  },
+  deliveryRecoveryCopy: {
+    flex: 1,
+    gap: 2
+  },
+  deliveryRecoveryTitle: {
+    color: colors.textPrimary,
+    fontSize: typography.bodySize,
+    fontWeight: '700'
+  },
+  deliveryRecoveryDescription: {
+    color: colors.textMuted,
+    fontSize: typography.metaSize,
+    lineHeight: 16
+  },
+  deliveryRecoveryButton: {
+    paddingHorizontal: spacing.sm,
+    paddingVertical: spacing.sm,
+    borderRadius: 8,
+    backgroundColor: colors.surfaceBright
+  },
+  deliveryRecoveryButtonText: {
+    color: colors.bgBase,
+    fontSize: typography.metaSize,
+    fontWeight: '700'
+  },
   chromeToggle: {
     flexDirection: 'row',
     alignItems: 'center',