fix: ensure user messages are sent with save button for file editing operations #6480
Conversation
…operations - Modified handlePrimaryButtonClick in ChatView to properly handle user input during file editing operations - For tool operations (file editing), the function now checks for current input from both the text parameter and inputValue state - This ensures that user messages typed while the agent is working are sent along with the save action - Added comprehensive tests for QueuedMessages component functionality - All existing tests continue to pass Fixes #6479
dosubot
bot
added
the
size:L
![ellipsis-dev[bot]](https://avatars.githubusercontent.com/in/64358?s=60&v=4){kind=small}
|
|
||
| // Mock the Thumbnails component | ||
| vi.mock("../common/Thumbnails", () => ({ | ||
| default: ({ images }: { images: string[] }) => <div data-testid="thumbnails">{images.length} images</div>, |
There was a problem hiding this comment.
The mock for the Thumbnails component returns a
| default: ({ images }: { images: string[] }) => <div data-testid="thumbnails">{images.length} images</div>, | |
| default: ({ images }: { images: string[] }) => <>{images.map((src, i) => <img key={i} src={src} alt="thumbnail" />)}</>, |
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
There was a problem hiding this comment.
Thank you for your contribution! I've reviewed the changes and found that the fix correctly addresses issue #6479. The solution properly handles user input during file editing operations while maintaining backward compatibility. However, there are a few suggestions for improvement, particularly around test consistency and code structure.
| render(<QueuedMessages queue={queue} onRemove={mockOnRemove} onUpdate={mockOnUpdate} />) | ||
|
|
||
| // Check that images are rendered (the actual Thumbnails component renders img elements) | ||
| const images = screen.getAllByRole("img") |
There was a problem hiding this comment.
The test expects elements but the mocked Thumbnails component returns a div with text content. This creates a mismatch between what the test expects and what the mock provides. Could we update the mock to render actual img elements or adjust the test expectations?
| images: images, | ||
| }) | ||
| // For tool operations (like file editing), check if we have current input or queued messages | ||
| if (clineAsk === "tool") { |
There was a problem hiding this comment.
Is this intentional? The special case for duplicates much of the logic from the else branch (lines 748-762). Could we refactor this to reduce duplication while maintaining the specific behavior for tool operations?
| setEnableButtons(false) | ||
| }, | ||
| [clineAsk, startNewTask], | ||
| [clineAsk, startNewTask, inputValue, selectedImages, setInputValue, setSelectedImages], |
There was a problem hiding this comment.
The dependency array includes and which are setState functions and should be stable. Could we verify this doesn't cause unnecessary re-renders? These might be safely omitted from the dependency array.
| // For tool operations (like file editing), check if we have current input or queued messages | ||
| if (clineAsk === "tool") { | ||
| // Get current input from the text area (this includes any text typed while agent was working) | ||
| const currentInput = text?.trim() || inputValue.trim() |
There was a problem hiding this comment.
Could we use more descriptive variable names here? Something like and would make it clearer that these are specifically for tool operations.
hannesrudolph
added
the
Issue/PR - Triage
|
Fixed on #6487 |
This PR fixes issue #6479 where user messages typed while the agent was working on file editing operations were not being sent when the save button was clicked.
Problem
When a user typed a message in the input field while the agent was performing file editing operations, clicking the save button would only send the file editing result but not the user's message. This broke the expected workflow where users could provide additional feedback along with approving file changes.
Solution
Modified the
handlePrimaryButtonClickfunction inChatView.tsxto properly handle user input during file editing operations:textparameter andinputValuestateChanges
handlePrimaryButtonClickto handle user input for tool operationsTesting
Verification
To test this fix:
Fixes #6479
Important
Fixes issue #6479 by ensuring user messages are sent with file editing results in
ChatView.tsx.handlePrimaryButtonClickinChatView.tsxto send user messages typed during file editing operations when the save button is clicked.QueuedMessages.spec.tsxto verify the new behavior.This description was created by
for 2640abc. You can customize this summary. It will automatically update as commits are pushed.