From 426e6ce994d31457b291441caa834e4731bcb61e Mon Sep 17 00:00:00 2001
From: Jacob Chung <chungjac@amazon.com>
Date: Wed, 11 Jun 2025 10:19:01 -0700
Subject: [PATCH 1/2] feat(amazonq): add MCP server support

---
 .../amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt      | 2 +-
 .../services/amazonq/lsp/model/ExtendedClientMetadata.kt        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt
index 1003523842b..4055b8381a5 100644
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt
@@ -34,7 +34,7 @@ class AwsServerCapabilitiesProvider {
             ),
             history = true,
             export = true,
-            mcpServers = false
+            mcpServers = true
         )
     }
 }
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/ExtendedClientMetadata.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/ExtendedClientMetadata.kt
index 173c2f29dbb..db49b158c41 100644
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/ExtendedClientMetadata.kt
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/ExtendedClientMetadata.kt
@@ -62,7 +62,7 @@ fun createExtendedClientMetadata(project: Project): ExtendedClientMetadata {
             awsClientCapabilities = AwsClientCapabilities(
                 q = DeveloperProfiles(
                     developerProfiles = true,
-                    mcp = false
+                    mcp = true
                 ),
                 window = WindowSettings(
                     showSaveFileDialog = true

From 2f8f9cdfcbe86cee277191c8f60a184a37a42a88 Mon Sep 17 00:00:00 2001
From: Jacob Chung <chungjac@amazon.com>
Date: Wed, 11 Jun 2025 10:25:27 -0700
Subject: [PATCH 2/2] Revert "revert: revert to "mcp support feature flag"
 (#5803)"

This reverts commit ba228e12da654f41cd29d18e32fd97de61b2e90b.
---
 .../services/amazonq/lsp/model/aws/chat/Conversations.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/Conversations.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/Conversations.kt
index a49405a8cfc..0009bf7a35f 100644
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/Conversations.kt
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/Conversations.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,
     )
 }