The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(desktop): recovery keeps files attached while it was running
Teknium1ec9c7661a30
diff --git a/apps/desktop/src/app/chat/composer/hooks/use-composer-draft.ts b/apps/desktop/src/app/chat/composer/hooks/use-composer-draft.tsindex 687f54e53ce..1251fb31880 100644--- a/apps/desktop/src/app/chat/composer/hooks/use-composer-draft.ts+++ b/apps/desktop/src/app/chat/composer/hooks/use-composer-draft.ts@@ -719,12 +719,15 @@ export function useComposerDraft({noteAttachmentsNotRestored(storedRetry)}- // Takes back a draft that is still exactly `retry`'s send under its identity.+ // Takes back a draft that is still exactly `retry`'s send under its identity: words AND+ // attachments, since a file attached after the offer makes it the user's new message.const clearRestoredDraft = (retry: ComposerDraftRetry) => {+ const stored = readDraftRetry(activeQueueSessionKey)+if (draftScopeRef.current !== activeQueueSessionKey ||- !draftRetryTextMatches(retry, syncDraftFromEditor()) ||- readDraftRetry(activeQueueSessionKey)?.id !== retry.id+ stored?.id !== retry.id ||+ !matchingDraftRetry(stored, syncDraftFromEditor(), attachmentScope.$attachments.get())) {return}@@ -737,7 +740,13 @@ export function useComposerDraft({const interruptedSend: InterruptedSendHandlers = {offer: retry => {- if (draftScopeRef.current !== activeQueueSessionKey || syncDraftFromEditor().trim()) {+ // Re-read after the owner check: anything typed or attached meanwhile keeps the composer,+ // and the send stays journaled for a later load.+ if (+ draftScopeRef.current !== activeQueueSessionKey ||+ syncDraftFromEditor().trim() ||+ attachmentScope.$attachments.get().length > 0+ ) {return false}diff --git a/apps/desktop/src/app/chat/composer/hooks/use-composer-submit.send-then-close.test.tsx b/apps/desktop/src/app/chat/composer/hooks/use-composer-submit.send-then-close.test.tsxindex 00fb59c9130..b3ca72d3af3 100644--- a/apps/desktop/src/app/chat/composer/hooks/use-composer-submit.send-then-close.test.tsx+++ b/apps/desktop/src/app/chat/composer/hooks/use-composer-submit.send-then-close.test.tsx@@ -34,12 +34,13 @@ const composer = vi.hoisted(() => {})// The stored transcript the owner serves for a session (the REST page the outbox reads on reopen).-const transcript = vi.hoisted(() => ({ rows: new Map<string, unknown[]>() }))+// `gate` holds the owner's answer (the recovery check is asynchronous) until a test releases it.+const transcript = vi.hoisted(() => ({ gate: Promise.resolve(), rows: new Map<string, unknown[]>() }))vi.mock('@/api/sessions', async importOriginal => ({...(await importOriginal<object>()),getSessionMessages: async (id: string) => ({- messages: transcript.rows.get(id) ?? [],+ messages: await transcript.gate.then(() => transcript.rows.get(id) ?? []),pagination: { limit: 200, offset: 0, order: 'latest' },session_id: id})@@ -134,6 +135,7 @@ afterEach(() => {cleanup()window.localStorage.clear()transcript.rows.clear()+ transcript.gate = Promise.resolve()vi.resetModules()})@@ -322,3 +324,37 @@ it('a restored send retried while a turn runs is queued under its id, never steeexpect(onSteer).not.toHaveBeenCalled()expect(queueCurrentDraft).toHaveBeenCalledWith(firstId)})++it('recovery never discards a file the user attached while it was running', async () => {+ const attached = async () =>+ (await import('@/store/composer')).mainComposerScope.$attachments.get().map(attachment => attachment.id)++ // Attached while the owner check is still pending: the offer would replace the composer.+ await sendThenClose('held words')++ let answer = () => {}+ transcript.gate = new Promise<void>(resolve => (answer = resolve))+ await openPage(vi.fn<ChatBarProps['onSubmit']>(async () => true))+ act(() => handles.attach('new-file.txt'))+ await act(async () => answer())+ await act(async () => {})+ expect(await attached()).toEqual(['new-file.txt'])+ closeWindow()+ window.localStorage.clear()++ // Attached to the offered draft, then a late snapshot lists the original send: the take-back+ // would clear the whole composer.+ const lateId = await sendThenClose('late words')+ await openPage(vi.fn<ChatBarProps['onSubmit']>(async () => true))+ await waitFor(() => expect(handles.editor()).toBe('late words'))+ act(() => handles.attach('new-file.txt'))+ const { reconcilePendingSubmissions } = await import('@/store/pending-submissions')+ act(() =>+ reconcilePendingSubmissions('stored-B', [+ { admission_id: 'adm-1', input_id: lateId, status: 'queued', text: 'late words' }+ ])+ )+ await act(async () => {})+ expect(await attached()).toEqual(['new-file.txt'])+ expect(handles.editor()).toBe('late words')+})