feat(amazonq): mcp support

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

@@ -72,6 +72,8 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.Encry
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GET_SERIALIZED_CHAT_REQUEST_METHOD
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSerializedChatResponse
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.LIST_MCP_SERVERS_REQUEST_METHOD
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.MCP_SERVER_CLICK_REQUEST_METHOD
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OPEN_SETTINGS
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OPEN_WORKSPACE_SETTINGS_KEY
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OpenSettingsNotification
@@ -461,6 +463,28 @@ class BrowserConnector(
             TELEMETRY_EVENT -> {
                 handleChat(AmazonQChatServer.telemetryEvent, node)
             }
+            LIST_MCP_SERVERS_REQUEST_METHOD -> {
+                handleChat(AmazonQChatServer.listMcpServers, node)
+                    .whenComplete { response, _ ->
+                        browser.postChat(
+                            FlareUiMessage(
+                                command = LIST_MCP_SERVERS_REQUEST_METHOD,
+                                params = response
+                            )
+                        )
+                    }
+            }
+            MCP_SERVER_CLICK_REQUEST_METHOD -> {
+                handleChat(AmazonQChatServer.mcpServerClick, node)
+                    .whenComplete { response, _ ->
+                        browser.postChat(
+                            FlareUiMessage(
+                                command = MCP_SERVER_CLICK_REQUEST_METHOD,
+                                params = response
+                            )
+                        )
+                    }
+            }
         }
     }
 

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

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp
 
 import org.eclipse.lsp4j.jsonrpc.json.JsonRpcMethodProvider
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LSPAny
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ButtonClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ButtonClickResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_BUTTON_CLICK
@@ -37,8 +38,10 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSe
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSerializedChatResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.InfoLinkClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.InsertToCursorPositionParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.LIST_MCP_SERVERS_REQUEST_METHOD
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.LinkClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ListConversationsParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.MCP_SERVER_CLICK_REQUEST_METHOD
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.PROMPT_INPUT_OPTIONS_CHANGE
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.PromptInputOptionChangeParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_CHAT_COMMAND_PROMPT
@@ -174,6 +177,18 @@ object AmazonQChatServer : JsonRpcMethodProvider {
         Any::class.java
     )
 
+    val listMcpServers = JsonRpcRequest(
+        LIST_MCP_SERVERS_REQUEST_METHOD,
+        LSPAny::class.java,
+        LSPAny::class.java
+    )
+
+    val mcpServerClick = JsonRpcRequest(
+        MCP_SERVER_CLICK_REQUEST_METHOD,
+        LSPAny::class.java,
+        LSPAny::class.java
+    )
+
     val conversationClick = JsonRpcRequest(
         CHAT_CONVERSATION_CLICK,
         ConversationClickParams::class.java,

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactHelper.kt

@@ -29,7 +29,9 @@ import java.util.concurrent.atomic.AtomicInteger
 class ArtifactHelper(private val lspArtifactsPath: Path = DEFAULT_ARTIFACT_PATH, private val maxDownloadAttempts: Int = MAX_DOWNLOAD_ATTEMPTS) {
 
     companion object {
-        private val DEFAULT_ARTIFACT_PATH = getToolkitsCommonCacheRoot().resolve(Paths.get("aws", "toolkits", "language-servers", "AmazonQ-JetBrains-temp"))
+        private val DEFAULT_ARTIFACT_PATH = getToolkitsCommonCacheRoot().resolve(
+            Paths.get("aws", "toolkits", "language-servers", "AmazonQ-JetBrains-temp")
+        )
         private val logger = getLogger<ArtifactHelper>()
         private const val MAX_DOWNLOAD_ATTEMPTS = 3
     }

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

@@ -33,7 +33,8 @@ class AwsServerCapabilitiesProvider {
                 )
             ),
             history = true,
-            export = true
+            export = true,
+            mcpServers = true
         )
     }
 }
@@ -46,6 +47,7 @@ data class ChatOptions(
     val quickActions: QuickActions,
     val history: Boolean,
     val export: Boolean,
+    val mcpServers: Boolean,
 )
 
 data class QuickActions(

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

@@ -23,6 +23,7 @@ data class AwsClientCapabilities(
 
 data class DeveloperProfiles(
     val developerProfiles: Boolean,
+    val mcp: Boolean,
 )
 
 data class WindowSettings(
@@ -60,7 +61,8 @@ fun createExtendedClientMetadata(project: Project): ExtendedClientMetadata {
             ),
             awsClientCapabilities = AwsClientCapabilities(
                 q = DeveloperProfiles(
-                    developerProfiles = true
+                    developerProfiles = true,
+                    mcp = true
                 ),
                 window = WindowSettings(
                     showSaveFileDialog = true

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

@@ -19,6 +19,12 @@ data class ChatMessage(
     val codeReference: List<ReferenceTrackerInformation>? = null,
     val fileList: FileList? = null,
     val contextList: FileList? = null,
+    val summary: Summary? = null,
+)
+
+data class Summary(
+    val content: ChatMessage? = null,
+    val collapsedContent: List<ChatMessage>? = null,
 )
 
 data class MessageHeader(

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

@@ -13,14 +13,24 @@ data class TextBasedFilterOption(
     val type: String,
     val placeholder: String?,
     val icon: IconType?,
+    val title: String?,
+    val description: String?,
 )
 
 data class FilterOption(
     val id: String,
+    val placeholder: String? = null,
+    val title: String? = null,
+    val description: String? = null,
+    val icon: IconType? = null,
     val type: String,
-    val placeholder: String?,
-    val icon: IconType?,
-)
+    val options: List<Option>? = null,
+) {
+    data class Option(
+        val value: String,
+        val label: String,
+    )
+}
 
 data class Action(
     val id: String,

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

@@ -51,3 +51,7 @@ const val SHOW_SAVE_FILE_DIALOG_REQUEST_METHOD = "aws/showSaveFileDialog"
 const val STOP_CHAT_RESPONSE = "stopChatResponse"
 const val SEND_TO_PROMPT = "sendToPrompt"
 const val TELEMETRY_EVENT = "telemetry/event"
+
+// https://github.com/aws/language-server-runtimes/blob/112feba70219a98a12f13727d67c540205fa9c9f/types/chat.ts#L32
+const val LIST_MCP_SERVERS_REQUEST_METHOD = "aws/chat/listMcpServers"
+const val MCP_SERVER_CLICK_REQUEST_METHOD = "aws/chat/mcpServerClick"