fix(amazonq): send full finding details to plugin, partial to agent (aws#2356)

* fix(amazonq): send full finding details to plugin, only send key fields to agent

* fix(amazonq): add unit test

---------

Co-authored-by: Blake Lazarine <[email protected]>

Author: BlakeLazarine

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

@@ -2097,6 +2097,28 @@ export class AgenticChatController implements ChatHandlers {
 
                 let toolResultContent: ToolResultContentBlock
 
+                if (toolUse.name === CodeReview.toolName) {
+                    // no need to write tool result for code review, this is handled by model via chat
+                    // Push result in message so that it is picked by IDE plugin to show in issues panel
+                    const codeReviewResult = result as InvokeOutput
+                    if (
+                        codeReviewResult?.output?.kind === 'json' &&
+                        codeReviewResult.output.success &&
+                        (codeReviewResult.output.content as any)?.findingsByFile
+                    ) {
+                        await chatResultStream.writeResultBlock({
+                            type: 'tool',
+                            messageId: toolUse.toolUseId + CODE_REVIEW_FINDINGS_MESSAGE_SUFFIX,
+                            body: (codeReviewResult.output.content as any).findingsByFile,
+                        })
+                        codeReviewResult.output.content = {
+                            codeReviewId: (codeReviewResult.output.content as any).codeReviewId,
+                            message: (codeReviewResult.output.content as any).message,
+                            findingsByFileSimplified: (codeReviewResult.output.content as any).findingsByFileSimplified,
+                        }
+                    }
+                }
+
                 if (typeof result === 'string') {
                     toolResultContent = { text: result }
                 } else if (Array.isArray(result)) {
@@ -2182,20 +2204,6 @@ export class AgenticChatController implements ChatHandlers {
                         await chatResultStream.writeResultBlock(chatResult)
                         break
                     case CodeReview.toolName:
-                        // no need to write tool result for code review, this is handled by model via chat
-                        // Push result in message so that it is picked by IDE plugin to show in issues panel
-                        const codeReviewResult = result as InvokeOutput
-                        if (
-                            codeReviewResult?.output?.kind === 'json' &&
-                            codeReviewResult.output.success &&
-                            (codeReviewResult.output.content as any)?.findingsByFile
-                        ) {
-                            await chatResultStream.writeResultBlock({
-                                type: 'tool',
-                                messageId: toolUse.toolUseId + CODE_REVIEW_FINDINGS_MESSAGE_SUFFIX,
-                                body: (codeReviewResult.output.content as any).findingsByFile,
-                            })
-                        }
                         break
                     case DisplayFindings.toolName:
                         // no need to write tool result for code review, this is handled by model via chat

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/qCodeAnalysis/codeReview.test.ts

@@ -146,6 +146,92 @@ describe('CodeReview', () => {
             expect(result.output.kind).to.equal('json')
         })
 
+        it('should return both full and simplified findings', async () => {
+            const mockFindings = [
+                {
+                    findingId: '1',
+                    title: 'Test Issue',
+                    description: { text: 'Test description', markdown: 'Test **description**' },
+                    startLine: 10,
+                    endLine: 15,
+                    severity: 'HIGH',
+                    filePath: '/test/file.js',
+                    detectorId: 'detector1',
+                    detectorName: 'Test Detector',
+                    ruleId: 'rule1',
+                    relatedVulnerabilities: [],
+                    recommendation: { text: 'Fix this', url: null },
+                    suggestedFixes: [],
+                    comment: 'Test Issue: Test description',
+                    scanJobId: 'job-123',
+                    language: 'javascript',
+                    autoDetected: false,
+                    findingContext: 'Full',
+                },
+            ]
+
+            mockCodeWhispererClient.createUploadUrl.resolves({
+                uploadUrl: 'https://upload.com',
+                uploadId: 'upload-123',
+                requestHeaders: {},
+            })
+
+            mockCodeWhispererClient.startCodeAnalysis.resolves({
+                jobId: 'job-123',
+                status: 'Pending',
+            })
+
+            mockCodeWhispererClient.getCodeAnalysis.resolves({
+                status: 'Completed',
+            })
+
+            mockCodeWhispererClient.listCodeAnalysisFindings.resolves({
+                codeAnalysisFindings: JSON.stringify(mockFindings),
+                nextToken: undefined,
+            })
+
+            sandbox.stub(CodeReviewUtils, 'uploadFileToPresignedUrl').resolves()
+            sandbox.stub(codeReview as any, 'prepareFilesAndFoldersForUpload').resolves({
+                zipBuffer: Buffer.from('test'),
+                md5Hash: 'hash123',
+                isCodeDiffPresent: false,
+                programmingLanguages: new Set(['javascript']),
+                numberOfFilesInCustomerCodeZip: 1,
+                codeDiffFiles: new Set(),
+                filePathsInZip: new Set(['/test/file.js']),
+            })
+            sandbox.stub(codeReview as any, 'parseFindings').returns(mockFindings)
+            sandbox.stub(codeReview as any, 'resolveFilePath').returns('/test/file.js')
+
+            const result = await codeReview.execute(validInput, context)
+
+            expect(result.output.success).to.be.true
+            expect(result.output.content).to.have.property('findingsByFile')
+            expect(result.output.content).to.have.property('findingsByFileSimplified')
+
+            const fullFindings = JSON.parse((result.output.content as any).findingsByFile)
+            const simplifiedFindings = JSON.parse((result.output.content as any).findingsByFileSimplified)
+
+            expect(fullFindings).to.have.length(1)
+            expect(simplifiedFindings).to.have.length(1)
+
+            // Verify full findings structure
+            expect(fullFindings[0].issues[0]).to.have.property('findingId')
+            expect(fullFindings[0].issues[0]).to.have.property('description')
+            expect(fullFindings[0].issues[0]).to.have.property('detectorId')
+
+            // Verify simplified findings structure (only 5 fields)
+            const simplifiedIssue = simplifiedFindings[0].issues[0]
+            expect(Object.keys(simplifiedIssue)).to.have.length(5)
+            expect(simplifiedIssue).to.have.property('filePath', '/test/file.js')
+            expect(simplifiedIssue).to.have.property('startLine', 10)
+            expect(simplifiedIssue).to.have.property('endLine', 15)
+            expect(simplifiedIssue).to.have.property('title', 'Test Issue')
+            expect(simplifiedIssue).to.have.property('severity', 'HIGH')
+            expect(simplifiedIssue).to.not.have.property('findingId')
+            expect(simplifiedIssue).to.not.have.property('description')
+        })
+
         it('should execute successfully and pass languageModelId and clientType to startCodeAnalysis', async () => {
             const inputWithModelId = {
                 ...validInput,

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/qCodeAnalysis/codeReview.ts

@@ -29,6 +29,7 @@ import {
     CodeReviewFinding,
     FailedMetricName,
     SuccessMetricName,
+    CodeReviewFindingSimplified,
 } from './codeReviewTypes'
 import { CancellationError } from '@aws/lsp-core'
 import { Origin } from '@amzn/codewhisperer-streaming'
@@ -44,7 +45,7 @@ export class CodeReview {
     private static readonly POLLING_INTERVAL_MS = 10000 // 10 seconds
     private static readonly UPLOAD_INTENT = 'AGENTIC_CODE_REVIEW'
     private static readonly SCAN_SCOPE = 'AGENTIC'
-    private static readonly MAX_FINDINGS_COUNT = 30
+    private static readonly MAX_FINDINGS_COUNT = 300
 
     private static readonly ERROR_MESSAGES = {
         MISSING_CLIENT: 'CodeWhisperer client not available',
@@ -477,9 +478,18 @@ export class CodeReview {
         )
 
         this.logging.info('Findings count grouped by file')
+        let aggregatedCodeScanIssueListSimplified: { filePath: string; issues: CodeReviewFindingSimplified[] }[] = []
         aggregatedCodeScanIssueList.forEach(item => {
             this.logging.info(`File path - ${item.filePath} Findings count - ${item.issues.length}`)
-            item.issues.forEach(issue =>
+            let simplifiedIssues: CodeReviewFindingSimplified[] = []
+            item.issues.forEach(issue => {
+                simplifiedIssues.push({
+                    filePath: issue.filePath,
+                    startLine: issue.startLine,
+                    endLine: issue.endLine,
+                    title: issue.title,
+                    severity: issue.severity,
+                })
                 CodeReviewUtils.emitMetric(
                     {
                         reason: SuccessMetricName.IssuesDetected,
@@ -496,7 +506,11 @@ export class CodeReview {
                     this.logging,
                     this.telemetry
                 )
-            )
+            })
+            aggregatedCodeScanIssueListSimplified.push({
+                filePath: item.filePath,
+                issues: simplifiedIssues,
+            })
         })
 
         let scopeMessage = this.overrideDiffScan
@@ -505,8 +519,9 @@ export class CodeReview {
 
         return {
             codeReviewId: jobId,
-            message: `${CODE_REVIEW_TOOL_NAME} tool completed successfully. ${scopeMessage} ${findingsExceededLimit ? ` Inform the user that we are limiting findings to top ${CodeReview.MAX_FINDINGS_COUNT} based on severity.` : ''}`,
+            message: `${CODE_REVIEW_TOOL_NAME} tool completed successfully. Please inform the user to use the explain and fix buttons in the Code Issues Panel to get the best information about particular findings. ${scopeMessage} ${findingsExceededLimit ? ` Inform the user that we are limiting findings to top ${CodeReview.MAX_FINDINGS_COUNT} based on severity.` : ''}`,
             findingsByFile: JSON.stringify(aggregatedCodeScanIssueList),
+            findingsByFileSimplified: JSON.stringify(aggregatedCodeScanIssueListSimplified),
         }
     }
 

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/qCodeAnalysis/codeReviewConstants.ts

@@ -181,7 +181,7 @@ export const CODE_REVIEW_TOOL_DESCRIPTION = [
     'The tool will generate some findings grouped by file',
     'Use following format STRICTLY to display the result of this tool for different scenarios:',
     '- When findings are present, you must inform user that you have completed the review of {file name / folder name / workspace} and found several issues that need attention. To inspect the details, and get fixes for those issues use the Code Issues panel.',
-    '  - When tool output message tells that findings were limited due to high count, you must inform the user that since there were lots of findings, you have included the top 30 findings only.',
+    '  - When tool output message tells that findings were limited due to high count, you must inform the user that since there were lots of findings, you have included the top 300 findings only.',
     '- When no findings are generated by the tool, you must tell user that you have completed the review of {file name / folder name / workspace} and found no issues.',
 ].join('\n')
 

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/qCodeAnalysis/codeReviewTypes.ts

@@ -43,6 +43,7 @@ export type CodeReviewResult = {
     codeReviewId: string
     message: string
     findingsByFile: string
+    findingsByFileSimplified: string
 }
 
 export type CodeReviewFinding = {
@@ -66,6 +67,14 @@ export type CodeReviewFinding = {
     findingContext: string | null | undefined
 }
 
+export type CodeReviewFindingSimplified = {
+    filePath: string
+    startLine: number
+    endLine: number
+    title: string
+    severity: string
+}
+
 export type CodeReviewMetric =
     | {
           reason: SuccessMetricName