feat(amazonq): add support for CodeReview and DisplayFindings tools, alter behavior of explain and fix buttons #5970

BlakeLazarine · 2025-08-14T00:21:53Z

Alters JB plugin to support CodeReview and DisplayFindings tools which are already present in flare.

This enables the Q agent to use the Q Code Review functionality and also migrates /review to call the agent.

The IssueDetails panel has been modified to remove the generated fix, and instead just has options for Explain and Fix, which send information about the issue to the Q Chat.

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)

Description

Checklist

My code follows the code style of this project
I have added tests to cover my changes
A short description of the change has been added to the CHANGELOG if the change is customer-facing in the IDE.
I have added metrics for my changes (if required)

License

I confirm that my contribution is made under the terms of the Apache 2.0 license.

…alter behavior of explain and fix buttons

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

...re/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt

.../toolkits/jetbrains/services/codewhisperer/codescan/utils/CodeWhispererCodeScanIssueUtils.kt

...c/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt

...unity/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatMessage.kt

…alter behavior of explain and fix buttons

…ndings tools

… Path.toUri() for WSL (aws#5960) Fix repeated UriError when Amazon Q starts with a WSL-backed workspace. We now validate the constructed file: URI and fallback to JDK’s Path.toUri() if the URI violates Rule (no authority while the path begins with //, maybe RFC 3986). This keeps legacy behavior where it’s safe, and prevents Q from rejecting the workspace folder URI

…5894) We need to support client-side opt-out for internal users who have workspace context server running by default.

It is not actually needed; we can read the values from AmazonQLspService

…alter behavior of explain and fix buttons

# Conflicts: # plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt

...c/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt

… tools, alter behavior of explain and fix buttons" This reverts commit f21c028.

shruti0085 · 2025-08-15T20:51:54Z

/retryBuild

singhAws

General comment - I dont see anything specific to telemetry events for Explain and Apply Fix. I believe all other events are coming from LangaugeServer.

manodnyab · 2025-08-15T22:13:51Z

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

                    throw error
                }
                chatCommunicationManager.removePartialChatMessage(partialResultToken)
+                val params = value?.let { encryptionManager?.decrypt(it) }.orEmpty()


Is this is in response to specific message from the UI? can we please create a separate function for this? Should this be included in every chat result?

I will move it to a separate function

manodnyab · 2025-08-15T22:16:27Z

...re/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt

+    fun createLineRangeText(issueContext: MutableMap<String, String>): String {
+        val startLineString = issueContext["startLine"]
+        val endLineString = issueContext["endLine"]
+        val startLineInteger = Integer.parseInt(startLineString)


can we use toInt()

manodnyab · 2025-08-15T22:17:15Z

...re/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt

+        val endLineString = issueContext["endLine"]
+        val startLineInteger = Integer.parseInt(startLineString)
+        val endLineInteger = Integer.parseInt(endLineString)
+        return if (startLineInteger == endLineInteger) {


Any specific reason we return a string and not a list here?

the return value is only used in formatting a string, so it makes sense to return string here

andrewyuq · 2025-08-15T23:34:50Z

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

 ) {
    val uiReady = CompletableDeferred<Boolean>()
    private val chatCommunicationManager = ChatCommunicationManager.getInstance(project)
+    private val codeScanManager = CodeWhispererCodeScanManager.getInstance(project)


recommendation is don't store this as a field

…mmands

BlakeLazarine · 2025-08-18T17:34:01Z

/retryBuild

manodnyab · 2025-08-18T20:41:46Z

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

    }

+    private fun parseFindingsMessages(messagesMap: Map<*, *>) {
+        val additionalMessages = messagesMap["additionalMessages"] as? MutableList<Map<String, Any>>


can we please add this in a try catch block?

manodnyab · 2025-08-18T20:42:15Z

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

        }
    }

+    private fun parseFindingsMessages(messagesMap: Map<*, *>) {


Can we add tests for this please?

will try to do this- need to look into how unit tests are written

manodnyab · 2025-08-18T20:44:09Z

...c/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt

            } ?: partialChatResult

+            if (partialResultMap is Map<*, *>) {
+                val additionalMessages = partialResultMap["additionalMessages"] as? MutableList<Map<String, Any>>


will additionalMessages always point to code review findings?

the messages in additional messages can be any message, but we filter by messageId to remove code review findings from partial results map. This prevents the findings from appearing in the chat

manodnyab · 2025-08-20T16:20:12Z

Is there a changelog required here?

laileni-aws · 2025-08-20T16:56:39Z

This feature needs a changeLog, @BlakeLazarine Can you add this?

rli · 2025-08-20T17:33:00Z

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

        }
    }

