diff --git a/packages/amazonq/src/lsp/chat/webviewProvider.ts b/packages/amazonq/src/lsp/chat/webviewProvider.ts index bb190b5eb67..70360b13e82 100644 --- a/packages/amazonq/src/lsp/chat/webviewProvider.ts +++ b/packages/amazonq/src/lsp/chat/webviewProvider.ts @@ -56,7 +56,7 @@ export class AmazonQChatViewProvider implements WebviewViewProvider { * it will 401 when trying to load */ const mynahUIPath = getAmazonQLspConfig().ui - if (process.env.WEBPACK_DEVELOPER_SERVER && mynahUIPath) { + if (mynahUIPath) { const dir = path.dirname(mynahUIPath) resourcesRoots.push(Uri.file(dir)) } diff --git a/packages/amazonq/src/lsp/config.ts b/packages/amazonq/src/lsp/config.ts index 1760fb51401..5e81f977591 100644 --- a/packages/amazonq/src/lsp/config.ts +++ b/packages/amazonq/src/lsp/config.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ import * as vscode from 'vscode' -import { DevSettings, getServiceEnvVarConfig } from 'aws-core-vscode/shared' +import { DevSettings, getServiceEnvVarConfig, resolvePath } from 'aws-core-vscode/shared' import { LspConfig } from 'aws-core-vscode/amazonq' import { LanguageClient } from 'vscode-languageclient' import { @@ -36,12 +36,14 @@ export function isValidConfigSection(section: unknown): section is ConfigSection } export const defaultAmazonQLspConfig: ExtendedAmazonQLSPConfig = { - manifestUrl: 'https://aws-toolkit-language-servers.amazonaws.com/qAgenticChatServer/0/manifest.json', - supportedVersions: '1.*.*', + manifestUrl: 'https://d3akiidp1wvqyg.cloudfront.net/qAgenticChatServer/0/manifest.json', // TODO swap this back + supportedVersions: '*', // TODO swap this back id: 'AmazonQ', // used across IDEs for identifying global storage/local disk locations. Do not change. suppressPromptPrefix: 'amazonQ', - path: undefined, - ui: undefined, + path: resolvePath('~/aws-lsp-codewhisperer.js'), // '/Volumes/workplace/aws-language-servers/app/aws-lsp-codewhisperer-runtimes/out/agent-standalone.js' + ui: resolvePath('~/amazonq-ui.js'), // '/Volumes/workplace/aws-language-servers/chat-client/build/amazonq-ui.js' + // path: resolvePath('~/app/aws-lsp-codewhisperer-runtimes/out/agent-standalone.js'), // '/Volumes/workplace/aws-language-servers/app/aws-lsp-codewhisperer-runtimes/out/agent-standalone.js' + // ui: resolvePath('~/chat-client/build/amazonq-ui.js'), // '/Volumes/workplace/aws-language-servers/chat-client/build/amazonq-ui.js' } export function getAmazonQLspConfig(): ExtendedAmazonQLSPConfig {