fix(native-chat): queued messages carry on in order after any turn, and nothing sends by itself after a restart

config/tsconfig.node.json

@@ -14,6 +14,8 @@
     "../src/renderer/src/components/native-chat/native-chat-resolution-receipt.ts",
     "../src/renderer/src/components/native-chat/structured-agent-question-projection.ts",
     "../src/renderer/src/components/native-chat/native-chat-subagent-delegation.ts",
+    "../src/renderer/src/components/native-chat/structured-agent-session-queued-cards.ts",
+    "../src/renderer/src/components/native-chat/native-chat-composer-primary-action.ts",
     "../src/preload/**/*",
     "../src/shared/**/*",
     "../src/relay/**/*",

mobile/src/session/MobileNativeChatQueuedMessages.test.tsx

@@ -282,7 +282,6 @@ describe('MobileNativeChatQueuedMessages', () => {
     it('heads the box with why the queue is paused, for each reason', async () => {
       const rows: readonly [AgentSessionQueuePause['reason'], string][] = [
         ['stopped', 'Queue paused because you interrupted'],
-        ['restarted', 'Queue paused because Orca restarted'],
         ['cleared', 'Queue paused after you cleared the conversation']
       ]
       for (const [reason, label] of rows) {
@@ -318,7 +317,7 @@ describe('MobileNativeChatQueuedMessages', () => {
     it('Resume asks the host to lift the pause once, however fast it is tapped twice', async () => {
       let answer: (resumed: boolean) => void = () => undefined
       const onResume = vi.fn(() => new Promise<boolean>((resolve) => (answer = resolve)))
-      const mounted = await mountPaused({ pause: { reason: 'restarted' }, onResume })
+      const mounted = await mountPaused({ pause: { reason: 'stopped' }, onResume })
       // Both taps land in one frame, before the disabled state can render.
       await act(async () => {
         resumeButton(mounted).props.onPress()

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

@@ -129,9 +129,6 @@ describe('mobileQueuedMessageCards', () => {
     expect(mobileQueuePauseLabel({ reason: 'stopped' })).toBe(
       'Queue paused because you interrupted'
     )
-    expect(mobileQueuePauseLabel({ reason: 'restarted' })).toBe(
-      'Queue paused because Orca restarted'
-    )
     expect(mobileQueuePauseLabel({ reason: 'cleared' })).toBe(
       'Queue paused after you cleared the conversation'
     )

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

@@ -68,7 +68,6 @@ function pausedCaption(reason: string | undefined): string {
 
 const QUEUE_PAUSE_LABELS: Readonly<Record<string, string>> = {
   stopped: 'Queue paused because you interrupted',
-  restarted: 'Queue paused because Orca restarted',
   cleared: 'Queue paused after you cleared the conversation'
 }
 

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

@@ -581,7 +581,8 @@ describe('mobile structured queued messages', () => {
               queuedDraft({ messageId: 'behind', position: 2 })
             ],
             [],
-            { reason: 'restarted' }
+            // This host publishes no restart pause; a Stop's stands in for any queue-wide one.
+            { reason: 'stopped' }
           )
         )
       )
@@ -590,7 +591,7 @@ describe('mobile structured queued messages', () => {
         { messageId: 'behind', caption: null }
       ])
       // The kept card is held on its own, so Resume would send the card behind it.
-      expect(hook!.queued.pause).toEqual({ reason: 'restarted' })
+      expect(hook!.queued.pause).toEqual({ reason: 'stopped' })
     })
   })
 

src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts

@@ -10,7 +10,7 @@ import type { AgentJournalAnsweredTurn } from '../../../shared/agent-session-jou
 import { journalDispatchRowApplies } from './journal-dispatch-settlement'
 import type { JournalReducerState } from './journal-reducer'
 import {
-  notePersonTurnAccepted,
+  noteTurnAccepted,
   placeHandedOverMessage,
   placeRejectedMessage
 } from './journal-submission-fold'
@@ -60,7 +60,7 @@ export function applyJournalDispatchRow(
     delete submission.recovered
   }
   if (row.state === 'accepted') {
-    notePersonTurnAccepted(state, submission)
+    noteTurnAccepted(state, submission)
   }
   if (row.state !== 'accepted' || !row.providerItemId) {
     return

src/main/native-chat/agent-session-journal/journal-queued-messages.ts

@@ -164,7 +164,7 @@ export class JournalQueuedMessages {
   /** The person's Stop still pausing the queue, if any (`journalUserStopInForce`). */
   userStopInForce(): JournalQueuePauseMarks['latestStop'] {
     const state = this.deps.state()
-    return journalUserStopInForce(state.queuePauseMarks, state.latestPersonTurnSequence)
+    return journalUserStopInForce(state.queuePauseMarks, state.latestAcceptedTurnSequence)
   }
 
   private derivePauses(
@@ -175,16 +175,16 @@ export class JournalQueuedMessages {
     return deriveQueuePauses({
       epoch: state.epoch,
       marks: state.queuePauseMarks,
-      latestPersonTurnSequence: state.latestPersonTurnSequence,
+      latestAcceptedTurnSequence: state.latestAcceptedTurnSequence,
       cards,
       hostInstance,
       restartEnded: this.restartEnded()
     })
   }
 
-  /** A person's turn started since this handle opened, which ends a restart's pause. */
+  /** A turn started since this handle opened, which ends a restart's pause. */
   restartEnded(): boolean {
-    const latest = this.deps.state().latestPersonTurnSequence
+    const latest = this.deps.state().latestAcceptedTurnSequence
     return latest > 0 && !this.deps.wroteBeforeOpen(latest)
   }
 

src/main/native-chat/agent-session-journal/journal-reducer.ts

@@ -60,9 +60,9 @@ export type JournalReducerState = {
   appliedSettlementIds: Set<string>
   /** Scope for rows stored without one; rebuilt by replay, never persisted. */
   derivedTurnScope: JournalDerivedTurnScope
-  /** The submission row of the latest turn a person asked for (`origin: 'client'`) that the
-   *  provider accepted; 0 when none. Kept as it folds so the queue's pause reads it in O(1). */
-  latestPersonTurnSequence: number
+  /** The submission row of the latest turn the provider accepted, whoever sent it; 0 when none.
+   *  Kept as it folds so the queue's pause reads it in O(1). */
+  latestAcceptedTurnSequence: number
   /** The latest person's Stop event and Resume, what the queue's pause is derived from. */
   queuePauseMarks: JournalQueuePauseMarks
 }
@@ -83,7 +83,7 @@ export function createJournalReducerState(sessionId: string, epoch: string): Jou
     aliases: new Map(),
     appliedSettlementIds: new Set(),
     derivedTurnScope: new JournalDerivedTurnScope(),
-    latestPersonTurnSequence: 0,
+    latestAcceptedTurnSequence: 0,
     queuePauseMarks: createJournalQueuePauseMarks()
   }
 }

src/main/native-chat/agent-session-journal/journal-store-collaborators.ts

@@ -75,7 +75,7 @@ export function createJournalStoreCollaborators(host: JournalStoreHost): Journal
     queuePauseRestatement: () =>
       journalQueuePauseRestatement(
         host.state().queuePauseMarks,
-        host.state().latestPersonTurnSequence
+        host.state().latestAcceptedTurnSequence
       ),
     cursor: host.cursor,
     adopt: host.adopt

src/main/native-chat/agent-session-journal/journal-submission-fold.ts

@@ -112,7 +112,7 @@ export function acceptSubmissionFromProviderItem(
   }
   submission.fence = row.fence
   submission.dispatchState = 'accepted'
-  notePersonTurnAccepted(state, submission)
+  noteTurnAccepted(state, submission)
   submission.providerItemId = providerItemId
   submission.reason = null
   submission.resolvedAt = row.ts
@@ -125,14 +125,14 @@ export function acceptSubmissionFromProviderItem(
   })
 }
 
-/** A person's turn the provider accepted: the fact the queue's pause is lifted by. */
-export function notePersonTurnAccepted(
+/** A turn the provider accepted, whoever sent it: the fact the queue's pause is lifted by. */
+export function noteTurnAccepted(
   state: JournalReducerState,
-  submission: Pick<AgentJournalSubmission, 'origin' | 'acceptedSequence'>
+  submission: Pick<AgentJournalSubmission, 'acceptedSequence'>
 ): void {
-  if (submission.origin === 'client' && submission.acceptedSequence !== undefined) {
-    state.latestPersonTurnSequence = Math.max(
-      state.latestPersonTurnSequence,
+  if (submission.acceptedSequence !== undefined) {
+    state.latestAcceptedTurnSequence = Math.max(
+      state.latestAcceptedTurnSequence,
       submission.acceptedSequence
     )
   }

src/main/native-chat/agent-session-journal/queued-message-pause.test.ts

@@ -1,5 +1,5 @@
-// The queue's pause is a pure function of the journal: a Stop and a Resume are rows, a person's
-// accepted turn is a row, and a /clear's carried card names its source. Nothing is stored beside
+// The queue's pause is a pure function of the journal: a Stop and a Resume are rows, an accepted
+// turn is a row, and a /clear's carried card names its source. Nothing is stored beside
 // them, so nothing has to retire.
 
 import { mkdtemp, rm } from 'node:fs/promises'
@@ -68,16 +68,10 @@ function queueDraft(journal: AgentSessionJournal, messageId: string, carriedFrom
   })
 }
 
-/** A turn sent, then accepted by the provider; `origin` says who asked for it. */
-async function turn(
-  journal: AgentSessionJournal,
-  id: string,
-  origin: 'client' | 'host',
-  accept = true
-): Promise<void> {
+/** A turn sent, then accepted by the provider. */
+async function turn(journal: AgentSessionJournal, id: string, accept = true): Promise<void> {
   await journal.appendSubmission({
     clientMessageId: id,
-    origin,
     payloadFingerprint: `fp-${id}`,
     body: message(id),
     fence: 0,
@@ -181,24 +175,24 @@ describe("the queue's pause, derived from the journal", () => {
     expect(pauseTables()).toBe(0)
   })
 
-  it("only a person's turn sent after the Stop and accepted lifts it; host turns never do", async () => {
+  it("any turn sent after the Stop and accepted lifts it, Orca's own mail included", async () => {
     const journal = await open()
-    await turn(journal, 'before-stop', 'client', false)
+    await turn(journal, 'before-stop', false)
     await userStop(journal)
     // Sent before the Stop: its acceptance now does not end a Stop that came after it.
     await acceptTurn(journal, 'before-stop')
-    await turn(journal, 'mail', 'host')
     expect(reason(journal)).toBe('stopped')
-    await turn(journal, 'typed', 'client', false)
+    // Orchestration mail: sent, not yet accepted, lifts nothing; accepted, it lifts the pause.
+    await turn(journal, 'mail', false)
     expect(reason(journal)).toBe('stopped')
-    await acceptTurn(journal, 'typed')
+    await acceptTurn(journal, 'mail')
     expect(reason(journal)).toBeNull()
   })
 
   it('a later Stop is the latest, and a Resume row lifts it', async () => {
     const journal = await open()
     await userStop(journal)
-    await turn(journal, 'typed', 'client')
+    await turn(journal, 'typed')
     expect(reason(journal)).toBeNull()
     await userStop(journal)
     expect(reason(journal)).toBe('stopped')
@@ -221,18 +215,18 @@ describe("the queue's pause, derived from the journal", () => {
     expect(pauseTables()).toBe(0)
   })
 
-  it("a person's accepted turn on the replacement lifts 'cleared'; a host turn does not", async () => {
+  it("any accepted turn on the replacement lifts 'cleared', a launch prompt Orca sent included", async () => {
     const journal = await open()
     await queueDraft(journal, 'carried', 'source-session')
-    await turn(journal, 'launch', 'host')
+    await turn(journal, 'launch', false)
     expect(reason(journal)).toBe('cleared')
-    await turn(journal, 'typed', 'client')
+    await acceptTurn(journal, 'launch')
     expect(reason(journal)).toBeNull()
   })
 
   it('rides a tombstone of an id no item takes, so an older build reads it and changes nothing', async () => {
     const journal = await open()
-    await turn(journal, 'typed', 'client')
+    await turn(journal, 'typed')
     await journal.appendStopEvent({ reason: 'user-stop', turnId: 'turn-1', caller: 'client-1' }, 0)
     const db = new Database(journalDatabasePath(root), { readonly: true })
     const stored = liveTestJournalRows(db, IDENTITY.sessionId)
@@ -304,7 +298,6 @@ describe("the queue's pause, derived from the journal", () => {
       journal.appendSubmission(
         {
           clientMessageId: id,
-          origin: automatic ? 'host' : 'client',
           payloadFingerprint: 'fp-draft-1',
           body: message('draft-1'),
           fence: 0,
@@ -325,12 +318,12 @@ describe("the queue's pause, derived from the journal", () => {
     expect(journal.queuedMessages.get('draft-1')?.state).toBe('dispatched')
   })
 
-  it("a rewind's epoch replacement restates a Stop still pausing, and not one a person ended", async () => {
+  it("a rewind's epoch replacement restates a Stop still pausing, and not one a turn ended", async () => {
     const journal = await open()
     await userStop(journal)
     await journal.replaceEpochItems('handle_forked', 0, [])
     expect(reason(journal)).toBe('stopped')
-    await turn(journal, 'typed', 'client')
+    await turn(journal, 'typed')
     await journal.replaceEpochItems('handle_forked', 0, [])
     expect(reason(journal)).toBeNull()
   })
@@ -380,7 +373,7 @@ describe("the queue's pause, derived from the journal", () => {
   })
 
   it.each([
-    ["a person's turn", (journal: AgentSessionJournal) => turn(journal, 'typed', 'client')],
+    ['an accepted turn', (journal: AgentSessionJournal) => turn(journal, 'typed')],
     ['a Resume', (journal: AgentSessionJournal) => journal.appendQueueResume(0)]
   ])('a /clear pause %s already lifted stays lifted across a rewind', async (_name, lift) => {
     const journal = await open()
@@ -394,7 +387,7 @@ describe("the queue's pause, derived from the journal", () => {
   it('a lifted /clear pause and a later Stop are both restated, the Stop still in force', async () => {
     const journal = await open()
     await queueDraft(journal, 'carried', 'source-session')
-    await turn(journal, 'typed', 'client')
+    await turn(journal, 'typed')
     await userStop(journal)
     await journal.replaceEpochItems('handle_forked', 0, [])
     expect(journal.queuedMessages.pauses(HOST).map((pause) => pause.reason)).toEqual(['stopped'])
@@ -427,7 +420,6 @@ describe('which cards a pause holds', () => {
     await journal.appendSubmission(
       {
         clientMessageId: 'send-now-1',
-        origin: 'client',
         payloadFingerprint: 'fp-steered',
         body: message('steered'),
         fence: 0,
@@ -458,7 +450,6 @@ describe('which cards a pause holds', () => {
       journal.appendSubmission(
         {
           clientMessageId: 'drain-newer',
-          origin: 'host',
           payloadFingerprint: 'fp-newer',
           body: message('newer'),
           fence: 0,
@@ -555,15 +546,15 @@ describe('which cards the pauses in force hold', () => {
     return { messageId, ...base, queuedAt, ...fields }
   }
 
-  /** A Stop at sequence 5 unless `stopped` is 0; no person's turn or Resume since. */
+  /** A Stop at sequence 5 unless `stopped` is 0; no turn or Resume since. */
   function pausesOver(cards: readonly Card[], stopped = 5) {
     return deriveQueuePauses({
       epoch: 'epoch-1',
       marks: {
         latestStop: stopped ? { sequence: stopped, event: { reason: 'user-stop', at: 0 } } : null,
         resumedSequence: 0
       },
-      latestPersonTurnSequence: 0,
+      latestAcceptedTurnSequence: 0,
       cards,
       hostInstance: HOST,
       restartEnded: false