Merge remote-tracking branch 'origin/main' into HEAD

 Conflicts:
	plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt
	plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt

Author: rli

.changes/3.63.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-04-08",
+  "version" : "3.63",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Enterprise users can choose their preferred Amazon Q profile to improve personalization and workflow across different business regions"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q /doc: close diff tab and open README file in preview mode after user accept changes"
+  } ]
+}

.changes/3.64.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-04-10",
+  "version" : "3.64",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Fix issue where IDE freezes when logging into Amazon Q"
+  } ]
+}

.changes/next-release/bugfix-00947041-108c-4ef1-bec6-eb749dae7c2f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix issue where Amazon Q cannot process chunks from local `@workspace` context"
+}

.changes/next-release/bugfix-19118cf8-9378-4bd6-bf5e-7e57520181d0.json

@@ -1,3 +1,10 @@
+# _3.64_ (2025-04-10)
+- **(Bug Fix)** Fix issue where IDE freezes when logging into Amazon Q
+
+# _3.63_ (2025-04-08)
+- **(Feature)** Enterprise users can choose their preferred Amazon Q profile to improve personalization and workflow across different business regions
+- **(Bug Fix)** Amazon Q /doc: close diff tab and open README file in preview mode after user accept changes
+
 # _3.62_ (2025-04-03)
 - **(Feature)** /review: automatically generate fix without clicking Generate Fix button
 - **(Bug Fix)** /transform: prompt user to re-authenticate if credentials expire during transformation

CHANGELOG.md

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.63-SNAPSHOT
+toolkitVersion=3.65-SNAPSHOT
 
 # Publish Settings
 publishToken=

gradle.properties

@@ -31,10 +31,10 @@ import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.jetbrains.common.session.Intent
-import software.aws.toolkits.jetbrains.core.awsClient
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 import software.aws.toolkits.jetbrains.services.amazonq.clients.AmazonQStreamingClient
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
 import software.aws.toolkits.jetbrains.services.amazonqDoc.FEATURE_EVALUATION_PRODUCT_NAME
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.calculateTotalLatency
 import software.aws.toolkits.jetbrains.services.telemetry.ClientMetadata
@@ -72,7 +72,7 @@ class AmazonQCodeGenerateClient(private val project: Project) {
     fun connection() = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())
         ?: error("Attempted to use connection while one does not exist")
 
-    fun bearerClient() = connection().getConnectionSettings().awsClient<CodeWhispererRuntimeClient>()
+    fun bearerClient() = QRegionProfileManager.getInstance().getQClient<CodeWhispererRuntimeClient>(project)
 
     private val amazonQStreamingClient
         get() = AmazonQStreamingClient.getInstance(project)
@@ -88,6 +88,7 @@ class AmazonQCodeGenerateClient(private val project: Project) {
             }
             requestBuilder.optOutPreference(getTelemetryOptOutPreference())
             requestBuilder.userContext(docUserContext)
+            requestBuilder.profileArn(QRegionProfileManager.getInstance().activeProfile(project)?.arn)
         }
 
     fun sendDocMetricData(operationName: String, result: String): SendTelemetryEventResponse =
@@ -118,7 +119,9 @@ class AmazonQCodeGenerateClient(private val project: Project) {
         }
 
     fun createTaskAssistConversation(): CreateTaskAssistConversationResponse = bearerClient().createTaskAssistConversation(
-        CreateTaskAssistConversationRequest.builder().build()
+        CreateTaskAssistConversationRequest.builder()
+            .profileArn(QRegionProfileManager.getInstance().activeProfile(project)?.arn)
+            .build()
     )
 
     fun createTaskAssistUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long): CreateUploadUrlResponse =
@@ -137,6 +140,7 @@ class AmazonQCodeGenerateClient(private val project: Project) {
                         )
                         .build()
                 )
+                .profileArn(QRegionProfileManager.getInstance().activeProfile(project)?.arn)
         }
 
     fun startTaskAssistCodeGeneration(conversationId: String, uploadId: String, userMessage: String, intent: Intent): StartTaskAssistCodeGenerationResponse =
@@ -155,6 +159,7 @@ class AmazonQCodeGenerateClient(private val project: Project) {
                             .uploadId(uploadId)
                     }
                     .intent(intent.name)
+                    .profileArn(QRegionProfileManager.getInstance().activeProfile(project)?.arn)
             }
 
     fun getTaskAssistCodeGeneration(conversationId: String, codeGenerationId: String): GetTaskAssistCodeGenerationResponse = bearerClient()

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/clients/AmazonQCodeGenerateClient.kt

@@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.services.amazonq
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
@@ -16,6 +17,7 @@ import com.intellij.ui.components.panels.Wrapper
 import com.intellij.ui.dsl.builder.Align
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.jcef.JBCefJSQuery
+import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
@@ -32,11 +34,16 @@ import software.aws.toolkits.jetbrains.core.webview.BrowserState
 import software.aws.toolkits.jetbrains.core.webview.LocalAssetJBCefRequestHandler
 import software.aws.toolkits.jetbrains.core.webview.LoginBrowser
 import software.aws.toolkits.jetbrains.isDeveloperMode
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QProfileSwitchIntent
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
 import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
 import software.aws.toolkits.jetbrains.utils.isQConnected
 import software.aws.toolkits.jetbrains.utils.isQExpired
 import software.aws.toolkits.jetbrains.utils.isQWebviewsAvailable
 import software.aws.toolkits.telemetry.FeatureId
