fix(native-chat): the phone keeps a message the host did not deliver, and a failed /compact is said once

mobile/src/session/MobileNativeChatMessage.test.ts

@@ -77,6 +77,7 @@ describe('MobileNativeChatMessage', () => {
         workedSeconds: number | null
       } | null
       onToggleTurn?: () => void
+      unsentNotice?: string
     } = {}
   ): ReactTestRenderer {
     act(() => {
@@ -146,6 +147,36 @@ describe('MobileNativeChatMessage', () => {
     expect(texts.some((text) => text.includes('/tmp/host.png'))).toBe(true)
   })
 
+  it('says under a message the host recorded but never delivered why it was not sent', () => {
+    const tree = render(
+      { ...userMessage([{ type: 'text', text: 'hello' }]), unsent: true },
+      { unsentNotice: "Orca couldn't reach the agent. Your message was not sent." }
+    )
+    expect(textIn(tree.root)).toEqual([
+      'hello',
+      "Orca couldn't reach the agent. Your message was not sent."
+    ])
+  })
+
+  it('still says it was not sent when no words for it are loaded', () => {
+    const tree = render({ ...userMessage([{ type: 'text', text: 'hello' }]), unsent: true })
+    expect(textIn(tree.root)).toEqual(['hello', 'Your message was not sent.'])
+  })
+
+  it('says it was not sent as a muted label, not an error', () => {
+    const tree = render({ ...userMessage([{ type: 'text', text: 'hello' }]), unsent: true })
+    const [label] = tree.root.findAll(
+      (node) =>
+        node.props.style !== undefined && node.children.join('') === 'Your message was not sent.'
+    )
+    expect(label?.props.style).toMatchObject({ color: colors.textMuted })
+  })
+
+  it('says nothing more under a delivered message', () => {
+    const tree = render(userMessage([{ type: 'text', text: 'hello' }]))
+    expect(textIn(tree.root)).toEqual(['hello'])
+  })
+
   it('makes user message text selectable', () => {
     const tree = render(userMessage([{ type: 'text', text: 'Prompt I typed' }]))
     const text = tree.root

mobile/src/session/MobileNativeChatMessage.tsx

@@ -17,6 +17,7 @@ import { ToolRun } from './MobileNativeChatToolRun'
 import type { NativeChatTurnStatus } from './use-mobile-native-chat-turn-status'
 import { isRenderableImageUri } from './mobile-native-chat-image-preview'
 import { styles, TEXT_SIZE } from './mobile-native-chat-message-styles'
+import { AGENT_SESSION_WRITE_NOTICE_COPY } from '../../../src/shared/agent-session-write-notice-copy'
 
 function Prose({
   block,
@@ -118,7 +119,8 @@ function MobileNativeChatMessageImpl({
   turnKey,
   onToggleTurn,
   activeTurnIsWorking,
-  structuredActivityUi = false
+  structuredActivityUi = false,
+  unsentNotice
 }: {
   message: NativeChatMessage
   toolsExpanded?: boolean
@@ -139,6 +141,8 @@ function MobileNativeChatMessageImpl({
   activeTurnIsWorking?: boolean
   /** Structured lane only: live tool progress plus the turn-status disclosure. */
   structuredActivityUi?: boolean
+  /** Why the host did not deliver this message, when it is shown as not sent. */
+  unsentNotice?: string
 }): React.JSX.Element {
   const isUser = message.role === 'user'
   const isReasoning = message.role === 'reasoning'
@@ -207,6 +211,11 @@ function MobileNativeChatMessageImpl({
             />
           ) : null}
         </Content>
+        {isUser && message.unsent === true ? (
+          <NativeText style={styles.unsentLabel}>
+            {unsentNotice ?? AGENT_SESSION_WRITE_NOTICE_COPY.notDoneSend}
+          </NativeText>
+        ) : null}
       </View>
       {actionsOpen ? (
         <MobileNativeChatMessageActionsSheet

mobile/src/session/MobileNativeChatView.tsx

@@ -21,6 +21,7 @@ import type { NativeChatTurnJournal } from '../../../src/shared/native-chat-turn
 import { colors } from '../theme/mobile-theme'
 import { styles } from './mobile-native-chat-view-styles'
 import { mobileNativeChatListFooter } from './mobile-native-chat-list-footer'
+import { mobileNativeChatListHeader } from './mobile-native-chat-list-header'
 import {
   buildMobileNativeChatTransientData,
   mobileNativeChatEmptyState,
@@ -40,6 +41,7 @@ import type { MobileChatPermission } from './mobile-native-chat-permission'
 import type { MobileChatQuestion } from './mobile-native-chat-question'
 import type { MobileNativeChatSessionOptionPickersProps } from './MobileNativeChatSessionOptionPickers'
 import { MobileNativeChatMessage } from './MobileNativeChatMessage'
+import { mobileNativeChatUnsentNotices } from './mobile-native-chat-unsent-notices'
 import type { MobileNativeChatStatus } from './use-mobile-native-chat-session'
 
 /** Why the composer input is locked: the transport is disconnected, or the
@@ -283,6 +285,10 @@ export function MobileNativeChatView({
   const hasPendingStructuredInteraction =
     structuredActivityUi && (ask != null || permission != null || question != null)
 
+  const unsentNotices = useMemo(
+    () => mobileNativeChatUnsentNotices(turnJournal, agent ?? null),
+    [turnJournal, agent]
+  )
   const renderItem = useCallback(
     ({ item, index }: { item: NativeChatMessage; index: number }) => (
       <MobileNativeChatMessage
@@ -292,10 +298,11 @@ export function MobileNativeChatView({
         onOpenFile={onOpenFile}
         structuredActivityUi={structuredActivityUi}
         onToggleTurn={turns.onToggleTurn}
+        unsentNotice={item.unsent === true ? unsentNotices.get(item.id) : undefined}
         {...turns.resolveRow(index, item)}
       />
     ),
-    [toolsExpanded, fontScale, onOpenFile, structuredActivityUi, turns]
+    [toolsExpanded, fontScale, onOpenFile, structuredActivityUi, turns, unsentNotices]
   )
 
   const liveStatus =
@@ -349,21 +356,7 @@ export function MobileNativeChatView({
               scrollEventThrottle={32}
               onContentSizeChange={pinToTailAfterContentResize}
               onLayout={pinToTail}
-              ListHeaderComponent={
-                hasMore ? (
-                  <Pressable
-                    style={styles.loadEarlier}
-                    onPress={loadEarlier}
-                    disabled={loadingEarlier}
-                  >
-                    {loadingEarlier ? (
-                      <ActivityIndicator size="small" color={colors.textMuted} />
-                    ) : (
-                      <Text style={styles.loadEarlierText}>Load earlier messages</Text>
-                    )}
-                  </Pressable>
-                ) : null
-              }
+              ListHeaderComponent={mobileNativeChatListHeader(hasMore, loadingEarlier, loadEarlier)}
               ListFooterComponent={mobileNativeChatListFooter(
                 liveStatus,
                 turns.waitingRows,

mobile/src/session/mobile-native-chat-draft-reconcile.ts

@@ -18,20 +18,37 @@ export type UnconfirmedSend = {
   baselineTailMessageId: string | null
   /** Queued-draft cards on screen at send time; see `findQueuedUnconfirmedSends`. */
   baselineQueuedMessageIds?: readonly string[]
+  /** Rows shown as not sent at send time; see `sendBaselineUnsentMessageIds`. */
+  baselineUnsentMessageIds?: readonly string[]
   deadline: ReturnType<typeof setTimeout> | null
 }
 
-export function normalizedUserText(message: NativeChatMessage): string | null {
-  return normalizedNativeChatUserMessageText(message)
+/** Rows shown as not sent when a send went out. Only these can't be its echo: one that appears
+ *  later is the send's own row, settled as not sent. The count, image and unconfirmed matchers
+ *  all apply this. */
+export function sendBaselineUnsentMessageIds(messages: readonly NativeChatMessage[]): string[] {
+  return messages.filter((message) => message.unsent === true).map((message) => message.id)
 }
 
+/** The row a send's echo must land after: the newest one, past any shown as not sent, which are in
+ *  the send's baseline and so never its echo. */
+export function sendBaselineTailMessageId(messages: readonly NativeChatMessage[]): string | null {
+  for (let index = messages.length - 1; index >= 0; index -= 1) {
+    if (messages[index]?.unsent !== true) {
+      return messages[index]?.id ?? null
+    }
+  }
+  return null
+}
+
+/** At send time: every row shown as not sent is then in the send's baseline, so none is counted. */
 export function countUserTextOccurrences(
   messages: readonly NativeChatMessage[],
   text: string
 ): number {
   let count = 0
   for (const message of messages) {
-    if (normalizedUserText(message) === text) {
+    if (message.unsent !== true && normalizedNativeChatUserMessageText(message) === text) {
       count++
     }
   }
@@ -63,6 +80,8 @@ export type PendingImagePreviewEcho = {
   images?: string[]
   expectedOccurrence: number
   baselineTailMessageId: string | null
+  /** See `sendBaselineUnsentMessageIds`. */
+  baselineUnsentMessageIds?: readonly string[]
 }
 
 export type LandedImagePreviewEcho = {
@@ -177,12 +196,13 @@ export function findLandedImagePreviewEchoes(
       continue
     }
     const targetText = normalizeNativeChatUserText(entry.text)
+    const baselineUnsent = new Set(entry.baselineUnsentMessageIds)
     const candidates = normalized.filter((message) => {
-      if (message.role !== 'user') {
+      if (message.role !== 'user' || (message.unsent === true && baselineUnsent.has(message.id))) {
         return false
       }
       if (targetText) {
-        const text = normalizedUserText(message)
+        const text = normalizedNativeChatUserMessageText(message)
         if (text === null) {
           return false
         }
@@ -257,15 +277,17 @@ export function findLandedUnconfirmedSends(
   // (`[Image: source: …]` or no text) keys under '' so an empty-text send can
   // claim it.
   const messageIndexById = new Map<string, number>()
-  const userMessagesByText = new Map<string, Array<{ id: string; index: number }>>()
+  const userMessagesByText = new Map<string, { id: string; index: number; unsent: boolean }[]>()
   for (const [index, message] of messages.entries()) {
     messageIndexById.set(message.id, index)
     if (message.role !== 'user') {
       continue
     }
-    const key = isImageSourceUserTurn(message) ? '' : (normalizedUserText(message) ?? '')
+    const key = isImageSourceUserTurn(message)
+      ? ''
+      : (normalizedNativeChatUserMessageText(message) ?? '')
     const current = userMessagesByText.get(key) ?? []
-    current.push({ id: message.id, index })
+    current.push({ id: message.id, index, unsent: message.unsent === true })
     userMessagesByText.set(key, current)
   }
 
@@ -278,9 +300,15 @@ export function findLandedUnconfirmedSends(
     if (tailIndex === undefined) {
       continue
     }
+    const baselineUnsent = new Set(entry.baselineUnsentMessageIds)
     const echo = userMessagesByText
       .get(entry.normalizedText)
-      ?.find((message) => message.index > tailIndex && !claimedMessageIds.has(message.id))
+      ?.find(
+        (message) =>
+          message.index > tailIndex &&
+          !claimedMessageIds.has(message.id) &&
+          !(message.unsent && baselineUnsent.has(message.id))
+      )
     if (echo) {
       claimedMessageIds.add(echo.id)
       landed.push(entry)

mobile/src/session/mobile-native-chat-list-header.tsx

@@ -0,0 +1,24 @@
+import type { ReactElement } from 'react'
+import { ActivityIndicator, Pressable, Text } from 'react-native'
+import { colors } from '../theme/mobile-theme'
+import { styles } from './mobile-native-chat-view-styles'
+
+/** The "Load earlier messages" control, while older history remains. */
+export function mobileNativeChatListHeader(
+  hasMore: boolean | undefined,
+  loadingEarlier: boolean | undefined,
+  loadEarlier: () => void
+): ReactElement | null {
+  if (!hasMore) {
+    return null
+  }
+  return (
+    <Pressable style={styles.loadEarlier} onPress={loadEarlier} disabled={loadingEarlier}>
+      {loadingEarlier ? (
+        <ActivityIndicator size="small" color={colors.textMuted} />
+      ) : (
+        <Text style={styles.loadEarlierText}>Load earlier messages</Text>
+      )}
+    </Pressable>
+  )
+}

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

@@ -37,6 +37,11 @@ export const styles = StyleSheet.create({
   reasoning: {
     opacity: 0.7
   },
+  unsentLabel: {
+    marginTop: spacing.xs,
+    color: colors.textMuted,
+    fontSize: typography.metaSize
+  },
   toolRun: {
     marginTop: spacing.xs
   },