feat(amazonq): remote workspace context #6894

leigaol · 2025-03-31T19:03:38Z

Problem

We did not utilize server side compute to help improve the quality of inline completion, chat, etc.

Solution

Add server side project context 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.
License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

force use lsp add env launch.json add listeners uri to string uri converter

github-actions · 2025-03-31T19:03:54Z

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.

packages/core/package.nls.json

justinmk3 · 2025-03-31T19:46:23Z

packages/core/src/codewhisperer/util/editorContext.ts

+async function getWorkspaceId(editor: vscode.TextEditor): Promise<string | undefined> {
+    try {
+        const workspaceIds: { workspaces: { workspaceRoot: string; workspaceId: string }[] } =
+            await vscode.commands.executeCommand('aws.amazonq.getWorkspaceId')


Why is this a command instead of a plain function?

To avoid cyclic dependency. The Flare LSP code was in the packages/amazonq which imports packages/core, but the CW code here is in packages/core.

What happens if the command isn't defined? Sometimes there are startup ordering issues which result in "command not found" errors. Using a plain function would avoid that and add confidence.

There are more robust ways of avoiding cyclic dependencies. Commands should be a last resort.

packages/core/src/codewhisperer/util/editorContext.ts

packages/amazonq/src/lsp/client.ts

1. Add the settings of workspace context. (String of the settings to be adjusted based on product spec) 2. Let inline completion use workspaceId. Before launch date, future workspace context PRs will target branch feature/q-lsp directly. VSC ref: aws/aws-toolkit-vscode#6894

…spc_pr

justinmk3 · 2025-04-15T19:11:01Z

packages/amazonq/src/lsp/config.ts

+    manifestUrl: 'https://aws-toolkit-language-servers.amazonaws.com/remoteWorkspaceContext/0/manifest.json',
+    supportedVersions: '^1.0.0',


is this the final URL or will /codewhisperer/ gain the features from the temporary /remoteWorkspaceContext/ artifact (then this version would be 3.x) ?

This is final, to my knowledge.

For now this is the final URL but I imagine we will need to change the URL in the near future because new artifacts are also being built

the name is pretty confusing. this defaultAmazonQLspConfig LSP bundle will be used for all Q features, not only "workspace indexing", right?

will this URL also have the upcoming "agentic chat" capabilities?

…spc_pr

github-actions · 2025-04-17T16:36:51Z

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.
This pull request implements a feat or fix, so it must include a changelog entry (unless the fix is for an unreleased feature). Review the changelog guidelines.
- Note: beta or "experiment" features that have active users should announce fixes in the changelog.
- If this is not a feature or fix, use an appropriate type from the title guidelines. For example, telemetry-only changes should use the telemetry type.

justinmk3 · 2025-04-17T19:37:41Z

packages/amazonq/src/lsp/client.ts

+                client.sendNotification('workspace/didCreateFiles', {
+                    files: e.files.map((it) => {
+                        return { uri: it.fsPath }


Does this event trigger for in-memory (non-file) editors? If so, should those be skipped, since the LSP can't do anything with them unless we send the file contents?

justinmk3 · 2025-04-17T19:41:30Z

packages/amazonq/src/lsp/client.ts

+                client.info(
+                    `Client: Updated Amazon Q Profile ${AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn} to Amazon Q LSP`,
+                    result
+                )
+            } catch (err) {
+                client.error('Error when setting Q Developer Profile to Amazon Q LSP', err)


non-blocker/future reference: these should probably be logged in logger, not client

jpinkney-aws

Merging to prepare mainline for ssc

## Problem We did not utilize server side compute to help improve the quality of inline completion, chat, etc. ## Solution 1. Add server side project context 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.

leigaol added 16 commits March 21, 2025 10:49

add settings for workspace context feature

14f2659

force use lsp add env launch.json add listeners uri to string uri converter

rc5

9df0b01

aggressive sync cred

ce37759

merge

f767505

rc8

86df670

merge

00bf62c

Merge branch 'master' of github.com:leigaol/aws-toolkit-vscode into sspc

37aeb2b

get ws id from flare

12d7169

Merge branch 'master' of github.com:leigaol/aws-toolkit-vscode into sspc

cb16c75

rc 22

b16e0d2

merge

724308e

pr

81597ea

format

9ad7a12

d

1a2f2f5

update

f71e05b

add message

5d4b6d9

leigaol requested review from a team as code owners March 31, 2025 19:03

leigaol marked this pull request as draft March 31, 2025 19:03

leigaol mentioned this pull request Mar 31, 2025

feat(amazonq): workspace context settings & workspaceId aws/aws-toolkit-jetbrains#5526

Merged

6 tasks

justinmk3 reviewed Mar 31, 2025

View reviewed changes

packages/core/package.nls.json Outdated Show resolved Hide resolved

justinmk3 reviewed Mar 31, 2025

View reviewed changes

packages/core/src/codewhisperer/util/editorContext.ts Outdated Show resolved Hide resolved

justinmk3 reviewed Mar 31, 2025

View reviewed changes

packages/amazonq/src/lsp/client.ts Outdated Show resolved Hide resolved

leigaol added 5 commits April 1, 2025 11:26

merge

f9433f6

merge

836ac80

update

6704a46

update imports:

74629c8

minimize changes

f293cac

leigaol added 2 commits April 1, 2025 11:39

minimize changes

e596890

update

8194371

leigaol added 5 commits April 3, 2025 11:57

merge

27cf915

remove settings

847cbff

Merge branch 'master' of github.com:leigaol/aws-toolkit-vscode into s…

9387633

…spc_pr

endpoint

97447cd

ws

3109971

justinmk3 reviewed Apr 15, 2025

View reviewed changes

justinmk3 mentioned this pull request Apr 15, 2025

Sspc leigaol/aws-toolkit-vscode#26

Open

leigaol added 5 commits April 16, 2025 18:05

default start for internal

ea8582b

merge

c6269e7

add profile update

30a9bfb

Merge branch 'master' of github.com:leigaol/aws-toolkit-vscode into s…

7c31f3a

…spc_pr

update profile and init profile

32009cd

leigaol marked this pull request as ready for review April 17, 2025 16:24

leigaol changed the title ~~WIP: feat(amazonq): workspace context~~ feat(amazonq): remote workspace context Apr 17, 2025

profile support

3a71511

update log

ddb9734

justinmk3 reviewed Apr 17, 2025

View reviewed changes

jpinkney-aws approved these changes Apr 17, 2025

View reviewed changes

jpinkney-aws merged commit b4de24f into aws:master Apr 17, 2025
30 of 31 checks passed

LiGaCu mentioned this pull request May 21, 2025

feat(amazonq): integrate server side workspace context with inline completion aws/language-servers#1402

Merged

		manifestUrl: 'https://aws-toolkit-language-servers.amazonaws.com/remoteWorkspaceContext/0/manifest.json',
		supportedVersions: '^1.0.0',

feat(amazonq): remote workspace context #6894

feat(amazonq): remote workspace context #6894

Uh oh!

Conversation

leigaol commented Mar 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Solution

Uh oh!

github-actions bot commented Mar 31, 2025

Uh oh!

Uh oh!

justinmk3 Mar 31, 2025

Choose a reason for hiding this comment

Uh oh!

leigaol Apr 1, 2025

Choose a reason for hiding this comment

Uh oh!

justinmk3 Apr 15, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

justinmk3 Apr 15, 2025

Choose a reason for hiding this comment

Uh oh!

leigaol Apr 15, 2025

Choose a reason for hiding this comment

Uh oh!

ege0zcan Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

justinmk3 Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Apr 17, 2025

Uh oh!

justinmk3 Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

justinmk3 Apr 17, 2025

Choose a reason for hiding this comment

Uh oh!

jpinkney-aws left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

leigaol commented Mar 31, 2025 •

edited

Loading

ege0zcan Apr 16, 2025 •

edited

Loading

justinmk3 Apr 16, 2025 •

edited

Loading