@aws/lsp-codewhisperer 0.0.70 → 0.0.72

package/out/language-server/inline-completion/documentChangedListener.d.ts

@@ -0,0 +1,8 @@
+import { DidChangeTextDocumentParams } from '@aws/language-server-runtimes/protocol';
+export declare class DocumentChangedListener {
+    private _lastUserModificationTime;
+    private _timeSinceLastUserModification;
+    get timeSinceLastUserModification(): number;
+    constructor();
+    onDocumentChanged(e: DidChangeTextDocumentParams): void;
+}

package/out/language-server/inline-completion/documentChangedListener.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DocumentChangedListener = void 0;
+class DocumentChangedListener {
+    _lastUserModificationTime = 0;
+    _timeSinceLastUserModification = 0;
+    get timeSinceLastUserModification() {
+        return this._timeSinceLastUserModification;
+    }
+    constructor() { }
+    onDocumentChanged(e) {
+        // Record last user modification time for any document
+        if (this._lastUserModificationTime) {
+            this._timeSinceLastUserModification = new Date().getTime() - this._lastUserModificationTime;
+        }
+        this._lastUserModificationTime = new Date().getTime();
+    }
+}
+exports.DocumentChangedListener = DocumentChangedListener;
+//# sourceMappingURL=documentChangedListener.js.map

package/out/language-server/inline-completion/documentChangedListener.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"documentChangedListener.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/documentChangedListener.ts"],"names":[],"mappings":";;;AAEA,MAAa,uBAAuB;IACxB,yBAAyB,GAAW,CAAC,CAAA;IACrC,8BAA8B,GAAW,CAAC,CAAA;IAClD,IAAI,6BAA6B;QAC7B,OAAO,IAAI,CAAC,8BAA8B,CAAA;IAC9C,CAAC;IAED,gBAAe,CAAC;IAEhB,iBAAiB,CAAC,CAA8B;QAC5C,sDAAsD;QACtD,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;YACjC,IAAI,CAAC,8BAA8B,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,yBAAyB,CAAA;QAC/F,CAAC;QACD,IAAI,CAAC,yBAAyB,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;IACzD,CAAC;CACJ;AAhBD,0DAgBC"}

package/out/language-server/inline-completion/editCompletionHandler.d.ts

@@ -0,0 +1,49 @@
+import { CancellationToken, InitializeParams, InlineCompletionListWithReferences, InlineCompletionWithReferencesParams, Range, TextDocument } from '@aws/language-server-runtimes/protocol';
+import { RecentEditTracker } from './tracker/codeEditTracker';
+import { CredentialsProvider, Logging, Telemetry, Workspace } from '@aws/language-server-runtimes/server-interface';
+import { GenerateSuggestionsResponse } from '../../shared/codeWhispererService';
+import { CodeWhispererSession, SessionManager } from './session/sessionManager';
+import { CursorTracker } from './tracker/cursorTracker';
+import { CodewhispererLanguage } from '../../shared/languageDetection';
+import { TelemetryService } from '../../shared/telemetry/telemetryService';
+import { AmazonQBaseServiceManager } from '../../shared/amazonQServiceManager/BaseAmazonQServiceManager';
+import { RejectedEditTracker } from './tracker/rejectedEditTracker';
+import { DocumentChangedListener } from './documentChangedListener';
+export declare class EditCompletionHandler {
+    readonly logging: Logging;
+    readonly clientMetadata: InitializeParams;
+    readonly workspace: Workspace;
+    readonly amazonQServiceManager: AmazonQBaseServiceManager;
+    readonly sessionManager: SessionManager;
+    readonly cursorTracker: CursorTracker;
+    readonly recentEditsTracker: RecentEditTracker;
+    readonly rejectedEditTracker: RejectedEditTracker;
+    readonly documentChangedListener: DocumentChangedListener;
+    readonly telemetry: Telemetry;
+    readonly telemetryService: TelemetryService;
+    readonly credentialsProvider: CredentialsProvider;
+    private readonly editsEnabled;
+    private debounceTimeout;
+    private isWaiting;
+    private hasDocumentChangedSinceInvocation;
+    constructor(logging: Logging, clientMetadata: InitializeParams, workspace: Workspace, amazonQServiceManager: AmazonQBaseServiceManager, sessionManager: SessionManager, cursorTracker: CursorTracker, recentEditsTracker: RecentEditTracker, rejectedEditTracker: RejectedEditTracker, documentChangedListener: DocumentChangedListener, telemetry: Telemetry, telemetryService: TelemetryService, credentialsProvider: CredentialsProvider);
+    get codeWhispererService(): import("../../shared/codeWhispererService").CodeWhispererServiceBase;
+    /**
+     * This is a workaround to refresh the debounce timer when user is typing quickly.
+     * Adding debounce at function call doesnt work because server won't process second request until first request is processed.
+     * Also as a followup, ideally it should be a message/event publish/subscribe pattern instead of manual invocation like this
+     */
+    documentChanged(): void;
+    onEditCompletion(params: InlineCompletionWithReferencesParams, token: CancellationToken): Promise<InlineCompletionListWithReferences>;
+    _invoke(params: InlineCompletionWithReferencesParams, token: CancellationToken, textDocument: TextDocument, inferredLanguageId: CodewhispererLanguage, currentSession: CodeWhispererSession | undefined): Promise<InlineCompletionListWithReferences>;
+    processSuggestionResponse(suggestionResponse: GenerateSuggestionsResponse, session: CodeWhispererSession, isNewSession: boolean, selectionRange?: Range, textDocument?: TextDocument): Promise<{
+        items: {
+            insertText: string;
+            isInlineEdit: boolean;
+            itemId: string;
+        }[];
+        sessionId: string;
+        partialResultToken: string | undefined;
+    }>;
+    handleSuggestionsErrors(error: Error, session: CodeWhispererSession): InlineCompletionListWithReferences;
+}

