Merge branch 'feature/q-lsp-chat' into samgst/q-chat-link-click

Author: samgst-amazon

.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-2301aeeb-f36e-4776-8e9b-4238c55e43f4.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/dev: Fix prompt to enable devfile build not triggering when devfile is present."
+}

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

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

.changes/next-release/feature-f49ee314-0987-45cd-84fe-d852e67c8723.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q /test: Remove unsupported message for non-java python languages"
+}

CHANGELOG.md

@@ -1,3 +1,10 @@
+# _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

gradle.properties

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

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

@@ -20,7 +20,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.util.command
 
 class MessageSerializer @VisibleForTesting constructor() {
 
-    private val objectMapper = jacksonObjectMapper()
+    val objectMapper = jacksonObjectMapper()
         .registerModule(JavaTimeModule())
         .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
         .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
@@ -37,8 +37,8 @@ class MessageSerializer @VisibleForTesting constructor() {
 
     fun serialize(value: Any): String = objectMapper.writeValueAsString(value)
 
-    fun <T> deserializeChatMessages(value: JsonNode, clazz: Class<T>): T =
-        objectMapper.treeToValue(value, clazz)
+    inline fun <reified T> deserializeChatMessages(value: JsonNode): T =
+        objectMapper.treeToValue<T>(value)
 
     // Provide singleton global access
     companion object {

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

@@ -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/webview/Browser.kt

@@ -43,7 +43,7 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
                 "mynah",
                 AssetResourceHandler.AssetResourceHandlerFactory(),
             )
-        AmazonQLspService.getInstance(project).addServerStartedListener {
+        AmazonQLspService.getInstance(project).addLspInitializeMessageListener {
             loadWebView(
                 isCodeTransformAvailable,
                 isFeatureDevAvailable,

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

@@ -157,7 +157,7 @@ class BrowserConnector(
     private fun handleFlareChatMessages(browser: Browser, node: JsonNode) {
         when (node.command) {
             SEND_CHAT_COMMAND_PROMPT -> {
-                val requestFromUi = serializer.deserializeChatMessages(node, SendChatPromptRequest::class.java)
+                val requestFromUi = serializer.deserializeChatMessages<SendChatPromptRequest>(node)
                 val chatPrompt = ChatPrompt(
                     requestFromUi.params.prompt.prompt,
                     requestFromUi.params.prompt.escapedPrompt,
@@ -195,7 +195,7 @@ class BrowserConnector(
                 showResult(result, partialResultToken, tabId, encryptionManager, browser)
             }
             CHAT_QUICK_ACTION -> {
-                val requestFromUi = serializer.deserializeChatMessages(node, QuickChatActionRequest::class.java)
+                val requestFromUi = serializer.deserializeChatMessages<QuickChatActionRequest>(node)
                 val tabId = requestFromUi.params.tabId
                 val quickActionParams = requestFromUi.params
                 val partialResultToken = chatCommunicationManager.addPartialChatMessage(tabId)