Merge branch 'main' into q-lsp-chat

andrewyuq · web-flow · commit d11d00e909b6 · 2025-06-10T10:36:26.000-07:00
diff --git a/.changes/next-release/feature-6de3f384-aa3b-47fe-b895-d41ef23ed6da.json b/.changes/next-release/feature-6de3f384-aa3b-47fe-b895-d41ef23ed6da.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Support for Amazon Q Builder ID paid tier"
+}
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/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
+                            )
+                        )
+                    }
+            }
         }
     }
 
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/resources/META-INF/plugin-codewhisperer.xml b/plugins/amazonq/codewhisperer/jetbrains-community/resources/META-INF/plugin-codewhisperer.xml
@@ -139,5 +139,7 @@
                 class="software.aws.toolkits.jetbrains.services.cwc.commands.codescan.actions.CodeScanCompleteAction" />
         </group>
 
+        <action id="q.manage.subscription"
+                class="software.aws.toolkits.jetbrains.services.codewhisperer.actions.ManageSubscription"/>
     </actions>
 </idea-plugin>
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/QStatusBarLoggedInActionGroup.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/QStatusBarLoggedInActionGroup.kt
@@ -12,15 +12,12 @@ import com.intellij.openapi.project.Project
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.actions.SsoLogoutAction
-import software.aws.toolkits.jetbrains.core.credentials.pinning.CodeWhispererConnection
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 import software.aws.toolkits.jetbrains.core.credentials.sono.isSono
-import software.aws.toolkits.jetbrains.services.amazonq.actions.QSwitchProfilesAction
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererConnectOnGithubAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererLearnMoreAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererProvideFeedbackAction
-import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererShowSettingsAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.actions.CodeWhispererCodeScanRunAction
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.ActionProvider
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.Customize
@@ -54,6 +51,7 @@ class QStatusBarLoggedInActionGroup : DefaultActionGroup() {
 
     override fun getChildren(e: AnActionEvent?) = e?.project?.let {
         val isPendingActiveProfile = QRegionProfileManager.getInstance().hasValidConnectionButNoActiveProfile(it)
+        val actionManager = ActionManager.getInstance()
         buildList {
             if (!isPendingActiveProfile) {
                 addAll(buildActionListForActiveProfileSelected(it, actionProvider))
@@ -64,15 +62,18 @@ class QStatusBarLoggedInActionGroup : DefaultActionGroup() {
             addAll(buildActionListForConnectHelp(actionProvider))
 
             add(Separator.create())
-            add(CodeWhispererShowSettingsAction())
-            (
-                ToolkitConnectionManager.getInstance(it).activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
-                )?.takeIf { !it.isSono() }
-                ?.let { add(QSwitchProfilesAction()) }
-            ToolkitConnectionManager.getInstance(it).activeConnectionForFeature(CodeWhispererConnection.getInstance())?.let { c ->
-                (c as? AwsBearerTokenConnection)?.let { connection ->
-                    add(SsoLogoutAction(connection))
+            add(actionManager.getAction("codewhisperer.settings"))
+
+            val connection = ToolkitConnectionManager.getInstance(it).activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
+
+            if (connection != null) {
+                if (!connection.isSono()) {
+                    add(actionManager.getAction("codewhisperer.switchProfiles"))
+                } else {
+                    add(actionManager.getAction("q.manage.subscription"))
                 }
+
+                add(SsoLogoutAction(connection))
             }
         }.toTypedArray()
     }.orEmpty()
diff --git a/plugins/amazonq/shared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties b/plugins/amazonq/shared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties
@@ -9,6 +9,7 @@ amazonqInlineChat.popup.title=Enter Instructions for Q
 amazonq.refresh.panel=Refresh Chat Session
 amazonq.title=Amazon Q
 amazonq.workspace.settings.open.prompt=Workspace index is now enabled. You can disable it from Amazon Q settings.
+action.q.manage.subscription.text=Manage Subscription
 action.q.profile.usage.text=You changed your profile
 action.q.profile.usage=You''re using the ''<b>{0}</b>'' profile for Amazon Q.
 action.q.switchProfiles.text=Change Profile
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQChatServer.kt b/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,
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactHelper.kt b/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
     }
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
@@ -33,7 +33,8 @@ class AwsServerCapabilitiesProvider {
                 )
             ),
             history = true,
-            export = true
+            export = true,
+            mcpServers = false
         )
     }
 }
