feat(amazonq): adding qCodeReview tool updates for Code Issues panel

packages/amazonq/.changes/next-release/Feature-a11ff37a-40bc-43e3-a779-004f52d5d5f7.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Two main update about CodeIssues panel 1) Explain and Fix for any issue in CodeIssues panel will pull the experience into chat. 2) QCodeReview tool will update CodeIssues panel along with `/review` quick actions."
+}

packages/amazonq/package.json

@@ -442,17 +442,22 @@
                 },
                 {
                     "command": "aws.amazonq.openSecurityIssuePanel",
+                    "when": "false && view == aws.amazonq.SecurityIssuesTree && (viewItem == issueWithoutFix || viewItem == issueWithFix || viewItem == issueWithFixDisabled)",
+                    "group": "inline@4"
+                },
+                {
+                    "command": "aws.amazonq.security.explain",
                     "when": "view == aws.amazonq.SecurityIssuesTree && (viewItem == issueWithoutFix || viewItem == issueWithFix || viewItem == issueWithFixDisabled)",
                     "group": "inline@4"
                 },
                 {
-                    "command": "aws.amazonq.security.ignore",
+                    "command": "aws.amazonq.security.generateFix",
                     "when": "view == aws.amazonq.SecurityIssuesTree && (viewItem == issueWithoutFix || viewItem == issueWithFix || viewItem == issueWithFixDisabled)",
                     "group": "inline@5"
                 },
                 {
-                    "command": "aws.amazonq.security.generateFix",
-                    "when": "view == aws.amazonq.SecurityIssuesTree && viewItem == issueWithoutFix",
+                    "command": "aws.amazonq.security.ignore",
+                    "when": "view == aws.amazonq.SecurityIssuesTree && (viewItem == issueWithoutFix || viewItem == issueWithFix || viewItem == issueWithFixDisabled)",
                     "group": "inline@6"
                 },
                 {
@@ -535,16 +540,17 @@
             "aws.amazonq.submenu.securityIssueMoreActions": [
                 {
                     "command": "aws.amazonq.security.explain",
+                    "when": "false",
                     "group": "1_more@1"
                 },
                 {
                     "command": "aws.amazonq.applySecurityFix",
-                    "when": "view == aws.amazonq.SecurityIssuesTree && viewItem == issueWithFix",
+                    "when": "false && view == aws.amazonq.SecurityIssuesTree && viewItem == issueWithFix",
                     "group": "1_more@3"
                 },
                 {
                     "command": "aws.amazonq.security.regenerateFix",
-                    "when": "view == aws.amazonq.SecurityIssuesTree && viewItem == issueWithFix",
+                    "when": "false && view == aws.amazonq.SecurityIssuesTree && viewItem == issueWithFix",
                     "group": "1_more@4"
                 },
                 {
@@ -778,6 +784,7 @@
             {
                 "command": "aws.amazonq.security.explain",
                 "title": "%AWS.command.amazonq.explainIssue%",
+                "icon": "$(search)",
                 "enablement": "view == aws.amazonq.SecurityIssuesTree"
             },
             {

packages/amazonq/src/lsp/chat/commands.ts

@@ -7,7 +7,8 @@ import { Commands, globals } from 'aws-core-vscode/shared'
 import { window } from 'vscode'
 import { AmazonQChatViewProvider } from './webviewProvider'
 import { CodeScanIssue } from 'aws-core-vscode/codewhisperer'
-import { EditorContextExtractor } from 'aws-core-vscode/codewhispererChat'
+import * as vscode from 'vscode'
+import * as path from 'path'
 
 /**
  * TODO: Re-enable these once we can figure out which path they're going to live in
@@ -21,45 +22,24 @@ export function registerCommands(provider: AmazonQChatViewProvider) {
         registerGenericCommand('aws.amazonq.optimizeCode', 'Optimize', provider),
         registerGenericCommand('aws.amazonq.generateUnitTests', 'Generate Tests', provider),
 
-        Commands.register('aws.amazonq.explainIssue', async (issue: CodeScanIssue) => {
-            void focusAmazonQPanel().then(async () => {
-                const editorContextExtractor = new EditorContextExtractor()
-                const extractedContext = await editorContextExtractor.extractContextForTrigger('ContextMenu')
-                const selectedCode =
-                    extractedContext?.activeFileContext?.fileText
-                        ?.split('\n')
-                        .slice(issue.startLine, issue.endLine)
-                        .join('\n') ?? ''
-
-                // The message that gets sent to the UI
-                const uiMessage = [
-                    'Explain the ',
-                    issue.title,
-                    ' issue in the following code:',
-                    '\n```\n',
-                    selectedCode,
-                    '\n```',
-                ].join('')
-
-                // The message that gets sent to the backend
-                const contextMessage = `Explain the issue "${issue.title}" (${JSON.stringify(
-                    issue
-                )}) and generate code demonstrating the fix`
-
-                void provider.webview?.postMessage({
-                    command: 'sendToPrompt',
-                    params: {
-                        selection: '',
-                        triggerType: 'contextMenu',
-                        prompt: {
-                            prompt: uiMessage, // what gets sent to the user
-                            escapedPrompt: contextMessage, // what gets sent to the backend
-                        },
-                        autoSubmit: true,
-                    },
-                })
-            })
-        }),
+        Commands.register('aws.amazonq.explainIssue', (issue: CodeScanIssue, filePath: string) =>
+            handleIssueCommand(
+                issue,
+                filePath,
+                'Explain',
+                'Provide a small description of the issue. You must not attempt to fix the issue. You should only give a small summary of it to the user.',
+                provider
+            )
+        ),
+        Commands.register('aws.amazonq.generateFix', (issue: CodeScanIssue, filePath: string) =>
+            handleIssueCommand(
+                issue,
+                filePath,
+                'Fix',
+                'Generate a fix for the following code issue. You must not explain the issue, just generate and explain the fix. The user should have the option to accept or reject the fix before any code is changed.',
+                provider
+            )
+        ),
         Commands.register('aws.amazonq.sendToPrompt', (data) => {
             const triggerType = getCommandTriggerType(data)
             const selection = getSelectedText()
@@ -82,6 +62,53 @@ export function registerCommands(provider: AmazonQChatViewProvider) {
     )
 }
 
+async function handleIssueCommand(
+    issue: CodeScanIssue,
+    filePath: string,
+    action: string,
+    contextPrompt: string,
+    provider: AmazonQChatViewProvider
+) {
+    await focusAmazonQPanel()
+
+    if (issue && filePath) {
+        await openFileWithSelection(issue, filePath)
+    }
+
+    const lineRange = createLineRangeText(issue)
+    const visibleMessageInChat = `_${action} **${issue.title}** issue in **${path.basename(filePath)}** at \`${lineRange}\`_`
+    const contextMessage = `${contextPrompt} Code issue - ${JSON.stringify(issue)}`
+
+    void provider.webview?.postMessage({
+        command: 'sendToPrompt',
+        params: {
+            selection: '',
+            triggerType: 'contextMenu',
+            prompt: {
+                prompt: visibleMessageInChat,
+                escapedPrompt: contextMessage,
+            },
+            autoSubmit: true,
+        },
+    })
+}
+
+async function openFileWithSelection(issue: CodeScanIssue, filePath: string) {
+    const range = new vscode.Range(issue.startLine, 0, issue.endLine, 0)
+    const doc = await vscode.workspace.openTextDocument(filePath)
+    await vscode.window.showTextDocument(doc, {
+        selection: range,
+        viewColumn: vscode.ViewColumn.One,
+        preview: true,
+    })
+}
+
+function createLineRangeText(issue: CodeScanIssue): string {
+    return issue.startLine === issue.endLine - 1
+        ? `[${issue.startLine + 1}]`
+        : `[${issue.startLine + 1}, ${issue.endLine}]`
+}
+
 function getSelectedText(): string {
     const editor = window.activeTextEditor
     if (editor) {
@@ -100,15 +127,14 @@ function getCommandTriggerType(data: any): string {
 }
 
 function registerGenericCommand(commandName: string, genericCommand: string, provider: AmazonQChatViewProvider) {
-    return Commands.register(commandName, (data) => {
+    return Commands.register(commandName, async (data) => {
         const triggerType = getCommandTriggerType(data)
         const selection = getSelectedText()
 
-        void focusAmazonQPanel().then(() => {
-            void provider.webview?.postMessage({
-                command: 'genericCommand',
-                params: { genericCommand, selection, triggerType },
-            })
+        await focusAmazonQPanel()
+        void provider.webview?.postMessage({
+            command: 'genericCommand',
+            params: { genericCommand, selection, triggerType },
         })
     })
 }

packages/amazonq/src/lsp/chat/messages.ts

@@ -71,7 +71,16 @@ import { v4 as uuidv4 } from 'uuid'
 import * as vscode from 'vscode'
 import { Disposable, LanguageClient, Position, TextDocumentIdentifier } from 'vscode-languageclient'
 import { AmazonQChatViewProvider } from './webviewProvider'
-import { AuthUtil, ReferenceLogViewProvider } from 'aws-core-vscode/codewhisperer'
+import {
+    AggregatedCodeScanIssue,
+    AuthUtil,
+    CodeAnalysisScope,
+    CodeWhispererSettings,
+    initSecurityScanRender,
+    ReferenceLogViewProvider,
+    SecurityIssueTreeViewProvider,
+    CodeWhispererConstants,
+} from 'aws-core-vscode/codewhisperer'
 import { amazonQDiffScheme, AmazonQPromptSettings, messages, openUrl, isTextEditor } from 'aws-core-vscode/shared'
 import {
     DefaultAmazonQAppInitContext,
@@ -85,6 +94,7 @@ import { isValidResponseError } from './error'
 import { decryptResponse, encryptRequest } from '../encryption'
 import { getCursorState } from '../utils'
 import { focusAmazonQPanel } from './commands'
+import { ChatMessage } from '@aws/language-server-runtimes/server-interface'
 
 export function registerActiveEditorChangeListener(languageClient: LanguageClient) {
     let debounceTimer: NodeJS.Timeout | undefined
@@ -299,7 +309,8 @@ export function registerMessageListeners(
                         encryptionKey,
                         provider,
                         chatParams.tabId,
-                        chatDisposable
+                        chatDisposable,
+                        languageClient
                     )
                 } catch (e) {
                     const errorMsg = `Error occurred during chat request: ${e}`
@@ -315,7 +326,8 @@ export function registerMessageListeners(
                         encryptionKey,
                         provider,
                         chatParams.tabId,
-                        chatDisposable
+                        chatDisposable,
+                        languageClient
                     )
                 } finally {
                     chatStreamTokens.delete(chatParams.tabId)
@@ -359,7 +371,8 @@ export function registerMessageListeners(
                     encryptionKey,
                     provider,
                     message.params.tabId,
-                    quickActionDisposable
+                    quickActionDisposable,
+                    languageClient
                 )
                 break
             }
@@ -612,6 +625,11 @@ async function handlePartialResult<T extends ChatResult>(
 ) {
     const decryptedMessage = await decryptResponse<T>(partialResult, encryptionKey)
 
+    decryptedMessage.additionalMessages = decryptedMessage.additionalMessages?.filter(
+        (message) =>
+            !(message.messageId !== undefined && message.messageId.endsWith(CodeWhispererConstants.findingsSuffix))
+    )
+
     if (decryptedMessage.body !== undefined) {
         void provider.webview?.postMessage({
             command: chatRequestType.method,
@@ -632,10 +650,13 @@ async function handleCompleteResult<T extends ChatResult>(
     encryptionKey: Buffer | undefined,
     provider: AmazonQChatViewProvider,
     tabId: string,
-    disposable: Disposable
+    disposable: Disposable,
+    languageClient: LanguageClient
 ) {
     const decryptedMessage = await decryptResponse<T>(result, encryptionKey)
 
+    handleSecurityFindings(decryptedMessage, languageClient)
+
     void provider.webview?.postMessage({
         command: chatRequestType.method,
         params: decryptedMessage,
@@ -649,6 +670,37 @@ async function handleCompleteResult<T extends ChatResult>(
     disposable.dispose()
 }
 
+function handleSecurityFindings(
+    decryptedMessage: { additionalMessages?: ChatMessage[] },
+    languageClient: LanguageClient
+): void {
+    if (decryptedMessage.additionalMessages === undefined || decryptedMessage.additionalMessages.length === 0) {
+        return
+    }
+    for (let i = decryptedMessage.additionalMessages.length - 1; i >= 0; i--) {
+        const message = decryptedMessage.additionalMessages[i]
+        if (message.messageId !== undefined && message.messageId.endsWith(CodeWhispererConstants.findingsSuffix)) {
+            if (message.body !== undefined) {
+                try {
+                    const aggregatedCodeScanIssues: AggregatedCodeScanIssue[] = JSON.parse(message.body)
+                    for (const aggregatedCodeScanIssue of aggregatedCodeScanIssues) {
+                        for (const issue of aggregatedCodeScanIssue.issues) {
+                            issue.visible = !CodeWhispererSettings.instance
+                                .getIgnoredSecurityIssues()
+                                .includes(issue.title)
+                        }
+                    }
+                    initSecurityScanRender(aggregatedCodeScanIssues, undefined, CodeAnalysisScope.PROJECT)
+                    SecurityIssueTreeViewProvider.focus()
+                } catch (e) {
+                    languageClient.info('Failed to parse findings')
+                }
+            }
+            decryptedMessage.additionalMessages.splice(i, 1)
+        }
+    }
+}
+
 async function resolveChatResponse(
     requestMethod: string,
     params: any,

packages/amazonq/src/lsp/client.ts

@@ -167,6 +167,7 @@ export async function startLanguageServer(
                         reroute: true,
                         modelSelection: true,
                         workspaceFilePath: vscode.workspace.workspaceFile?.fsPath,
+                        qCodeReviewInChat: true,
                     },
                     window: {
                         notifications: true,