-
Notifications
You must be signed in to change notification settings - Fork 3k
fix(web-shell): stop stacking duplicate copies when restoring prompt text #7134
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
wenshao
merged 1 commit into
QwenLM:main
from
zjunothing:fix/7128-queued-prompt-restore
Jul 17, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import { describe, expect, it } from 'vitest'; | ||
| import { mergeRestoredPromptText } from './useQueuedPrompts'; | ||
|
|
||
| // Regression for #7128: restoration paths can fire more than once for the | ||
| // same prompt (failed submit + reconnect/refresh, queue clear racing an | ||
| // abort), and a user retrying an identical message restores identical text. | ||
| // Stacking those copies is what surfaced as "sent messages concatenated back | ||
| // into the input box after refresh". | ||
| describe('mergeRestoredPromptText', () => { | ||
| it('fills an empty editor with the restored text', () => { | ||
| expect(mergeRestoredPromptText('', 'hello')).toBe('hello'); | ||
| expect(mergeRestoredPromptText(' ', 'hello')).toBe('hello'); | ||
| }); | ||
|
|
||
| it('prepends above a different draft the user is typing', () => { | ||
| expect(mergeRestoredPromptText('draft', 'restored')).toBe( | ||
| 'restored\ndraft', | ||
| ); | ||
| }); | ||
|
|
||
| it('is a no-op when the same text was already restored', () => { | ||
| expect(mergeRestoredPromptText('hello', 'hello')).toBe('hello'); | ||
| }); | ||
|
|
||
| it('is a no-op when the text already sits at the top of the editor', () => { | ||
| expect(mergeRestoredPromptText('hello\ndraft', 'hello')).toBe( | ||
| 'hello\ndraft', | ||
| ); | ||
| }); | ||
|
|
||
| it('stays idempotent across repeated restores of the same prompt', () => { | ||
| let editor = ''; | ||
| for (let i = 0; i < 3; i++) { | ||
| editor = mergeRestoredPromptText(editor, '用python写一个hello world'); | ||
| } | ||
| expect(editor).toBe('用python写一个hello world'); | ||
| }); | ||
|
|
||
| it('does not treat a same-prefix but different first line as a duplicate', () => { | ||
| expect(mergeRestoredPromptText('hello world\ndraft', 'hello')).toBe( | ||
| 'hello\nhello world\ndraft', | ||
| ); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[Suggestion]
restoreImagesis outside theif (next !== current)dedup guard — images are unconditionally appended on every restore call viasetPastedImages((prev) => [...prev, ...images]), while text dedup correctly skipssetText. — Failure scenario: a prompt with attached images fails to submit, restore fires, then a reconnect/retry triggers a second restore of the same prompt → text stays correct (dedup works) but images silently double, producing an inconsistent editor state.— qwen3.7-max via Qwen Code /review
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch — fixed in follow-up PR #7169: restoreImages now runs only alongside an actual text change, so a deduplicated restore no longer doubles the attachments.