@@ -46,6 +47,7 @@ data class ChatOptions(
     val quickActions: QuickActions,
     val history: Boolean,
     val export: Boolean,
+    val mcpServers: Boolean,
 )
 
 data class QuickActions(
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
@@ -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 = false
                 ),
                 window = WindowSettings(
                     showSaveFileDialog = true
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatMessage.kt b/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(
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
@@ -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? = null,
+        val label: String? = null,
+    )
+}
 
 data class Action(
     val id: String,
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FlareChatCommands.kt b/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"
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/ManageSubscription.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/ManageSubscription.kt
@@ -0,0 +1,58 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.actions
+
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.progress.currentThreadCoroutineScope
+import com.intellij.openapi.project.DumbAware
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.launch
+import org.eclipse.lsp4j.ExecuteCommandParams
+import software.aws.toolkits.core.utils.error
+import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
+import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
+import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
+import software.aws.toolkits.jetbrains.core.credentials.sono.isSono
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
+
+class ManageSubscription : AnAction(), DumbAware {
+    override fun getActionUpdateThread() = ActionUpdateThread.BGT
+
+    override fun update(e: AnActionEvent) {
+        val project = e.project
+        // disable if user is IdC
+        if (project == null) {
+            e.presentation.isEnabledAndVisible = false
+        } else {
+            val connection = ToolkitConnectionManager.getInstance(project)
+                .activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
+
+            e.presentation.isEnabledAndVisible = connection.isSono()
+        }
+    }
+
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project ?: return
+        currentThreadCoroutineScope().launch {
+            AmazonQLspService.getInstance(project).execute { lsp ->
+                lsp.workspaceService.executeCommand(
+                    ExecuteCommandParams().apply {
+                        this.command = "aws/chat/manageSubscription"
+                    }
+                )
+            }.handleAsync { _, ex ->
+                if (ex != null) {
+                    LOG.error(ex) { "Failed aws/chat/manageSubscription" }
+                }
+            }.await()
+        }
+    }
+
+    companion object {
+        private val LOG = getLogger<ManageSubscription>()
+    }
+}
diff --git a/plugins/core/webview/src/q-ui/components/qOptions.vue b/plugins/core/webview/src/q-ui/components/qOptions.vue
@@ -26,8 +26,8 @@
             :isSelected="selectedLoginOption === LoginOption.BUILDER_ID"
             :itemId="LoginOption.BUILDER_ID"
             :login-type="LoginOption.BUILDER_ID"
-            :itemTitle="'Use for free'"
-            :itemText="'No AWS account required'"
+            :itemTitle="'Personal account'"
+            :itemText="'Best for personal use. Free to start with a Builder ID'"
             class="font-amazon bottom-small-gap"
         ></SelectableItem>
         <!-- TODO: IdC description undecided -->
@@ -37,7 +37,8 @@
             :isSelected="selectedLoginOption === LoginOption.ENTERPRISE_SSO"
             :itemId="LoginOption.ENTERPRISE_SSO"
             :login-type="LoginOption.ENTERPRISE_SSO"
-            :itemTitle="'Use with Pro license'"
+            :itemTitle="'Company account'"
+            :itemText="'Best for individual teams or organizations'"
             class="font-amazon bottom-small-gap"
         ></SelectableItem>
         <button
diff --git a/plugins/core/webview/src/q-ui/components/toolkitOptions.vue b/plugins/core/webview/src/q-ui/components/toolkitOptions.vue
@@ -27,8 +27,8 @@
             :isSelected="selectedLoginOption === LoginOption.BUILDER_ID"
             :itemId="LoginOption.BUILDER_ID"
             :login-type="LoginOption.BUILDER_ID"
-            :itemTitle="'Use for free'"
-            :itemText="'No AWS account required'"
+            :itemTitle="'Personal account'"
+            :itemText="'Best for personal use. Free to start with a Builder ID'"
             class="font-amazon bottom-small-gap"
         ></SelectableItem>
         <!-- TODO: IdC description undecided -->

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "feature",
 +  "description" : "Support for Amazon Q Builder ID paid tier"
 +}
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ class AwsServerCapabilitiesProvider {`
`33`	`33`	`)`
`34`	`34`	`),`
`35`	`35`	`history = true,`
`36`		`- export = true`
	`36`	`+ export = true,`
	`37`	`+ mcpServers = false`
`37`	`38`	`)`
`38`	`39`	`}`
`39`	`40`	`}`
`@@ -46,6 +47,7 @@ data class ChatOptions(`
`46`	`47`	`val quickActions: QuickActions,`
`47`	`48`	`val history: Boolean,`
`48`	`49`	`val export: Boolean,`
	`50`	`+ val mcpServers: Boolean,`
`49`	`51`	`)`
`50`	`52`
`51`	`53`	`data class QuickActions(`