Merge master into feature/agentic-chat #6971
Merged
Conversation
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
Remove static response string for shell command reject ## Problem - Use shell icon in shell command header - Remove static response string for shell command reject ## Solution  --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…ge (#6977) ## Problem Before we are unclear about the commands' category and sometimes we show warning for some wide-used commands. Also we want to show the different warning message for destructive commands and mutable commands. ## Solution --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Notes
- fix(chat): Improve diffView UX, changes include:
- Remove the icon in diff view
- Clean up temp files when accept or reject
- Do not open the files as they generate
---
- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
## Problem The pair-program was off by default and there was no tooltip. ## Solution  --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
This command is called frequently and the command or related vscode "view" may not exist yet early in the extension startup/lifecycle.
fix(chat): Send back throttling error message
## Problem Chat input prompt should be disabled during the agentic loop ## Solution - Disable chat prompt - Removed stop button for now --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem There was no implementation for the `copyToClipboard` message received from LSP for Amazon Q. The functionality did work because of the [MynahUI implementation](https://github.com/aws/mynah-ui/blob/b56a4b1df828eaa22515ef0f5af211eec24a5f89/src/helper/chat-item.ts#L36C1-L37C1), but for UI consistency to consider edge cases with webview clipboard, we decided to handle it explicitly. ## Solution Call the `copyToClipboard` function and add unit tests --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
fix(chat): handle JSON.parse error gracefully
## Problem - We show read tool message for each file read which is occupying the entire chat with these messages which is not super important. ## Solution - Group all the read tool messaged under ContextList.  --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
## Problem When toggling the experiment via, the `aws.experiments.amazonqChatLSP` flag in settings, inline chat fails to activate. Specifically, it appears the command fails to register. ``` command 'aws.amazonq.inline.invokeChat' not found ``` This happened because inline chat was activated as part of regular chat. When we use LSP chat, this then never gets activated. ## Solution - Activate inline chat independently of regular chat. ## Testing - Verified the fix by running extension with and without `aws.experiments.amazonqChatLSP` flag and using inlineChat in both cases. One of these cases is shown in the demo below. ## Notes This will have to change once we consume LSP inline chat, as we don't want to activate both our inline chat and Flare's.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
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.
Automatic merge failed
Command line hint
To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):