Merge staging into feature/lambda-get-started

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Removal-847a5d3c-5934-48ca-acaf-700db856e26a.json

@@ -0,0 +1,4 @@
+{
+	"type": "Removal",
+	"description": "Auth: No longer share SSO sessions with AWS Toolkit."
+}

packages/amazonq/src/auth/util.ts

@@ -12,7 +12,8 @@ import { updateDevMode } from 'aws-core-vscode/dev'
 import { CommonAuthViewProvider } from 'aws-core-vscode/login'
 import { isExtensionActive, VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
 import { registerSubmitFeedback } from 'aws-core-vscode/feedback'
-import { DevFunction } from 'aws-core-vscode/dev'
+import { DevOptions } from 'aws-core-vscode/dev'
+import { Auth } from 'aws-core-vscode/auth'
 
 export async function activate(context: vscode.ExtensionContext) {
     // IMPORTANT: No other code should be added to this function. Place it in one of the following 2 functions where appropriate.
@@ -59,19 +60,25 @@ async function setupDevMode(context: vscode.ExtensionContext) {
     // TODO: Make this work in web mode and move it to extensionCommon.ts
     await updateDevMode()
 
+    const devOptions: DevOptions = {
+        context,
+        auth: Auth.instance,
+        menuOptions: [
+            'editStorage',
+            'showEnvVars',
+            'deleteSsoConnections',
+            'expireSsoConnections',
+            'editAuthConnections',
+        ],
+    }
+
     context.subscriptions.push(
         vscode.commands.registerCommand('amazonq.dev.openMenu', async () => {
             if (!isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit)) {
                 void vscode.window.showErrorMessage('AWS Toolkit must be installed to access the Developer Menu.')
                 return
             }
-            await vscode.commands.executeCommand('_aws.dev.invokeMenu', context, [
-                'editStorage',
-                'showEnvVars',
-                'deleteSsoConnections',
-                'expireSsoConnections',
-                'editAuthConnections',
-            ] as DevFunction[])
+            await vscode.commands.executeCommand('_aws.dev.invokeMenu', devOptions)
         })
     )
 }

packages/amazonq/src/extension.ts

@@ -10,6 +10,7 @@ import {
     activate as activateCodeWhisperer,
     shutdown as shutdownCodeWhisperer,
     amazonQDismissedKey,
+    AuthUtil,
 } from 'aws-core-vscode/codewhisperer'
 import {
     ExtContext,
@@ -25,11 +26,10 @@ import {
     getLogger,
     getMachineId,
 } from 'aws-core-vscode/shared'
-import { initializeAuth, CredentialsStore, LoginManager, AuthUtils } from 'aws-core-vscode/auth'
+import { initializeAuth, CredentialsStore, LoginManager, AuthUtils, SsoConnection } from 'aws-core-vscode/auth'
 import { CommonAuthWebview } from 'aws-core-vscode/login'
 import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
 import { telemetry, ExtStartUpSources } from 'aws-core-vscode/telemetry'
-import { getAuthStatus } from './auth/util'
 import { makeEndpointsProvider, registerGenericCommands } from 'aws-core-vscode/extensionCommon'
 import { registerCommands } from './commands'
 
@@ -131,11 +131,11 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
             telemetry.record({ source: ExtStartUpSources.reload })
         }
 
-        const { authStatus, authEnabledConnections, authScopes } = await getAuthStatus()
+        const authState = (await AuthUtil.instance.getChatAuthState()).codewhispererChat
         telemetry.record({
-            authStatus,
-            authEnabledConnections,
-            authScopes,
+            authStatus: authState === 'connected' || authState === 'expired' ? authState : 'notConnected',
+            authEnabledConnections: AuthUtils.getAuthFormIdsFromConnection(AuthUtil.instance.conn).join(','),
+            authScopes: ((AuthUtil.instance.conn as SsoConnection)?.scopes ?? []).join(','),
         })
     })
 }