Merge branch 'main' into id2

Author: zuoyaofu

.changes/3.61.json

@@ -0,0 +1,17 @@
+{
+  "date" : "2025-03-27",
+  "version" : "3.61",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q: Moved \"Include suggestions with code references\" setting to General"
+  }, {
+    "type" : "feature",
+    "description" : "Add support for 2025.1"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Attempt to reduce thread pool contention locking IDE caused by `@workspace` making a large number of requests"
+  }, {
+    "type" : "deprecation",
+    "description" : "An upcoming release will remove support for JetBrains Gateway version 2024.3 and for IDEs based on the 2024.1 platform"
+  } ]
+}

.changes/3.62.json

@@ -0,0 +1,20 @@
+{
+  "date" : "2025-04-03",
+  "version" : "3.62",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "/review: automatically generate fix without clicking Generate Fix button"
+  }, {
+    "type" : "bugfix",
+    "description" : "/transform: prompt user to re-authenticate if credentials expire during transformation"
+  }, {
+    "type" : "bugfix",
+    "description" : "Gracefully handle additional fields in Amazon Q /dev code generation result without throwing errors"
+  }, {
+    "type" : "bugfix",
+    "description" : "/review: set programmingLanguage to Plaintext if language is unknown"
+  }, {
+    "type" : "bugfix",
+    "description" : "/review: Respect user option to allow code suggestions with references"
+  } ]
+}

.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/3.65.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-04-10",
+  "version" : "3.65",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Fix issue where Amazon Q cannot process chunks from local `@workspace` context"
+  } ]
+}

.changes/3.66.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-04-11",
+  "version" : "3.66",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "The logs emitted by the Agent during user command execution will be accepted and written to `.amazonq/dev/run_command.log` file in the user's local repository."
+  }, {
+    "type" : "bugfix",
+    "description" : "Unit test generation now completes successfully when using the `/test` command "
+  } ]
+}

.changes/next-release/bugfix-a70cb565-5de8-4302-9f1e-71925f78061b.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q: Customization now resets with a warning if unavailable in the selected profile."
+}

.changes/next-release/bugfix-afb46d2b-24c7-48be-94b1-02a7f56cbde0.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Q panel will get stuck while signin if users have multiple windows"
+}

.changes/next-release/bugfix-e06391bd-f5ae-4c2a-a102-580d30f3be8d.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix infinite loop when workspace indexing server fails to initialize"
+}

.changes/next-release/bugfix-f31946b6-3709-44a5-b23f-9fa202bd5cb5.json

@@ -1,3 +1,30 @@
+# _3.66_ (2025-04-11)
+- **(Feature)** The logs emitted by the Agent during user command execution will be accepted and written to `.amazonq/dev/run_command.log` file in the user's local repository.
+- **(Bug Fix)** Unit test generation now completes successfully when using the `/test` command
+
+# _3.64_ (2025-04-10)
+- **(Bug Fix)** Fix issue where IDE freezes when logging into Amazon Q
+
+# _3.65_ (2025-04-10)
+- **(Bug Fix)** Fix issue where Amazon Q cannot process chunks from local `@workspace` context
+
+# _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
+- **(Bug Fix)** Gracefully handle additional fields in Amazon Q /dev code generation result without throwing errors
+- **(Bug Fix)** /review: set programmingLanguage to Plaintext if language is unknown
+- **(Bug Fix)** /review: Respect user option to allow code suggestions with references
+
+# _3.61_ (2025-03-27)
+- **(Feature)** Amazon Q: Moved "Include suggestions with code references" setting to General
+- **(Feature)** Add support for 2025.1
+- **(Bug Fix)** Amazon Q: Attempt to reduce thread pool contention locking IDE caused by `@workspace` making a large number of requests
+- **(Deprecation)** An upcoming release will remove support for JetBrains Gateway version 2024.3 and for IDEs based on the 2024.1 platform
+
 # _3.60_ (2025-03-20)
 - **(Feature)** AmazonQ /test now displays a concise test plan summary to users.
 - **(Bug Fix)** Fix inline completion failure due to context length exceeding the threshold

.changes/next-release/deprecation-90102050-86a4-4c19-9ecc-70c6e033b949.json

@@ -36,7 +36,7 @@ phases:
         }
 
          # Rider is very expensive (spikes our CI jobs to 50% CPU, so let it do the prep work in parallel, but run tests later
