feat(amazonq): support configuration for VS Code

Author: zixlin7

server/aws-lsp-codewhisperer/src/language-server/amazonQServiceManager/AmazonQTokenServiceManager.ts

@@ -13,6 +13,7 @@ import {
     CredentialsType,
     InitializeParams,
     CancellationTokenSource,
+    DidChangeConfigurationParams,
 } from '@aws/language-server-runtimes/server-interface'
 import {
     DEFAULT_AWS_Q_ENDPOINT_URL,
@@ -34,7 +35,7 @@ import {
     AmazonQServiceProfileUpdateCancelled,
 } from './errors'
 import { BaseAmazonQServiceManager } from './BaseAmazonQServiceManager'
-import { Q_CONFIGURATION_SECTION } from '../configuration/qConfigurationServer'
+import { Q_CONFIGURATION_SECTION, Q_CONFIGURATION_VSC } from '../configuration/qConfigurationServer'
 import { textUtils } from '@aws/lsp-core'
 import { CodeWhispererStreaming } from '@amzn/codewhisperer-streaming'
 import { ConfiguredRetryStrategy } from '@aws-sdk/util-retry'
@@ -281,8 +282,33 @@ export class AmazonQTokenServiceManager implements BaseAmazonQServiceManager {
         this.logServiceState('Unknown Connection state')
     }
 
-    public async handleDidChangeConfiguration() {
+    public async handleDidChangeConfiguration(ideCategory?: string, params?: DidChangeConfigurationParams) {
         try {
+            if (ideCategory === 'VSCODE') {
+                const vscConfig = await this.features.lsp.workspace.getConfiguration(Q_CONFIGURATION_VSC)
+                if (!vscConfig) {
+                    this.log(`VS Code configuration not found`)
+                    return
+                }
+                const optOutTelemetryPreference = vscConfig['shareContentWithAWS'] === true ? 'OPTOUT' : 'OPTIN'
+                this.log(`Read configuration optOutTelemetryPreference=${optOutTelemetryPreference}`)
+                this.configurationCache.set('optOutTelemetryPreference', optOutTelemetryPreference)
+                const includeSuggestionsWithCodeReferences = vscConfig['showCodeWithReferences'] === true
+                this.log(
+                    `Read сonfiguration includeSuggestionsWithCodeReferences=${includeSuggestionsWithCodeReferences}`
+                )
+                this.configurationCache.set(
+                    'includeSuggestionsWithCodeReferences',
+                    includeSuggestionsWithCodeReferences
+                )
+
+                const customizationArn = textUtils.undefinedIfEmpty(params?.settings['customization'])
+                if (customizationArn) {
+                    this.log(`Read configuration customizationArn=${customizationArn}`)
+                    this.configurationCache.set('customizationArn', customizationArn)
+                }
+                return
+            }
             const qConfig = await this.features.lsp.workspace.getConfiguration(Q_CONFIGURATION_SECTION)
             if (qConfig) {
                 // aws.q.customizationArn - selected customization

server/aws-lsp-codewhisperer/src/language-server/amazonQServiceManager/BaseAmazonQServiceManager.ts

@@ -1,6 +1,7 @@
+import { DidChangeConfigurationParams } from '@aws/language-server-runtimes/protocol'
 import { CodeWhispererServiceBase } from '../codeWhispererService'
 
 export interface BaseAmazonQServiceManager {
-    handleDidChangeConfiguration: () => Promise<void>
+    handleDidChangeConfiguration: (ideCategory?: string, params?: DidChangeConfigurationParams) => Promise<void>
     getCodewhispererService: () => CodeWhispererServiceBase
 }

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

@@ -16,6 +16,7 @@ import {
     SDKInitializator,
     ResponseError,
     LSPErrorCodes,
+    DidChangeConfigurationParams,
 } from '@aws/language-server-runtimes/server-interface'
 import { AWSError } from 'aws-sdk'
 import { autoTrigger, triggerType } from './auto-trigger/autoTrigger'
@@ -34,7 +35,7 @@ import { CodePercentageTracker } from './telemetry/codePercentage'
 import { CodeWhispererPerceivedLatencyEvent, CodeWhispererServiceInvocationEvent } from './telemetry/types'
 import { getCompletionType, getEndPositionForAcceptedSuggestion, isAwsError, safeGet } from './utils'
 import { getUserAgent, makeUserContextObject } from './utilities/telemetryUtils'
-import { Q_CONFIGURATION_SECTION } from './configuration/qConfigurationServer'
+import { Q_CONFIGURATION_SECTION, Q_CONFIGURATION_VSC } from './configuration/qConfigurationServer'
 import { fetchSupplementalContext } from './utilities/supplementalContextUtil/supplementalContextUtil'
 import { textUtils } from '@aws/lsp-core'
 import { TelemetryService } from './telemetryService'
@@ -642,12 +643,13 @@ export const CodewhispererServerFactory =
             await emitUserTriggerDecisionTelemetry(telemetry, telemetryService, session, timeSinceLastUserModification)
         }
 
-        const updateConfiguration = async () => {
+        const updateConfiguration = async (params?: DidChangeConfigurationParams) => {
             try {
                 // Currently can't hook AmazonQTokenServiceManager.handleDidChangeConfiguration to lsp listenre directly
                 // as it will override listeners from each consuming Server.
                 // TODO: refactor configuration listener in Server and AmazonQTokenServiceManager in runtimes.
-                await amazonQServiceManager.handleDidChangeConfiguration()
+                const ideCategory = telemetryService.getUserContext()?.ideCategory
+                await amazonQServiceManager.handleDidChangeConfiguration(ideCategory, params)
 
                 const qConfig = await lsp.workspace.getConfiguration(Q_CONFIGURATION_SECTION)
                 if (qConfig) {
@@ -739,7 +741,7 @@ export const CodewhispererServerFactory =
         lsp.extensions.onInlineCompletionWithReferences(onInlineCompletionHandler)
         lsp.extensions.onLogInlineCompletionSessionResults(onLogInlineCompletionSessionResultsHandler)
         lsp.onInitialized(onInitializedHandler)
-        lsp.didChangeConfiguration(updateConfiguration)
+        lsp.didChangeConfiguration(params => updateConfiguration(params))
 
         lsp.onDidChangeTextDocument(async p => {
             const textDocument = await workspace.getTextDocument(p.textDocument.uri)

server/aws-lsp-codewhisperer/src/language-server/configuration/qConfigurationServer.ts

@@ -24,6 +24,7 @@ const Q_DEVELOPER_PROFILES = 'developerProfiles'
 export const Q_CUSTOMIZATIONS_CONFIGURATION_SECTION = `${Q_CONFIGURATION_SECTION}.${Q_CUSTOMIZATIONS}`
 export const Q_DEVELOPER_PROFILES_CONFIGURATION_SECTION = `${Q_CONFIGURATION_SECTION}.${Q_DEVELOPER_PROFILES}`
 
+export const Q_CONFIGURATION_VSC = 'amazonQ'
 export const QConfigurationServerToken =
     (): Server =>
     ({ credentialsProvider, lsp, logging, runtime, workspace, sdkInitializator }) => {

server/aws-lsp-codewhisperer/src/language-server/telemetryService.ts

@@ -30,6 +30,7 @@ import {
 import { CodewhispererLanguage, getRuntimeLanguage } from './languageDetection'
 import { CONVERSATION_ID_METRIC_KEY } from './chat/telemetry/chatTelemetryController'
 import { BaseAmazonQServiceManager } from './amazonQServiceManager/BaseAmazonQServiceManager'
+// import { User } from 'aws-sdk/clients/budgets'
 
 export class TelemetryService {
     // Using Base service manager here to support fallback cases such as in codeWhispererServer
@@ -70,6 +71,10 @@ export class TelemetryService {
         this.userContext = userContext
     }
 
+    public getUserContext(): UserContext | undefined {
+        return this.userContext
+    }
+
     public updateOptOutPreference(optOutPreference: OptOutPreference): void {
         this.optOutPreference = optOutPreference
     }

server/aws-lsp-codewhisperer/src/language-server/utilities/telemetryUtils.ts

@@ -47,7 +47,7 @@ export const getUserAgent = (initializeParams: InitializeParams, serverInfo?: Se
 }
 
 const IDE_CATEGORY_MAP: { [key: string]: IdeCategory } = {
-    'AmazonQ-For-VSCode': 'VSCODE',
+    'AWS IDE Extensions for VSCode': 'VSCODE',
     'Amazon-Q-For-JetBrains': 'JETBRAINS',
     'AmazonQ-For-Eclipse': 'ECLIPSE',
     'AWS-Toolkit-For-VisualStudio': 'VISUAL_STUDIO',
@@ -59,7 +59,7 @@ const mapClientNameToIdeCategory = (clientName: string): string | undefined => {
 
 // Use InitializeParams.initializationOptions.aws.clientInfo.extension to derive IDE Category from calling client
 // https://github.com/aws/language-server-runtimes/blob/main/runtimes/protocol/lsp.ts#L60-L69
-const getIdeCategory = (initializeParams: InitializeParams) => {
+export const getIdeCategory = (initializeParams: InitializeParams) => {
     let ideCategory
     if (initializeParams.initializationOptions?.aws?.clientInfo?.extension?.name) {
         ideCategory = mapClientNameToIdeCategory(initializeParams.initializationOptions.aws.clientInfo.extension.name)