From b08d458c4b3c6fb459ad4c9cc79caf1017519aa5 Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Sun, 8 Nov 2026 00:10:34 +0000 Subject: [PATCH] Keep asynchronous clipboard files with their original composer --- .../chat/conversation/chat_composer_bar.dart | 14 ++++-- app/notes/chat-unfocused-paste.md | 6 +++ .../chat_composer_paste_test.dart | 46 +++++++++++++++++-- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/app/lib/features/chat/conversation/chat_composer_bar.dart b/app/lib/features/chat/conversation/chat_composer_bar.dart index 63321cec..d66c339a 100644 --- a/app/lib/features/chat/conversation/chat_composer_bar.dart +++ b/app/lib/features/chat/conversation/chat_composer_bar.dart @@ -248,7 +248,8 @@ class _ChatComposerBarState extends State { _seenAccepted = widget.composer.composerSendsAccepted; _syncDraft(); } - if (oldWidget.paste != widget.paste || + if (oldWidget.composer != widget.composer || + oldWidget.paste != widget.paste || oldWidget.pasteTarget != widget.pasteTarget) { _stopListeningForPaste(); _listenForPaste(); @@ -257,10 +258,17 @@ class _ChatComposerBarState extends State { void _listenForPaste() { if (!_paste.isSupported) return; + final owner = widget.composer; _stopPaste = _paste.listen( - onFiles: _onPastedFiles, + // File decoding is asynchronous. Keep an accepted paste on its original + // chat even if it becomes inactive, but never carry it to a replacement. + onFiles: (files) { + if (mounted && identical(widget.composer, owner)) _onPastedFiles(files); + }, canAccept: _canAcceptPaste, - onError: _onPasteError, + onError: (error) { + if (mounted && identical(widget.composer, owner)) _onPasteError(error); + }, onText: _onPastedText, canAcceptText: _canAcceptTextPaste, ); diff --git a/app/notes/chat-unfocused-paste.md b/app/notes/chat-unfocused-paste.md index 936ef59d..28f5778b 100644 --- a/app/notes/chat-unfocused-paste.md +++ b/app/notes/chat-unfocused-paste.md @@ -11,3 +11,9 @@ Verification: - Full app browser fixture evidence: `/tmp/review/unfocused-paste-final/` and `/tmp/unfocused-paste-capture.json`. Uses in-process fixtures, synthetic events and private Chrome only. Synthetic paste validates routing/default-prevention; it does not claim trusted OS clipboard integration or native-device verification. Harness limitation: importing full app widget dependencies into Flutter's Chrome test runner collides with SDK `host.dart.js` naming and hangs at loading. That attempt was interrupted and is not counted as passing. Browser bridge tests and a release-mode full app fixture avoid that test-server issue. No real chats or device clipboard were used. Work preserved for pipeline continuation; no commit, deployment or shared-service restart performed here. + +Manager review: an accepted asynchronous file paste belongs to the original chat, +including when quick-switch makes it inactive while bytes decode. Listener +callbacks capture composer identity so decoded files/errors cannot attach to a +replacement composer that reuses the State; changing composer rebinds the listener. +Regressions cover both retained inactive ownership and stale-completion rejection. diff --git a/app/test/features/chat/conversation/chat_composer_paste_test.dart b/app/test/features/chat/conversation/chat_composer_paste_test.dart index b9b6d7c2..6f0b5852 100644 --- a/app/test/features/chat/conversation/chat_composer_paste_test.dart +++ b/app/test/features/chat/conversation/chat_composer_paste_test.dart @@ -297,9 +297,7 @@ void main() { expect(fake.canAcceptText!(), isFalse); }); - testWidgets('paste is only taken by the active composer', ( - tester, - ) async { + testWidgets('paste is only taken by the active composer', (tester) async { final fake = _FakePaste(); await pumpBar(tester, paste: fake.source); @@ -312,6 +310,48 @@ void main() { expect(fake.canAccept!(), isTrue); }); + testWidgets('accepted file paste stays with its original inactive chat', ( + tester, + ) async { + final fake = _FakePaste(); + await pumpBar(tester, paste: fake.source); + expect(fake.canAccept!(), isTrue); + final decodingFinished = fake.onFiles!; + await pumpWith(tester, paste: fake.source, pasteTarget: false); + decodingFinished([ + _file('original.txt', [1]), + ]); + await tester.pump(); + expect(find.text('original.txt'), findsOneWidget); + }); + + testWidgets('late file decoding never attaches to a replacement composer', ( + tester, + ) async { + final fake = _FakePaste(); + await pumpBar(tester, paste: fake.source); + final decodingFinished = fake.onFiles!; + composer = ChatComposerController( + gateway, + 'replacement', + drafts: MemoryChatDraftStore(), + newOperationId: () => 'op/replacement', + ); + controllers.add(composer); + await pumpWith(tester, paste: fake.source); + decodingFinished([ + _file('wrong-chat.txt', [1]), + ]); + await tester.pump(); + expect(find.text('wrong-chat.txt'), findsNothing); + expect(fake.canAccept!(), isTrue); + fake.paste([ + _file('replacement.txt', [2]), + ]); + await tester.pump(); + expect(find.text('replacement.txt'), findsOneWidget); + }); + testWidgets('a paste during an in-flight prompt adds nothing', ( tester, ) async {