Merge main into feature/model-selection

aws-toolkit-automation · web-flow · commit f537e4c4f6ba · 2025-10-01T10:47:36.000-07:00
diff --git a/.changes/next-release/bugfix-f071cf54-2c8d-4504-9326-6bce9619cee6.json b/.changes/next-release/bugfix-f071cf54-2c8d-4504-9326-6bce9619cee6.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "DisplayFindings tool findings were not being populated in the display panel, instead sending json to chat"
+}
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/FlareAdditionalFindings.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/FlareAdditionalFindings.kt
@@ -49,7 +49,7 @@ data class FlareCodeScanIssue(
     val language: String,
     val autoDetected: Boolean,
     val filePath: String,
-    val findingContext: String,
+    val findingContext: String?,
 )
 
 data class AggregatedCodeScanIssue(
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -910,7 +910,7 @@ codewhisperer.codescan.regenerate_fix_button_label=Regenerate Fix
 codewhisperer.codescan.run_scan_complete=<html><body> Code Review completed for {0, choice, 1#1 file|2#{0,number} files}. {1, choice, 0#No issues|1#1 issue|2#{1,number} issues} found in {2}. <font color="{3}">  Last Run {4} </font></body></html>
 codewhisperer.codescan.run_scan_error=Amazon Q encountered an error while reviewing for code issues. Please try again later.
 codewhisperer.codescan.run_scan_error_telemetry=Code Review failed.
-codewhisperer.codescan.run_scan_info=Enter /review in Amazon Q Chat Panel to run code reviews.
+codewhisperer.codescan.run_scan_info=Ask the agent in Amazon Q Chat Panel to run code reviews.
 codewhisperer.codescan.scan_complete_count=- {0}: `{1, choice, 1#{1,number} issue|2#{1,number} issues}`
 codewhisperer.codescan.scan_complete_file=Reviewing your File is complete. Here's what I found:
 codewhisperer.codescan.scan_complete_project=Reviewing your Project is complete. Here's what I found:

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "DisplayFindings tool findings were not being populated in the display panel, instead sending json to chat"
 +}
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ data class FlareCodeScanIssue(`
`49`	`49`	`val language: String,`
`50`	`50`	`val autoDetected: Boolean,`
`51`	`51`	`val filePath: String,`
`52`		`- val findingContext: String,`
	`52`	`+ val findingContext: String?,`
`53`	`53`	`)`
`54`	`54`
`55`	`55`	`data class AggregatedCodeScanIssue(`