Merge master into feature/ui-e2e-tests (#7767)

## Automatic merge failed

- Resolve conflicts and push to this PR branch.
- **Do not squash-merge** this PR. Use the "Create a merge commit"
option to do a regular merge.

## Command line hint

To perform the merge from the command line, you could do something like
the following (where "origin" is the name of the remote in your local
git repo):
```
git stash
git fetch --all
git checkout origin/feature/ui-e2e-tests
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/ui-e2e-tests
```

---------

Co-authored-by: Roger Zhang <[email protected]>
Co-authored-by: 🥩 Flora <[email protected]>
Co-authored-by: Reed Hamilton <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
Co-authored-by: Roger Zhang <[email protected]>
Co-authored-by: Jacob Chung <[email protected]>
Co-authored-by: aws-asolidu <[email protected]>
Co-authored-by: Newton Der <[email protected]>
Co-authored-by: Newton Der <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: Tyrone Smith <[email protected]>
Co-authored-by: Aidan Ton <[email protected]>
Co-authored-by: abhraina-aws <[email protected]>
Co-authored-by: atontb <[email protected]>
Co-authored-by: Nitish <[email protected]>
Co-authored-by: Nitish Kumar Singh <[email protected]>
Co-authored-by: Blake Lazarine <[email protected]>
Co-authored-by: mkovelam <[email protected]>
Co-authored-by: BlakeLazarine <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: Na Yue <[email protected]>
Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: tsmithsz <[email protected]>
Co-authored-by: Reed Hamilton <[email protected]>
Co-authored-by: Boyu <[email protected]>
Co-authored-by: Dung Dong <[email protected]>
Co-authored-by: Bryce Ito <[email protected]>
Co-authored-by: Suraj Reddy <[email protected]>

Author: 24 people

.gitignore

@@ -31,7 +31,6 @@ src.gen/*
 **/src/shared/telemetry/clienttelemetry.d.ts
 **/src/codewhisperer/client/codewhispererclient.d.ts
 **/src/codewhisperer/client/codewhispereruserclient.d.ts
-**/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
 **/src/auth/sso/oidcclientpkce.d.ts
 
 # Generated by tests

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Faster and more responsive inline completion UX"
+}

packages/amazonq/.changes/next-release/Bug Fix-7261a487-e80a-440f-b311-2688e256a886.json

@@ -521,22 +521,17 @@
                     "command": "aws.amazonq.walkthrough.show",
                     "group": "1_help@1"
                 },
-                {
-                    "command": "aws.amazonq.exploreAgents",
-                    "when": "!aws.isSageMaker",
-                    "group": "1_help@2"
-                },
                 {
                     "command": "aws.amazonq.github",
-                    "group": "1_help@3"
+                    "group": "1_help@2"
                 },
                 {
                     "command": "aws.amazonq.aboutExtension",
-                    "group": "1_help@4"
+                    "group": "1_help@3"
                 },
                 {
                     "command": "aws.amazonq.viewLogs",
-                    "group": "1_help@5"
+                    "group": "1_help@4"
                 }
             ],
             "aws.amazonq.submenu.securityIssueMoreActions": [
@@ -843,12 +838,6 @@
                 "title": "%AWS.amazonq.openChat%",
                 "category": "%AWS.amazonq.title%"
             },
-            {
-                "command": "aws.amazonq.exploreAgents",
-                "title": "%AWS.amazonq.exploreAgents%",
-                "category": "%AWS.amazonq.title%",
-                "enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
-            },
             {
                 "command": "aws.amazonq.walkthrough.show",
                 "title": "%AWS.amazonq.welcomeWalkthrough%"
@@ -972,6 +961,10 @@
                 "command": "aws.amazonq.showPrev",
                 "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
             },
