fix: inline UTD empty cases dont differentiate Edit and Completion (aws#2287)

Author: Will-ShaoHua

server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.ts

@@ -426,7 +426,7 @@ export const CodewhispererServerFactory =
                 session.responseContext = suggestionResponse.responseContext
                 session.codewhispererSessionId = suggestionResponse.responseContext.codewhispererSessionId
                 session.timeToFirstRecommendation = new Date().getTime() - session.startTime
-                session.suggestionType = suggestionResponse.suggestionType
+                session.predictionType = SuggestionType.COMPLETION
             } else {
                 session.suggestions = [...session.suggestions, ...suggestionResponse.suggestions]
             }
@@ -454,7 +454,7 @@ export const CodewhispererServerFactory =
 
             // session was closed by user already made decisions consequent completion request before new paginated API response was received
             if (
-                session.suggestionType !== SuggestionType.EDIT && // TODO: this is a shorterm fix to allow Edits tabtabtab experience, however the real solution is to manage such sessions correctly
+                session.predictionType !== SuggestionType.EDIT && // TODO: this is a shorterm fix to allow Edits tabtabtab experience, however the real solution is to manage such sessions correctly
                 (session.state === 'CLOSED' || session.state === 'DISCARD')
             ) {
                 return EMPTY_RESULT
@@ -640,7 +640,7 @@ export const CodewhispererServerFactory =
             let deletedLengthForEdits = 0
             if (acceptedSuggestion) {
                 codePercentageTracker.countSuccess(session.language)
-                if (session.suggestionType === SuggestionType.EDIT && acceptedSuggestion.content) {
+                if (session.predictionType === SuggestionType.EDIT && acceptedSuggestion.content) {
                     // [acceptedSuggestion.insertText] will be undefined for NEP suggestion. Use [acceptedSuggestion.content] instead.
                     // Since [acceptedSuggestion.content] is in the form of a diff, transform the content into addedCharacters and deletedCharacters.
                     const { addedLines, deletedLines } = getAddedAndDeletedLines(acceptedSuggestion.content)

server/aws-lsp-codewhisperer/src/language-server/inline-completion/editCompletionHandler.ts

@@ -16,6 +16,7 @@ import {
     GenerateSuggestionsRequest,
     GenerateSuggestionsResponse,
     getFileContext,
+    SuggestionType,
 } from '../../shared/codeWhispererService'
 import { CodeWhispererSession, SessionManager } from './session/sessionManager'
 import { CursorTracker } from './tracker/cursorTracker'
@@ -340,7 +341,7 @@ export class EditCompletionHandler {
             session.responseContext = suggestionResponse.responseContext
             session.codewhispererSessionId = suggestionResponse.responseContext.codewhispererSessionId
             session.timeToFirstRecommendation = new Date().getTime() - session.startTime
-            session.suggestionType = suggestionResponse.suggestionType
+            session.predictionType = SuggestionType.EDIT
         } else {
             session.suggestions = [...session.suggestions, ...suggestionResponse.suggestions]
         }

server/aws-lsp-codewhisperer/src/language-server/inline-completion/session/sessionManager.ts

@@ -91,7 +91,9 @@ export class CodeWhispererSession {
     customizationArn?: string
     includeImportsWithSuggestions?: boolean
     codewhispererSuggestionImportCount: number = 0
-    suggestionType?: string
+
+    // Suggestion type specified by the clients, could be either "EDIT" or "COMPLETION"
+    predictionType?: SuggestionType
     // Track the most recent itemId for paginated Edit suggestions
 
     constructor(data: SessionData) {
@@ -175,7 +177,7 @@ export class CodeWhispererSession {
         if (
             this.state === 'CLOSED' ||
             this.state === 'DISCARD' ||
-            (this.completionSessionResult && this.suggestionType === SuggestionType.COMPLETION)
+            (this.completionSessionResult && this.predictionType === SuggestionType.COMPLETION)
         ) {
             return
         }

server/aws-lsp-codewhisperer/src/language-server/inline-completion/telemetry.ts

@@ -156,7 +156,7 @@ export const emitUserTriggerDecisionTelemetry = async (
     // Edits show one suggestion sequentially (with pagination), so use latest itemId state;
     // Completions show multiple suggestions together, so aggregate all states
     const userTriggerDecision =
-        session.suggestionType === SuggestionType.EDIT
+        session.predictionType === SuggestionType.EDIT
             ? session.getUserTriggerDecision(itemId)
             : session.getAggregatedUserTriggerDecision()
 

server/aws-lsp-codewhisperer/src/shared/telemetry/telemetryService.ts

@@ -22,7 +22,6 @@ import {
     ChatAddMessageEvent,
     UserIntent,
     InlineChatEvent,
-    AgenticChatEventStatus,
     IdeDiagnostic,
     UserModificationEvent,
 } from '../../client/token/codewhispererbearertokenclient'
@@ -201,6 +200,7 @@ export class TelemetryService {
         streakLength?: number
     ) {
         session.decisionMadeTimestamp = performance.now()
+        // Toolkit telemetry API
         if (this.enableTelemetryEventsToDestination) {
             const data: CodeWhispererUserTriggerDecisionEvent = {
                 codewhispererSessionId: session.codewhispererSessionId || '',
@@ -256,8 +256,9 @@ export class TelemetryService {
             acceptedSuggestion && acceptedSuggestion.content ? acceptedSuggestion.content.length : 0
         const perceivedLatencyMilliseconds =
             session.triggerType === 'OnDemand' ? session.timeToFirstRecommendation : timeSinceLastUserModification
-        const isInlineEdit = session.suggestionType === SuggestionType.EDIT
+        const isInlineEdit = session.predictionType === SuggestionType.EDIT
 
+        // RTS STE API
         const event: UserTriggerDecisionEvent = {
             sessionId: session.codewhispererSessionId || '',
             requestId: session.responseContext?.requestId || '',
@@ -283,7 +284,7 @@ export class TelemetryService {
             addedIdeDiagnostics: addedIdeDiagnostics,
             removedIdeDiagnostics: removedIdeDiagnostics,
             streakLength: streakLength ?? 0,
-            suggestionType: isInlineEdit ? 'EDITS' : 'COMPLETIONS',
+            suggestionType: session.predictionType,
         }
         this.logging.info(`Invoking SendTelemetryEvent:UserTriggerDecisionEvent with:
             "requestId": ${event.requestId}