feat(amazonq): client emits followUpClick when chat follow up is selected (#5596)

* Set up Flare chat connection

* Partial chat results

* feedback

* detekt

* syntax error

* detekt

* detekt

* Add quick actions to chat

* adding commands from initialize result

* added trace logging

* add followUpClick handling

* fix deserialization bug

* line not needed

* feedback

* remove showResult call

---------

Co-authored-by: Manodnya Bhoite <[email protected]>
Co-authored-by: manodnyab <[email protected]>

Author: samgst-amazon

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

@@ -29,6 +29,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryp
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.getTextDocumentIdentifier
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FEEDBACK
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FOLLOW_UP_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_INFO_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_QUICK_ACTION
@@ -43,6 +44,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.FeedbackNotification
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FeedbackParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FollowUpClickNotification
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FollowUpClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.InfoLinkClickNotification
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.InfoLinkClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.LinkClickNotification
@@ -247,6 +250,11 @@ class BrowserConnector(
                     server.sourceLinkClick(params)
                 }
             }
+            CHAT_FOLLOW_UP_CLICK -> {
+                handleChatNotification<FollowUpClickNotification, FollowUpClickParams>(node) { server, params ->
+                    server.followUpClick(params)
+                }
+            }
         }
     }
 

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

@@ -11,6 +11,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.GetConfigu
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LspServerConfigurations
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.UpdateConfigurationParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FEEDBACK
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FOLLOW_UP_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_INFO_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_QUICK_ACTION
@@ -19,6 +20,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FeedbackParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FollowUpClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.InfoLinkClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.LinkClickParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_CHAT_COMMAND_PROMPT
@@ -67,4 +69,7 @@ interface AmazonQLanguageServer : LanguageServer {
 
     @JsonNotification(CHAT_SOURCE_LINK_CLICK)
     fun sourceLinkClick(params: SourceLinkClickParams): CompletableFuture<Unit>
+
+    @JsonNotification(CHAT_FOLLOW_UP_CLICK)
+    fun followUpClick(params: FollowUpClickParams): CompletableFuture<Unit>
 }

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

@@ -22,5 +22,5 @@ data class MidChatPrompt(
 data class InnerChatPrompt(
     val prompt: String,
     val escapedPrompt: String,
-    val context: List<String>,
+    val context: List<String>? = null,
 )

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

@@ -38,10 +38,10 @@ data class SourceLink(
 
 data class ChatItemAction(
     val pillText: String,
-    val prompt: String,
-    val disabled: Boolean,
-    val description: String,
-    val type: String,
+    val prompt: String? = null,
+    val disabled: Boolean? = null,
+    val description: String? = null,
+    val type: String? = null,
 )
 
 data class RecommendationContentSpan(

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

@@ -10,3 +10,4 @@ const val CHAT_LINK_CLICK = "aws/chat/linkClick"
 const val CHAT_INFO_LINK_CLICK = "aws/chat/infoLinkClick"
 const val CHAT_SOURCE_LINK_CLICK = "aws/chat/sourceLinkClick"
 const val CHAT_FEEDBACK = "aws/chat/feedback"
+const val CHAT_FOLLOW_UP_CLICK = "aws/chat/followUpClick"

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

@@ -0,0 +1,15 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
+
+data class FollowUpClickNotification(
+    override val command: String,
+    override val params: FollowUpClickParams,
+) : ChatNotification<FollowUpClickParams>
+
+data class FollowUpClickParams(
+    val tabId: String,
+    val messageId: String,
+    val followUp: ChatItemAction,
+)