fix(native-chat): an unsent draft survives a reload or quit

src/main/window/clipboard-dashboard-popout-access.test.ts

@@ -109,6 +109,9 @@ describe('dashboard popout clipboard access', () => {
     expect(() => handlers.get('clipboard:readFilePaths')?.(popoutEvent)).toThrow(
       'Unauthorized clipboard IPC sender'
     )
+    expect(() =>
+      handlers.get('clipboard:restoreNativeChatPastes')?.(popoutEvent, ['/etc/passwd'])
+    ).toThrow('Unauthorized clipboard IPC sender')
     expect(() =>
       handlers.get('clipboard:writeFile')?.(popoutEvent, {
         filePath: '/tmp/copied-file.txt',

src/main/window/clipboard-image-temp-file.test.ts

@@ -1,12 +1,16 @@
+import { dirname, join } from 'node:path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { writeFileMock, getPathMock, writeFileBase64Mock } = vi.hoisted(() => ({
+const { writeFileMock, mkdirMock, getPathMock, writeFileBase64Mock } = vi.hoisted(() => ({
   writeFileMock: vi.fn(),
-  getPathMock: vi.fn(() => '/var/folders/ab/T'),
+  mkdirMock: vi.fn(),
+  getPathMock: vi.fn((name: string) =>
+    name === 'temp' ? '/os/temp' : '/Users/me/Library/Application Support/orca'
+  ),
   writeFileBase64Mock: vi.fn()
 }))
 
-vi.mock('node:fs/promises', () => ({ default: { writeFile: writeFileMock } }))
+vi.mock('node:fs/promises', () => ({ default: { writeFile: writeFileMock, mkdir: mkdirMock } }))
 vi.mock('node:crypto', () => ({ randomUUID: () => 'uuid-1' }))
 vi.mock('../../shared/app-environment', () => ({
   getAppEnvironment: () => ({ getPath: getPathMock })
@@ -25,10 +29,28 @@ beforeEach(() => {
 })
 
 describe('saveClipboardImageBufferAsTempFile', () => {
-  it('writes the pasted image to the local temp folder', async () => {
+  it('keeps a terminal, editor or phone paste in OS temp, as before', async () => {
     const savedPath = await saveClipboardImageBufferAsTempFile(Buffer.from([1, 2, 3]))
 
-    expect(savedPath.startsWith('/var/folders/ab/T')).toBe(true)
+    expect(getPathMock).toHaveBeenCalledWith('temp')
+    expect(getPathMock).not.toHaveBeenCalledWith('userData')
+    expect(mkdirMock).not.toHaveBeenCalled()
+    expect(dirname(savedPath)).toBe('/os/temp')
+    expect(writeFileMock).toHaveBeenCalledWith(savedPath, Buffer.from([1, 2, 3]))
+  })
+
+  it('writes a native-chat composer paste into the paste folder, where its draft can find it', async () => {
+    const savedPath = await saveClipboardImageBufferAsTempFile(Buffer.from([1, 2, 3]), {
+      forNativeChatDraft: true
+    })
+
+    expect(mkdirMock).toHaveBeenCalledWith(
+      join('/Users/me/Library/Application Support/orca', 'native-chat-pastes'),
+      { recursive: true }
+    )
+    expect(dirname(savedPath)).toBe(
+      join('/Users/me/Library/Application Support/orca', 'native-chat-pastes')
+    )
     expect(writeFileMock).toHaveBeenCalledWith(savedPath, Buffer.from([1, 2, 3]))
   })
 

src/main/window/clipboard-image-temp-file.ts

@@ -2,14 +2,17 @@ import fs from 'node:fs/promises'
 import path from 'node:path'
 import { randomUUID } from 'node:crypto'
 
-import { getAppEnvironment } from '../../shared/app-environment'
 import { requireSshFilesystemProvider } from '../providers/ssh-filesystem-dispatch'
+import { getAppEnvironment } from '../../shared/app-environment'
 import { isWindowsAbsolutePathLike } from '../../shared/cross-platform-path'
 import { assertClipboardImageByteLengthWithinLimit } from '../../shared/clipboard-image'
+import { nativeChatPasteFolder } from './native-chat-paste-files'
 
 export type SaveClipboardImageAsTempFileArgs = {
   connectionId?: string | null
   runtimeEnvironmentId?: string | null
+  /** A native-chat composer paste: kept in Orca's paste folder so its draft can bring it back. */
+  forNativeChatDraft?: boolean
 }
 
 const REMOTE_CLIPBOARD_IMAGE_TEMP_DIR = '/tmp'
@@ -39,7 +42,14 @@ export async function saveClipboardImageBufferAsTempFile(
     return remotePath
   }
 
-  const tempPath = path.join(getAppEnvironment().getPath('temp'), fileName)
+  // Why only a composer paste goes to the paste folder: its draft can bring it back after a
+  // restart, while terminal, editor and phone pastes stay in OS temp, as they always have.
+  let folder = getAppEnvironment().getPath('temp')
+  if (args?.forNativeChatDraft === true) {
+    folder = nativeChatPasteFolder()
+    await fs.mkdir(folder, { recursive: true })
+  }
+  const tempPath = path.join(folder, fileName)
   await fs.writeFile(tempPath, buffer)
   return tempPath
 }

src/main/window/clipboard-ipc-handlers.test.ts

@@ -84,9 +84,7 @@ vi.mock('node:fs/promises', () => ({
   stat: fsStatMock,
   realpath: vi.fn(), // unused here; only satisfies filesystem-path-containment's named import
   writeFile: fsWriteFileMock,
-  default: {
-    writeFile: fsWriteFileMock
-  }
+  default: { writeFile: fsWriteFileMock, mkdir: fsMkdirMock }
 }))
 
 vi.mock('../ipc/filesystem-auth', () => ({

src/main/window/clipboard-ipc-handlers.ts

@@ -44,6 +44,7 @@ import { readClipboardCopiedFilePaths } from './clipboard-copied-file-paths'
 import { buildClipboardImageThumbnail } from './clipboard-image-thumbnail'
 import { writeClipboardTextAndVerify } from './clipboard-text-write-verify'
 import { isDashboardPopoutRenderer } from './dashboard-popout-window'
+import { restoreNativeChatPastes, sweepExpiredNativeChatPastes } from './native-chat-paste-files'
 
 let trustedClipboardRendererWebContentsId: number | null = null
 
@@ -101,8 +102,10 @@ export function registerClipboardHandlers(store: Store): void {
   ipcMain.removeHandler('clipboard:readImageThumbnail')
   ipcMain.removeHandler('clipboard:hasImage')
   ipcMain.removeHandler('clipboard:readFilePaths')
+  ipcMain.removeHandler('clipboard:restoreNativeChatPastes')
 
   void cleanupExpiredRemoteClipboardFiles()
+  void sweepExpiredNativeChatPastes()
   scheduleLegacyRemoteClipboardFileCleanup()
 
   ipcMain.handle('clipboard:readText', async (event, options?: ReadClipboardTextOptions) => {
@@ -116,6 +119,10 @@ export function registerClipboardHandlers(store: Store): void {
       return assertClipboardTextWithinLimitWithYield(clipboard.readText('selection'), options)
     }
   )
+  ipcMain.handle('clipboard:restoreNativeChatPastes', (event, paths: unknown) => {
+    assertTrustedClipboardSender(event)
+    return restoreNativeChatPastes(paths)
+  })
   // Why: an unanswered paste reads as a dropped paste, so the composer probes
   // the clipboard in memory before the (slower) save lands.
   ipcMain.handle('clipboard:readImageThumbnail', (event): ClipboardImageThumbnail | null => {

src/main/window/clipboard-runtime-owned-ssh-paste.test.ts

@@ -39,7 +39,7 @@ vi.mock('node:fs/promises', () => ({
   stat: vi.fn(),
   realpath: vi.fn(),
   writeFile: fsWriteFileMock,
-  default: { writeFile: fsWriteFileMock }
+  default: { writeFile: fsWriteFileMock, mkdir: vi.fn() }
 }))
 vi.mock('../ipc/filesystem-auth', () => ({
   PATH_ACCESS_DENIED_MESSAGE: 'denied',