Merge remote-tracking branch 'origin/codeReview' into codeReview

Author: blakelaz-amazon

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/utils/CodeWhispererCodeScanIssueUtils.kt

@@ -8,6 +8,7 @@ import com.intellij.diff.DiffContentFactory
 import com.intellij.diff.DiffManager
 import com.intellij.diff.requests.SimpleDiffRequest
 import com.intellij.diff.util.DiffUserDataKeys
+import com.intellij.docker.agent.util.toJson
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys

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

@@ -143,6 +143,15 @@ class ChatCommunicationManager(private val project: Project, private val cs: Cor
                 Gson().fromJson(partialChatResult, Map::class.java)
             } ?: partialChatResult
 
+            if (partialResultMap is Map<*, *>) {
+                val additionalMessages = partialResultMap["additionalMessages"] as? MutableList<Map<String, Any>>
+                additionalMessages?.removeAll {
+                    val messageId = it["messageId"] as? String
+                    messageId != null &&
+                        (messageId.endsWith(CODE_REVIEW_FINDINGS_SUFFIX) ||
+                            messageId.endsWith(DISPLAY_FINDINGS_SUFFIX))
+                }
+            }
 
             notifyUi(
                 FlareUiMessage(