+    fun parseFindingsMessages(messagesMap: Map<*, *>) {


model types properly instead of turning everything into maps and casting everywhere

I am going to push back on this because there are many possible datatypes that the fields in this can take, and it would be difficult to guarantee that they are all caught by an absolute type. Any missed datatype would cause a failure, when we really only care about the additionalMessages field

how we do this is pass-through the entire payload to the UI<->LSP channel and only model the fields we want to process. then we can let the deserializer drop anything we don't care about, but not affect the underlying communication

rli · 2025-08-20T17:33:14Z

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

+                    val jsonFindings = gson.fromJson(findingsMessage["body"] as String, List::class.java)
+                    val mappedFindings = mutableListOf<CodeWhispererCodeScanIssue>()
+                    for (aggregatedIssueUnformatted in jsonFindings) {
+                        val aggregatedIssue = gson.fromJson(gson.toJson(aggregatedIssueUnformatted), AggregatedCodeScanIssue::class.java)


We are receiving a List of AggregatedCodeScanIssues as a string from FLARE message, this is formatting them and putting them into a List object.

rli · 2025-08-20T17:34:36Z

...re/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt

+        val contextDataKey = DataKey.create<MutableMap<String, String>>("amazonq.codescan.handleIssueCommandContext")
+        val actionDataKey = DataKey.create<String>("amazonq.codescan.handleIssueCommandAction")


data keys should be created once, not every time one is needed

moved to common

...rc/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

...tware/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt

...mmunity/tst/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnectorTest.kt

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

...re/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt

+import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.TelemetryHelper
+import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
+
+class HandleIssueCommandAction : AnAction(), DumbAware {


manodnyab · 2025-08-25T23:56:35Z

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

+            if (findingsMessages != null) {
+                for (findingsMessage in findingsMessages) {
+                    additionalMessages.remove(findingsMessage)
+                    val gson = Gson()


nit: would recommend using the same instance of Gson throughout the class

will add in follow up PR

manodnyab · 2025-08-25T23:58:19Z

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


+    fun parseFindingsMessages(messagesMap: Map<String, *>) {
+        try {
+            val additionalMessages = messagesMap["additionalMessages"] as? MutableList<Map<String, Any>>


Why is this any?

The typing is very complex and only the shape of additionalMessages matters. Even then I am not confident in my ability to know the shape of every possible entry here. Only the shape of the findings message matters. Introducing forced shapes would be too risky in my opinion

rli · 2025-08-26T00:44:17Z

...re/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt

+    val contextDataKey = DataKey.create<MutableMap<String, String>>("amazonq.codescan.handleIssueCommandContext")
+    val actionDataKey = DataKey.create<String>("amazonq.codescan.handleIssueCommandAction")


Suggested change

val contextDataKey = DataKey.create<MutableMap<String, String>>("amazonq.codescan.handleIssueCommandContext")

val actionDataKey = DataKey.create<String>("amazonq.codescan.handleIssueCommandAction")

will add in follow up PR

Reduce the amount of Gson calls added by #5970

blakelaz-amazon added 2 commits August 13, 2025 17:01

feat(amazonq): add support for CodeReview and DisplayFindings tools, …

f76d69d

…alter behavior of explain and fix buttons

fix(amazonq): remove commented lines

b05c4f1

BlakeLazarine requested a review from a team as a code owner August 14, 2025 00:21

github-advanced-security bot found potential problems Aug 14, 2025

View reviewed changes

blakelaz-amazon and others added 9 commits August 14, 2025 11:19

feat(amazonq): add support for CodeReview and DisplayFindings tools, …

99d8433

…alter behavior of explain and fix buttons

fix(amazonq): remove commented lines

ec2d4fd

fix(amazonq): general code quality fixes for CodeReview and DisplayFi…

19f51a9

…ndings tools

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

d28f486

feat(amazonq): show the opt-in checkbox for server-side context (aws#…

d37106e

…5894) We need to support client-side opt-out for internal users who have workspace context server running by default.

fix(amazonq): delete AwsServerCapabilitiesProvider (aws#5833)

fe668ee

It is not actually needed; we can read the values from AmazonQLspService

feat(amazonq): add support for CodeReview and DisplayFindings tools, …

f21c028

…alter behavior of explain and fix buttons

Merge branch 'main' into codeReview

683189f

# Conflicts: # plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt

github-advanced-security bot found potential problems Aug 15, 2025

View reviewed changes

...c/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt Fixed Show fixed Hide fixed

...c/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt Fixed Show fixed Hide fixed

blakelaz-amazon added 4 commits August 15, 2025 09:05

Revert "feat(amazonq): add support for CodeReview and DisplayFindings…

45b7fe2

… tools, alter behavior of explain and fix buttons" This reverts commit f21c028.

fix(amazonq): fix formatting issues

2588777

fix(amazonq): fix more formatting issues

7d4404d

fix(amazonq): fix build failures

5e878f9

BlakeLazarine closed this Aug 15, 2025

BlakeLazarine reopened this Aug 15, 2025

shruti0085 closed this Aug 15, 2025

shruti0085 reopened this Aug 15, 2025

fix(amazonq): undo unrelated change

b26778c

singhAws reviewed Aug 15, 2025

View reviewed changes

manodnyab reviewed Aug 15, 2025

View reviewed changes

andrewyuq approved these changes Aug 15, 2025

View reviewed changes

blakelaz-amazon added 3 commits August 15, 2025 17:03

fix(amazonq): address codeReview comments

5d2c6f5

fix(amazonq): fixing detekt errors

8ed39dd

feat(amazonq): emit telemetry events for explainIssue and applyFix co…

b0ebef0

…mmands

Merge branch 'main' into codeReview

3725505

manodnyab reviewed Aug 18, 2025

View reviewed changes

blakelaz-amazon and others added 4 commits August 18, 2025 15:32

feat(amazonq): add unit tests for parseFindingsMessage

e913055

fix(amazonq): fix detekt errors

f8e45e8

Merge branch 'main' into codeReview

9819471

fix(amazonq): fix re-direct of /review action

685db1a

Merge branch 'main' into codeReview

7baa5f2

laileni-aws approved these changes Aug 20, 2025

View reviewed changes

rli reviewed Aug 20, 2025

View reviewed changes

blakelaz-amazon and others added 4 commits August 22, 2025 10:07

fix(amazonq): improve handling of case where messageId is null

683944b

Merge branch 'main' into codeReview

98e8b3c

fix(amazonq): Add changelog, code quality improvements

9debeac

Merge branch 'main' into codeReview

2a007ad

rli reviewed Aug 22, 2025

View reviewed changes

...tware/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt Outdated Show resolved Hide resolved

...mmunity/tst/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnectorTest.kt Outdated Show resolved Hide resolved

fix(amazonq): address comments

718153b

github-advanced-security bot found potential problems Aug 22, 2025

View reviewed changes

blakelaz-amazon and others added 2 commits August 22, 2025 12:32

fix(amazonq): remove unused import

f675828

Merge branch 'main' into codeReview

f9c0976

manodnyab reviewed Aug 25, 2025

View reviewed changes

rli reviewed Aug 26, 2025

View reviewed changes

manodnyab merged commit 2d5ca0b into aws:main Aug 26, 2025
14 of 15 checks passed

rli added a commit that referenced this pull request Aug 26, 2025

chore: cleanup/reduce de/ser cycles introduced in #5970

cdc4564

rli mentioned this pull request Aug 26, 2025

perf: cleanup/reduce de/ser cycles introduced in #5970 #5992

Merged

rli added a commit that referenced this pull request Aug 27, 2025

perf: cleanup/reduce de/ser cycles introduced in #5970 (#5992)

62153b8

Reduce the amount of Gson calls added by #5970

		val contextDataKey = DataKey.create<MutableMap<String, String>>("amazonq.codescan.handleIssueCommandContext")
		val actionDataKey = DataKey.create<String>("amazonq.codescan.handleIssueCommandAction")

feat(amazonq): add support for CodeReview and DisplayFindings tools, alter behavior of explain and fix buttons #5970

feat(amazonq): add support for CodeReview and DisplayFindings tools, alter behavior of explain and fix buttons #5970

Uh oh!

Conversation

BlakeLazarine commented Aug 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Types of changes

Description

Checklist

License

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shruti0085 commented Aug 15, 2025

Uh oh!

singhAws left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BlakeLazarine commented Aug 18, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

manodnyab commented Aug 20, 2025

Uh oh!

laileni-aws commented Aug 20, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check warning

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BlakeLazarine commented Aug 14, 2025 •

edited

Loading