comment: Move Profile push up a level

- Moves the profile/customization code up a level out of the LSP chat activation, since it doesn't make sense there
- Remove the previous onDidChangeProfile handler from the auth setup since it is redundant due to us having it already in onLanguageServerReady()
- Renamed function to onLanguageServerReady() to be more aligned with flare naming

Signed-off-by: nkomonen-amazon <[email protected]>

Author: nkomonen-amazon

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

@@ -17,22 +17,6 @@ import { pushConfigUpdate } from '../config'
 export async function activate(languageClient: LanguageClient, encryptionKey: Buffer, mynahUIPath: string) {
     const disposables = globals.context.subscriptions
 
-    // Make sure we've sent an auth profile to the language server before even initializing the UI
-    //
-    // Ideally the handler for onDidChangeRegionProfile would trigger this, but because the handler is set up too late (due to the current structure), the initial event is missed.
-    // So we have to explicitly do it here on startup.
-    if (AuthUtil.instance.isConnectionValid()) {
-        await pushConfigUpdate(languageClient, {
-            type: 'profile',
-            profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
-        })
-
-        await pushConfigUpdate(languageClient, {
-            type: 'customization',
-            customization: getSelectedCustomization(),
-        })
-    }
-
     const provider = new AmazonQChatViewProvider(mynahUIPath)
 
     disposables.push(

packages/amazonq/src/lsp/client.ts

@@ -16,7 +16,6 @@ import {
     GetConfigurationFromServerParams,
     RenameFilesParams,
     ResponseMessage,
-    updateConfigurationRequestType,
     WorkspaceFolder,
 } from '@aws/language-server-runtimes/protocol'
 import { AuthUtil, CodeWhispererSettings, getSelectedCustomization } from 'aws-core-vscode/codewhisperer'
@@ -164,25 +163,18 @@ export async function startLanguageServer(
 
     const auth = await initializeAuth(client)
 
-    await postStartLanguageServer(auth, client, resourcePaths, toDispose)
+    await onLanguageServerReady(auth, client, resourcePaths, toDispose)
 
     return client
 }
 
 async function initializeAuth(client: LanguageClient): Promise<AmazonQLspAuth> {
-    AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(async () => {
-        void pushConfigUpdate(client, {
-            type: 'profile',
-            profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
-        })
-    })
-
     const auth = new AmazonQLspAuth(client)
     await auth.refreshConnection(true)
     return auth
 }
 
-async function postStartLanguageServer(
+async function onLanguageServerReady(
     auth: AmazonQLspAuth,
     client: LanguageClient,
     resourcePaths: AmazonQResourcePaths,
@@ -208,25 +200,17 @@ async function postStartLanguageServer(
 
     const refreshInterval = auth.startTokenRefreshInterval(10 * oneSecond)
 
-    const sendProfileToLsp = async () => {
-        try {
-            const result = await client.sendRequest(updateConfigurationRequestType.method, {
-                section: 'aws.q',
-                settings: {
-                    profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
-                },
-            })
-            client.info(
-                `Client: Updated Amazon Q Profile ${AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn} to Amazon Q LSP`,
-                result
-            )
-        } catch (err) {
-            client.error('Error when setting Q Developer Profile to Amazon Q LSP', err)
-        }
-    }
+    // We manually push the cached values the first time since event handlers, which should push, may not have been setup yet.
+    // Execution order is weird and should be fixed in the flare implementation.
+    // TODO: Revisit if we need this if we setup the event handlers properly
+    if (AuthUtil.instance.isConnectionValid()) {
+        await sendProfileToLsp(client)
 
-    // send profile to lsp once.
-    void sendProfileToLsp()
+        await pushConfigUpdate(client, {
+            type: 'customization',
+            customization: getSelectedCustomization(),
+        })
+    }
 
     toDispose.push(
         AuthUtil.instance.auth.onDidChangeActiveConnection(async () => {
@@ -235,7 +219,7 @@ async function postStartLanguageServer(
         AuthUtil.instance.auth.onDidDeleteConnection(async () => {
             client.sendNotification(notificationTypes.deleteBearerToken.method)
         }),
-        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(sendProfileToLsp),
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => sendProfileToLsp(client)),
         vscode.commands.registerCommand('aws.amazonq.getWorkspaceId', async () => {
             const requestType = new RequestType<GetConfigurationFromServerParams, ResponseMessage, Error>(
                 'aws/getConfigurationFromServer'
@@ -295,6 +279,13 @@ async function postStartLanguageServer(
         // Set this inside onReady so that it only triggers on subsequent language server starts (not the first)
         onServerRestartHandler(client, auth)
     )
+
+    async function sendProfileToLsp(client: LanguageClient) {
+        await pushConfigUpdate(client, {
+            type: 'profile',
+            profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+        })
+    }
 }
 
 /**