Merge master into feature/flare-mega-LSP-gamma #7394
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
We are bumping the version as it is potentially related to V1793742233 --- - 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. Signed-off-by: nkomonen-amazon <nkomonen@amazon.com>
Did this just to force our codepipeline to retrigger
feat(amazonq): add mcp field to client capabilities
|
## Problem:
rejected promise not handled within 1 second:
Error: command 'aws.amazonq.focusChat' not found
## Solution:
Don't use `void` to ignore rejected promises.
---
- 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 `browser_download_url` in https://api.github.com/repos/aws/aws-toolkit-vscode/releases/latest points to a random artifact depending on whether toolkit or amazonq was the last release to publish. Solution: Modify the deploy logic to only set "latest" for "amazonq", never "toolkit".
## Problem `chatOptionsUpdate` notifications are not forwarded to UI. This is needed to persist previously selected model in new tabs. ## Solution Forward `chatOptionsUpdate` notifications to UI Related PR: aws/language-server-runtimes#530 --- - 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.
Analistarjx
approved these changes
May 31, 2025
Analistarjx
approved these changes
May 31, 2025
Problem: LSP server can't open URLs, because the LSP client does not correctly handle `ShowDocumentParams.external` requests. LSP spec: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#showDocumentParams Solution: When `ShowDocumentParams.external` is true, open the URL in a web browser instead of as a editor document.
…bilities" This reverts commit 6cbe787.
## Problem - Current telemetry version is ` 1.0.322` ## Solution - Bumping up telemetry version to ` 1.0.323` - aws/aws-toolkit-common#1034 --- - 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 Minor text update ## 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. Co-authored-by: David Hasani <davhasan@amazon.com>
## Problem The LSP start failure because 1. node binary is blocked because of firewall 2. chat UI js file is blocked because of firewall or anti virus 3. lsp js file is broken post download because of security mechanism ## Solution 1. Bundle the JS LSP with the amazonq package. 2. Re-start LSP wth the bundled JS files if and only if downloaded LSP does not work! 3. Use the VS Code vended node to start the bundled LSP. This was tested by 1. Generated the vsix, which is now 20MB. 2. Disconnect from internet, remove local LSP caches 3. Install the new vsix 4. Webview of chat should load. also tested by manually corrupting the aws-lsp-codewhisperer.js Limitations: 1. The indexing library function will not work because it is missing. 2. rg is not in the bundle Ref: aws/aws-toolkit-jetbrains#5772 --- - 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. --------- Co-authored-by: Justin M. Keyes <jmkeyes@amazon.com>
fix(amazonq): Add proxy configuration support with SSL Cert Validation
## Problem
- `windows-2019` image is being deprecated on 6/30/2025
- See here: actions/runner-images#12045
## Solution
- update to use `windows-latest` image for github CI
---
- 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.
…nformation (#7524) ## Problem The documentation was incomplete for setting up the LSP locally for testing. ## Solution Added the required information. --- - 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 https://github.com/aws/aws-toolkit-vscode/pull/7450/files is too convoluted, hard to review and we also found a couple of regressions. ## Solution Move inline completion to Flare first in this PR. Then we plan on how to move auth to Flare. After this merge, https://github.com/aws/aws-toolkit-vscode/pull/7450/files will be a lot easier to debug and review. --- - 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. --------- Signed-off-by: nkomonen-amazon <nkomonen@amazon.com> Co-authored-by: Josh Pinkney <103940141+jpinkney-aws@users.noreply.github.com> Co-authored-by: aws-toolkit-automation <43144436+aws-toolkit-automation@users.noreply.github.com> Co-authored-by: Hweinstock <42325418+Hweinstock@users.noreply.github.com> Co-authored-by: Nikolas Komonen <118216176+nkomonen-amazon@users.noreply.github.com> Co-authored-by: nkomonen-amazon <nkomonen@amazon.com> Co-authored-by: Josh Pinkney <jpink@amazon.com> Co-authored-by: Tom Zu <138054255+tomcat323@users.noreply.github.com> Co-authored-by: Will Lo <96078566+Will-ShaoHua@users.noreply.github.com> Co-authored-by: Tai Lai <ctlai95@gmail.com> Co-authored-by: Adam Khamis <110852798+akhamis-amzn@users.noreply.github.com> Co-authored-by: Na Yue <yueny@amazon.com> Co-authored-by: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com> Co-authored-by: Jiatong Li <lijiatong1997@outlook.com> Co-authored-by: Avi Alpert <131792194+avi-alpert@users.noreply.github.com> Co-authored-by: Brad Skaggs <126105424+brdskggs@users.noreply.github.com> Co-authored-by: hkobew <hkobew@amazon.com> Co-authored-by: Zoe Lin <60411978+zixlin7@users.noreply.github.com> Co-authored-by: chungjac <chungjac@amazon.com> Co-authored-by: invictus <149003065+ashishrp-aws@users.noreply.github.com>
fix(amazonq): increase node memory size to 8G
…tor versions (#7525) ## Problem `cfn-policy-validator` dependency was updated (https://github.com/awslabs/aws-cloudformation-iam-policy-validator/releases/tag/v0.0.36) `tf-policy-validator` dependency was updated (https://github.com/awslabs/terraform-iam-policy-validator/releases/tag/v0.0.9) ## Solution Update the dependency version to 0.0.36 from 0.0.34 and 0.0.9 from 0.0.8 in the accessanalyzer integration. --- - 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 - Missing `chatOptions` like mcp icon, history icon, export icon in tab bar and quickActions like `/clear` and `/help` in the input menu.  #### Root Cause 1: - The `CHAT_OPTIONS` command is sometimes not properly received by the handleInboundMessage function in the chat client. - The root issue was a race c 6DB6 ondition in the communication between the VSCode extension and the webview component. When the `onDidResolveWebview` event fired, the code was immediately trying to send a message to the webview, but in some cases, the webview wasn't fully ready to receive messages yet, causing the message to be lost. #### Root Cause 2: - If user opens a large repository(example: [JetBrains](https://github.com/aws/aws-toolkit-jetbrains)) in any IDE(VSC or JB or VS or Ecllipse), IDE takes some time to do indexing. - This delay of indexing is stopping the webview to initialize and if the webview is delayed, the `chatOptions` like quickActions(`/help` or `/clear`) and tab bar icons are not sent because of webview delay. ## Ideal case: - VSC Extension at `messages.ts`, `chatOptions` are sent to the [webview using webview.postMessage() with the command CHAT_OPTIONS](https://github.com/aws/language-servers/blob/0cac52c3d037da8fc4403f030738256b07195e76/client/vscode/src/chatActivation.ts#L340-L348) and this is handled by the `handleInboundMessage` in `LS/chat.ts` file. ## Solution: 1. Listen to dedicated `aws/chat/ready` event, which ensures we only send messages when the UI is fully initialized and ready to process them. 2. The chat options are stored when initialized, and then sent when the `aws/chat/ready` event is received from the UI. 3. Added explicit try/catch around the message sending process with proper error logging. 4. Added clearer log messages to track the UI ready event and message sending process, which will make debugging easier if issues arise in the future. --- - 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: - Adding change log for #7520 --- - 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.
…nch (#7531) ## Problem - Right now, Q does not open the history tabs automatically after VSC Reload or restart ## Solution - This PR fixes the above 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.
fix(amazonq): allow node to inherit proxy settings from VSC
… ## Problem - to reduce # of service calls within short time duration and result in throttling error thrown - ## 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.
…ble deployment from WFS (#7315) ## Problem - Save telemetry was being recorded for all document saves in VS Code, not just for the active workflow studio document. - Save & Deploy functionality required closing Workflow Studio before starting deployment ## Solution - Add URI comparison check to ensure telemetry is only recorded when the saved document matches the current workflow studio document. - Refactored publishStateMachine.ts to accept an optional TextDocument parameter and updated activation.ts to support new interface - Removed closeCustomEditorMessageHandler call from saveFileAndDeployMessageHandler --- - 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. --------- Co-authored-by: Diler Zaza <zazadile@amazon.com>
## Problem Instead of running `mvn dependency:copy-dependencies` and `mvn clean install`, we have a JAR that we can execute which will gather all of the project dependencies as well as some important metadata stored in a `compilations.json` file which our service will use to improve the quality of transformations. ## Solution Remove Maven shell commands; add custom JAR execution. --- - 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/ B108 CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: David Hasani <davhasan@amazon.com>
fix(amazonq): migrate process.env proxy setting handling to proxyUtil.ts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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):