+            {
+                "command": "aws.amazonq.checkInlineSuggestionVisibility",
+                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
+            },
             {
                 "command": "aws.amazonq.inline.invokeChat",
                 "win": "ctrl+i",

packages/amazonq/package.json

@@ -30,7 +30,7 @@ export class SvgGenerationService {
         origionalCodeHighlightRange: Range[]
     }> {
         const textDoc = await vscode.workspace.openTextDocument(filePath)
-        const originalCode = textDoc.getText()
+        const originalCode = textDoc.getText().replaceAll('\r\n', '\n')
         if (originalCode === '') {
             logger.error(`udiff format error`)
             throw new ToolkitError('udiff format error')

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

@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-
+import * as vscode from 'vscode'
 import {
     CancellationToken,
     InlineCompletionContext,
@@ -32,7 +32,6 @@ import {
     ImportAdderProvider,
     CodeSuggestionsState,
     vsCodeState,
-    inlineCompletionsDebounceDelay,
     noInlineSuggestionsMsg,
     getDiagnosticsDifferences,
     getDiagnosticsOfCurrentFile,
@@ -42,7 +41,7 @@ import { LineTracker } from './stateTracker/lineTracker'
 import { InlineTutorialAnnotation } from './tutorials/inlineTutorialAnnotation'
 import { TelemetryHelper } from './telemetryHelper'
 import { Experiments, getLogger, sleep } from 'aws-core-vscode/shared'
-import { debounce, messageUtils } from 'aws-core-vscode/utils'
+import { messageUtils } from 'aws-core-vscode/utils'
 import { showEdits } from './EditRendering/imageRenderer'
 import { ICursorUpdateRecorder } from './cursorUpdateManager'
 import { DocumentEventListener } from './documentEventListener'
@@ -164,6 +163,11 @@ export class InlineCompletionManager implements Disposable {
         const onInlineRejection = async () => {
             try {
                 vsCodeState.isCodeWhispererEditing = true
+                if (this.sessionManager.getActiveSession() === undefined) {
+                    return
+                }
+                const requestStartTime = this.sessionManager.getActiveSession()!.requestStartTime
+                const totalSessionDisplayTime = performance.now() - requestStartTime
                 await commands.executeCommand('editor.action.inlineSuggest.hide')
                 // TODO: also log the seen state for other suggestions in session
                 this.disposable.dispose()
@@ -185,6 +189,7 @@ export class InlineCompletionManager implements Disposable {
                             discarded: false,
                         },
                     },
+                    totalSessionDisplayTime: totalSessionDisplayTime,
                 }
                 this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 // clear session manager states once rejected
@@ -198,7 +203,7 @@ export class InlineCompletionManager implements Disposable {
 }
 
 export class AmazonQInlineCompletionItemProvider implements InlineCompletionItemProvider {
-    private logger = getLogger('nextEditPrediction')
+    private logger = getLogger()
     constructor(
         private readonly languageClient: LanguageClient,
         private readonly recommendationService: RecommendationService,
@@ -208,13 +213,23 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
     ) {}
 
     private readonly logSessionResultMessageName = 'aws/logInlineCompletionSessionResults'
-    provideInlineCompletionItems = debounce(
-        this._provideInlineCompletionItems.bind(this),
-        inlineCompletionsDebounceDelay,
-        true
-    )
 
-    private async _provideInlineCompletionItems(
+    // Ideally use this API handleDidShowCompletionItem
+    // https://github.com/microsoft/vscode/blob/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts#L83
+    // we need this because the returned items of provideInlineCompletionItems may not be actually rendered on screen
+    // if VS Code believes the user is actively typing then it will not show such item
+    async checkWhetherInlineCompletionWasShown() {
+        // this line is to force VS Code to re-render the inline completion
+        // if it decides the inline completion can be shown
+        await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
+        // yield event loop to let backend state transition finish plus wait for vsc to render
+        await sleep(10)
+        // run the command to detect if inline suggestion is really shown or not
+        await vscode.commands.executeCommand(`aws.amazonq.checkInlineSuggestionVisibility`)
+    }
+
+    // this method is automatically invoked by VS Code as user types
+    async provideInlineCompletionItems(
         document: TextDocument,
         position: Position,
         context: InlineCompletionContext,
@@ -299,26 +314,28 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 }
                 // re-use previous suggestions as long as new typed prefix matches
                 if (prevItemMatchingPrefix.length > 0) {
-                    getLogger().debug(`Re-using suggestions that match user typed characters`)
+                    logstr += `- not call LSP and reuse previous suggestions that match user typed characters
+                    - duration between trigger to completion suggestion is displayed ${performance.now() - t0}`
+                    void this.checkWhetherInlineCompletionWasShown()
                     return prevItemMatchingPrefix
                 }
-                getLogger().debug(`Auto rejecting suggestions from previous session`)
-                // if no such suggestions, report the previous suggestion as Reject
+
+                // if no such suggestions, report the previous suggestion as Reject or Discarded
                 const params: LogInlineCompletionSessionResultsParams = {
                     sessionId: prevSessionId,
                     completionSessionResult: {
                         [prevItemId]: {
-                            seen: true,
+                            seen: prevSession.displayed,
                             accepted: false,
-                            discarded: false,
+                            discarded: !prevSession.displayed,
                         },
                     },
+                    totalSessionDisplayTime: performance.now() - prevSession.requestStartTime,
                 }
                 this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 this.sessionManager.clear()
             }
 
-            // TODO: this line will take ~200ms each trigger, need to root cause and maybe better to disable it for now
             // tell the tutorial that completions has been triggered
             await this.inlineTutorialAnnotation.triggered(context.triggerKind)
 
@@ -346,12 +363,13 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
 
             const t2 = performance.now()
 
-            logstr = logstr += `- number of suggestions: ${items.length}
+            logstr += `- number of suggestions: ${items.length}
 - sessionId: ${this.sessionManager.getActiveSession()?.sessionId}
 - first suggestion content (next line):
 ${itemLog}
-- duration since trigger to before sending Flare call: ${t1 - t0}ms
-- duration since trigger to receiving responses from Flare: ${t2 - t0}ms
+- duration between trigger to before sending LSP call: ${t1 - t0}ms
+- duration between trigger to after receiving LSP response: ${t2 - t0}ms
+- duration between before sending LSP call to after receving LSP response: ${t2 - t1}ms
 `
             const session = this.sessionManager.getActiveSession()
 
@@ -361,16 +379,13 @@ ${itemLog}
             }
 
             if (!session || !items.length || !editor) {
-                getLogger().debug(
-                    `Failed to produce inline suggestion results. Received ${items.length} items from service`
-                )
+                logstr += `Failed to produce inline suggestion results. Received ${items.length} items from service`
                 return []
             }
 
             const cursorPosition = document.validatePosition(position)
 
             if (position.isAfter(editor.selection.active)) {
-                getLogger().debug(`Cursor moved behind trigger position. Discarding suggestion...`)
                 const params: LogInlineCompletionSessionResultsParams = {
                     sessionId: session.sessionId,
                     completionSessionResult: {
@@ -383,6 +398,7 @@ ${itemLog}
                 }
                 this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 this.sessionManager.clear()
+                logstr += `- cursor moved behind trigger position. Discarding suggestion...`
                 return []
             }
 
@@ -410,9 +426,7 @@ ${itemLog}
                     // Check if Next Edit Prediction feature flag is enabled
                     if (Experiments.instance.get('amazonqLSPNEP', true)) {
                         await showEdits(item, editor, session, this.languageClient, this)
-                        const t3 = performance.now()
-                        logstr = logstr + `- duration since trigger to NEP suggestion is displayed: ${t3 - t0}ms`
-                        this.logger.info(logstr)
+                        logstr += `- duration between trigger to edits suggestion is displayed: ${performance.now() - t0}ms`
                     }
                     return []
                 }
@@ -438,9 +452,6 @@ ${itemLog}
 
             // report discard if none of suggestions match typeahead
             if (itemsMatchingTypeahead.length === 0) {
-                getLogger().debug(
-                    `Suggestion does not match user typeahead from insertion position. Discarding suggestion...`
-                )
                 const params: LogInlineCompletionSessionResultsParams = {
                     sessionId: session.sessionId,
                     completionSessionResult: {
@@ -453,17 +464,22 @@ ${itemLog}
                 }
                 this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 this.sessionManager.clear()
+                logstr += `- suggestion does not match user typeahead from insertion position. Discarding suggestion...`
                 return []
             }
 
             this.sessionManager.updateCodeReferenceAndImports()
             // suggestions returned here will be displayed on screen
+            logstr += `- duration between trigger to completion suggestion is displayed: ${performance.now() - t0}ms`
+            void this.checkWhetherInlineCompletionWasShown()
             return itemsMatchingTypeahead as InlineCompletionItem[]
         } catch (e) {
             getLogger('amazonqLsp').error('Failed to provide completion items: %O', e)
+            logstr += `- failed to provide completion items ${(e as Error).message}`
             return []
         } finally {
             vsCodeState.isRecommendationsActive = false
+            this.logger.info(logstr)
         }
     }
 }

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

@@ -12,10 +12,10 @@ import {
 import { CancellationToken, InlineCompletionContext, Position, TextDocument } from 'vscode'
 import { LanguageClient } from 'vscode-languageclient'
 import { SessionManager } from './sessionManager'
-import { AuthUtil, CodeWhispererStatusBarManager } from 'aws-core-vscode/codewhisperer'
+import { AuthUtil, CodeWhispererStatusBarManager, vsCodeState } from 'aws-core-vscode/codewhisperer'
 import { TelemetryHelper } from './telemetryHelper'
 import { ICursorUpdateRecorder } from './cursorUpdateManager'
-import { globals, getLogger } from 'aws-core-vscode/shared'
+import { getLogger } from 'aws-core-vscode/shared'
 
 export interface GetAllRecommendationsOptions {
     emitTelemetry?: boolean
@@ -68,7 +68,7 @@ export class RecommendationService {
         if (options.editsStreakToken) {
             request = { ...request, partialResultToken: options.editsStreakToken }
         }
-        const requestStartTime = globals.clock.Date.now()
+        const requestStartTime = performance.now()
         const statusBar = CodeWhispererStatusBarManager.instance
 
         // Only track telemetry if enabled
@@ -92,13 +92,15 @@ export class RecommendationService {
                     nextToken: request.partialResultToken,
                 },
             })
+            const t0 = performance.now()
             const result: InlineCompletionListWithReferences = await languageClient.sendRequest(
                 inlineCompletionWithReferencesRequestType.method,
                 request,
                 token
             )
-            getLogger().info('Received inline completion response: %O', {
+            getLogger().info('Received inline completion response from LSP: %O', {
                 sessionId: result.sessionId,
+                latency: performance.now() - t0,
                 itemCount: result.items?.length || 0,
                 items: result.items?.map((item) => ({
                     itemId: item.itemId,
@@ -117,7 +119,7 @@ export class RecommendationService {
             }
             TelemetryHelper.instance.setFirstSuggestionShowTime()
 
-            const firstCompletionDisplayLatency = globals.clock.Date.now() - requestStartTime
+            const firstCompletionDisplayLatency = performance.now() - requestStartTime
             this.sessionManager.startSession(
                 result.sessionId,
                 result.items,
@@ -128,6 +130,7 @@ export class RecommendationService {
 
             const isInlineEdit = result.items.some((item) => item.isInlineEdit)
 
+            // TODO: question, is it possible that the first request returns empty suggestion but has non-empty next token?
             if (result.partialResultToken) {
                 if (!isInlineEdit) {
                     // If the suggestion is COMPLETIONS and there are more results to fetch, handle them in the background
@@ -183,6 +186,11 @@ export class RecommendationService {
                 request,
                 token
             )
+            // when pagination is in progress, but user has already accepted or rejected an inline completion
+            // then stop pagination
+            if (this.sessionManager.getActiveSession() === undefined || vsCodeState.isCodeWhispererEditing) {
+                break
+            }
             this.sessionManager.updateSessionSuggestions(result.items)
             nextToken = result.partialResultToken
         }