-        ./gradlew -PideProfileName="$Env:ALTERNATIVE_IDE_PROFILE_NAME" :plugin-toolkit:intellij-standalone:check :plugin-toolkit:jetbrains-rider:compileTestKotlin --info --console plain --continue
+        ./gradlew -PideProfileName="$Env:ALTERNATIVE_IDE_PROFILE_NAME" :plugin-toolkit:intellij-standalone:check :plugin-toolkit:jetbrains-rider:compileTestKotlin -x :plugin-toolkit:jetbrains-rider:check --info --console plain --continue
         if ($LastExitCode -ne 0) {
           Write-Host "Command failed with exit code $LastExitCode"
           exit -1

.changes/next-release/feature-45f6e6a7-fc5b-4b14-89e2-0d9a2b138c65.json

@@ -17,7 +17,7 @@ class BannedImportsRule : Rule() {
     override fun visitImportList(importList: KtImportList) {
         super.visitImportList(importList)
         importList.imports.forEach { element ->
-            val importedFqName = element.importedFqName?.asString()
+            val importedFqName = element.importedFqName?.asString() ?: return
             if (importedFqName == "org.assertj.core.api.Assertions") {
                 report(
                     CodeSmell(
@@ -28,7 +28,7 @@ class BannedImportsRule : Rule() {
                 )
             }
 
-            if (importedFqName?.startsWith("org.hamcrest") == true) {
+            if (importedFqName.startsWith("org.hamcrest")) {
                 report(
                     CodeSmell(
                         issue,
@@ -38,9 +38,7 @@ class BannedImportsRule : Rule() {
                 )
             }
 
-            if (importedFqName?.startsWith("kotlin.test.assert") == true &&
-                importedFqName.startsWith("kotlin.test.assertNotNull") == false
-            ) {
+            if (importedFqName.startsWith("kotlin.test.assert") && !importedFqName.startsWith("kotlin.test.assertNotNull")) {
                 report(
                     CodeSmell(
                         issue,
@@ -50,7 +48,17 @@ class BannedImportsRule : Rule() {
                 )
             }
 
-            if (importedFqName?.startsWith("org.gradle.internal.impldep") == true) {
+            if (importedFqName.startsWith("org.junit.jupiter.api.Assertions") || importedFqName.startsWith("org.junit.Assert")) {
+                report(
+                    CodeSmell(
+                        issue,
+                        Entity.from(element),
+                        message = "Use AssertJ instead of JUnit assertions"
+                    )
+                )
+            }
+
+            if (importedFqName.startsWith("org.gradle.internal.impldep")) {
                 report(
                     CodeSmell(
                         issue,
@@ -60,7 +68,7 @@ class BannedImportsRule : Rule() {
                 )
             }
 
-            if (importedFqName?.contains("kotlinx.coroutines.Dispatchers") == true) {
+            if (importedFqName.contains("kotlinx.coroutines.Dispatchers")) {
                 report(
                     CodeSmell(
                         issue,

.changes/next-release/feature-c88b1af5-2318-4ca3-903c-a289e5494b1d.json

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

CHANGELOG.md

@@ -13,6 +13,7 @@ import software.amazon.awssdk.services.codewhispererruntime.model.ContentChecksu
 import software.amazon.awssdk.services.codewhispererruntime.model.CreateTaskAssistConversationRequest
 import software.amazon.awssdk.services.codewhispererruntime.model.CreateTaskAssistConversationResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.CreateUploadUrlResponse
+import software.amazon.awssdk.services.codewhispererruntime.model.Dimension
 import software.amazon.awssdk.services.codewhispererruntime.model.DocV2AcceptanceEvent
 import software.amazon.awssdk.services.codewhispererruntime.model.DocV2GenerationEvent
 import software.amazon.awssdk.services.codewhispererruntime.model.GetTaskAssistCodeGenerationResponse
@@ -30,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
@@ -71,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)
@@ -87,10 +88,40 @@ 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 =
+        bearerClient().sendTelemetryEvent { requestBuilder ->
+            requestBuilder.telemetryEvent { telemetryEventBuilder ->
+                telemetryEventBuilder.metricData {
+                    it
+                        .metricName("Operation")
+                        .metricValue(1.0)
+                        .timestamp(Instant.now())
+                        .product("DocGeneration")
+                        .dimensions(
+                            listOf(
+                                Dimension.builder()
+                                    .name("operationName")
+                                    .value(operationName)
+                                    .build(),
+                                Dimension.builder()
+                                    .name("result")
+                                    .value(result)
+                                    .build()
+                            )
+                        )
+                }
+            }
+            requestBuilder.optOutPreference(getTelemetryOptOutPreference())
+            requestBuilder.userContext(docUserContext)
         }
 
     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 =
@@ -109,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 =
@@ -127,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()

buildspec/windowsTestsForToolkit.yml

@@ -20,7 +20,6 @@ import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.common.clients.AmazonQCodeGenerateClient
 import software.aws.toolkits.jetbrains.common.session.Intent
-import software.aws.toolkits.jetbrains.services.amazonqDoc.docServiceError
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.DocGenerationStreamResult
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.ExportDocTaskAssistResultArchiveStreamResult
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ApiException
@@ -34,9 +33,9 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConvers
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ServiceException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileCorruptedException
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
-import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.jetbrains.services.amazonqDoc.ContentLengthException as DocContentLengthException
 
 class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val project: Project) {
     fun createConversation(): String {
@@ -115,7 +114,7 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
 
                 if (e is ValidationException && e.message?.contains("Invalid contentLength") == true) {
                     if (featureName?.equals("docGeneration") == true) {
-                        throw docServiceError(message("amazonqDoc.exception.content_length_error"))
+                        throw DocContentLengthException(operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, cause = e.cause)
                     }
                     throw ContentLengthException(operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, cause = e.cause)
                 }
@@ -162,6 +161,9 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
                 ) {
                     throw CodeIterationLimitException(operation = FeatureDevOperation.StartTaskAssistCodeGeneration.toString(), desc = null, e.cause)
                 } else if (e is ValidationException && e.message?.contains("repo size is exceeding the limits") == true) {
+                    if (intent == Intent.DOC) {
+                        throw DocContentLengthException(operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, cause = e.cause)
+                    }
                     throw ContentLengthException(operation = FeatureDevOperation.StartTaskAssistCodeGeneration.toString(), desc = null, cause = e.cause)
                 } else if (e is ValidationException && e.message?.contains("zipped file is corrupted") == true) {
                     throw ZipFileCorruptedException(operation = FeatureDevOperation.StartTaskAssistCodeGeneration.toString(), desc = null, e.cause)