fix: Developer Profile not pushed to LSP on start

Because the `AuthUtil.restore()` was called before we registered the
onDidChangeRegionProvider, the expected pushConfigUpdate was not called
when the server started. This resulted in the cached Developer Profile
not being pushed to the LSP.

This fixes that.

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

Author: nkomonen-amazon

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

@@ -73,10 +73,6 @@ export async function activate(languageClient: LanguageClient, encryptionKey: Bu
 
     disposables.push(
         AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(async () => {
-            void pushConfigUpdate(languageClient, {
-                type: 'profile',
-                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
-            })
             await provider.refreshWebview()
         }),
         Commands.register('aws.amazonq.updateCustomizations', () => {

packages/amazonq/src/lsp/client.ts

@@ -54,7 +54,7 @@ import { processUtils } from 'aws-core-vscode/shared'
 import { activate as activateChat } from './chat/activation'
 import { AmazonQResourcePaths } from './lspInstaller'
 import { auth2 } from 'aws-core-vscode/auth'
-import { ConfigSection, isValidConfigSection, toAmazonQLSPLogLevel } from './config'
+import { ConfigSection, isValidConfigSection, pushConfigUpdate, toAmazonQLSPLogLevel } from './config'
 import { telemetry } from 'aws-core-vscode/telemetry'
 
 const localize = nls.loadMessageBundle()
@@ -179,15 +179,31 @@ export async function startLanguageServer(
 
     await client.onReady()
 
-    // IMPORTANT: This sets up Auth and must be called before anything attempts to use it
-    AuthUtil.create(new auth2.LanguageClientAuth(client, clientId, encryptionKey))
-    // Ideally this would be part of AuthUtil.create() as it restores the existing Auth connection, but we have some
-    // future work which will need to delay this call
-    await AuthUtil.instance.restore()
+    /**
+     * We use the Flare Auth language server, and our Auth client depends on it.
+     * Because of this we initialize our Auth client **immediately** after the language server is ready.
+     * Doing this removes the chance of something else attempting to use the Auth client before it is ready.
+     */
+    await initializeAuth(client)
 
     await postStartLanguageServer(client, resourcePaths, toDispose)
 
     return client
+
+    async function initializeAuth(client: LanguageClient) {
+        AuthUtil.create(new auth2.LanguageClientAuth(client, clientId, encryptionKey))
+
+        /** All must be setup before {@link AuthUtil.restore} otherwise they may not trigger when expected */
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(async () => {
+            void pushConfigUpdate(client, {
+                type: 'profile',
+                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+            })
+        })
+
+        // Try and restore a cached connection if exists
+        await AuthUtil.instance.restore()
+    }
 }
 
 async function postStartLanguageServer(