fix(amazonq): don't call completions when edits active

Author: floralph

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

@@ -24,6 +24,7 @@ import { getLogger } from 'aws-core-vscode/shared'
 import { DocumentEventListener } from './documentEventListener'
 import { getOpenFilesInWindow } from 'aws-core-vscode/utils'
 import { asyncCallWithTimeout } from '../../util/timeoutUtil'
+import { EditSuggestionState } from './editSuggestionState'
 
 export interface GetAllRecommendationsOptions {
     emitTelemetry?: boolean
@@ -132,7 +133,7 @@ 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) {
+            if (!isTriggerByDeletion && !request.partialResultToken && !EditSuggestionState.isEditSuggestionActive()) {
                 const completionPromise: Promise<InlineCompletionListWithReferences> = languageClient.sendRequest(
                     inlineCompletionWithReferencesRequestType.method,
                     request,

packages/amazonq/test/unit/amazonq/apps/inline/completion.test.ts

@@ -443,16 +443,20 @@ describe('InlineCompletionManager', () => {
                 // Should return empty array
                 assert.deepStrictEqual(result, [])
 
-                // Should emit telemetry for each completion suggestion
-                assert.strictEqual(sendNotificationStub.callCount, 2) // For both mockSuggestions
-
-                // Verify telemetry parameters for first call
-                const firstCall = sendNotificationStub.getCall(0)
-                assert.strictEqual(firstCall.args[0], 'aws/logInlineCompletionSessionResults')
-                const sessionResult = Object.values(firstCall.args[1].completionSessionResult)[0] as any
-                assert.strictEqual(sessionResult.seen, false)
-                assert.strictEqual(sessionResult.accepted, false)
-                assert.strictEqual(sessionResult.discarded, true)
+                // Should emit single batched telemetry for both completion suggestions
+                assert.strictEqual(sendNotificationStub.callCount, 1)
+
+                // Verify telemetry parameters
+                const call = sendNotificationStub.getCall(0)
+                assert.strictEqual(call.args[0], 'aws/logInlineCompletionSessionResults')
+                const completionSessionResult = call.args[1].completionSessionResult
+                const sessionResults = Object.values(completionSessionResult) as any[]
+                assert.strictEqual(sessionResults.length, 2) // Both mockSuggestions should be included
+                sessionResults.forEach((result) => {
+                    assert.strictEqual(result.seen, false)
+                    assert.strictEqual(result.accepted, false)
+                    assert.strictEqual(result.discarded, true)
+                })
             })
 
             it('should only emit telemetry for non-inline-edit items when edit is active', async () => {

packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts

@@ -15,6 +15,7 @@ import { CursorUpdateManager } from '../../../../../src/app/inline/cursorUpdateM
 import { CodeWhispererStatusBarManager } from 'aws-core-vscode/codewhisperer'
 import { globals } from 'aws-core-vscode/shared'
 import { DocumentEventListener } from '../../../../../src/app/inline/documentEventListener'
+import { EditSuggestionState } from '../../../../../src/app/inline/editSuggestionState'
 
 const completionApi = 'aws/textDocument/inlineCompletionWithReferences'
 const editApi = 'aws/textDocument/editCompletion'
@@ -325,5 +326,77 @@ describe('RecommendationService', () => {
                 console.error = originalConsoleError
             }
         })
+
+        it('should not make completion request when edit suggestion is active', async () => {
+            // Mock EditSuggestionState to return true (edit suggestion is active)
+            const isEditSuggestionActiveStub = sandbox.stub(EditSuggestionState, 'isEditSuggestionActive').returns(true)
+
+            const mockResult = {
+                sessionId: 'test-session',
+                items: [mockInlineCompletionItemOne],
+                partialResultToken: undefined,
+            }
+
+            sendRequestStub.resolves(mockResult)
+
+            await service.getAllRecommendations(
+                languageClient,
+                mockDocument,
+                mockPosition,
+                mockContext,
+                mockToken,
+                true,
+                mockDocumentEventListener
+            )
+
+            // Verify sendRequest was called only for edit API, not completion API
+            const cs = sendRequestStub.getCalls()
+            const completionCalls = cs.filter((c) => c.firstArg === completionApi)
+            const editCalls = cs.filter((c) => c.firstArg === editApi)
+
+            assert.strictEqual(cs.length, 1) // Only edit call
+            assert.strictEqual(completionCalls.length, 0) // No completion calls
+            assert.strictEqual(editCalls.length, 1) // One edit call
+
+            // Verify the stub was called
+            sinon.assert.calledOnce(isEditSuggestionActiveStub)
+        })
+
+        it('should make completion request when edit suggestion is not active', async () => {
+            // Mock EditSuggestionState to return false (no edit suggestion active)
+            const isEditSuggestionActiveStub = sandbox
+                .stub(EditSuggestionState, 'isEditSuggestionActive')
+                .returns(false)
+
+            const mockResult = {
+                sessionId: 'test-session',
+                items: [mockInlineCompletionItemOne],
+                partialResultToken: undefined,
+            }
+
+            sendRequestStub.resolves(mockResult)
+
+            await service.getAllRecommendations(
+                languageClient,
+                mockDocument,
+                mockPosition,
+                mockContext,
+                mockToken,
+                true,
+                mockDocumentEventListener
+            )
+
+            // Verify sendRequest was called for both APIs
+            const cs = sendRequestStub.getCalls()
+            const completionCalls = cs.filter((c) => c.firstArg === completionApi)
+            const editCalls = cs.filter((c) => c.firstArg === editApi)
+
+            assert.strictEqual(cs.length, 2) // Both calls
+            assert.strictEqual(completionCalls.length, 1) // One completion call
+            assert.strictEqual(editCalls.length, 1) // One edit call
+
+            // Verify the stub was called
+            sinon.assert.calledOnce(isEditSuggestionActiveStub)
+        })
     })
 })