package/out/language-server/inline-completion/editCompletionHandler.js

@@ -0,0 +1,320 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EditCompletionHandler = void 0;
+const protocol_1 = require("@aws/language-server-runtimes/protocol");
+const codeWhispererService_1 = require("../../shared/codeWhispererService");
+const languageDetection_1 = require("../../shared/languageDetection");
+const workspaceFolderManager_1 = require("../workspaceContext/workspaceFolderManager");
+const trigger_1 = require("./trigger");
+const telemetry_1 = require("./telemetry");
+const mergeRightUtils_1 = require("./mergeRightUtils");
+const lsp_core_1 = require("@aws/lsp-core");
+const utils_1 = require("../../shared/utils");
+const errors_1 = require("../../shared/amazonQServiceManager/errors");
+const constants_1 = require("./constants");
+class EditCompletionHandler {
+    logging;
+    clientMetadata;
+    workspace;
+    amazonQServiceManager;
+    sessionManager;
+    cursorTracker;
+    recentEditsTracker;
+    rejectedEditTracker;
+    documentChangedListener;
+    telemetry;
+    telemetryService;
+    credentialsProvider;
+    editsEnabled;
+    debounceTimeout;
+    isWaiting = false;
+    hasDocumentChangedSinceInvocation = false;
+    constructor(logging, clientMetadata, workspace, amazonQServiceManager, sessionManager, cursorTracker, recentEditsTracker, rejectedEditTracker, documentChangedListener, telemetry, telemetryService, credentialsProvider) {
+        this.logging = logging;
+        this.clientMetadata = clientMetadata;
+        this.workspace = workspace;
+        this.amazonQServiceManager = amazonQServiceManager;
+        this.sessionManager = sessionManager;
+        this.cursorTracker = cursorTracker;
+        this.recentEditsTracker = recentEditsTracker;
+        this.rejectedEditTracker = rejectedEditTracker;
+        this.documentChangedListener = documentChangedListener;
+        this.telemetry = telemetry;
+        this.telemetryService = telemetryService;
+        this.credentialsProvider = credentialsProvider;
+        this.editsEnabled =
+            this.clientMetadata.initializationOptions?.aws?.awsClientCapabilities?.textDocument
+                ?.inlineCompletionWithReferences?.inlineEditSupport ?? false;
+    }
+    get codeWhispererService() {
+        return this.amazonQServiceManager.getCodewhispererService();
+    }
+    /**
+     * This is a workaround to refresh the debounce timer when user is typing quickly.
+     * Adding debounce at function call doesnt work because server won't process second request until first request is processed.
+     * Also as a followup, ideally it should be a message/event publish/subscribe pattern instead of manual invocation like this
+     */
+    documentChanged() {
+        if (this.debounceTimeout) {
+            this.logging.info('[NEP] refresh timeout');
+            this.debounceTimeout.refresh();
+        }
+        if (this.isWaiting) {
+            this.hasDocumentChangedSinceInvocation = true;
+        }
+    }
+    async onEditCompletion(params, token) {
+        this.hasDocumentChangedSinceInvocation = false;
+        this.debounceTimeout = undefined;
+        // On every new completion request close current inflight session.
+        const currentSession = this.sessionManager.getCurrentSession();
+        if (currentSession && currentSession.state == 'REQUESTING' && !params.partialResultToken) {
+            // this REQUESTING state only happens when the session is initialized, which is rare
+            currentSession.discardInflightSessionOnNewInvocation = true;
+        }
+        if (this.cursorTracker) {
+            this.cursorTracker.trackPosition(params.textDocument.uri, params.position);
+        }
+        const textDocument = await this.workspace.getTextDocument(params.textDocument.uri);
+        if (!textDocument) {
+            this.logging.warn(`textDocument [${params.textDocument.uri}] not found`);
+            return constants_1.EMPTY_RESULT;
+        }
+        if (!(this.codeWhispererService instanceof codeWhispererService_1.CodeWhispererServiceToken)) {
+            return constants_1.EMPTY_RESULT;
+        }
+        // request for new session
+        const inferredLanguageId = (0, languageDetection_1.getSupportedLanguageId)(textDocument);
+        if (!inferredLanguageId) {
+            this.logging.log(`textDocument [${params.textDocument.uri}] with languageId [${textDocument.languageId}] not supported`);
+            return constants_1.EMPTY_RESULT;
+        }
+        if (params.partialResultToken && currentSession) {
+            // subsequent paginated requests for current session
+            try {
+                const suggestionResponse = await this.codeWhispererService.generateSuggestions({
+                    ...currentSession.requestContext,
+                    nextToken: `${params.partialResultToken}`,
+                });
+                return await this.processSuggestionResponse(suggestionResponse, currentSession, false, params.context.selectedCompletionInfo?.range);
+            }
+            catch (error) {
+                return this.handleSuggestionsErrors(error, currentSession);
+            }
+        }
+        // TODO: telemetry, discarded suggestions
+        // The other easy way to do this is simply not return any suggestion (which is used when retry > 3)
+        const invokeWithRetry = async (attempt = 0) => {
+            return new Promise(async (resolve) => {
+                this.debounceTimeout = setTimeout(async () => {
+                    try {
+                        this.isWaiting = true;
+                        const result = await this._invoke(params, token, textDocument, inferredLanguageId, currentSession).finally(() => {
+                            this.isWaiting = false;
+                        });
+                        if (this.hasDocumentChangedSinceInvocation) {
+                            if (attempt < constants_1.EDIT_STALE_RETRY_COUNT) {
+                                this.logging.info(`Document changed during execution, retrying (attempt ${attempt + 1})`);
+                                this.hasDocumentChangedSinceInvocation = false;
+                                const retryResult = await invokeWithRetry(attempt + 1);
+                                resolve(retryResult);
+                            }
+                            else {
+                                this.logging.info('Max retries reached, returning empty result');
+                                resolve(constants_1.EMPTY_RESULT);
+                            }
+                        }
+                        else {
+                            this.logging.info('No document changes, resolving result');
+                            resolve(result);
+                        }
+                    }
+                    finally {
+                        this.debounceTimeout = undefined;
+                    }
+                }, constants_1.EDIT_DEBOUNCE_INTERVAL_MS);
+            });
+        };
+        return invokeWithRetry();
+    }
+    async _invoke(params, token, textDocument, inferredLanguageId, currentSession) {
+        // Build request context
+        const isAutomaticLspTriggerKind = params.context.triggerKind == protocol_1.InlineCompletionTriggerKind.Automatic;
+        const maxResults = isAutomaticLspTriggerKind ? 1 : 5;
+        const fileContext = (0, codeWhispererService_1.getFileContext)({
+            textDocument,
+            inferredLanguageId,
+            position: params.position,
+            workspaceFolder: this.workspace.getWorkspaceFolder(textDocument.uri),
+        });
+        const workspaceState = workspaceFolderManager_1.WorkspaceFolderManager.getInstance()?.getWorkspaceState();
+        const workspaceId = workspaceState?.webSocketClient?.isConnected() ? workspaceState.workspaceId : undefined;
+        const qEditsTrigger = (0, trigger_1.shouldTriggerEdits)(this.codeWhispererService, fileContext, params, this.cursorTracker, this.recentEditsTracker, this.sessionManager, true);
+        if (!qEditsTrigger) {
+            return constants_1.EMPTY_RESULT;
+        }
+        const generateCompletionReq = {
+            fileContext: fileContext,
+            maxResults: maxResults,
+            predictionTypes: ['EDITS'],
+            workspaceId: workspaceId,
+        };
+        if (qEditsTrigger) {
+            generateCompletionReq.editorState = {
+                document: {
+                    relativeFilePath: textDocument.uri,
+                    programmingLanguage: {
+                        languageName: generateCompletionReq.fileContext.programmingLanguage.languageName,
+                    },
+                    text: textDocument.getText(),
+                },
+                cursorState: {
+                    position: {
+                        line: params.position.line,
+                        character: params.position.character,
+                    },
+                },
+            };
+        }
+        const supplementalContext = await this.codeWhispererService.constructSupplementalContext(textDocument, params.position, this.workspace, this.recentEditsTracker, this.logging, token, params.openTabFilepaths, {
+            includeRecentEdits: true,
+        });
+        if (supplementalContext) {
+            generateCompletionReq.supplementalContexts = supplementalContext.items;
+        }
+        // Close ACTIVE session and record Discard trigger decision immediately
+        if (currentSession && currentSession.state === 'ACTIVE') {
+            if (this.editsEnabled && currentSession.suggestionType === codeWhispererService_1.SuggestionType.EDIT) {
+                const mergedSuggestions = (0, mergeRightUtils_1.mergeEditSuggestionsWithFileContext)(currentSession, textDocument, fileContext);
+                if (mergedSuggestions.length > 0) {
+                    return {
+                        items: mergedSuggestions,
+                        sessionId: currentSession.id,
+                    };
+                }
+            }
+            // Emit user trigger decision at session close time for active session
+            this.sessionManager.discardSession(currentSession);
+            const streakLength = this.editsEnabled ? this.sessionManager.getAndUpdateStreakLength(false) : 0;
+            await (0, telemetry_1.emitUserTriggerDecisionTelemetry)(this.telemetry, this.telemetryService, currentSession, this.documentChangedListener.timeSinceLastUserModification, 0, 0, [], [], streakLength);
+        }
+        const newSession = this.sessionManager.createSession({
+            document: textDocument,
+            startPosition: params.position,
+            triggerType: isAutomaticLspTriggerKind ? 'AutoTrigger' : 'OnDemand',
+            language: fileContext.programmingLanguage.languageName,
+            requestContext: generateCompletionReq,
+            autoTriggerType: undefined,
+            triggerCharacter: '',
+            classifierResult: undefined,
+            classifierThreshold: undefined,
+            credentialStartUrl: this.credentialsProvider.getConnectionMetadata?.()?.sso?.startUrl ?? undefined,
+            supplementalMetadata: supplementalContext?.supContextData,
+            customizationArn: lsp_core_1.textUtils.undefinedIfEmpty(this.codeWhispererService.customizationArn),
+        });
+        try {
+            const suggestionResponse = await this.codeWhispererService.generateSuggestions(generateCompletionReq);
+            return await this.processSuggestionResponse(suggestionResponse, newSession, true, params.context.selectedCompletionInfo?.range);
+        }
+        catch (error) {
+            return this.handleSuggestionsErrors(error, newSession);
+        }
+    }
+    async processSuggestionResponse(suggestionResponse, session, isNewSession, selectionRange, textDocument) {
+        // TODO: we haven't decided how to do these telemetry for Edits suggestions
+        // codePercentageTracker.countInvocation(session.language)
+        // userWrittenCodeTracker?.recordUsageCount(session.language)
+        if (isNewSession) {
+            // Populate the session with information from codewhisperer response
+            session.suggestions = suggestionResponse.suggestions;
+            session.responseContext = suggestionResponse.responseContext;
+            session.codewhispererSessionId = suggestionResponse.responseContext.codewhispererSessionId;
+            session.timeToFirstRecommendation = new Date().getTime() - session.startTime;
+            session.suggestionType = suggestionResponse.suggestionType;
+        }
+        else {
+            session.suggestions = [...session.suggestions, ...suggestionResponse.suggestions];
+        }
+        // Emit service invocation telemetry for every request sent to backend
+        (0, telemetry_1.emitServiceInvocationTelemetry)(this.telemetry, session, suggestionResponse.responseContext.requestId);
+        // Discard previous inflight API response due to new trigger
+        if (session.discardInflightSessionOnNewInvocation) {
+            session.discardInflightSessionOnNewInvocation = false;
+            this.sessionManager.discardSession(session);
+            const streakLength = this.editsEnabled ? this.sessionManager.getAndUpdateStreakLength(false) : 0;
+            await (0, telemetry_1.emitUserTriggerDecisionTelemetry)(this.telemetry, this.telemetryService, session, this.documentChangedListener.timeSinceLastUserModification, 0, 0, [], [], streakLength);
+        }
+        // API response was recieved, we can activate session now
+        this.sessionManager.activateSession(session);
+        // Process suggestions to apply Empty or Filter filters
+        const filteredSuggestions = suggestionResponse.suggestions
+            // Empty suggestion filter
+            .filter(suggestion => {
+            if (suggestion.content === '') {
+                session.setSuggestionState(suggestion.itemId, 'Empty');
+                return false;
+            }
+            return true;
+        })
+            // References setting filter
+            .filter(suggestion => {
+            // State to track whether code with references should be included in
+            // the response. No locking or concurrency controls, filtering is done
+            // right before returning and is only guaranteed to be consistent within
+            // the context of a single response.
+            const { includeSuggestionsWithCodeReferences } = this.amazonQServiceManager.getConfiguration();
+            if (includeSuggestionsWithCodeReferences) {
+                return true;
+            }
+            if (suggestion.references == null || suggestion.references.length === 0) {
+                return true;
+            }
+            // Filter out suggestions that have references when includeSuggestionsWithCodeReferences setting is true
+            session.setSuggestionState(suggestion.itemId, 'Filter');
+            return false;
+        });
+        return {
+            items: suggestionResponse.suggestions
+                .map(suggestion => {
+                // Check if this suggestion is similar to a previously rejected edit
+                const isSimilarToRejected = this.rejectedEditTracker.isSimilarToRejected(suggestion.content, textDocument?.uri || '');
+                if (isSimilarToRejected) {
+                    // Mark as rejected in the session
+                    session.setSuggestionState(suggestion.itemId, 'Reject');
+                    this.logging.debug(`[EDIT_PREDICTION] Filtered out suggestion similar to previously rejected edit`);
+                    // Return empty item that will be filtered out
+                    return {
+                        insertText: '',
+                        isInlineEdit: true,
+                        itemId: suggestion.itemId,
+                    };
+                }
+                return {
+                    insertText: suggestion.content,
+                    isInlineEdit: true,
+                    itemId: suggestion.itemId,
+                };
+            })
+                .filter(item => item.insertText !== ''),
+            sessionId: session.id,
+            partialResultToken: suggestionResponse.responseContext.nextToken,
+        };
+    }
+    handleSuggestionsErrors(error, session) {
+        this.logging.log('Recommendation failure: ' + error);
+        (0, telemetry_1.emitServiceInvocationFailure)(this.telemetry, session, error);
+        this.sessionManager.closeSession(session);
+        let translatedError = error;
+        if ((0, utils_1.hasConnectionExpired)(error)) {
+            translatedError = new errors_1.AmazonQServiceConnectionExpiredError((0, utils_1.getErrorMessage)(error));
+        }
+        if (translatedError instanceof errors_1.AmazonQError) {
+            throw new protocol_1.ResponseError(protocol_1.LSPErrorCodes.RequestFailed, translatedError.message || 'Error processing suggestion requests', {
+                awsErrorCode: translatedError.code,
+            });
+        }
+        return constants_1.EMPTY_RESULT;
+    }
+}
+exports.EditCompletionHandler = EditCompletionHandler;
+//# sourceMappingURL=editCompletionHandler.js.map

