Skip to content

fix(amazonq): fix handling of code review tool findings #6022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 11, 2025
Merged

fix(amazonq): fix handling of code review tool findings #6022

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c15cad4
fix(amazonq): fix handling of code review tool findings
blakelaz-amazon Sep 10, 2025
a924166
fix(amazonq): include changelog
blakelaz-amazon Sep 10, 2025
e84bc52
fix(amazonq): fix detekt failures
blakelaz-amazon Sep 10, 2025
8fe497d
Merge branch 'main' into CodeReviewHandling
BlakeLazarine Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions ...ommunity/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,12 +595,12 @@ class BrowserConnector(
}
chatCommunicationManager.removePartialChatMessage(partialResultToken)
val decryptedMessage = value?.let { encryptionManager?.decrypt(it) }.orEmpty()
parseFindingsMessages(decryptedMessage)
val filteredMessage = parseFindingsMessages(decryptedMessage)

val messageToChat = ChatCommunicationManager.convertToJsonToSendToChat(
SEND_CHAT_COMMAND_PROMPT,
tabId,
decryptedMessage,
filteredMessage,
isPartialResult = false
)
browser.postChat(messageToChat)
Expand All @@ -618,13 +618,10 @@ class BrowserConnector(
val additionalMessages = serializer.objectMapper.readValue<FlareAdditionalMessages>(responsePayload).additionalMessages
?: return emptyList()

return additionalMessages.filter { message ->
message.messageId.endsWith(CODE_REVIEW_FINDINGS_SUFFIX) ||
message.messageId.endsWith(DISPLAY_FINDINGS_SUFFIX)
}
return additionalMessages
}

fun parseFindingsMessages(@Language("JSON") responsePayload: String) {
fun parseFindingsMessages(@Language("JSON") responsePayload: String): String {
try {
val findings = deserializeFindings(responsePayload)
val scannedFiles = mutableListOf<VirtualFile>()
Expand Down Expand Up @@ -687,9 +684,17 @@ class BrowserConnector(
CodeWhispererConstants.CodeAnalysisScope.AGENTIC
)
CodeWhispererCodeScanManager.getInstance(project).showCodeScanUI()

// Remove findings messages from response payload
val rootNode = serializer.objectMapper.readTree(responsePayload) as ObjectNode
rootNode.remove("additionalMessages")
return serializer.objectMapper.writeValueAsString(rootNode)
}

return responsePayload
} catch (e: Exception) {
LOG.error(e) { "Failed to parse findings message" }
return responsePayload
}
}

Expand Down
14 changes: 12 additions & 2 deletions ...y/src/software/aws/toolkits/jetbrains/services/amazonq/webview/FlareAdditionalFindings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ import com.fasterxml.jackson.annotation.Nulls
import com.fasterxml.jackson.core.JsonParser
import com.fasterxml.jackson.databind.DeserializationContext
import com.fasterxml.jackson.databind.JsonDeserializer
import com.fasterxml.jackson.databind.JsonNode
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.Description
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.Recommendation
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.SuggestedFix
Expand Down Expand Up @@ -55,10 +58,17 @@ data class AggregatedCodeScanIssue(
)

class FlareAggregatedFindingsDeserializer : JsonDeserializer<FlareAggregatedFindings>() {
private val objectMapper = jacksonObjectMapper()

override fun deserialize(p: JsonParser, ctxt: DeserializationContext): FlareAggregatedFindings? =
// drop values that do not look like FlareAggregatedFindings
try {
ctxt.readValue(p, FlareAggregatedFindings::class.java)
val node = p.readValueAsTree<JsonNode>()
val messageId = node.get("messageId")?.asText() ?: return null
val bodyNode = node.get("body") ?: return null

val body = objectMapper.readValue<List<AggregatedCodeScanIssue>>(bodyNode.asText())

FlareAggregatedFindings(messageId, body)
} catch (_: Exception) {
null
}
Expand Down
11 changes: 7 additions & 4 deletions ...nity/tst/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnectorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class BrowserConnectorTest : AmazonQTestBase() {
"additionalMessages": [
{
"messageId": "test_codeReviewFindings",
"body": [{"filePath": "/test/file.kt", "issues": []}]
"body": "[{\"filePath\": \"/test/file.kt\", \"issues\": []}]"
},
{
"messageId": "other_message",
Expand Down Expand Up @@ -121,7 +121,7 @@ class BrowserConnectorTest : AmazonQTestBase() {
"additionalMessages": [
{
"messageId": "test_displayFindings",
"body": [{"filePath": "/test/file.kt", "issues": []}]
"body": "[{\"filePath\": \"/test/file.kt\", \"issues\": []}]"
},
{
"messageId": "other_message",
Expand Down Expand Up @@ -179,7 +179,7 @@ class BrowserConnectorTest : AmazonQTestBase() {
"additionalMessages": [
{
"messageId": "test_codeReviewFindings",
"body": ${jacksonObjectMapper().writeValueAsString(listOf(aggregatedIssue))}
"body": "${jacksonObjectMapper().writeValueAsString(listOf(aggregatedIssue)).replace("\"", "\\\"")}"
},
{
"messageId": "other_message",
Expand Down Expand Up @@ -228,7 +228,7 @@ class BrowserConnectorTest : AmazonQTestBase() {
"additionalMessages": [
{
"messageId": "test_displayFindings",
"body": ${jacksonObjectMapper().writeValueAsString(listOf(aggregatedIssue))}
"body": "${jacksonObjectMapper().writeValueAsString(listOf(aggregatedIssue)).replace("\"", "\\\"")}"
},
{
"messageId": "other_message",
Expand Down Expand Up @@ -256,6 +256,9 @@ class BrowserConnectorTest : AmazonQTestBase() {
{
"messageId": "test_codeReviewFindings",
"body": "invalid json"
},
{
"body": "invalid json"
}
]
}
Expand Down
Loading