feat(amazonq): Bundle LSP with the extension as fallback. #7421

leigaol · 2025-06-03T22:06:05Z

Problem

The LSP start failure because

node binary is blocked because of firewall
chat UI js file is blocked because of firewall or anti virus
lsp js file is broken post download because of security mechanism

Solution

Bundle the JS LSP with the amazonq package.
Re-start LSP wth the bundled JS files if and only if downloaded LSP does not work!
Use the VS Code vended node to start the bundled LSP.

This was tested by

Generated the vsix, which is now 20MB.
Disconnect from internet, remove local LSP caches
Install the new vsix
Webview of chat should load.

also tested by manually corrupting the aws-lsp-codewhisperer.js

Limitations:

The indexing library function will not work because it is missing.
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.
License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

github-actions · 2025-06-03T22:06:17Z

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.

packages/amazonq/src/lsp/lspInstaller.ts

scripts/lspArtifact.ts

…uild_script

scripts/lspArtifact.ts

packages/amazonq/src/lsp/activation.ts

justinmk3 · 2025-06-06T16:16:37Z

packages/amazonq/src/lsp/activation.ts

+        try {
+            await lspSetupStage('all', async () => {
+                await lspSetupStage('launch', async () => await startLanguageServer(ctx, getBundledResourcePaths(ctx)))
+            })
+        } catch (error) {


the fallback logic should live in the resolver, just like all the other fallback cases. it doesn't make sense to add a fallback at this level.

this fallback is no different than the other fallback cases in the resolver. it's just yet another fallback scenario.

No. In the case of a firewall/anti virus, the resolver believes it successfully finished downloading and it then proceed to start the language server with the download path, but at that moment anti virus kicked in and broke it.

This outmost try catch can handle such cases.

the resolver believes it successfully finished downloading and it then proceed to start the language server with the download path

isn't that a bug in the resolver that should be fixed / redesigned ?

packages/amazonq/src/lsp/chat/webviewProvider.ts

justinmk3 · 2025-06-06T16:18:45Z

packages/amazonq/src/lsp/chat/webviewProvider.ts

+        let resourcesRoots = [lspDir, dist]
+        if (this.mynahUIPath?.startsWith(globals.context.extensionUri.fsPath)) {
+            getLogger('amazonqLsp').info(`Using bundled webview resources ${bundledResources.fsPath}`)


why is this decision being made here instead of in LanguageServerResolver

Same reason as I mentioned above. When it failed to launch, there are cases when the anti virus modified/removed the downloaded artifacts later on. The LanguageServerResolver does not throw, it indeed successfully unzipped those artifacts.

If LanguageServerResolver does not throw, I will not be able to resolve to bundled artifact

When it failed to launch, there are cases when the anti virus modified/removed the downloaded artifacts later on. The LanguageServerResolver does not throw, it indeed successfully unzipped those artifacts.

Can it do a step that verifies the contents after unzipping? I.e. whatever causes the AV to quarantine the artifacts, the resolver should do itself before continuing.

scripts/package.ts

Co-authored-by: Justin M. Keyes <[email protected]>

justinmk3 · 2025-06-09T23:33:16Z

scripts/lspArtifact.ts

+    await ensureDirectoryExists(resourcesDir)
+
+    return new Promise((resolve, reject) => {
+        const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/qAgenticChatServer/0/manifest.json'


@leigaol Future note: this could be a source of confusion for cases like 756c286 when an alpha manifest is used. Unless this location is also updated.

leigaol added 3 commits June 3, 2025 09:30

build script

588bfec

improve build script

1cdcf1e

bundled LSP

048195b

leigaol requested a review from a team as a code owner June 3, 2025 22:06

leigaol marked this pull request as draft June 3, 2025 22:06

fix ci

632953c

leigaol requested review from andrewyuq and rli June 3, 2025 22:48

rli reviewed Jun 3, 2025

View reviewed changes

packages/amazonq/src/lsp/lspInstaller.ts Show resolved Hide resolved

andrewyuq reviewed Jun 3, 2025

View reviewed changes

scripts/lspArtifact.ts Show resolved Hide resolved

leigaol added 5 commits June 3, 2025 16:47

assume rg is there

d2bcaa4

separate resource path

51aec30

disable rg

4931885

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

7a06a07

…uild_script

change log

9b077d9

leigaol marked this pull request as ready for review June 5, 2025 19:44

rli approved these changes Jun 5, 2025

View reviewed changes

scripts/lspArtifact.ts Show resolved Hide resolved

andrewyuq approved these changes Jun 5, 2025

View reviewed changes

justinmk3 reviewed Jun 6, 2025

View reviewed changes

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

justinmk3 reviewed Jun 6, 2025

View reviewed changes

packages/amazonq/src/lsp/chat/webviewProvider.ts Outdated Show resolved Hide resolved

justinmk3 reviewed Jun 6, 2025

View reviewed changes

scripts/package.ts Show resolved Hide resolved

leigaol and others added 3 commits June 6, 2025 09:39

Update packages/amazonq/src/lsp/chat/webviewProvider.ts

ce41a61

Co-authored-by: Justin M. Keyes <[email protected]>

Update packages/amazonq/src/lsp/activation.ts

5182ba6

Co-authored-by: Justin M. Keyes <[email protected]>

assert more file exists

5927053

leigaol merged commit 62d50d9 into aws:master Jun 6, 2025
30 of 31 checks passed

justinmk3 reviewed Jun 9, 2025

View reviewed changes

feat(amazonq): Bundle LSP with the extension as fallback. #7421

feat(amazonq): Bundle LSP with the extension as fallback. #7421

Uh oh!

Conversation

leigaol commented Jun 3, 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 Jun 3, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

justinmk3 Jun 6, 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!

leigaol Jun 6, 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 Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

justinmk3 Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

leigaol Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

leigaol Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

justinmk3 Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

justinmk3 Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

leigaol commented Jun 3, 2025 •

edited

Loading

justinmk3 Jun 6, 2025 •

edited

Loading

leigaol Jun 6, 2025 •

edited

Loading