Merge remote-tracking branch 'origin/main' into rli/certs-tweak

Author: rli

.changes/3.75.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-06-11",
+  "version" : "3.75",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Support for Amazon Q Builder ID paid tier"
+  } ]
+}

.changes/next-release/feature-6de3f384-aa3b-47fe-b895-d41ef23ed6da.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add MCP support for Amazon Q chat"
+}

.changes/next-release/feature-91688ea0-032c-48db-a160-7dfbe71a736d.json

@@ -1,3 +1,6 @@
+# _3.75_ (2025-06-11)
+- **(Feature)** Support for Amazon Q Builder ID paid tier
+
 # _3.74_ (2025-06-05)
 - **(Feature)** Agentic coding experience: Amazon Q can now write code and run shell commands on your behalf
 - **(Bug Fix)** Support full Unicode range in inline chat panel on Windows

CHANGELOG.md

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

gradle.properties

@@ -34,7 +34,7 @@ class AwsServerCapabilitiesProvider {
             ),
             history = true,
             export = true,
-            mcpServers = false
+            mcpServers = true
         )
     }
 }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt

@@ -62,7 +62,7 @@ fun createExtendedClientMetadata(project: Project): ExtendedClientMetadata {
             awsClientCapabilities = AwsClientCapabilities(
                 q = DeveloperProfiles(
                     developerProfiles = true,
-                    mcp = false
+                    mcp = true
                 ),
                 window = WindowSettings(
                     showSaveFileDialog = true

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/ExtendedClientMetadata.kt

@@ -27,8 +27,8 @@ data class FilterOption(
     val options: List<Option>? = null,
 ) {
     data class Option(
-        val value: String? = null,
-        val label: String? = null,
+        val value: String,
+        val label: String,
     )
 }
 

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/Conversations.kt

@@ -71,9 +71,9 @@ class TextDocumentServiceHandler(
                     realTimeEdit(event)
                 }
             }
-            file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, listener)
             ApplicationManager.getApplication().runReadAction {
-                FileDocumentManager.getInstance().getDocument(file)?.addDocumentListener(listener, this)
+                FileDocumentManager.getInstance().getDocument(file)?.addDocumentListener(listener)
+                file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, listener)
             }
         }
         AmazonQLspService.executeIfRunning(project) { languageServer ->

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt

@@ -56,7 +56,7 @@ PatchPluginXmlTask.register(project)
 val patchPluginXml = tasks.named<PatchPluginXmlTask>("patchPluginXml")
 patchPluginXml.configure {
     val buildSuffix = if (!project.isCi()) "+${buildMetadata()}" else ""
-    pluginVersion.set("$toolkitVersion-${ideProfile.shortName}$buildSuffix")
+    pluginVersion.set("$toolkitVersion.${ideProfile.shortName}$buildSuffix")
 }
 
 tasks.jar {