feat(amazonq): integrate server side workspace context with inline completion (#1402)

* feat(amazonq): integrate workspace context with inline completion

* fix: replace got with axios for s3 uploads in workspace context capability

---------

Co-authored-by: Jiatong Li <[email protected]>
Co-authored-by: Ege Ozcan <[email protected]>

Author: 3 people

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

@@ -83,6 +83,11 @@ const webworkerConfig = {
             fs: path.resolve(__dirname, 'src/mock-fs.js'),
             child_process: false,
             vm: false,
+            dns: false,
+            zlib: false,
+            net: false,
+            tls: false,
+            http2: false,
         },
         extensions: ['.ts', '.tsx', '.js', '.jsx'],
     },

package-lock.json

@@ -39,6 +39,7 @@
         "adm-zip": "^0.5.10",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.1403.0",
+        "axios": "^1.9.0",
         "chokidar": "^4.0.3",
         "deepmerge": "^4.3.1",
         "diff": "^7.0.0",

server/aws-lsp-codewhisperer/package.json

@@ -49,7 +49,7 @@ import { getOrThrowBaseTokenServiceManager } from '../../shared/amazonQServiceMa
 import { AmazonQWorkspaceConfig } from '../../shared/amazonQServiceManager/configurationUtils'
 import { hasConnectionExpired } from '../../shared/utils'
 import { getOrThrowBaseIAMServiceManager } from '../../shared/amazonQServiceManager/AmazonQIAMServiceManager'
-// import { WorkspaceFolderManager } from '../workspaceContext/workspaceFolderManager'
+import { WorkspaceFolderManager } from '../workspaceContext/workspaceFolderManager'
 import path = require('path')
 import { getRelativePath } from '../workspaceContext/util'
 import { UserWrittenCodeTracker } from '../../shared/userWrittenCodeTracker'
@@ -349,8 +349,10 @@ export const CodewhispererServerFactory =
                     const maxResults = isAutomaticLspTriggerKind ? 1 : 5
                     const selectionRange = params.context.selectedCompletionInfo?.range
                     const fileContext = getFileContext({ textDocument, inferredLanguageId, position: params.position })
-                    // const workspaceFolder = WorkspaceFolderManager.getInstance()?.getWorkspaceFolder(params.textDocument.uri)
-                    // const workspaceId = WorkspaceFolderManager.getInstance()?.getWorkspaceId(workspaceFolder)
+                    const workspaceState = WorkspaceFolderManager.getInstance()?.getWorkspaceState()
+                    const workspaceId = workspaceState?.webSocketClient?.isConnected()
+                        ? workspaceState.workspaceId
+                        : undefined
                     // TODO: Can we get this derived from a keyboard event in the future?
                     // This picks the last non-whitespace character, if any, before the cursor
                     const triggerCharacter = fileContext.leftFileContent.trim().at(-1) ?? ''
@@ -453,7 +455,7 @@ export const CodewhispererServerFactory =
                                     .slice(0, CONTEXT_CHARACTERS_LIMIT)
                                     .replaceAll('\r\n', '\n'),
                             },
-                            // workspaceId: workspaceId,
+                            ...(workspaceId ? { workspaceId: workspaceId } : {}),
                         })
                         .then(async suggestionResponse => {
                             return processSuggestionResponse(suggestionResponse, newSession, true, selectionRange)

server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.ts

@@ -1,10 +1,10 @@
 import { CredentialsProvider, WorkspaceFolder } from '@aws/language-server-runtimes/server-interface'
 import { CreateUploadUrlResponse } from '../../client/token/codewhispererbearertokenclient'
-import got from 'got'
 import { URI } from 'vscode-uri'
 import * as fs from 'fs'
 import * as crypto from 'crypto'
 import * as path from 'path'
+import axios from 'axios'
 
 export const findWorkspaceRootFolder = (
     fileUri: string,
@@ -47,10 +47,7 @@ export const uploadArtifactToS3 = async (content: Buffer, resp: CreateUploadUrlR
             'x-amz-server-side-encryption-context': Buffer.from(encryptionContext, 'utf8').toString('base64'),
         })
     }
-    await got.put(resp.uploadUrl, {
-        body: content,
-        headers: headersObj,
-    })
+    await axios.put(resp.uploadUrl, { body: content, headers: headersObj })
 }
 
 export const isDirectory = (path: string): boolean => {