test

Author: Randall-Jiang

aws-toolkit-vscode.code-workspace

@@ -12,6 +12,9 @@
         {
             "path": "packages/amazonq",
         },
+        {
+            "path": "../language-servers",
+        },
     ],
     "settings": {
         "typescript.tsdk": "node_modules/typescript/lib",

packages/.vscodeignore.packages

@@ -20,6 +20,8 @@
 !package.json
 !package.nls.json
 !package.nls.*.json
+!**/*/clients.zip
+!**/*/servers.zip
 
 !quickStart**
 !README.**

packages/amazonq/.vscode/launch.json

@@ -13,10 +13,10 @@
             "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
             "env": {
                 "SSMDOCUMENT_LANGUAGESERVER_PORT": "6010",
-                "WEBPACK_DEVELOPER_SERVER": "http://localhost:8080"
+                "WEBPACK_DEVELOPER_SERVER": "http://localhost:8080",
                 // Below allows for overrides used during development
-                // "__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/agent-standalone.js",
-                // "__AMAZONQLSP_UI": "${workspaceFolder}/../../../language-servers/chat-client/build/amazonq-ui.js"
+                "__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/agent-standalone.js",
+                "__AMAZONQLSP_UI": "${workspaceFolder}/../../../language-servers/chat-client/build/amazonq-ui.js"
             },
             "envFile": "${workspaceFolder}/.local.env",
             "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],

packages/amazonq/package.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.70.0-SNAPSHOT",
+    "version": "1.70.0-g82f5d76",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/src/lsp/activation.ts

@@ -4,15 +4,35 @@
  */
 
 import vscode from 'vscode'
+import path from 'path'
 import { startLanguageServer } from './client'
-import { AmazonQLspInstaller } from './lspInstaller'
+import { AmazonQResourcePaths } from './lspInstaller'
 import { lspSetupStage, ToolkitError, messages } from 'aws-core-vscode/shared'
 
 export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
     try {
         await lspSetupStage('all', async () => {
-            const installResult = await new AmazonQLspInstaller().resolve()
-            await lspSetupStage('launch', async () => await startLanguageServer(ctx, installResult.resourcePaths))
+            // Use local servers instead of downloading
+            const resourcesPath = path.join(ctx.extensionPath, 'resources')
+            // Define paths to local resources
+            const resourcePaths: AmazonQResourcePaths = {
+                lsp: path.join(resourcesPath, 'servers/aws-lsp-codewhisperer.js'),
+                node: path.join(resourcesPath, 'servers/node'),
+                ripGrep: path.join(resourcesPath, 'servers/ripgrep/rg'),
+                ui: path.join(resourcesPath, 'clients/amazonq-ui.js'),
+            }
+            // Log paths for debugging
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            console.log('Amazon Q Resource Paths:', {
+                extensionPath: ctx.extensionPath,
+                resourcesPath: resourcesPath,
+                lsp: resourcePaths.lsp,
+                node: resourcePaths.node,
+                ripGrep: resourcePaths.ripGrep,
+                ui: resourcePaths.ui,
+            })
+
+            await lspSetupStage('launch', async () => await startLanguageServer(ctx, resourcePaths))
         })
     } catch (err) {
         const e = err as ToolkitError

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

@@ -44,8 +44,10 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
     ) {
         const lspDir = Uri.file(LanguageServerResolver.defaultDir())
         const dist = Uri.joinPath(globals.context.extensionUri, 'dist')
+        // Add the directory containing the UI file to resource roots
+        const uiDir = Uri.file(path.dirname(this.mynahUIPath))
 
-        const resourcesRoots = [lspDir, dist]
+        const resourcesRoots = [lspDir, dist, uiDir]
 
         /**
          * if the mynah chat client is defined, then make sure to add it to the resource roots, otherwise
@@ -72,6 +74,14 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
                 : webviewView.webview.asWebviewUri(Uri.joinPath(dist, source)).toString()
         this.uiPath = webviewView.webview.asWebviewUri(Uri.file(this.mynahUIPath)).toString()
 
+        // Log for debugging
+        console.log('Amazon Q Webview paths:', {
+            mynahUIPath: this.mynahUIPath,
+            uiPath: this.uiPath,
+            connectorAdapterPath: this.connectorAdapterPath,
+            resourceRoots: resourcesRoots.map((r) => r.toString()),
+        })
+
         webviewView.webview.html = await this.getWebviewContent()
 
         this.webviewView = webviewView