+import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Telemetry
 import software.aws.toolkits.telemetry.UiTelemetry
 import software.aws.toolkits.telemetry.WebviewTelemetry
 import java.awt.event.ActionListener
@@ -192,6 +199,18 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
                     UiTelemetry.click(project, signInOption)
                 }
             }
+
+            is BrowserMessage.SwitchProfile -> {
+                QRegionProfileManager.getInstance().switchProfile(
+                    project,
+                    QRegionProfile(profileName = message.profileName, arn = message.arn),
+                    intent = QProfileSwitchIntent.Auth
+                )
+            }
+
+            is BrowserMessage.PublishWebviewTelemetry -> {
+                publishTelemetry(message)
+            }
         }
     }
 
@@ -232,13 +251,42 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
         }
 
         // TODO: pass "REAUTH" if connection expires
-        val stage = if (isQExpired(project)) {
-            "REAUTH"
-        } else {
-            "START"
-        }
+        // Perform the potentially blocking AWS call outside the EDT to fetch available region profiles.
+        ApplicationManager.getApplication().executeOnPooledThread {
+            val stage = if (isQExpired(project)) {
+                "REAUTH"
+            } else if (isQConnected(project) && QRegionProfileManager.getInstance().isPendingProfileSelection(project)) {
+                "PROFILE_SELECT"
+            } else {
+                "START"
+            }
 
-        val jsonData = """
+            var errorMessage: String? = null
+            var profiles: List<QRegionProfile> = emptyList()
+
+            if (stage == "PROFILE_SELECT") {
+                try {
+                    profiles = QRegionProfileManager.getInstance().listRegionProfiles(project).orEmpty()
+                    if (profiles.size == 1) {
+                        LOG.debug { "User only have access to 1 Q profile, auto-selecting profile ${profiles.first().profileName} for ${project.name}" }
+                        QRegionProfileManager.getInstance().switchProfile(project, profiles.first(), QProfileSwitchIntent.Update)
+                    }
+                } catch (e: Exception) {
+                    errorMessage = e.message
+                    LOG.warn { "Failed to call listRegionProfiles API" }
+                    val qConn = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())
+                    Telemetry.amazonq.didSelectProfile.use { span ->
+                        span.source(QProfileSwitchIntent.Auth.value)
+                            .amazonQProfileRegion(QRegionProfileManager.getInstance().activeProfile(project)?.region ?: "not-set")
+                            .ssoRegion((qConn as? AwsBearerTokenConnection)?.region)
+                            .credentialStartUrl((qConn as? AwsBearerTokenConnection)?.startUrl)
+                            .result(MetricResult.Failed)
+                            .reason(e.message)
+                    }
+                }
+            }
+
+            val jsonData = """
             {
                 stage: '$stage',
                 regions: $regions,
@@ -249,10 +297,16 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
                 },
                 cancellable: ${state.browserCancellable},
                 feature: '${state.feature}',
-                existConnections: ${writeValueAsString(selectionSettings.values.map { it.currentSelection }.toList())}
+                existConnections: ${writeValueAsString(selectionSettings.values.map { it.currentSelection }.toList())},
+                profiles: ${writeValueAsString(profiles)},
+                errorMessage: ${errorMessage?.let { "\"$it\"" } ?: "null"}
+            }
+            """.trimIndent()
+
+            runInEdt {
+                executeJS("window.ideClient.prepareUi($jsonData)")
             }
-        """.trimIndent()
-        executeJS("window.ideClient.prepareUi($jsonData)")
+        }
     }
 
     override fun loginIAM(profileName: String, accessKey: String, secretKey: String) {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt

@@ -19,6 +19,7 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 import software.aws.toolkits.jetbrains.core.gettingstarted.emitUserState
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
 import software.aws.toolkits.jetbrains.services.amazonq.project.ProjectContextController
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowFactory
@@ -52,6 +53,9 @@ class AmazonQStartupActivity : ProjectActivity {
                 CodeWhispererExplorerActionManager.getInstance().setIsFirstRestartAfterQInstall(false)
             }
         }
+
+        QRegionProfileManager.getInstance().validateProfile(project)
+
         startLsp(project)
         if (runOnce.get()) return
         emitUserState(project)

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/startup/AmazonQStartupActivity.kt

@@ -24,6 +24,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
 import software.aws.toolkits.jetbrains.services.amazonq.messages.MessageConnector
 import software.aws.toolkits.jetbrains.services.amazonq.onboarding.OnboardingPageInteraction
 import software.aws.toolkits.jetbrains.services.amazonq.onboarding.OnboardingPageInteractionType
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
 import software.aws.toolkits.jetbrains.services.amazonq.util.highlightCommand
 import software.aws.toolkits.jetbrains.services.amazonq.webview.BrowserConnector
 import software.aws.toolkits.jetbrains.services.amazonq.webview.FqnWebviewAdapter
@@ -127,7 +128,8 @@ class AmazonQToolWindow private constructor(
             isCodeScanAvailable = isCodeScanAvailable(project),
             isCodeTestAvailable = isCodeTestAvailable(project),
             isDocAvailable = isDocAvailable(project),
-            highlightCommand = highlightCommand()
+            highlightCommand = highlightCommand(),
+            activeProfile = QRegionProfileManager.getInstance().takeIf { it.shouldDisplayProfileInfo(project) }?.activeProfile(project)
         )
 
         scope.launch {