feat: edit queued messages inline with the full chat composer

mobile/scripts/check-tests-typecheck-incremental-cache.test.ts

@@ -44,7 +44,7 @@ it.each([
       const source = "import type { Shape } from './model'; const shape: Shape = { value: 1 }"
       writeFileSync(test, source)
       const clean = collectTypecheckPass(root)
-      expect(clean).toEqual({ failing: [], programTestFiles: ['value.test.ts'] })
+      expect(clean).toEqual({ failing: [], diagnostics: [], programTestFiles: ['value.test.ts'] })
       if (buildInfo) {
         expect(existsSync(buildInfo)).toBe(true)
       }
@@ -54,6 +54,9 @@ it.each([
       writeFileSync(join(root, 'model.ts'), 'export interface Shape { value: string }')
       const failed = collectTypecheckPass(root)
       expect(failed.failing).toEqual(['value.test.ts'])
+      expect(failed.diagnostics).toEqual([
+        expect.stringMatching(/^value\.test\.ts\(1,\d+\): error TS2322:/)
+      ])
       expect(collectTypecheckPass(root)).toEqual(failed)
 
       writeFileSync(join(root, 'new.test.ts'), 'export const value: number = 1')
@@ -64,7 +67,11 @@ it.each([
       expect(findTsNocheckFiles(root, nocheck.programTestFiles)).toEqual(['value.test.ts'])
 
       unlinkSync(test)
-      expect(collectTypecheckPass(root)).toEqual({ failing: [], programTestFiles: ['new.test.ts'] })
+      expect(collectTypecheckPass(root)).toEqual({
+        failing: [],
+        diagnostics: [],
+        programTestFiles: ['new.test.ts']
+      })
     } finally {
       vi.unstubAllEnvs()
       removeTreeSync(root)

mobile/scripts/check-tests-typecheck-ratchet.mjs

@@ -153,6 +153,7 @@ export function collectTypecheckPass(root = process.cwd()) {
   const output = `${result.stdout ?? ''}${result.stderr ?? ''}`
   return {
     failing: parseFailingFiles(output),
+    diagnostics: output.split('\n').filter((line) => ERROR_LINE.test(line)),
     programTestFiles: parseProgramTestFiles(output, fs.realpathSync(root))
   }
 }
@@ -277,6 +278,9 @@ export function main(root = process.cwd()) {
 
   if (added.length > 0) {
     printAddedFailure(added)
+    for (const diagnostic of pass.diagnostics) {
+      console.error(diagnostic)
+    }
     if (stale.length > 0) {
       printStaleFailure(stale)
     }

mobile/scripts/check-tests-typecheck-ratchet.test.ts

@@ -1,17 +1,95 @@
+import { runProcessSync } from '@orca/process-host'
 import fs from 'node:fs'
+import os from 'node:os'
 import path from 'node:path'
-import { describe, expect, it } from 'vitest'
-// Only the pure functions are under test; the tsc spawn is proven end to end by CI.
+import { describe, expect, it, vi } from 'vitest'
+import { removeTreeSync } from '../../src/shared/windows-transient-lock-removal'
 import {
   diffBaseline,
   diffCensus,
   hasTsNocheckDirective,
+  main,
   parseBaseline,
   parseFailingFiles,
   parseProgramTestFiles,
   TESTS_OUTSIDE_PROGRAM
 } from './check-tests-typecheck-ratchet.mjs'
 
+vi.mock('@orca/process-host', () => ({ runProcessSync: vi.fn() }))
+vi.mock('./mobile-typecheck-compiler.mjs', () => ({
+  resolveMobileTypecheckCommand: (project: string, cwd: string) => ({
+    program: 'compiler',
+    args: ['--project', project],
+    cwd
+  })
+}))
+
+describe('ratchet failure diagnostics', () => {
+  it.each([
+    { name: 'new failure', baseline: '', failed: true, exit: 1, printsDiagnostics: true },
+    { name: 'clean pass', baseline: '', failed: false, exit: 0, printsDiagnostics: false },
+    {
+      name: 'grandfathered failure',
+      baseline: 'src/value.test.ts\n',
+      failed: true,
+      exit: 0,
+      printsDiagnostics: false
+    },
+    {
+      name: 'stale baseline',
+      baseline: 'src/value.test.ts\n',
+      failed: false,
+      exit: 1,
+      printsDiagnostics: false
+    }
+  ])('preserves $name outcome and baseline', ({ baseline, failed, exit, printsDiagnostics }) => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), 'orca-pr31180-ratchet-'))
+    const diagnostic = 'src/value.test.ts(1,2): error TS2322: Type number is not assignable.'
+    const stderrDiagnostic = 'src/value.test.ts(2,3): error TS2345: Argument type mismatch.'
+    const detail = '  Type number is not assignable to type string.'
+    const errors = vi.spyOn(console, 'error').mockImplementation(() => {})
+    const logs = vi.spyOn(console, 'log').mockImplementation(() => {})
+    try {
+      for (const file of [...TESTS_OUTSIDE_PROGRAM.keys(), 'src/value.test.ts']) {
+        fs.mkdirSync(path.dirname(path.join(root, file)), { recursive: true })
+        fs.writeFileSync(path.join(root, file), 'export {}\n')
+      }
+      const baselineFile = path.join(root, 'tests-typecheck-baseline.txt')
+      fs.writeFileSync(baselineFile, baseline)
+      const programFile = path.join(fs.realpathSync(root), 'src/value.test.ts')
+      vi.mocked(runProcessSync).mockReturnValue({
+        code: failed ? 2 : 0,
+        signal: null,
+        timedOut: false,
+        stdout: `${programFile}\n${failed ? `${diagnostic}\n${detail}\n` : ''}`,
+        stderr: failed ? `${stderrDiagnostic}\n` : ''
+      })
+
+      expect(main(root)).toBe(exit)
+      expect(runProcessSync).toHaveBeenCalledExactlyOnceWith({
+        program: 'compiler',
+        args: ['--project', 'tsconfig.test.json', '--listFiles'],
+        cwd: root,
+        timeoutMs: null,
+        maxOutputBytes: 64 * 1024 * 1024
+      })
+      expect(errors.mock.calls.some(([message]) => message === diagnostic)).toBe(printsDiagnostics)
+      expect(errors.mock.calls.some(([message]) => message === stderrDiagnostic)).toBe(
+        printsDiagnostics
+      )
+      expect(
+        errors.mock.calls.some(([message]) => message === detail || message === programFile)
+      ).toBe(false)
+      expect(fs.readFileSync(baselineFile, 'utf8')).toBe(baseline)
+    } finally {
+      vi.mocked(runProcessSync).mockReset()
+      errors.mockRestore()
+      logs.mockRestore()
+      removeTreeSync(root)
+    }
+  })
+})
+
 describe('the failing-file parser', () => {
   it('names each file once however many errors it carries', () => {
     const output = [

mobile/src/session/MobileNativeChatOverlay.tsx

@@ -1,3 +1,4 @@
+import { MobileQueuedMessageComposerContext } from './mobile-queued-message-composer-context'
 import { useCallback, useLayoutEffect, useMemo } from 'react'
 import { StyleSheet, View } from 'react-native'
 import { MobileNativeChatView, type MobileNativeChatInputLockReason } from './MobileNativeChatView'
@@ -121,6 +122,36 @@ export function MobileNativeChatOverlay({
         : null,
     [itemSource, fullContent.detail, load]
   )
+  const queuedComposerContext = useMemo(
+    () => ({
+      agent,
+      structured: structuredComposer ?? null,
+      skillDiscovery: controller.nativeChatSkills,
+      onNeedSkills: controller.loadNativeChatSkills,
+      filePaths: controller.nativeChatFilePaths,
+      onNeedFiles: controller.loadNativeChatFiles,
+      onError: (message: string) => controller.reportQueuedEditError?.(message),
+      onMicPress,
+      micActive,
+      dictationMode,
+      onMicPressIn,
+      onMicPressOut
+    }),
+    [
+      agent,
+      structuredComposer,
+      controller.nativeChatSkills,
+      controller.loadNativeChatSkills,
+      controller.nativeChatFilePaths,
+      controller.loadNativeChatFiles,
+      controller.reportQueuedEditError,
+      onMicPress,
+      micActive,
+      dictationMode,
+      onMicPressIn,
+      onMicPressOut
+    ]
+  )
   const noticeNames = useMemo(
     () => ({ hostName, ...(agent ? { agentName: tuiAgentDisplayName(agent) ?? agent } : {}) }),
     [hostName, agent]
@@ -133,94 +164,97 @@ export function MobileNativeChatOverlay({
       conversation={{ surfaceId: sendSurfaceId, sessionId }}
       imageClient={controller.nativeChatVisualSource?.client}
     >
-      <View style={styles.overlay}>
-        <MobileNativeChatVisualContext.Provider value={visuals}>
-          <MobileNativeChatRootItemSourceContext.Provider value={detailSource}>
-            <MobileNativeChatReplyRevealsContext.Provider value={replyReveals}>
-              <MobileNativeChatNoticeContext.Provider value={noticeNames}>
-                <MobileNativeChatView
-                  messages={session.messages}
-                  folded={folded}
-                  status={session.status}
-                  error={session.error}
-                  readFailedFinally={session.readFailedFinally === true}
-                  agent={controller.nativeChatAgent}
-                  agentWorking={controller.nativeChatTurnActive}
-                  awaitingInput={controller.nativeChatAwaitingInput}
-                  canStop={controller.nativeChatCanStop}
-                  structuredActivityUi={controller.nativeChatStructured}
-                  turnIndicator={controller.nativeChatTurnIndicator}
-                  workingStartedAt={controller.nativeChatWorkingStartedAt}
-                  settledTurns={controller.nativeChatSettledTurns}
-                  turnJournal={controller.nativeChatTurnJournal}
-                  receipts={controller.nativeChatReceipts}
-                  actionablePromptIds={controller.nativeChatActionablePromptIds}
-                  streaming={streaming}
-                  onStop={controller.handleNativeChatStop}
-                  ask={controller.nativeChatAsk}
-                  askKey={controller.nativeChatAskKey}
-                  promptKey={controller.nativeChatPromptKey}
-                  onDismissAsk={controller.dismissNativeChatAsk}
-                  onAnswerAsk={controller.handleNativeChatAnswerAsk}
-                  askRequiresTerminal={
-                    !controller.nativeChatStructured && nativeChatAskRequiresTerminal(agent)
-                  }
-                  onAnswerInTerminal={
-                    activeSessionTabId
-                      ? () => controller.setTabView(activeSessionTabId, 'terminal')
-                      : undefined
-                  }
-                  onCancelAsk={controller.handleNativeChatCancelAsk}
-                  onCancelPrompt={controller.handleNativeChatCancelPrompt}
-                  onCollapseAsk={controller.collapseNativeChatAsk}
-                  onCollapsePrompt={controller.collapseNativeChatPrompt}
-                  collapsedPrompt={controller.nativeChatCollapsedPrompt}
-                  question={controller.nativeChatQuestion}
-                  onAnswerQuestion={controller.handleNativeChatQuestionAnswer}
-                  permission={controller.nativeChatPermission}
-                  onRespondPermission={controller.handleNativeChatRespondPermission}
-                  composerTray={composerTray}
-                  onOpenFile={onOpenFile}
-                  hasMore={session.hasMore}
-                  olderPages={session.olderPages}
-                  onLoadEarlier={session.loadEarlier}
-                  onSend={images.sendNativeChat}
-                  sendSurfaceId={sendSurfaceId}
-                  getSendCompletionGeneration={getSendCompletionGeneration}
-                  getComposerEditGeneration={controller.getChatComposerEditGeneration}
-                  pending={controller.chatPending}
-                  imagePreviewsByMessageId={controller.chatImagePreviewsByMessageId}
-                  draftKey={controller.chatDraftKey}
-                  onComposerTextChange={controller.setChatComposerText}
-                  onAttachImage={
-                    controller.nativeChatAcceptsImages
-                      ? () => void images.attachImage('library')
-                      : undefined
-                  }
-                  attachments={images.attachments}
-                  onRemoveAttachment={images.removeAttachment}
-                  isAttaching={images.isAttaching}
-                  onMicPress={onMicPress}
-                  micActive={micActive}
-                  dictationMode={dictationMode}
-                  onMicPressIn={onMicPressIn}
-                  onMicPressOut={onMicPressOut}
-                  inputLockReason={inputLockReason}
-                  sendErrorMessage={sendErrorMessage}
-                  onClearSendError={onClearSendError}
-                  filePaths={controller.nativeChatFilePaths}
-                  onNeedFiles={controller.loadNativeChatFiles}
-                  skillDiscovery={controller.nativeChatSkills}
-                  onNeedSkills={controller.loadNativeChatSkills}
-                  sessionOptions={controller.nativeChatSessionOptions}
-                  structuredComposer={structuredComposer}
-                  keyboardInset={keyboardInset}
-                />
-              </MobileNativeChatNoticeContext.Provider>
-            </MobileNativeChatReplyRevealsContext.Provider>
-          </MobileNativeChatRootItemSourceContext.Provider>
-        </MobileNativeChatVisualContext.Provider>
-      </View>
+      <MobileQueuedMessageComposerContext.Provider value={queuedComposerContext}>
+        <View style={styles.overlay}>
+          <MobileNativeChatVisualContext.Provider value={visuals}>
+            <MobileNativeChatRootItemSourceContext.Provider value={detailSource}>
+              <MobileNativeChatReplyRevealsContext.Provider value={replyReveals}>
+                <MobileNativeChatNoticeContext.Provider value={noticeNames}>
+                  <MobileNativeChatView
+                    messages={session.messages}
+                    folded={folded}
+                    status={session.status}
+                    error={session.error}
+                    readFailedFinally={session.readFailedFinally === true}
+                    agent={controller.nativeChatAgent}
+                    agentWorking={controller.nativeChatTurnActive}
+                    awaitingInput={controller.nativeChatAwaitingInput}
+                    canStop={controller.nativeChatCanStop}
+                    structuredActivityUi={controller.nativeChatStructured}
+                    turnIndicator={controller.nativeChatTurnIndicator}
+                    workingStartedAt={controller.nativeChatWorkingStartedAt}
+                    settledTurns={controller.nativeChatSettledTurns}
+                    turnJournal={controller.nativeChatTurnJournal}
+                    receipts={controller.nativeChatReceipts}
+                    actionablePromptIds={controller.nativeChatActionablePromptIds}
+                    streaming={streaming}
+                    onStop={controller.handleNativeChatStop}
+                    ask={controller.nativeChatAsk}
+                    askKey={controller.nativeChatAskKey}
+                    promptKey={controller.nativeChatPromptKey}
+                    onDismissAsk={controller.dismissNativeChatAsk}
+                    onAnswerAsk={controller.handleNativeChatAnswerAsk}
+                    askRequiresTerminal={
+                      !controller.nativeChatStructured && nativeChatAskRequiresTerminal(agent)
+                    }
+                    onAnswerInTerminal={
+                      activeSessionTabId
+                        ? () => controller.setTabView(activeSessionTabId, 'terminal')
+                        : undefined
+                    }
+                    onCancelAsk={controller.handleNativeChatCancelAsk}
+                    onCancelPrompt={controller.handleNativeChatCancelPrompt}
+                    onCollapseAsk={controller.collapseNativeChatAsk}
+                    onCollapsePrompt={controller.collapseNativeChatPrompt}
+                    collapsedPrompt={controller.nativeChatCollapsedPrompt}
+                    question={controller.nativeChatQuestion}
+                    onAnswerQuestion={controller.handleNativeChatQuestionAnswer}
+                    permission={controller.nativeChatPermission}
+                    onRespondPermission={controller.handleNativeChatRespondPermission}
+                    composerTray={composerTray}
+                    onOpenFile={onOpenFile}
+                    hasMore={session.hasMore}
+                    olderPages={session.olderPages}
+                    onLoadEarlier={session.loadEarlier}
+                    onSend={images.sendNativeChat}
+                    sendSurfaceId={sendSurfaceId}
+                    getSendCompletionGeneration={getSendCompletionGeneration}
+                    getComposerEditGeneration={controller.getChatComposerEditGeneration}
+                    pending={controller.chatPending}
+                    imagePreviewsByMessageId={controller.chatImagePreviewsByMessageId}
+                    composerScopeKey={controller.chatComposerScopeKey}
+                    draftKey={controller.chatDraftKey}
+                    onComposerTextChange={controller.setChatComposerText}
+                    onAttachImage={
+                      controller.nativeChatAcceptsImages
+                        ? () => void images.attachImage('library')
+                        : undefined
+                    }
+                    attachments={images.attachments}
+                    onRemoveAttachment={images.removeAttachment}
+                    isAttaching={images.isAttaching}
+                    onMicPress={onMicPress}
+                    micActive={micActive}
+                    dictationMode={dictationMode}
+                    onMicPressIn={onMicPressIn}
+                    onMicPressOut={onMicPressOut}
+                    inputLockReason={inputLockReason}
+                    sendErrorMessage={sendErrorMessage}
+                    onClearSendError={onClearSendError}
+                    filePaths={controller.nativeChatFilePaths}
+                    onNeedFiles={controller.loadNativeChatFiles}
+                    skillDiscovery={controller.nativeChatSkills}
+                    onNeedSkills={controller.loadNativeChatSkills}
+                    sessionOptions={controller.nativeChatSessionOptions}
+                    structuredComposer={structuredComposer}
+                    keyboardInset={keyboardInset}
+                  />
+                </MobileNativeChatNoticeContext.Provider>
+              </MobileNativeChatReplyRevealsContext.Provider>
+            </MobileNativeChatRootItemSourceContext.Provider>
+          </MobileNativeChatVisualContext.Provider>
+        </View>
+      </MobileQueuedMessageComposerContext.Provider>
     </MobileNativeChatRowOverlaysHost>
   )
 }

mobile/src/session/MobileNativeChatView.composer-lock.test.ts

@@ -183,3 +183,7 @@ describe('MobileNativeChatView: composer lock and prompt cards', () => {
     })
   })
 })
+
+vi.mock('./MobileQueuedMessageComposer', () => ({
+  MobileQueuedMessageComposer: 'QueuedMessageComposer'
+}))

mobile/src/session/MobileNativeChatView.failure-banner.test.ts

@@ -111,3 +111,7 @@ describe('MobileNativeChatView: send and read failure banners', () => {
     expect(onClearSendError).toHaveBeenCalledOnce()
   })
 })
+
+vi.mock('./MobileQueuedMessageComposer', () => ({
+  MobileQueuedMessageComposer: 'QueuedMessageComposer'
+}))

mobile/src/session/MobileNativeChatView.history-paging.test.ts

@@ -216,3 +216,7 @@ describe('MobileNativeChatView: history paging and anchoring', () => {
     })
   })
 })
+
+vi.mock('./MobileQueuedMessageComposer', () => ({
+  MobileQueuedMessageComposer: 'QueuedMessageComposer'
+}))