Merge main into feature/disable-sspc

aws-toolkit-automation · web-flow · commit cf96942374fa · 2025-07-14T11:10:59.000-07:00
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt
@@ -200,7 +200,7 @@ class ChatCommunicationManager(private val project: Project, private val cs: Cor
         var errorMessage: String? = null
         if (exception is ResponseErrorException) {
             errorMessage = tryOrNull {
-                Gson().fromJson(exception.responseError.data as JsonObject, ChatMessage::class.java).body
+                "${exception.responseError.message}: ${Gson().fromJson(exception.responseError.data as JsonObject, ChatMessage::class.java).body}"
             } ?: exception.responseError.message
         }
 

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ class ChatCommunicationManager(private val project: Project, private val cs: Cor`
`200`	`200`	`var errorMessage: String? = null`
`201`	`201`	`if (exception is ResponseErrorException) {`
`202`	`202`	`errorMessage = tryOrNull {`
`203`		`- Gson().fromJson(exception.responseError.data as JsonObject, ChatMessage::class.java).body`
	`203`	`+ "${exception.responseError.message}: ${Gson().fromJson(exception.responseError.data as JsonObject, ChatMessage::class.java).body}"`
`204`	`204`	`} ?: exception.responseError.message`
`205`	`205`	`}`
`206`	`206`