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
|
Analistarjx
approved these changes
May 31, 2025
Analistarjx
approved these changes
May 31, 2025
fix(amazonq): Re-enable experimental proxy support
## Problem step functions still uses sdk v2 ## Solution - Refactor `DefaultStepFunctionsClient` to `StepFunctionsClient` using ClientWrapper. - Refactor references to `DefaultStepFunctionsClient` with `StepFunctionsClient` and reference sdk v3 types ## Verification - Verified CreateStateMachine, UpdateStateMachine works and creates/updates StateMachine - Verified AWS Explorer lists all StateMachines using ListStateMachine - Verified StartExecution works - Verified TestState, ListIAMRoles works in Workflow Studio, which also fixes the bug that variables cannot be used in TestState in Workflow Studio - fixes #6819  --- - 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): Remove incompatible Node 18 flag
…rigger-setting fix(amazonq): update cursor tracking based on autotrigger setting
1. update the commonAuthViewProvider to use the locally bundled vue.js, instead of to load the vue.js from CDN. 2. this going to resolve the customer request that When customer is trying to login to IDC via Q they are hitting a URL which is not part of the whitelist urls as per [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/firewall.html)
fix(amazonq): connect chat history to VSCode workspace file
## Problem Modify text in some places, and modify the manifest to include the `IDE` field. ## Solution Above --- - 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 <[email protected]>
fix(amazonq): remove the depedency of the CDN js script.
Merge pull request #7592 from atonaamz/nep-flare
…7594) ## Problem Before we migrate inline completion to LSP, we do not auto trigger when user delete code. ## Solution In the `provideInlineCompletion` callback that VS Code invokes, we check if this document has a very recent deletion event, if there is, do not make auto trigger. This is a best effort estimate of recent deletion because the `provideInlineCompletion` callback does not indicate the source input that triggered itself, we have to listen to document deletion events that almost happens at the same time. --- - 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 We only need to create the branch. The bumping of the version will be handled by the release pipeline scripts. See github scripts under: [github.com/aws/aws-toolkit-vscode/tree/master/buildspec/release](https://github.com/aws/aws-toolkit-vscode/tree/master/buildspec/release) - `10changeversion.yml`: Removes `-SNAPSHOT` from version and creates git release tag - `40pushtogithub.yml`: Bumps to next development version with `-SNAPSHOT` suffix and pushes to GitHub - `50githubrelease.yml`: Creates official GitHub release with `.vsix` files and SHA384 hashes ## Solution Remove the logic to bump the version --- - 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 inline completion in Jupyter Notebook is not working. https://github.com/aws/aws-toolkit-vscode/pull/7086/files is gone after inline completion migration to language server. ## Solution 1. Re-implement inline completion in Notebook 2. Re-organize the left and right context given precise cursor position in current cell. Requires aws/language-servers#2114 <img width="723" height="429" alt="Screenshot 2025-08-12 at 4 09 28 PM" src="https://github.com/user-attachments/assets/8335360b-7a83-431c-b967-0547cb60a48a" /> --- - 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 - remove unnecessary files from buildspec --- - 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.
… telemetry (#7893) ## Problem Language server is using `initializeParams.initializationOptions?.aws?.clientInfo?.version` https://github.com/aws/language-servers/blob/main/server/aws-lsp-codewhisperer/src/shared/telemetryUtils.ts#L99-L100 However current we're passing IDE version (vscode) and use the other field as plugin version which is not used by server. ``` clientInfo: { name: getClientName(), version: version, extension: { name: 'AmazonQ-For-VSCode', version: extensionVersion, ``` ## 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.
## Problem There is an issue we suspect is related to the recent support we added for proxy auto-discovery on this GitHub issue: #7878 ## Solution Disabling the experimental proxy support --- - 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.
Please enter the commit message for your changes. Lines starting
## Problem This merges the released changes for rc-20250815 into main. MCM-132479224 ## 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: Lei Gao <[email protected]> Co-authored-by: Na Yue <[email protected]> Co-authored-by: Will Lo <[email protected]> Co-authored-by: Aidan Ton <[email protected]> Co-authored-by: atontb <[email protected]>
## Problem When a connection to a remote space is severed, the extension will attempt to reconnect up to 60 times. Each reconnect attempt opens the Space Details page in a new browser tab. Opening up to 60 new tabs is a poor user experience. ## Solution We change the maximum number of retries to 8. --- - 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: Newton Der <[email protected]>
…atch (#7924) ## Problem Bug: When inline suggestion is active but user types a character that does not match the typeahead, this typing event triggered a inline completion API call that eventually did not manage to display suggestion on screen, which eventually reported as rejected completions. ## Solution Previously, before Flare migration, we had this design: https://github.com/aws/aws-toolkit-vscode/blob/amazonq/v1.74.0/packages/amazonq/src/app/inline/activation.ts#L108 Auto trigger will be disabled if at that moment the suggestion is visible. Under the previous design, the first character that does not match the typeahead will not make a new auto trigger, it simply rejects the current inline completion. This PR is to bring back the old design. It is not customer facing, hence no change log. --- - 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.
…ersion in telemetry (#7929) …" This reverts commit 8be30f1. ## Problem ## Solution should use this instead aws/language-servers#2142 --- - 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.
…ains only space char or empty line (#7922) ## Problem The suggestion indicates the empty line (L4) is edited and replaced with suggestion content however there is no diff highlight. Reason behind is because the function `diffWordsWithSpace` will not say the line is removed (since it's be edited). https://github.com/aws/aws-toolkit-vscode/blob/master/packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts#L437-L441 <img width="1299" height="1292" alt="image" src="https://github.com/user-attachments/assets/a2a07ba0-28fe-4f31-9b8a-37d5ef2ff223" /> ## Solution <img width="1299" height="1292" alt="image" src="https://github.com/user-attachments/assets/a8530917-ac06-4b9e-af39-ea037c38b340" /> --- - 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.
… support (#7923) ## Problem The proxy and certificate auto-discovery code occasionally causes issues and there is a need to allow control of this by users. ## Solution Add a checkbox in settings that allow customers to control whether they want Amazon Q's proxy and certificate auto-discovery turned on. ## Testing Experimental proxy util used once setting enabled: <img width="438" height="111" alt="Screenshot 2025-08-19 at 10 49 11 AM" src="https://github.com/user-attachments/assets/bafbc879-41db-4ad7-a164-bb8bb2655de0" /> Standard proxy util used once setting disabled: <img width="438" height="111" alt="Screenshot 2025-08-19 at 10 50 05 AM" src="https://github.com/user-attachments/assets/d38c4a25-ea9b-41be-8b04-25cbc13f49ec" /> --- - 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.
…mes (#7934) ## Problem - `npm link` is not working for some people when connecting local language-server-runtimes ## Solution - `npm pack` has been working better for people, hence updating documentation to include the `npm pack` approach --- - 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 New feature for mcp admin control needs changelog ## Solution - Added changelog --- - 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.
… and 3.73.0-SNAPSHOT (#7940) ## Notes: Updating snapshots and release summary: - 98d28d4 - 29e52ee --- - 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: aws-toolkit-automation <>
…t and for Remote MCP (#7954) ## Notes: - Adding change log to auto fetch models to Amazon Q chat and for Remote MCP --- - 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 previously a task "Remove `[Ln 34, Col 1]` from Code Issues panel from each issue`". Originally, this was meant to just mean remove `, Col 1`, but I interpreted it to mean remove the whole blob. ## Solution This change adds the line back, but without the `, Col 1` <img width="432" height="341" alt="image" src="https://github.com/user-attachments/assets/63ed938d-7f2d-4718-8ca4-ceb5b4e50a96" /> --- - 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: Blake Lazarine <[email protected]> Co-authored-by: Laxman Reddy <[email protected]>
…ests (#7956) ## Problem Keyboard shortcuts for fixCode and generateUnitTests functions are not working on Windows VSC, although they function correctly on Mac The current shortcuts conflict with Windows reserved keyboard combinations. Current Shortcuts (Windows): - fixCode: Windows + Alt + Y - generateUnitTests: Windows + Alt + T New Shortcuts (Windows only): - fixCode: Windows + Alt + H - generateUnitTests: Windows + Alt + N ## Solution This approach results in different letter keys for the same functions across platforms: - generateUnitTests: 'T' on Mac, 'N' on Windows - fixCode: 'Y' on Mac, 'H' on Windows --- - 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 ## 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 <[email protected]> Co-authored-by: invictus <[email protected]>
## Problem ## 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.
…sec when a completion arrives (#7950) ## Problem ## 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.
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):