fix(amazonq): read amazonq-ui.js from servers.zip instead of clients.zip #7982
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
⏳ I'm reviewing this pull request for security vulnerabilities and code quality issues. I'll provide an update when I'm done |
|
|
✅ I finished the code review, and didn't find any security or code quality issues. |
leigaol
reviewed
Sep 4, 2025
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| import * as nodeFs from 'fs' |
Contributor
There was a problem hiding this comment.
what is the reason of using nodeFs
Contributor
Author
There was a problem hiding this comment.
The fs wrapper in the toolkit doesn't have existsSync, but Node.js's native fs module does
leigaol
reviewed
Sep 4, 2025
| if (!fs.existsSync(path.join(resourcesDir, 'servers', 'aws-lsp-codewhisperer.js'))) { | ||
| throw new Error(`Extracting aws-lsp-codewhisperer.js failure`) | ||
| } | ||
| if (!fs.existsSync(path.join(resourcesDir, 'clients', 'amazonq-ui.js'))) { |
Contributor
There was a problem hiding this comment.
You need to make it compatible with https://github.com/aws/aws-toolkit-vscode/pull/7421/files. Please check function export function getBundledResourcePaths(ctx: vscode.ExtensionContext): AmazonQResourcePaths {
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
Related PR:
As part of changes made to move
amazonq-ui.jsfromclients.ziptoservers.zip, we now need to load the LSP UI from the correct locations.Solution
lspArtifact.ts- Added backwards compatibility check foramazonq-ui.jsin both locationslspInstaller.ts- Added backwards compatibility logic to check both clients/ and servers/ directoriestypes.ts- Updated comments to show both possible locationsbaseLspInstaller.ts- Updated comments to reflect the changeThe changes maintain backwards compatibility.
Testing
Tested using local build on Mac and Windows with the old and new
.zipsetup and plugin works without issuefeature/xbranches will not be squash-merged at release time.