update

Author: leigaol

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

@@ -91,7 +91,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.Promp
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.PromptInputOptionChangeParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.QuickChatActionRequest
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_CHAT_COMMAND_PROMPT
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_ERROR_MESSAGE
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_ERROR_PARAMS
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.STOP_CHAT_RESPONSE
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendChatPromptRequest
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SourceLinkClickNotification
@@ -212,6 +212,8 @@ class BrowserConnector(
         }
     }
 
+
+
     private fun handleFlareChatMessages(browser: Browser, node: JsonNode) {
         when (node.command) {
             SEND_CHAT_COMMAND_PROMPT -> {
@@ -439,17 +441,9 @@ class BrowserConnector(
                             browser.postChat(res)
                         } catch (e: Exception) {
                             LOG.error { "Failed to perform chat tab bar action $e" }
-                            if (params.tabId != null) {
-                                browser.postChat(
-                                    ChatCommunicationManager.convertToJsonToSendToChat(
-                                        CHAT_ERROR_MESSAGE,
-                                        params.tabId.toString(),
-                                        getErrorUiMessage(e),
-                                        isPartialResult = false
-                                    )
-                                )
+                            params.tabId?.let {
+                                chatCommunicationManager.sendErrorToUi(it, e, null)
                             }
-
                         }
                     }
                 }
@@ -510,25 +504,12 @@ class BrowserConnector(
                 chatCommunicationManager.removeInflightRequestForTab(tabId)
             } catch (e: Exception) {
                 LOG.error { "Failed to send chat message $e" }
-                chatCommunicationManager.removePartialChatMessage(partialResultToken)
-                browser.postChat(
-                    ChatCommunicationManager.convertToJsonToSendToChat(
-                        CHAT_ERROR_MESSAGE,
-                        tabId,
-                        getErrorUiMessage(e),
-                        isPartialResult = false
-                    )
-                )
+                chatCommunicationManager.sendErrorToUi(tabId, e, partialResultToken)
             }
 
         }
     }
 
-    private fun getErrorUiMessage(e: Exception) = Gson().toJson(
-        ChatUiMessageParams(
-            title = "An error occurred while processing your request.",
-            body = "Details: ${e.message}"
-        )).toString()
 
     private fun cancelInflightRequests(tabId: String) {
         chatCommunicationManager.getInflightRequestForTab(tabId)?.let { request ->

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

@@ -4,15 +4,18 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat
 
 import com.google.gson.Gson
+import com.google.gson.JsonElement
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import org.eclipse.lsp4j.ProgressParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ProgressNotificationUtils.getObject
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ErrorParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSerializedChatResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OpenTabResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_CHAT_COMMAND_PROMPT
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_ERROR_PARAMS
 import java.util.UUID
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ConcurrentHashMap
@@ -70,13 +73,42 @@ class ChatCommunicationManager {
         }
     }
 
+    fun sendErrorToUi(tabId: String, exception: Exception, token: String?) {
+        token?.let {
+            removePartialChatMessage(it)
+        }
+        val errorTitle = "An error occurred while processing your request."
+        val errorMessage = "Details: ${exception.message}"
+        val errorParams = Gson().toJsonTree(ErrorParams(tabId, null, errorMessage, errorTitle))
+        sendErrorMessageToChatUi(CHAT_ERROR_PARAMS, tabId, errorParams, false)
+    }
+
+    private fun sendErrorMessageToChatUi(command: String, tabId: String, partialChatResult: JsonElement, isPartialResult: Boolean) {
+        val uiMessage =  """
+                {
+                "command":"$command",
+                "tabId": "$tabId",
+                "params": $partialChatResult,
+                "isPartialResult": $isPartialResult
+                }
+            """.trimIndent()
+        AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
+    }
+
     companion object {
         fun getInstance(project: Project) = project.service<ChatCommunicationManager>()
 
         val pendingSerializedChatRequests = ConcurrentHashMap<String, CompletableFuture<GetSerializedChatResult>>()
         fun completeSerializedChatResponse(requestId: String, content: String) {
             pendingSerializedChatRequests.remove(requestId)?.complete(GetSerializedChatResult((content)))
         }
+        fun getErrorUiMessage(tabId: String, e: Exception): String = Gson().toJson(
+            ErrorParams(
+                title = "An error occurred while processing your request.",
+                message = "Details: ${e.message}",
+                tabID = tabId,
+                triggerType = TODO(),
+            )).toString()
 
         fun convertToJsonToSendToChat(command: String, tabId: String, params: String, isPartialResult: Boolean): String =
             """

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

@@ -31,5 +31,5 @@ const val CHAT_SEND_UPDATE = "aws/chat/sendChatUpdate"
 const val CHAT_CREATE_PROMPT = "aws/chat/createPrompt"
 const val SHOW_SAVE_FILE_DIALOG_REQUEST_METHOD = "aws/showSaveFileDialog"
 const val GET_SERIALIZED_CHAT_REQUEST_METHOD = "aws/chat/getSerializedChat"
-const val CHAT_ERROR_MESSAGE = "errorMessage"
+const val CHAT_ERROR_PARAMS = "errorMessage"
 const val STOP_CHAT_RESPONSE = "stopChatResponse"