Merge branch 'feature/q-lsp' into rli/lsp-proxy

Author: rli

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

@@ -0,0 +1,20 @@
+{
+  "date" : "2025-04-18",
+  "version" : "3.67",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Customization now resets with a warning if unavailable in the selected profile."
+  }, {
+    "type" : "bugfix",
+    "description" : "Q panel will get stuck while signin if users have multiple windows"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix integer overflow when local context index input is larger than 2GB"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix workspace index process quits when hitting a race condition"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix infinite loop when workspace indexing server fails to initialize"
+  } ]
+}

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

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/review: disabled highlighter for ignored issues"
+}

.changes/next-release/bugfix-2acb4142-8c33-475d-a57a-3445fa4a7725.json

@@ -1,6 +1,20 @@
+# _3.67_ (2025-04-18)
+- **(Bug Fix)** Amazon Q: Customization now resets with a warning if unavailable in the selected profile.
+- **(Bug Fix)** Q panel will get stuck while signin if users have multiple windows
+- **(Bug Fix)** Fix integer overflow when local context index input is larger than 2GB
+- **(Bug Fix)** Fix workspace index process quits when hitting a race condition
+- **(Bug Fix)** Fix infinite loop when workspace indexing server fails to initialize
+
+# _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

CHANGELOG.md

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

gradle.properties

@@ -95,7 +95,8 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
         project.messageBus.connect(toolWindow.disposable).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
+                // note we name myProject intentionally ow it will shadow the "project" provided by the IDE
+                override fun onProfileSelected(myProject: Project, profile: QRegionProfile?) {
                     if (project.isDisposed) return
                     AmazonQToolWindow.getInstance(project).disposeAndRecreate()
                     qPanel.setContent(AmazonQToolWindow.getInstance(project).component)

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

@@ -409,6 +409,7 @@ class CodeTestChatController(
             .build()
         return GenerateAssistantResponseRequest.builder()
             .conversationState(conversationState)
+            .profileArn(QRegionProfileManager.getInstance().activeProfile(context.project)?.arn)
             .build()
     }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -30,6 +30,7 @@ import software.aws.toolkits.telemetry.MetricResult
 import java.util.UUID
 
 private val logger = getLogger<CodeGenerationState>()
+private const val RUN_COMMAND_LOG_PATH = ".amazonq/dev/run_command.log"
 
 class CodeGenerationState(
     override val tabID: String,
@@ -211,9 +212,23 @@ private suspend fun CodeGenerationState.generateCode(
                         conversationId = config.conversationId,
                     )
 
-                val newFileInfo = registerNewFiles(newFileContents = codeGenerationStreamResult.new_file_contents)
-                val deletedFileInfo = registerDeletedFiles(deletedFiles = codeGenerationStreamResult.deleted_files)
+                val fileContents = codeGenerationStreamResult.new_file_contents.filterKeys { file ->
+                    if (file.endsWith(RUN_COMMAND_LOG_PATH)) {
+                        val contents: String = codeGenerationStreamResult.new_file_contents[file].orEmpty()
+                        val truncatedContents = if (contents.length > 10000000) {
+                            contents.substring(0, 10000000)
+                        } else {
+                            contents
+                        }
+                        logger.info(truncatedContents) { "Run command log: $truncatedContents" }
+                        false
+                    } else {
+                        true
+                    }
+                }
 
+                val newFileInfo = registerNewFiles(newFileContents = fileContents)
+                val deletedFileInfo = registerDeletedFiles(deletedFiles = codeGenerationStreamResult.deleted_files)
                 return CodeGenerationResult(
                     newFiles = newFileInfo,
                     deletedFiles = deletedFileInfo,