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

- 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.

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

package-lock.json

@@ -164,6 +164,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 +190,7 @@ export class InlineCompletionManager implements Disposable {
                             discarded: false,
                         },
                     },
+                    totalSessionDisplayTime: totalSessionDisplayTime,
                 }
                 this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 // clear session manager states once rejected
@@ -377,7 +383,6 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                             discarded: !prevSession.displayed,
                         },
                     },
-                    firstCompletionDisplayLatency: prevSession.firstCompletionDisplayLatency,
                     totalSessionDisplayTime: performance.now() - prevSession.requestStartTime,
                 }
                 this.languageClient.sendNotification(this.logSessionResultMessageName, params)
@@ -436,24 +441,25 @@ ${itemLog}
 
             const cursorPosition = document.validatePosition(position)
 
-            // Completion will not be rendered if users cursor moves to a position which is before the position when the service is invoked
-            if (items.length > 0 && !items[0].isInlineEdit) {
-                if (position.isAfter(editor.selection.active)) {
-                    const params: LogInlineCompletionSessionResultsParams = {
-                        sessionId: session.sessionId,
-                        completionSessionResult: {
-                            [itemId]: {
-                                seen: false,
-                                accepted: false,
-                                discarded: true,
-                            },
+            if (position.isAfter(editor.selection.active)) {
+                const params: LogInlineCompletionSessionResultsParams = {
+                    sessionId: session.sessionId,
+                    completionSessionResult: {
+                        [itemId]: {
+                            seen: false,
+                            accepted: false,
+                            discarded: true,
                         },
                     }
                     this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                     this.sessionManager.clear()
                     logstr += `- cursor moved behind trigger position. Discarding completion suggestion...`
                     return []
                 }
+                this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+                this.sessionManager.clear()
+                logstr += `- cursor moved behind trigger position. Discarding suggestion...`
+                return []
             }
 
             // delay the suggestion rendeing if user is actively typing

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

@@ -12,19 +12,10 @@ import {
 import { CancellationToken, InlineCompletionContext, Position, TextDocument } from 'vscode'
 import { LanguageClient } from 'vscode-languageclient'
 import { SessionManager } from './sessionManager'
-import {
-    AuthUtil,
-    CodeWhispererConstants,
-    CodeWhispererStatusBarManager,
-    vsCodeState,
-} from 'aws-core-vscode/codewhisperer'
+import { AuthUtil, CodeWhispererStatusBarManager, vsCodeState } from 'aws-core-vscode/codewhisperer'
 import { TelemetryHelper } from './telemetryHelper'
 import { ICursorUpdateRecorder } from './cursorUpdateManager'
 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
@@ -120,53 +111,11 @@ export class RecommendationService {
                 },
             })
             const t0 = performance.now()
-
-            // Best effort estimate of deletion
-            const isTriggerByDeletion = documentEventListener.isLastEventDeletion(document.uri.fsPath)
-
-            const ps: Promise<InlineCompletionListWithReferences>[] = []
-            /**
-             * IsTriggerByDeletion is to prevent user deletion invoking Completions.
-             * PartialResultToken is not a hack for now since only Edits suggestion use partialResultToken across different calls of [getAllRecommendations],
-             * 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)
-            }
-
-            /**
-             * 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.
-             */
-            const editPromise: Promise<InlineCompletionListWithReferences> = languageClient.sendRequest(
-                editCompletionRequestType.method,
+            const result: InlineCompletionListWithReferences = await languageClient.sendRequest(
+                inlineCompletionWithReferencesRequestType.method,
                 request,
                 token
             )
-            ps.push(editPromise)
-
-            /**
-             * First come first serve, ideally we should simply return the first response returned. However there are some caviar here because either
-             * (1) promise might be returned early without going through service
-             * (2) some users are not enabled with edits suggestion, therefore service will return empty result without passing through the model
-             * With the scenarios listed above or others, it's possible that 1 promise will ALWAYS win the race and users will NOT get any suggestion back.
-             * This is the hack to return first "NON-EMPTY" response
-             */
-            let result = await Promise.race(ps)
-            if (ps.length > 1 && result.items.length === 0) {
-                for (const p of ps) {
-                    const r = await p
-                    if (r.items.length > 0) {
-                        result = r
-                    }
-                }
-            }
-
             getLogger().info('Received inline completion response from LSP: %O', {
                 sessionId: result.sessionId,
                 latency: performance.now() - t0,
@@ -199,6 +148,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
@@ -249,7 +199,11 @@ export class RecommendationService {
         while (nextToken) {
             const request = { ...initialRequest, partialResultToken: nextToken }
 
-            const result = await this.getRecommendationsWithTimeout(languageClient, request, token)
+            const result: InlineCompletionListWithReferences = await languageClient.sendRequest(
+                inlineCompletionWithReferencesRequestType.method,
+                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) {

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

@@ -134,6 +134,12 @@ export class SessionManager {
         }
     }
 
+    public checkInlineSuggestionVisibility() {
+        if (this.activeSession) {
+            this.activeSession.displayed = true
+        }
+    }
+
     private clearReferenceInlineHintsAndImportHints() {
         ReferenceInlineProvider.instance.removeInlineReference()
         ImportAdderProvider.instance.clear()

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

@@ -187,7 +187,7 @@ export async function startLanguageServer(
                     window: {
                         notifications: true,
                         showSaveFileDialog: true,
-                        showLogs: true,
+                        showLogs: isSageMaker() ? false : true,
                     },
                     textDocument: {
                         inlineCompletionWithReferences: textDocSection,
@@ -363,6 +363,10 @@ async function onLanguageServerReady(
             await vscode.commands.executeCommand('editor.action.inlineSuggest.showNext')
             sessionManager.onNextSuggestion()
         }),
+        // this is a workaround since handleDidShowCompletionItem is not public API
+        Commands.register('aws.amazonq.checkInlineSuggestionVisibility', async () => {
+            sessionManager.checkInlineSuggestionVisibility()
+        }),
         Commands.register({ id: 'aws.amazonq.invokeInlineCompletion', autoconnect: true }, async () => {
             vsCodeState.lastManualTriggerTime = performance.now()
             await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')

packages/amazonq/src/lsp/client.ts

@@ -7,6 +7,4 @@
  * These agents have underlying requirements on node dependencies (e.g. jsdom, admzip)
  */
 export { init as cwChatAppInit } from '../codewhispererChat/app'
-export { init as featureDevChatAppInit } from '../amazonqFeatureDev/app' // TODO: Remove this
 export { init as gumbyChatAppInit } from '../amazonqGumby/app'
-export { init as docChatAppInit } from '../amazonqDoc/app' // TODO: Remove this

packages/core/src/amazonq/indexNode.ts

@@ -4,7 +4,7 @@
  */
 
 export type TabStatus = 'free' | 'busy' | 'dead'
-const TabTypes = ['cwc', 'gumby', 'review', 'agentWalkthrough', 'welcome', 'unknown'] as const
+const TabTypes = ['cwc', 'gumby', 'review', 'welcome', 'unknown'] as const
 export type TabType = (typeof TabTypes)[number]
 export function isTabType(value: string): value is TabType {
     return (TabTypes as readonly string[]).includes(value)