feat(amazonq): configuration support for vscode #882

zixlin7 · 2025-03-26T23:16:49Z

Problem

merging main branch changes into the feature branch, the only new commit is: a1d43e4 and 08426ad

VS Code currently use a different section for configurations
the client name in ideCategory matching logic doesn't match the actual VS Code client name
Import currently doesn't take into consideration user settings

Solution

update the logic to accommodate VSC configurations in language server
fix the client name for VS Code
respect user's import settings

License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Bumps [@types/vscode](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/vscode) from 1.97.0 to 1.98.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/vscode) --- updated-dependencies: - dependency-name: "@types/vscode" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ventional to 19.8.0 (aws#830) Co-authored-by: Paras <[email protected]>

… hit (aws#832)

…#833) * feat: add IAM webworker bundling in codewhisperer-runtimes --------- Co-authored-by: Francesco Piccoli <[email protected]>

Follow up PRs will enable it for use in the identity server. Flow: - Shows a user code ack to client - can be cancelled - Then opens the url and a progress bar on the client with the user code as a message on it - Periodically polls for the user to complete login or the client to cancel the auth flow Misc: - modify eslint rule to support a common idiom - move util function to lsp core (it was unused where it was)

…re (aws#834) ## Problem - Common utils that will be used by other amazon q agents + potentially other lsps are buried in the codewhisperer package ## Solution - pull out those utils into lsp-core - add resolve fallbacks for stream, crypto and set vm, fs to be false so that the codewhisperer web runtime could be built when using `@aws/lsp-core` - See [vscode toolkit webpack](https://github.com/aws/aws-toolkit-vscode/blob/master/packages/webpack.web.config.js#L56)

…les (aws#839)

…request

- Add device code as selectable auth flow - Refactor PKCE flow to use params structure - Add IdentityServer to cw lsp activation and update version - Add example message handlers in the sample vscode app

* chore(release): release packages from branch main * fix: add missing dependency version updates * fix: update package-lock.json * fix: update test workflow with all released packages * chore: update runtimes dependency --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Natalia Durlik <[email protected]>

…pport for Q Developer profiles (aws#814) * Added support for Amazon Q Developer Profile API * Added CodeWhisperer Service connection manager * Added AmazonQTokenServiceManager to provide centralized access to regionalized CodeWhisperer Service client object, based on current SSO connection type and Developer profile selection. * Added support for configuration option in LSP InitializeParams to toggle Q Developer Profiles support logic for backwards compatibility * Integrate AmazonQTokenServiceManager with CodeWhisperer InlineCompletions handler

…nvoked (aws#848) * feat(amazonq): listed on amazon.q configuration pushed from client and support Q Profiles feature * feat(amazonq): extend global SDK service lifecycle management and handle profile changes * feat: throw LSP response errors from Codewhisperer server instead of return * feat: added base class for AmazonQService manager * feat: complete login and profile state transitions * feat: handle LSP configuration changes in QServiceManager * feat(amazonq): put IDC profiles behing feature flag * chore(amazonq): maintain formatting in codeWhispererServer * feat: allow to set userAgent of QService manager * chore: docs and styling * chore: docs and removed unused errors * feat(amazonq): adding tests for AmazonQTokenServiceManager * feat(amazonq): clean up state handling * test(amazonq): update unit test * docs(amazonq): docs for AmazonQTokenServiceManager * feat(amazonq): added more logs and use shared listProfiles handler * chore: delete empty file * feat(amazonq): fix usage of AmazonQTokenServiceManager configurations handler * fix(amazonq): fix default profile selection * feat: abort all inflight requests when resetCodewhispererService is invoked * fix(amazonq): update initialization flow for AmazonQTokenServiceManager * fix(amazonq): block Q service usage when PENDING_Q_PROFILE_UPDATE * feat: refactoring of types and removing the error event handler to track complete request --------- Co-authored-by: Viktor Shcherba <[email protected]> Co-authored-by: Paras <[email protected]>

…of bearer token signout (aws#842) * feat(amazonq): listed on amazon.q configuration pushed from client and support Q Profiles feature * feat(amazonq): extend global SDK service lifecycle management and handle profile changes * feat: throw LSP response errors from Codewhisperer server instead of return * feat: added base class for AmazonQService manager * feat: complete login and profile state transitions * feat: handle LSP configuration changes in QServiceManager * feat(amazonq): put IDC profiles behing feature flag * chore(amazonq): maintain formatting in codeWhispererServer * feat: allow to set userAgent of QService manager * chore: docs and styling * chore: docs and removed unused errors * feat(amazonq): adding tests for AmazonQTokenServiceManager * feat(amazonq): clean up state handling * test(amazonq): update unit test * docs(amazonq): docs for AmazonQTokenServiceManager * feat(amazonq): added more logs and use shared listProfiles handler * chore: delete empty file * feat(amazonq): fix usage of AmazonQTokenServiceManager configurations handler * chore: added auth listener to reset the service manager state in case of bearer token signout * chore: update to attach a handler with credentialsProvider * refactor: remove unused execute command capability: bearerCredentialsDeleteCommand * chore: remove unused import * chore: update to use new credentials handler * chore: reset the state to pending connection * fix(amazonq): fix default profile selection * chore: fix failing tests * fix(amazonq): update initialization flow for AmazonQTokenServiceManager * fix(amazonq): block Q service usage when PENDING_Q_PROFILE_UPDATE * feat: update the version of runtimes to be able to use credential deletion event handler * feat: add unit tests and call to reserCodeWhispererService --------- Co-authored-by: Viktor Shcherba <[email protected]> Co-authored-by: Paras <[email protected]>

…ws#852)

…ws#853) Update AmazonQTokenServiceManager to expose factory to create CodeWhisperer Streaming client. Use streaming client factory from manager in Q Chat Server.

…ws#859) * feat(amazonq): add regionalization support to security scan server * refactor(amazonq): improve region discovery logging

* feat: cancel inflight update profile requests * feat: added respective test case for cancelling inflight update request * feat: refactor the changes to restore the old state for cancellation --------- Co-authored-by: Paras <[email protected]>

Emit expired errors instead of returning undefined so that the client can more easily understand what is going on.

…scans (aws#858) ## Problem Q developer scans were failing to execute due to a couple of issues. This change adds fixes to address them. ## Solution Changes included: * Scans were timing out due to a lower timeout limit. It has now been updated to 15mins matching other IDE's timeout limits for project scans. * Missing parameters specifying the scope of the scan has now been added to the `UploadToS3` call and the `CreateScanJob` call of the scan process. At this time only `PROJECT` scope is supported. Support for file auto scans is out of scope. * A bug related to the presence of kms key in the upload call has been fixed. * The null and undefined check for kmsKey always returned a true, that has now been fixed as an AND conditional check * The `CreateUploadUrlResponse` 's requestHeaders is defaulted first to pick the request Headers.

…older

server/aws-lsp-codewhisperer/src/language-server/codeWhispererServer.ts

…r factory

jpinkney-aws · 2025-04-01T12:03:54Z

@zixlin7 is there any specific files you've changed that we need to take a look at for the merge?

zixlin7 · 2025-04-01T17:30:07Z

I think just reviewing the new commits should be sufficient for now. In case of unexpected merge error, there probably would be test failure and we should be able to catch it when we merge this feature branch back to main.

@zixlin7 is there any specific files you've changed that we need to take a look at for the merge?

viktorsaws · 2025-04-03T11:20:09Z

It would be much easier to review, If actual functional changes would be in separate PR from rebases.

viktorsaws · 2025-04-03T11:33:18Z

...ws-lsp-codewhisperer/src/language-server/amazonQServiceManager/AmazonQTokenServiceManager.ts

+
+    public async handleDidChangeConfiguration(ideCategory?: string, params?: DidChangeConfigurationParams) {
+        try {
+            if (ideCategory === 'VSCODE') {


I'd prefer not to add custom client-specific handling to Language Server, and delegate it to client to respond with expected configuration and read from client-specific configuration store. Adding more modes make it harder to test and manage language server logic.

VsCode extension could register custom handler on ConfigurationRequest method on LanguageClient and respond with what server expects following existing API.

client.onRequest(ConfigurationRequest.method, (section) => { // Get configuration from VSCode and return })

viktorsaws · 2025-04-03T11:35:52Z

server/aws-lsp-codewhisperer/src/language-server/utilities/telemetryUtils.ts

@@ -47,7 +47,7 @@ export const getUserAgent = (initializeParams: InitializeParams, serverInfo?: Se
 }

 const IDE_CATEGORY_MAP: { [key: string]: IdeCategory } = {
-    'AmazonQ-For-VSCode': 'VSCODE',
+    'AWS IDE Extensions for VSCode': 'VSCODE',


This value should not be changed, because this format was specifically requested. Was there a change in the requirements from BI?

Could you help me understand how does this affect BI if we are just mapping client name to 'VSCODE'? I don't see a reverse mapping where we send AmazonQ-For-VSCode to telemetry.
I can instead change the VS Code extension name to match this one.

zixlin7 · 2025-04-03T16:45:10Z

It would be much easier to review, If actual functional changes would be in separate PR from rebases.

Is there any reason that we cannot have auto merge to feature branches, similar to all toolkits repos? I think it adds unnecessary work to create manual merge PRs just to rebase on top of feature changes. Or are feature flags preferred?

dependabot bot and others added 30 commits March 13, 2025 00:38

chore: update the version of commitlint/cli and commitlint/config-con…

55253ea

…ventional to 19.8.0 (aws#830) Co-authored-by: Paras <[email protected]>

feat(chat-client): openTab returns error for tab create if tabs limit…

aa85848

… hit (aws#832)

feat(aws-lsp-codewhisperer-runtimes): add webworker iam bundling (aws…

4af1c35

…#833) * feat: add IAM webworker bundling in codewhisperer-runtimes --------- Co-authored-by: Francesco Piccoli <[email protected]>

feat(amazonq): add support for listing available q developer profiles

40ee2ff

feat(amazonq): handle client signalling support for q developer profi…

8b1b4ad

…les (aws#839)

docs: improve readme aws#824

f045079

docs(amazonq): add docs to README for aws/getConfigurationFromServer …

7ceb8bf

…request

fix: bump mynah-ui version (aws#843)

4b4de1e

feat(identity): enable device code (aws#840)

c048158

- Add device code as selectable auth flow - Refactor PKCE flow to use params structure - Add IdentityServer to cw lsp activation and update version - Add example message handlers in the sample vscode app

feat(amazonq): integrate q service manager with configuration server (a…

c0e3290

…ws#852)

fix: disable slack notifications for PRs from forks (aws#846)

7d257d8

feat(amazonq): intergrate regionalization support into Q Chat server (a…

394104c

…ws#853) Update AmazonQTokenServiceManager to expose factory to create CodeWhisperer Streaming client. Use streaming client factory from manager in Q Chat Server.

feat(amazonq): add regionalization support to Telemetry service

6937c7f

feat(amazonq): attach profileArn to API calls when available

00fe7e2

feat(amazonq): add regionalization support to security scan server (a…

9945398

…ws#859) * feat(amazonq): add regionalization support to security scan server * refactor(amazonq): improve region discovery logging

chore: language server runtimes version bump

629bc04

fix(amazonq): await for recordMetric in CodeDiff tracker

ee04afc

fix(amazonq): handle exceptions in TelemetryService

e8f6375

feat(identity): refreshingSsoCache expiration errors (aws#845)

6ded523

Emit expired errors instead of returning undefined so that the client can more easily understand what is going on.

feat(amazonq): add support for setting profile to null

b02906d

feat(amazonq): add eu-central-1 endpoint

83133d6

chore(amazonq): merge main

c8ea116

zixlin7 marked this pull request as ready for review March 26, 2025 23:23

zixlin7 requested a review from a team as a code owner March 26, 2025 23:23

zixlin7 mentioned this pull request Mar 26, 2025

feat(amazonq): support customization through language server aws/aws-toolkit-vscode#6865

Open

Kamiel Wanrooij added 2 commits March 27, 2025 14:33

feat: create copy of chat server and controller to use in agentic chat

035b30e

feat: copied test files and added README to clarify purpose of this f…

6a18e55

…older

viktorsaws reviewed Mar 27, 2025

View reviewed changes

server/aws-lsp-codewhisperer/src/language-server/codeWhispererServer.ts Outdated Show resolved Hide resolved

viktorsaws and others added 3 commits March 27, 2025 17:00

fix(amazonq): select corrert Service manager mode in completion serve…

8041934

…r factory

ci: move release-please last release pointer commit

a81943d

chore(release): release packages from branch main

b885869

zixlin7 marked this pull request as draft March 28, 2025 17:08

zixlin7 added 2 commits March 28, 2025 10:10

feat(amazonq): support configuration for VS Code

a1d43e4

Merge branch 'main' into mergeMain-new

6da36fc

zixlin7 force-pushed the configuration branch from 6ca0199 to 6da36fc Compare March 28, 2025 17:14

fix(amazonq): cleanup

25e351b

zixlin7 force-pushed the configuration branch from e4c1682 to 25e351b Compare March 28, 2025 18:07

zixlin7 marked this pull request as ready for review March 28, 2025 18:13

zixlin7 requested review from jpinkney-aws and viktorsaws March 28, 2025 18:13

zixlin7 added 2 commits March 31, 2025 16:15

Merge branch 'feature/qflare' into configuration

ee842c8

feat(amazonq): support import adder setting

08426ad

fix(amazonq): fix for tests

03bd051

jpinkney-aws approved these changes Apr 1, 2025

View reviewed changes

viktorsaws requested changes Apr 3, 2025

View reviewed changes

viktorsaws reviewed Apr 3, 2025

View reviewed changes

zixlin7 marked this pull request as draft April 4, 2025 02:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(amazonq): configuration support for vscode #882

feat(amazonq): configuration support for vscode #882

zixlin7 commented Mar 26, 2025 •

edited

Loading

jpinkney-aws commented Apr 1, 2025

zixlin7 commented Apr 1, 2025

viktorsaws commented Apr 3, 2025

viktorsaws Apr 3, 2025

viktorsaws Apr 3, 2025

zixlin7 Apr 3, 2025

zixlin7 commented Apr 3, 2025 •

edited

Loading

feat(amazonq): configuration support for vscode #882

Are you sure you want to change the base?

feat(amazonq): configuration support for vscode #882

Conversation

zixlin7 commented Mar 26, 2025 • edited Loading

Problem

Solution

License

jpinkney-aws commented Apr 1, 2025

zixlin7 commented Apr 1, 2025

viktorsaws commented Apr 3, 2025

viktorsaws Apr 3, 2025

Choose a reason for hiding this comment

viktorsaws Apr 3, 2025

Choose a reason for hiding this comment

zixlin7 Apr 3, 2025

Choose a reason for hiding this comment

zixlin7 commented Apr 3, 2025 • edited Loading

zixlin7 commented Mar 26, 2025 •

edited

Loading

zixlin7 commented Apr 3, 2025 •

edited

Loading