feat: add support for IAM/STS credentials management

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

@@ -12,6 +12,9 @@ const baseConfig = {
     },
     resolve: {
         extensions: ['.ts', '.tsx', '.js', '.node'],
+        fallback: {
+            path: require.resolve('path-browserify'),
+        },
     },
     module: {
         rules: [

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

@@ -4,6 +4,9 @@ const baseConfig = {
     mode: 'production',
     resolve: {
         extensions: ['.ts', '.tsx', '.js', '.node'],
+        fallback: {
+            path: require.resolve('path-browserify'),
+        },
     },
     module: {
         rules: [

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

@@ -1,11 +1,10 @@
 import { standalone } from '@aws/language-server-runtimes/runtimes'
 import {
-    AmazonQServiceServerIAM,
-    AmazonQServiceServerToken,
+    AmazonQServiceServer,
     CodeWhispererSecurityScanServerTokenProxy,
-    CodeWhispererServerTokenProxy,
-    QAgenticChatServerProxy,
+    CodeWhispererServerProxy,
     QConfigurationServerTokenProxy,
+    QAgenticChatServerProxy,
     QLocalProjectContextServerProxy,
     QNetTransformServerTokenProxy,
     WorkspaceContextServerTokenProxy,
@@ -26,7 +25,7 @@ const VERSION = `${MAJOR}.${MINOR}.${PATCH}`
 const props = {
     version: VERSION,
     servers: [
-        CodeWhispererServerTokenProxy,
+        CodeWhispererServerProxy,
         CodeWhispererSecurityScanServerTokenProxy,
         QConfigurationServerTokenProxy,
         QNetTransformServerTokenProxy,
@@ -38,8 +37,7 @@ const props = {
         WorkspaceContextServerTokenProxy,
         McpToolsServer,
         // LspToolsServer,
-        AmazonQServiceServerIAM,
-        AmazonQServiceServerToken,
+        AmazonQServiceServer,
     ],
     name: 'AWS CodeWhisperer',
 } as RuntimeProps

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

@@ -1,7 +1,7 @@
 import { standalone } from '@aws/language-server-runtimes/runtimes'
-import { CodeWhispererServerIAM, QChatServerIAMProxy } from '@aws/lsp-codewhisperer'
-import { createIAMRuntimeProps } from './standalone-common'
+import { CodeWhispererServer, QChatServerProxy } from '@aws/lsp-codewhisperer'
+import { createRuntimeProps } from './standalone-common'
 
-const props = createIAMRuntimeProps('0.1.0', [CodeWhispererServerIAM, QChatServerIAMProxy])
+const props = createRuntimeProps('0.1.0', [CodeWhispererServer, QChatServerProxy])
 
 standalone(props)

app/aws-lsp-codewhisperer-runtimes/src/iam-webworker.ts

@@ -1,14 +1,14 @@
 import { webworker } from '@aws/language-server-runtimes/runtimes/webworker'
-import { CodeWhispererServerIAM } from '@aws/lsp-codewhisperer/out/language-server/inline-completion/codeWhispererServer'
-import { QChatServerIAM } from '@aws/lsp-codewhisperer/out/language-server/chat/qChatServer'
+import { CodeWhispererServer } from '@aws/lsp-codewhisperer/out/language-server/inline-completion/codeWhispererServer'
+import { QChatServer } from '@aws/lsp-codewhisperer/out/language-server/chat/qChatServer'
 import { RuntimeProps } from '@aws/language-server-runtimes/runtimes/runtime'
-import { AmazonQServiceServerIAM } from '@aws/lsp-codewhisperer/out/shared/amazonQServer'
+import { AmazonQServiceServer } from '@aws/lsp-codewhisperer/out/shared/amazonQServer'
 
 // all bundles depend on AmazonQServiceServer, make sure to always include it. The standalone helper
 // to inject the AmazonQServiceServer does not work for webworker as it triggers missing polyfill errors
 const props: RuntimeProps = {
     version: '1.0.0',
-    servers: [AmazonQServiceServerIAM, CodeWhispererServerIAM, QChatServerIAM],
+    servers: [AmazonQServiceServer, CodeWhispererServer, QChatServer],
     name: 'AWS CodeWhisperer',
 }
 

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

@@ -1,7 +1,6 @@
 import { RuntimeProps } from '@aws/language-server-runtimes/runtimes/runtime'
 import { Server } from '@aws/language-server-runtimes/server-interface'
-import { AmazonQServiceServerToken } from '@aws/lsp-codewhisperer'
-import { AmazonQServiceServerIAM } from '@aws/lsp-codewhisperer'
+import { AmazonQServiceServer } from '@aws/lsp-codewhisperer'
 
 const createRuntimePropsFactory =
     (AmazonQServiceServer: Server) =>
@@ -13,5 +12,4 @@ const createRuntimePropsFactory =
         }
     }
 
-export const createIAMRuntimeProps = createRuntimePropsFactory(AmazonQServiceServerIAM)
-export const createTokenRuntimeProps = createRuntimePropsFactory(AmazonQServiceServerToken)
+export const createRuntimeProps = createRuntimePropsFactory(AmazonQServiceServer)

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

@@ -1,27 +1,27 @@
 import { standalone } from '@aws/language-server-runtimes/runtimes'
 import {
     CodeWhispererSecurityScanServerTokenProxy,
-    CodeWhispererServerTokenProxy,
-    QChatServerTokenProxy,
+    CodeWhispererServerProxy,
+    QChatServerProxy,
     QConfigurationServerTokenProxy,
     QNetTransformServerTokenProxy,
     QLocalProjectContextServerProxy,
     WorkspaceContextServerTokenProxy,
 } from '@aws/lsp-codewhisperer'
 import { IdentityServer } from '@aws/lsp-identity'
-import { createTokenRuntimeProps } from './standalone-common'
+import { createRuntimeProps } from './standalone-common'
 
 const MAJOR = 0
 const MINOR = 1
 const PATCH = 0
 const VERSION = `${MAJOR}.${MINOR}.${PATCH}`
 
-const props = createTokenRuntimeProps(VERSION, [
-    CodeWhispererServerTokenProxy,
+const props = createRuntimeProps(VERSION, [
+    CodeWhispererServerProxy,
     CodeWhispererSecurityScanServerTokenProxy,
     QConfigurationServerTokenProxy,
     QNetTransformServerTokenProxy,
-    QChatServerTokenProxy,
+    QChatServerProxy,
     IdentityServer.create,
     QLocalProjectContextServerProxy,
     WorkspaceContextServerTokenProxy,

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

@@ -13,6 +13,9 @@ const baseConfig = {
     },
     resolve: {
         extensions: ['.ts', '.tsx', '.js', '.node'],
+        fallback: {
+            path: require.resolve('path-browserify'),
+        },
     },
     module: {
         rules: [

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

@@ -13,6 +13,9 @@ const baseConfig = {
     },
     resolve: {
         extensions: ['.ts', '.tsx', '.js', '.node'],
+        fallback: {
+            path: require.resolve('path-browserify'),
+        },
     },
     module: {
         rules: [

app/hello-world-lsp-runtimes/webpack.config.js

@@ -13,6 +13,9 @@ const baseConfig = {
     },
     resolve: {
         extensions: ['.ts', '.tsx', '.js', '.node'],
+        fallback: {
+            path: require.resolve('path-browserify'),
+        },
     },
     module: {
         rules: [

chat-client/webpack.config.js

@@ -13,6 +13,9 @@ module.exports = {
     },
     resolve: {
         extensions: ['.ts', '.js'],
+        fallback: {
+            path: require.resolve('path-browserify'),
+        },
     },
     module: {
         rules: [

client/vscode/src/identityActivation.ts

@@ -17,6 +17,8 @@ import {
     SsoTokenChangedParams,
     ssoTokenChangedRequestType,
     SsoTokenSourceKind,
+    StsCredentialChangedParams,
+    stsCredentialChangedRequestType,
     UpdateProfileParams,
     updateProfileRequestType,
 } from '@aws/language-server-runtimes/protocol'
@@ -32,6 +34,7 @@ import { encryptionKey } from './credentialsActivation'
 
 export async function registerIdentity(client: LanguageClient): Promise<void> {
     client.onNotification(ssoTokenChangedRequestType.method, ssoTokenChangedHandler)
+    client.onNotification(stsCredentialChangedRequestType.method, stsCredentialChangedHandler)
     client.onTelemetry(e => window.showInformationMessage(`Telemetry: ${JSON.stringify(e)}`))
 
     client.onRequest<MessageActionItem | null, Error>(
@@ -79,6 +82,10 @@ function ssoTokenChangedHandler(params: SsoTokenChangedParams): void {
     window.showInformationMessage(`SsoTokenChanged raised: ${JSON.stringify(params)}`)
 }
 
+function stsCredentialChangedHandler(params: StsCredentialChangedParams): void {
+    window.showInformationMessage(`StsCredentialChanged raised: ${JSON.stringify(params)}`)
+}
+
 // The code here is for experimental purposes only.  Feel free to erase and replace
 // what is here with whatever you're experimenting with.  If it is helpful to commit
 // the code as a sample for future implementors to experiment as well, that is fine.