Skip to content

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-mega
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/flare-mega

## 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.
@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners May 30, 2025 00:40
@github-actions
Copy link

  • 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.

justinmk3 and others added 20 commits May 30, 2025 14:29
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 <[email protected]>
## 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 <[email protected]>
fix(amazonq): Add proxy configuration support with SSL Cert Validation
@opieter-aws
Copy link
Contributor

[Linux Unit Tests - minimum] failing because of:

this.session.getConnectionState is not a function: TypeError: this.session.getConnectionState is not a function
    at AuthUtil.getAuthState (/codebuild/output/src1943696235/src/github.com/aws/aws-toolkit-vscode/packages/core/src/codewhisperer/util/authUtil.ts:173:29)
    at AuthUtil.setVscodeContextProps (/codebuild/output/src1943696235/src/github.com/aws/aws-toolkit-vscode/packages/core/src/codewhisperer/util/authUtil.ts:200:53)
    at s.value (/codebuild/output/src1943696235/src/github.com/aws/aws-toolkit-vscode/packages/core/src/codewhisperer/util/authUtil.ts:93:24)
    at c.z (/tmp/.vscode-test/vscode-linux-x64-1.83.0/resources/app/out/vs/workbench/api/node/extensionHostProcess.js:80:1902)
    at c.fire (/tmp/.vscode-test/vscode-linux-x64-1.83.0/resources/app/out/vs/workbench/api/node/extensionHostProcess.js:80:2119)
    at RegionProfileManager._switchRegionProfile (/codebuild/output/src1943696235/src/github.com/aws/aws-toolkit-vscode/packages/core/src/codewhisperer/region/regionProfileManager.ts:264:40)
    at GlobalStatePoller.changeHandler (/codebuild/output/src1943696235/src/github.com/aws/aws-toolkit-vscode/packages/core/src/codewhisperer/region/regionProfileManager.ts:92:23)
    at Timeout._onTimeout (/codebuild/output/src1943696235/src/github.com/aws/aws-toolkit-vscode/packages/core/src/shared/globalState.ts:371:22)
    at listOnTimeout (node:internal/timers:569:17)
    at processTimers (node:internal/timers:512:7)

This looks to be a race condition due to a global poller set up here. Shouldn't affect prod behaviour.

@opieter-aws opieter-aws merged commit ad93067 into feature/flare-mega Jun 9, 2025
27 of 31 checks passed
@opieter-aws opieter-aws deleted the autoMerge/feature/flare-mega branch June 9, 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.

9 participants