fix(amazonq): add reject reason to nep telemetry

Author: bywang56

packages/amazonq/src/app/inline/EditRendering/displayImage.ts

@@ -14,7 +14,7 @@ import path from 'path'
 import { imageVerticalOffset } from './svgGenerator'
 import { EditSuggestionState } from '../editSuggestionState'
 import type { AmazonQInlineCompletionItemProvider } from '../completion'
-import { vsCodeState } from 'aws-core-vscode/codewhisperer'
+import { vsCodeState, InlineCompletionLoggingReason } from 'aws-core-vscode/codewhisperer'
 
 const autoRejectEditCursorDistance = 25
 const autoDiscardEditCursorDistance = 10
@@ -25,7 +25,7 @@ export class EditDecorationManager {
     private currentImageDecoration: vscode.DecorationOptions | undefined
     private currentRemovedCodeDecorations: vscode.DecorationOptions[] = []
     private acceptHandler: (() => void) | undefined
-    private rejectHandler: ((isDiscard: boolean) => void) | undefined
+    private rejectHandler: ((isDiscard: boolean, reason?: InlineCompletionLoggingReason) => void) | undefined
 
     constructor() {
         this.registerCommandHandlers()
@@ -132,7 +132,7 @@ export class EditDecorationManager {
         svgImage: vscode.Uri,
         startLine: number,
         onAccept: () => Promise<void>,
-        onReject: (isDiscard: boolean) => Promise<void>,
+        onReject: (isDiscard: boolean, reason?: InlineCompletionLoggingReason) => Promise<void>,
         originalCode: string,
         newCode: string,
         originalCodeHighlightRanges: Array<{ line: number; start: number; end: number }>
@@ -187,11 +187,14 @@ export class EditDecorationManager {
         })
 
         // Register Esc key handler for rejecting suggestion
-        vscode.commands.registerCommand('aws.amazonq.inline.rejectEdit', (isDiscard: boolean = false) => {
-            if (this.rejectHandler) {
-                this.rejectHandler(isDiscard)
+        vscode.commands.registerCommand(
+            'aws.amazonq.inline.rejectEdit',
+            (isDiscard: boolean = false, reason?: InlineCompletionLoggingReason) => {
+                if (this.rejectHandler) {
+                    this.rejectHandler(isDiscard, reason)
+                }
             }
-        })
+        )
     }
 
     /**
@@ -376,7 +379,11 @@ export async function displaySvgDecoration(
         const isPatchValid = applyPatch(e.document.getText(), item.insertText as string)
         if (!isPatchValid) {
             logSuggestionFailure('REJECT', 'Invalid patch due to document change', item.insertText as string)
-            void vscode.commands.executeCommand('aws.amazonq.inline.rejectEdit')
+            void vscode.commands.executeCommand(
+                'aws.amazonq.inline.rejectEdit',
+                false,
+                InlineCompletionLoggingReason.IMPLICIT_REJECT
+            )
         }
     })
     const cursorChangeListener = vscode.window.onDidChangeTextEditorSelection((e) => {
@@ -394,7 +401,11 @@ export async function displaySvgDecoration(
                 `cursor position move too far away off ${autoRejectEditCursorDistance} lines`,
                 item.insertText as string
             )
-            void vscode.commands.executeCommand('aws.amazonq.inline.rejectEdit')
+            void vscode.commands.executeCommand(
+                'aws.amazonq.inline.rejectEdit',
+                false,
+                InlineCompletionLoggingReason.IMPLICIT_REJECT
+            )
         }
     })
     await decorationManager.displayEditSuggestion(
@@ -436,7 +447,7 @@ export async function displaySvgDecoration(
             void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
             session.triggerOnAcceptance = true
         },
-        async (isDiscard: boolean) => {
+        async (isDiscard: boolean, reason?: InlineCompletionLoggingReason) => {
             // Handle reject
             if (isDiscard) {
                 getLogger().info('Edit suggestion discarded')
@@ -465,6 +476,9 @@ export async function displaySvgDecoration(
                 totalSessionDisplayTime: Date.now() - session.requestStartTime,
                 firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
                 isInlineEdit: true,
+                // Add reason only for reject (not discard) and only when explicitly provided (IMPLICIT_REJECT)
+                // If no reason provided, server will assign EXPLICIT_REJECT
+                ...(reason && !isDiscard ? { reason } : {}),
             }
             void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
         },

packages/amazonq/src/app/inline/recommendationService.ts

@@ -140,14 +140,14 @@ export class RecommendationService {
              * Completions use PartialResultToken with single 1 call of [getAllRecommendations].
              * Edits leverage partialResultToken to achieve EditStreak such that clients can pull all continuous suggestions generated by the model within 1 EOS block.
              */
-            if (!isTriggerByDeletion && !request.partialResultToken && !EditSuggestionState.isEditSuggestionActive()) {
-                const completionPromise: Promise<InlineCompletionListWithReferences> = languageClient.sendRequest(
-                    inlineCompletionWithReferencesRequestType.method,
-                    request,
-                    token
-                )
-                ps.push(completionPromise)
-            }
+            // if (!isTriggerByDeletion && !request.partialResultToken && !EditSuggestionState.isEditSuggestionActive()) {
+            //     const completionPromise: Promise<InlineCompletionListWithReferences> = languageClient.sendRequest(
+            //         inlineCompletionWithReferencesRequestType.method,
+            //         request,
+            //         token
+            //     )
+            //     ps.push(completionPromise)
+            // }
 
             /**
              * Though Edit request is sent on keystrokes everytime, the language server will execute the request in a debounced manner so that it won't be immediately executed.