feat(amazonq): redirect /review, rename CodeReview tool, emit metrics, modify prompts (aws#1964)

* Emitting metrics for QCodeReview operations

* fix(amazonq): add scope attribute in the metric data for Scan metrics

* fix(amazonq): increase code review tool timeout

* fix(amazonq): add metrics metadata to QAgenticReview tool

* fix(amazonq): update metric metadata attribute names for QCodeReview tools

* fix(amazonq): redirect /review to use agentic chat

* fix(amazonq): rename QCodeReview tool to CodeReview

* fix(amazonq): fix the casing of variables

* fix(amazonq): emitting metrics based on definitions

* fix(amazonq): update prompts for tool & /review

* fix(amazonq): update prompts for tool

* feat(amazonq): redirect commands to use the agentic reviewer

* fix(amazonq): putting agentic review redirect behind feature flag

* fix(amazonq): change the review reroute card text

* fix(amazonq): when no active file is provided, ask the user for more input

* fix(amazonq): remove summary suppressor in prompt

* fix(amazonq): add programmingLanguages in telemetry

* fix(amazonq): change genericCommandString back to original format

* fix(amazonq): update codeReview unit tests

---------

Co-authored-by: mkovelam <[email protected]>
Co-authored-by: Nitish <[email protected]>
Co-authored-by: Nitish Kumar Singh <[email protected]>
Co-authored-by: Blake Lazarine <[email protected]>

Author: 4 people

chat-client/src/client/chat.ts

@@ -294,6 +294,10 @@ export const createChat = (
                     tabFactory.enableReroute()
                 }
 
+                if ((params as any)?.codeReviewInChat) {
+                    tabFactory.enableCodeReviewInChat()
+                }
+
                 if (params?.quickActions?.quickActionsCommandGroups) {
                     const quickActionCommandGroups = params.quickActions.quickActionsCommandGroups.map(group => ({
                         ...group,

chat-client/src/client/mynahUi.ts

@@ -196,11 +196,10 @@ export const handleChatPrompt = (
         messager.onStopChatResponse(tabId)
     }
 
+    const commandsToReroute = ['/dev', '/test', '/doc', '/review']
+
     const isReroutedCommand =
-        agenticMode &&
-        tabFactory?.isRerouteEnabled() &&
-        prompt.command &&
-        ['/dev', '/test', '/doc'].includes(prompt.command)
+        agenticMode && tabFactory?.isRerouteEnabled() && prompt.command && commandsToReroute.includes(prompt.command)
 
     if (prompt.command && !isReroutedCommand && prompt.command !== '/compact') {
         // Send /compact quick action as normal regular chat prompt
@@ -227,7 +226,7 @@ export const handleChatPrompt = (
     } else {
         // Go agentic chat workflow when:
         // 1. Regular prompts without commands
-        // 2. Rerouted commands (/dev, /test, /doc) when feature flag: reroute is enabled
+        // 2. Rerouted commands (/dev, /test, /doc, /review) when feature flag: reroute is enabled
 
         // Special handling for /doc command - always send fixed prompt for fixed response
         if (isReroutedCommand && prompt.command === '/doc') {
@@ -253,6 +252,9 @@ export const handleChatPrompt = (
                 case '/doc':
                     defaultPrompt = DEFAULT_DOC_PROMPT
                     break
+                case '/review':
+                    defaultPrompt = DEFAULT_REVIEW_PROMPT
+                    break
             }
 
             // Send the updated prompt with default text to server
@@ -1421,15 +1423,25 @@ export const createMynahUi = (
             tabId = createTabId()
             if (!tabId) return
         }
-
-        const body = [
-            params.genericCommand,
-            ' the following part of my code:',
-            '\n~~~~\n',
-            params.selection,
-            '\n~~~~\n',
-        ].join('')
-        const chatPrompt: ChatPrompt = { prompt: body, escapedPrompt: body }
+        let body = ''
+        let chatPrompt: ChatPrompt
+        const genericCommandString = params.genericCommand as string
+        if (genericCommandString.includes('Review')) {
+            chatPrompt = { command: '/review' }
+            if (!tabFactory?.isCodeReviewInChatEnabled()) {
+                customChatClientAdapter?.handleQuickAction(chatPrompt, tabId, '')
+                return
+            }
+        } else {
+            body = [
+                genericCommandString,
+                ' the following part of my code:',
+                '\n~~~~\n',
+                params.selection,
+                '\n~~~~\n',
+            ].join('')
+            chatPrompt = { prompt: body, escapedPrompt: body }
+        }
 
         handleChatPrompt(mynahUi, tabId, chatPrompt, messager, params.triggerType, undefined, agenticMode, tabFactory)
     }
@@ -1754,6 +1766,8 @@ const DEFAULT_TEST_PROMPT = `You are Amazon Q. Start with a warm greeting, then
 
 const DEFAULT_DEV_PROMPT = `You are Amazon Q. Start with a warm greeting, then ask the user to specify what kind of help they need in code development. Present common questions asked (like Creating a new project, Adding a new feature, Modifying your files). Keep the question brief and friendly. Don't make assumptions about existing content or context. Wait for their response before providing specific guidance.`
 
+const DEFAULT_REVIEW_PROMPT = `You are Amazon Q. Start with a warm greeting, then use code review tool to perform code analysis of the open file. If there is no open file, ask what the user would like to review.`
+
 export const uiComponentsTexts = {
     mainTitle: 'Amazon Q (Preview)',
     copy: 'Copy',

chat-client/src/client/tabs/tabFactory.ts

@@ -28,6 +28,7 @@ export class TabFactory {
     private mcp: boolean = false
     private modelSelectionEnabled: boolean = false
     private reroute: boolean = false
+    private codeReviewInChat: boolean = false
     private showLogs: boolean = false
     initialTabId: string
 
@@ -124,10 +125,18 @@ export class TabFactory {
         this.reroute = true
     }
 
+    public enableCodeReviewInChat() {
+        this.codeReviewInChat = true
+    }
+
     public isRerouteEnabled(): boolean {
         return this.reroute
     }
 
+    public isCodeReviewInChatEnabled(): boolean {
+        return this.codeReviewInChat
+    }
+
     public getDefaultTabData(): DefaultTabData {
         const tabData = {
             ...this.defaultTabData,
@@ -143,7 +152,7 @@ export class TabFactory {
                           icon: MynahIcons.INFO,
                           title: 'Q Developer agentic capabilities',
                           description:
-                              "You can now ask Q directly in the chat to generate code, documentation, and unit tests. You don't need to explicitly use /dev, /test, or /doc",
+                              "You can now ask Q directly in the chat to generate code, documentation, and unit tests. You don't need to explicitly use /dev, /test, /review or /doc",
                       } as QuickActionCommandsHeader,
                   }
                 : {}),

chat-client/src/client/texts/pairProgramming.ts

@@ -80,6 +80,21 @@ Ask me to do things like:
 3. Modify your files`,
 }
 
+export const reviewRerouteCard: ChatItem = {
+    type: ChatItemType.ANSWER,
+    border: true,
+    header: {
+        padding: true,
+        iconForegroundStatus: 'warning',
+        icon: MynahIcons.INFO,
+        body: 'You can now ask to run code reviews directly in the chat.',
+    },
+    body: `You don't need to explicitly use /review. We've redirected your request to chat.
+Ask me to do things like:
+• Perform a code review of uncommitted changes in my active file
+• Perform a code review of my active file`,
+}
+
 export const createRerouteCard = (command: string): ChatItem => {
     switch (command) {
         case '/test':
@@ -88,6 +103,8 @@ export const createRerouteCard = (command: string): ChatItem => {
             return docRerouteCard
         case '/dev':
             return devRerouteCard
+        case '/review':
+            return reviewRerouteCard
         default:
             return devRerouteCard // Default fallback
     }

chat-client/src/client/withAdapter.test.ts

@@ -107,6 +107,7 @@ describe('withAdapter', () => {
         // Set up tab factory
         tabFactory = {
             isRerouteEnabled: sinon.stub().returns(false),
+            isCodeReviewInChatEnabled: sinon.stub().returns(false),
         } as unknown as TabFactory
 
         // Create the enhanced props

chat-client/src/client/withAdapter.ts

@@ -75,12 +75,18 @@ export const withAdapter = (
                 return
             }
 
-            // Only /review and /transform commands for chatClientAdapter handling
-            // Let /dev, /test, /doc use default event handler routing(agentic chat)
+            // Only /transform commands for chatClientAdapter handling
+            // Let /dev, /test, /doc, /review use default event handler routing(agentic chat)
             if (prompt.command) {
+                const quickActionCommands = ['/transform']
+
+                if (!tabFactory?.isCodeReviewInChatEnabled()) {
+                    quickActionCommands.push('/review')
+                }
+
                 const shouldHandleQuickAction = !tabFactory.isRerouteEnabled()
                     ? chatClientAdapter.isSupportedQuickAction(prompt.command)
-                    : ['/review', '/transform'].includes(prompt.command)
+                    : quickActionCommands.includes(prompt.command)
 
                 if (shouldHandleQuickAction) {
                     chatClientAdapter.handleQuickAction(prompt, tabId, eventId)

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

@@ -24,7 +24,7 @@ import {
     GREP_SEARCH,
     FILE_SEARCH,
     EXECUTE_BASH,
-    Q_CODE_REVIEW,
+    CODE_REVIEW,
     BUTTON_RUN_SHELL_COMMAND,
     BUTTON_REJECT_SHELL_COMMAND,
     BUTTON_REJECT_MCP_TOOL,
@@ -197,8 +197,8 @@ import {
 import { URI } from 'vscode-uri'
 import { CommandCategory } from './tools/executeBash'
 import { UserWrittenCodeTracker } from '../../shared/userWrittenCodeTracker'
-import { QCodeReview } from './tools/qCodeAnalysis/qCodeReview'
-import { FINDINGS_MESSAGE_SUFFIX } from './tools/qCodeAnalysis/qCodeReviewConstants'
+import { CodeReview } from './tools/qCodeAnalysis/codeReview'
+import { FINDINGS_MESSAGE_SUFFIX } from './tools/qCodeAnalysis/codeReviewConstants'
 import { McpEventHandler } from './tools/mcp/mcpEventHandler'
 import { enabledMCP, createNamespacedToolName } from './tools/mcp/mcpUtils'
 import { McpManager } from './tools/mcp/mcpManager'
@@ -1750,7 +1750,7 @@ export class AgenticChatController implements ChatHandlers {
                         }
                         break
                     }
-                    case QCodeReview.toolName:
+                    case CodeReview.toolName:
                         // no need to write tool message for code review
                         break
                     // — DEFAULT ⇒ Only MCP tools, but can also handle generic tool execution messages
@@ -1825,7 +1825,7 @@ export class AgenticChatController implements ChatHandlers {
                     })
                 }
 
-                if (toolUse.name === QCodeReview.toolName) {
+                if (toolUse.name === CodeReview.toolName) {
                     try {
                         let initialInput = JSON.parse(JSON.stringify(toolUse.input))
                         let ruleArtifacts = await this.#additionalContextProvider.collectWorkspaceRules(tabId)
@@ -1837,7 +1837,7 @@ export class AgenticChatController implements ChatHandlers {
                         }
                         toolUse.input = initialInput
                     } catch (e) {
-                        this.#features.logging.warn(`could not parse QCodeReview tool input: ${e}`)
+                        this.#features.logging.warn(`could not parse CodeReview tool input: ${e}`)
                     }
                 }
 
@@ -1916,19 +1916,19 @@ export class AgenticChatController implements ChatHandlers {
                         )
                         await chatResultStream.writeResultBlock(chatResult)
                         break
-                    case QCodeReview.toolName:
+                    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 qCodeReviewResult = result as InvokeOutput
+                        const codeReviewResult = result as InvokeOutput
                         if (
-                            qCodeReviewResult?.output?.kind === 'json' &&
-                            qCodeReviewResult.output.success &&
-                            (qCodeReviewResult.output.content as any)?.findingsByFile
+                            codeReviewResult?.output?.kind === 'json' &&
+                            codeReviewResult.output.success &&
+                            (codeReviewResult.output.content as any)?.findingsByFile
                         ) {
                             await chatResultStream.writeResultBlock({
                                 type: 'tool',
                                 messageId: toolUse.toolUseId + FINDINGS_MESSAGE_SUFFIX,
-                                body: (qCodeReviewResult.output.content as any).findingsByFile,
+                                body: (codeReviewResult.output.content as any).findingsByFile,
                             })
                         }
                         break
@@ -2237,7 +2237,7 @@ export class AgenticChatController implements ChatHandlers {
     }
 
     #getWritableStream(chatResultStream: AgenticChatResultStream, toolUse: ToolUse): WritableStream | undefined {
-        if (toolUse.name === QCodeReview.toolName) {
+        if (toolUse.name === CodeReview.toolName) {
             return this.#getToolOverWritableStream(chatResultStream, toolUse)
         }
         if (toolUse.name !== EXECUTE_BASH) {

server/aws-lsp-codewhisperer/src/language-server/agenticChat/constants/toolConstants.ts

@@ -19,7 +19,7 @@ export const FILE_SEARCH = 'fileSearch'
 export const EXECUTE_BASH = 'executeBash'
 
 // Code analysis tools
-export const Q_CODE_REVIEW = 'qCodeReview'
+export const CODE_REVIEW = 'codeReview'
 
 // Tool use button IDs
 export const BUTTON_RUN_SHELL_COMMAND = 'run-shell-command'

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

@@ -26,6 +26,13 @@ export function enabledReroute(params: InitializeParams | undefined): boolean {
     return qCapabilities?.reroute || false
 }
 
+export function enabledCodeReviewInChat(params: InitializeParams | undefined): boolean {
+    const qCapabilities = params?.initializationOptions?.aws?.awsClientCapabilities?.q as
+        | QClientCapabilities
+        | undefined
+    return qCapabilities?.codeReviewInChat || false
+}
+
 export function enabledCompaction(params: InitializeParams | undefined): boolean {
     const qCapabilities = params?.initializationOptions?.aws?.awsClientCapabilities?.q as
         | QClientCapabilities
@@ -54,6 +61,7 @@ export const QAgenticChatServer =
 
         lsp.addInitializer((params: InitializeParams) => {
             const rerouteEnabled = enabledReroute(params)
+            const codeReviewInChatEnabled = enabledCodeReviewInChat(params)
             const quickActions = [HELP_QUICK_ACTION, CLEAR_QUICK_ACTION]
             if (enabledCompaction(params)) {
                 quickActions.push(COMPACT_QUICK_ACTION)
@@ -84,7 +92,8 @@ export const QAgenticChatServer =
                         export: TabBarController.enableChatExport(params),
                         shortcut: shortcutEnabled,
                         showLogs: TabBarController.enableShowLogs(params),
-                        reroute: rerouteEnabled
+                        reroute: rerouteEnabled,
+                        codeReviewInChat: codeReviewInChatEnabled
                     },
                 },
             }