Merge pull request #1772 from aws/main

Author: ashishrp-aws

.release-please-manifest.json

@@ -1,9 +1,9 @@
 {
-    "chat-client": "0.1.18",
-    "core/aws-lsp-core": "0.0.9",
-    "server/aws-lsp-antlr4": "0.1.12",
-    "server/aws-lsp-codewhisperer": "0.0.56",
-    "server/aws-lsp-json": "0.1.12",
+    "chat-client": "0.1.19",
+    "core/aws-lsp-core": "0.0.10",
+    "server/aws-lsp-antlr4": "0.1.13",
+    "server/aws-lsp-codewhisperer": "0.0.58",
+    "server/aws-lsp-json": "0.1.13",
     "server/aws-lsp-partiql": "0.0.13",
-    "server/aws-lsp-yaml": "0.1.12"
+    "server/aws-lsp-yaml": "0.1.13"
 }

app/aws-lsp-antlr4-runtimes/package.json

@@ -12,7 +12,7 @@
         "webpack": "webpack"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.98",
+        "@aws/language-server-runtimes": "^0.2.100",
         "@aws/lsp-antlr4": "*",
         "antlr4-c3": "^3.4.1",
         "antlr4ng": "^3.0.4"

app/aws-lsp-codewhisperer-runtimes/package.json

@@ -15,7 +15,7 @@
         "local-build": "node scripts/local-build.js"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.98",
+        "@aws/language-server-runtimes": "^0.2.100",
         "@aws/lsp-codewhisperer": "*",
         "copyfiles": "^2.4.1",
         "cross-env": "^7.0.3",

app/aws-lsp-codewhisperer-runtimes/src/agent-standalone.ts

@@ -1,10 +1,12 @@
 import { standalone } from '@aws/language-server-runtimes/runtimes'
 import {
+    AmazonQServiceServerIAM,
+    AmazonQServiceServerToken,
     CodeWhispererSecurityScanServerTokenProxy,
     CodeWhispererServerTokenProxy,
-    QAgenticChatServerTokenProxy,
+    QAgenticChatServerProxy,
     QConfigurationServerTokenProxy,
-    QLocalProjectContextServerTokenProxy,
+    QLocalProjectContextServerProxy,
     QNetTransformServerTokenProxy,
     WorkspaceContextServerTokenProxy,
 } from '@aws/lsp-codewhisperer'
@@ -14,26 +16,32 @@ import {
     FsToolsServer,
     McpToolsServer,
 } from '@aws/lsp-codewhisperer/out/language-server/agenticChat/tools/toolServer'
-import { createTokenRuntimeProps } from './standalone-common'
+import { RuntimeProps } from '@aws/language-server-runtimes/runtimes/runtime'
 
 const MAJOR = 0
 const MINOR = 1
 const PATCH = 0
 const VERSION = `${MAJOR}.${MINOR}.${PATCH}`
 
-const props = createTokenRuntimeProps(VERSION, [
-    CodeWhispererServerTokenProxy,
-    CodeWhispererSecurityScanServerTokenProxy,
-    QConfigurationServerTokenProxy,
-    QNetTransformServerTokenProxy,
-    QAgenticChatServerTokenProxy,
-    IdentityServer.create,
-    FsToolsServer,
-    BashToolsServer,
-    QLocalProjectContextServerTokenProxy,
-    WorkspaceContextServerTokenProxy,
-    McpToolsServer,
-    // LspToolsServer,
-])
+const props = {
+    version: VERSION,
+    servers: [
+        CodeWhispererServerTokenProxy,
+        CodeWhispererSecurityScanServerTokenProxy,
+        QConfigurationServerTokenProxy,
+        QNetTransformServerTokenProxy,
+        QAgenticChatServerProxy,
+        IdentityServer.create,
+        FsToolsServer,
+        BashToolsServer,
+        QLocalProjectContextServerProxy,
+        WorkspaceContextServerTokenProxy,
+        McpToolsServer,
+        // LspToolsServer,
+        AmazonQServiceServerIAM,
+        AmazonQServiceServerToken,
+    ],
+    name: 'AWS CodeWhisperer',
+} as RuntimeProps
 
 standalone(props)

app/aws-lsp-codewhisperer-runtimes/src/token-standalone.ts

@@ -5,7 +5,7 @@ import {
     QChatServerTokenProxy,
     QConfigurationServerTokenProxy,
     QNetTransformServerTokenProxy,
-    QLocalProjectContextServerTokenProxy,
+    QLocalProjectContextServerProxy,
     WorkspaceContextServerTokenProxy,
 } from '@aws/lsp-codewhisperer'
 import { IdentityServer } from '@aws/lsp-identity'
@@ -23,7 +23,7 @@ const props = createTokenRuntimeProps(VERSION, [
     QNetTransformServerTokenProxy,
     QChatServerTokenProxy,
     IdentityServer.create,
-    QLocalProjectContextServerTokenProxy,
+    QLocalProjectContextServerProxy,
     WorkspaceContextServerTokenProxy,
 ])
 

app/aws-lsp-codewhisperer-runtimes/webpack.config.js

@@ -88,6 +88,7 @@ const webworkerConfig = {
             net: false,
             tls: false,
             http2: false,
+            buffer: require.resolve('buffer/'),
         },
         extensions: ['.ts', '.tsx', '.js', '.jsx'],
     },
@@ -109,6 +110,9 @@ const webworkerConfig = {
         new webpack.ProvidePlugin({
             process: 'process/browser',
         }),
+        new webpack.ProvidePlugin({
+            Buffer: ['buffer', 'Buffer'],
+        }),
     ],
 }
 

app/aws-lsp-identity-runtimes/package.json

@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.98",
+        "@aws/language-server-runtimes": "^0.2.100",
         "@aws/lsp-identity": "^0.0.1"
     }
 }

app/aws-lsp-json-runtimes/package.json

@@ -11,7 +11,7 @@
         "webpack": "webpack"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.98",
+        "@aws/language-server-runtimes": "^0.2.100",
         "@aws/lsp-json": "*"
     },
     "devDependencies": {

app/aws-lsp-json-runtimes/src/tests/jsonServerCFInteg.test.ts

@@ -47,7 +47,7 @@ async function createLSPServer(runtimeFile: string) {
     return { client, endpoint, process }
 }
 
-describe('Test JsonServer with CloudFormation schema', () => {
+;(describe('Test JsonServer with CloudFormation schema', () => {
     let client: LspClient
     let endpoint: JSONRPCEndpoint
     let process: ChildProcessWithoutNullStreams
@@ -200,4 +200,4 @@ describe('Test JsonServer with CloudFormation schema', () => {
 
             expect(clientResult).to.deep.equal(HOVER_JSON_CUSTOMIZED)
         })
-    })
+    }))

app/aws-lsp-notification-runtimes/package.json

@@ -7,7 +7,7 @@
         "compile": "tsc --build"
     },
     "dependencies": {
-        "@aws/language-server-runtimes": "^0.2.98",
+        "@aws/language-server-runtimes": "^0.2.100",
         "@aws/lsp-notification": "^0.0.1"
     }
 }