fix(web): preserve composer attachments across session switches (#1110)

* fix(web): preserve composer attachments across session switches

Persist composer files per session and restore completed uploads without
uploading them again. Clear attachment drafts alongside text after send and
cover restoration, isolation, and adapter reuse with regression tests.

Fixes #465

* fix(web): keep cleared attachment drafts tombstoned

Retain an empty in-memory cache entry until the queued IndexedDB delete completes so a fast remount cannot restore stale files. Add regression coverage for the clear/remount race.

* fix(web): defer attachment restore for inactive sessions

Only restore or clear attachment drafts while the session attachment adapter is available. Preserve saved files when an inactive session mounts without attachment support and add regression coverage.

web/src/hooks/useComposerDraft.test.ts

@@ -6,18 +6,27 @@ vi.mock('@/lib/composer-drafts', () => ({
     getDraft: vi.fn(() => ''),
     saveDraft: vi.fn(),
 }))
+vi.mock('@/lib/composer-attachment-drafts', () => ({
+    getDraftAttachments: vi.fn(async () => []),
+    saveDraftAttachments: vi.fn(),
+}))
 
 import { getDraft, saveDraft } from '@/lib/composer-drafts'
+import { getDraftAttachments, saveDraftAttachments } from '@/lib/composer-attachment-drafts'
 import { useComposerDraft } from './useComposerDraft'
 
 const mockGetDraft = vi.mocked(getDraft)
 const mockSaveDraft = vi.mocked(saveDraft)
+const mockGetDraftAttachments = vi.mocked(getDraftAttachments)
+const mockSaveDraftAttachments = vi.mocked(saveDraftAttachments)
 
 describe('useComposerDraft', () => {
     let rAFCallbacks: Array<() => void>
 
     beforeEach(() => {
         vi.clearAllMocks()
+        mockGetDraft.mockReturnValue('')
+        mockGetDraftAttachments.mockResolvedValue([])
         rAFCallbacks = []
         vi.stubGlobal('requestAnimationFrame', vi.fn((cb: () => void) => {
             rAFCallbacks.push(cb)
@@ -30,61 +39,60 @@ describe('useComposerDraft', () => {
         vi.unstubAllGlobals()
     })
 
-    function flushRAF() {
+    async function flushRAF() {
         const cbs = [...rAFCallbacks]
         rAFCallbacks = []
         cbs.forEach(cb => cb())
+        await Promise.resolve()
+        await Promise.resolve()
     }
 
-    it('restores saved draft on mount via requestAnimationFrame', () => {
+    it('restores saved draft on mount via requestAnimationFrame', async () => {
         mockGetDraft.mockReturnValue('saved text')
         const setText = vi.fn()
 
-        renderHook(() => useComposerDraft('session-1', '', setText))
+        renderHook(() => useComposerDraft('session-1', '', [], true, setText, vi.fn()))
 
         // Before rAF fires, setText should not have been called
         expect(setText).not.toHaveBeenCalled()
 
         // Flush rAF
-        act(() => flushRAF())
-
+        await act(async () => flushRAF())
         expect(mockGetDraft).toHaveBeenCalledWith('session-1')
         expect(setText).toHaveBeenCalledWith('saved text')
     })
 
-    it('does not restore draft if composer already has text', () => {
+    it('does not restore draft if composer already has text', async () => {
         mockGetDraft.mockReturnValue('saved text')
         const setText = vi.fn()
 
-        renderHook(() => useComposerDraft('session-1', 'user is typing', setText))
-
-        act(() => flushRAF())
+        renderHook(() => useComposerDraft('session-1', 'user is typing', [], true, setText, vi.fn()))
 
+        await act(async () => flushRAF())
         expect(setText).not.toHaveBeenCalled()
     })
 
-    it('does not restore if draft is empty', () => {
+    it('does not restore if draft is empty', async () => {
         mockGetDraft.mockReturnValue('')
         const setText = vi.fn()
 
-        renderHook(() => useComposerDraft('session-1', '', setText))
-
-        act(() => flushRAF())
+        renderHook(() => useComposerDraft('session-1', '', [], true, setText, vi.fn()))
 
+        await act(async () => flushRAF())
         expect(setText).not.toHaveBeenCalled()
     })
 
-    it('saves draft on unmount after rAF has fired', () => {
+    it('saves draft on unmount after rAF has fired', async () => {
         mockGetDraft.mockReturnValue('')
         const setText = vi.fn()
 
         const { unmount, rerender } = renderHook(
-            ({ text }) => useComposerDraft('session-1', text, setText),
+            ({ text }) => useComposerDraft('session-1', text, [], true, setText, vi.fn()),
             { initialProps: { text: '' } },
         )
 
         // Fire rAF to set draftReady = true
-        act(() => flushRAF())
+        await act(async () => flushRAF())
 
         // Simulate user typing
         rerender({ text: 'my draft' })
@@ -92,6 +100,7 @@ describe('useComposerDraft', () => {
         unmount()
 
         expect(mockSaveDraft).toHaveBeenCalledWith('session-1', 'my draft')
+        expect(mockSaveDraftAttachments).toHaveBeenCalledWith('session-1', [])
     })
 
     it('does not save draft on unmount before rAF has fired', () => {
@@ -99,7 +108,7 @@ describe('useComposerDraft', () => {
         const setText = vi.fn()
 
         const { unmount } = renderHook(
-            () => useComposerDraft('session-1', 'some text', setText),
+            () => useComposerDraft('session-1', 'some text', [], true, setText, vi.fn()),
         )
 
         // Unmount before rAF fires (draftReady is still false)
@@ -109,18 +118,57 @@ describe('useComposerDraft', () => {
         expect(vi.mocked(cancelAnimationFrame)).toHaveBeenCalled()
     })
 
-    it('does nothing when sessionId is undefined', () => {
+    it('does nothing when sessionId is undefined', async () => {
         const setText = vi.fn()
 
         const { unmount } = renderHook(
-            () => useComposerDraft(undefined, 'text', setText),
+            () => useComposerDraft(undefined, 'text', [], true, setText, vi.fn()),
         )
 
-        act(() => flushRAF())
+        await act(async () => flushRAF())
         unmount()
 
         expect(mockGetDraft).not.toHaveBeenCalled()
         expect(mockSaveDraft).not.toHaveBeenCalled()
         expect(setText).not.toHaveBeenCalled()
     })
+
+    it('restores saved attachments when the composer is empty', async () => {
+        const file = new File(['image'], 'image.png', { type: 'image/png' })
+        mockGetDraftAttachments.mockResolvedValue([file])
+        const addAttachment = vi.fn(async () => {})
+
+        renderHook(() => useComposerDraft('session-1', '', [], true, vi.fn(), addAttachment))
+        await act(async () => flushRAF())
+
+        expect(addAttachment).toHaveBeenCalledWith(file)
+    })
+
+    it('does not duplicate saved attachments when the composer already has files', async () => {
+        const current = new File(['current'], 'current.png', { type: 'image/png' })
+        const saved = new File(['saved'], 'saved.png', { type: 'image/png' })
+        mockGetDraftAttachments.mockResolvedValue([saved])
+        const addAttachment = vi.fn(async () => {})
+
+        renderHook(() => useComposerDraft('session-1', '', [{ id: 'current', file: current }], true, vi.fn(), addAttachment))
+        await act(async () => flushRAF())
+
+        expect(addAttachment).not.toHaveBeenCalled()
+    })
+
+    it('preserves saved attachments while the attachment adapter is unavailable', async () => {
+        const saved = new File(['saved'], 'saved.png', { type: 'image/png' })
+        mockGetDraftAttachments.mockResolvedValue([saved])
+        const addAttachment = vi.fn(async () => {})
+
+        const { unmount } = renderHook(() => (
+            useComposerDraft('session-1', '', [], false, vi.fn(), addAttachment)
+        ))
+        await act(async () => flushRAF())
+        unmount()
+
+        expect(mockGetDraftAttachments).not.toHaveBeenCalled()
+        expect(addAttachment).not.toHaveBeenCalled()
+        expect(mockSaveDraftAttachments).not.toHaveBeenCalled()
+    })
 })