Skip to content

Merge master into feature/flare-iam #7432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 40 commits into from
Jun 16, 2025

Conversation

aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

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):

git stash
git fetch --all
git checkout origin/feature/flare-iam
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/flare-iam

justinmk3 and others added 16 commits May 29, 2025 17:29
## 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.
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.
## 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>
@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners June 6, 2025 18:45
Copy link

github-actions bot commented Jun 6, 2025

  • This pull request modifies code in src/* but no tests were added/updated.
    • Confirm whether tests should be added or ensure the PR description explains why tests are not required.

leigaol and others added 11 commits June 6, 2025 13:47
## 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
UX/product decision: aws account-id will be collected by the aws console
instead of the client (IDE extension).
## Problem
- we are missing the `mcp: true` flag

## Solution
- add `mcp: true` flag to enable mcp server 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.
)

## Problem
MCP Servers feature is broken in alpha manifest and is causing
regression to chat.

## Solution
- reverting the feature flag to enable 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.
feat(amazonq): enable agentic workflow
Problem:
"Manage Subscription" menu item shows for IdC users, but the Q service
call does not currently support IdC users.

Solution:
Only show the menu item for BuilderId users.
aws-toolkit-automation and others added 13 commits June 11, 2025 17:51
## Problem
- we are missing `mcp: true` flag

## Solution
- add back `mcp: true` flag to enable mcp server 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.
## Problem
String comparison says "1.11.0" < "1.9.0". We should compare numbers.

## 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.
#7487)

## Problem
- Start seeing "unable to get local issuer certificate" since 1.72,
affecting server-side workspace context in Flare

## Solution
- Removing  openSSL and the Experiment flag set to true works fine.
- This should fix the current regression.

---

- 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

Some plan statistics, such as files to be changed, incorrectly show as 0
currently.


## Solution

To avoid confusion, only show users the # of lines of code statistic,
which works fine.

---

- 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>
@liramon1 liramon1 merged commit 2f55375 into feature/flare-iam Jun 16, 2025
33 of 37 checks passed
@liramon1 liramon1 deleted the autoMerge/feature/flare-iam branch June 16, 2025 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.