package/out/language-server/inline-completion/editCompletionHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"editCompletionHandler.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/editCompletionHandler.ts"],"names":[],"mappings":"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"}

package/out/language-server/inline-completion/session/sessionManager.d.ts

@@ -60,6 +60,8 @@ export declare class CodeWhispererSession {
     includeImportsWithSuggestions?: boolean;
     codewhispererSuggestionImportCount: number;
     suggestionType?: string;
+    hasEditsPending?: boolean;
+    recentItemId?: string;
     constructor(data: SessionData);
     generateSessionId(): string;
     get lastSuggestionIndex(): number;
@@ -79,9 +81,15 @@ export declare class CodeWhispererSession {
      * - Discard otherwise
      */
     getAggregatedUserTriggerDecision(): UserTriggerDecision | undefined;
+    /**
+     * Determines trigger decision based on the most recent user action.
+     * Uses the last processed itemId to determine the overall session decision.
+     */
+    getLatestUserTriggerDecision(): UserTriggerDecision | undefined;
 }
 export declare class SessionManager {
-    private static _instance?;
+    private static _completionInstance?;
+    private static _editInstance?;
     private currentSession?;
     private sessionsLog;
     private maxHistorySize;
@@ -90,7 +98,7 @@ export declare class SessionManager {
     /**
      * Singleton SessionManager class
      */
-    static getInstance(): SessionManager;
+    static getInstance(type?: 'COMPLETIONS' | 'EDITS'): SessionManager;
     static reset(): void;
     createSession(data: SessionData): CodeWhispererSession;
     closeCurrentSession(): void;

package/out/language-server/inline-completion/session/sessionManager.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionManager = exports.CodeWhispererSession = void 0;
 const uuid_1 = require("uuid");
+const codeWhispererService_1 = require("../../../shared/codeWhispererService");
 class CodeWhispererSession {
     id;
     document;
@@ -41,6 +42,9 @@ class CodeWhispererSession {
     includeImportsWithSuggestions;
     codewhispererSuggestionImportCount = 0;
     suggestionType;
+    hasEditsPending = false;
+    // Track the most recent itemId for paginated Edit suggestions
+    recentItemId;
     constructor(data) {
         this.id = this.generateSessionId();
         this.document = data.document;
@@ -101,7 +105,9 @@ class CodeWhispererSession {
     }
     setClientResultData(completionSessionResult, firstCompletionDisplayLatency, totalSessionDisplayTime, typeaheadLength) {
         // Skip if session results were already recorded for session of session is closed
-        if (this.state === 'CLOSED' || this.state === 'DISCARD' || this.completionSessionResult) {
+        if (this.state === 'CLOSED' ||
+            this.state === 'DISCARD' ||
+            (this.completionSessionResult && this.suggestionType === codeWhispererService_1.SuggestionType.COMPLETION)) {
             return;
         }
         this.completionSessionResult = completionSessionResult;
@@ -141,6 +147,7 @@ class CodeWhispererSession {
                 // No recommendation was accepted, but user have seen this suggestion
                 this.setSuggestionState(itemId, 'Reject');
             }
+            this.recentItemId = itemId;
         }
         this.firstCompletionDisplayLatency = firstCompletionDisplayLatency;
         this.totalSessionDisplayTime = totalSessionDisplayTime;
@@ -182,10 +189,29 @@ class CodeWhispererSession {
         }
         return isEmpty ? 'Empty' : 'Discard';
     }
+    /**
+     * Determines trigger decision based on the most recent user action.
+     * Uses the last processed itemId to determine the overall session decision.
+     */
+    getLatestUserTriggerDecision() {
+        // Force Discard trigger decision when session was explicitly discarded by server
+        if (this.state === 'DISCARD') {
+            return 'Discard';
+        }
+        if (!this.recentItemId)
+            return;
+        const state = this.getSuggestionState(this.recentItemId);
+        if (state === 'Accept')
+            return 'Accept';
+        if (state === 'Reject')
+            return 'Reject';
+        return state === 'Empty' ? 'Empty' : 'Discard';
+    }
 }
 exports.CodeWhispererSession = CodeWhispererSession;
 class SessionManager {
-    static _instance;
+    static _completionInstance;
+    static _editInstance;
     currentSession;
     sessionsLog = [];
     maxHistorySize = 5;
@@ -195,15 +221,16 @@ class SessionManager {
     /**
      * Singleton SessionManager class
      */
-    static getInstance() {
-        if (!SessionManager._instance) {
-            SessionManager._instance = new SessionManager();
+    static getInstance(type = 'COMPLETIONS') {
+        if (type === 'EDITS') {
+            return (SessionManager._editInstance ??= new SessionManager());
         }
-        return SessionManager._instance;
+        return (SessionManager._completionInstance ??= new SessionManager());
     }
     // For unit tests
     static reset() {
-        SessionManager._instance = undefined;
+        SessionManager._completionInstance = undefined;
+        SessionManager._editInstance = undefined;
     }
     createSession(data) {
         this.closeCurrentSession();

package/out/language-server/inline-completion/session/sessionManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../../src/language-server/inline-completion/session/sessionManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../../src/language-server/inline-completion/session/sessionManager.ts"],"names":[],"mappings":"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"}

package/out/language-server/inline-completion/telemetry.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.emitAggregatedUserTriggerDecisionTelemetry = exports.emitUserTriggerDecisionTelemetry = exports.emitPerceivedLatencyTelemetry = exports.emitServiceInvocationFailure = exports.emitServiceInvocationTelemetry = void 0;
 const utils_1 = require("../../shared/utils");
+const codeWhispererService_1 = require("../../shared/codeWhispererService");
 const emitServiceInvocationTelemetry = (telemetry, session, requestId) => {
     const duration = new Date().getTime() - session.startTime;
     const data = {
@@ -94,12 +95,21 @@ const emitUserTriggerDecisionTelemetry = async (telemetry, telemetryService, ses
     if (session.reportedUserDecision) {
         return;
     }
+    // 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 === codeWhispererService_1.SuggestionType.EDIT
+        ? session.getLatestUserTriggerDecision()
+        : session.getAggregatedUserTriggerDecision();
     // Can not emit previous trigger decision if it's not available on the session
-    if (!session.getAggregatedUserTriggerDecision()) {
+    if (!userTriggerDecision) {
         return;
     }
     await (0, exports.emitAggregatedUserTriggerDecisionTelemetry)(telemetryService, session, timeSinceLastUserModification, addedCharsCountForEditSuggestion, deletedCharsCountForEditSuggestion, addedIdeDiagnostics, removedIdeDiagnostics, streakLength);
-    session.reportedUserDecision = true;
+    // Mark telemetry as complete unless Edit suggestion was accepted with more pending
+    const hasPendingEditTelemetry = session.suggestionType === codeWhispererService_1.SuggestionType.EDIT && session.acceptedSuggestionId && session.hasEditsPending;
+    if (!hasPendingEditTelemetry) {
+        session.reportedUserDecision = true;
+    }
 };
 exports.emitUserTriggerDecisionTelemetry = emitUserTriggerDecisionTelemetry;
 const emitAggregatedUserTriggerDecisionTelemetry = (telemetryService, session, timeSinceLastUserModification, addedCharsCountForEditSuggestion, deletedCharsCountForEditSuggestion, addedIdeDiagnostics, removedIdeDiagnostics, streakLength) => {