Merge master into feature/agentic-chat #6964
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
Problem: Webpack fails on the parent commit: 2025-04-07T17:25:48.4129595Z Error: Cannot find module './globalState' 2025-04-07T17:25:48.4148372Z at webpackMissingModule (file:///…/packages/amazonq/dist/test/web/testRunnerWebCore.js#vscode-extension:159675:92) Solution: Avoid importing `'aws-core-vscode/amazonq'` in `webviewProvider.ts`. `AmazonQPromptSettings` is intended to have application-specific logic, so move the logic there and drop the special `disclaimer.ts` module.
## Problem * Amazon Q extension sometimes crashed with a grey screen * Chat history icon was not easy for users to identify ## Solution * Update to [Mynah UI 4.30.0](https://github.com/aws/mynah-ui/releases)
|
## Problem Users don't have a way to export an Amazon Q chat ## Solution Add an export icon to chat tab bar and, allow users to export conversations from chat history. Users can choose Markdown or HTML format
…6963 ## Problem Users can't add `@Code` context from PHP, Ruby, Scala, Shell, and Swift files ## Solution Add support for adding `@Code` context for PHP, Ruby, Scala, Shell, and Swift
## Problem Users lose all chats when they close VSCode, and there's no way to browse through chat history. Users also cant export their conversations to an easily shareable format. ## Solution Automatically persist conversations to JSON files in ~/.aws/amazonq/history, one for each workspace where Amazon Q chats occur. Add chat history and chat export buttons to top of Amazon Q toolbar. Clicking on the chat history button allows users to browse and search through chat history. Users click on an old conversation to open it back up (currently open conversations are in bold). Clicking on chat export button allows users to save chat transcript as a markdown or html. Note: persistence + history is only for Q Chat Tabs (not /dev, /doc, /transform, etc.)  ## Note Agentic chat does not currently use this persisted history in it's context. Follow-up PR will address this issue. --- - 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.
…est #6935 ## Problem In /test feature, test generation in languages other than Java and Python display message that they were not supported. Tests are generated for all languages, so this message needs to be removed. ## Solution Removed message to the user that /test only supports Python and Java
ctlai95
approved these changes
Apr 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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):