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

- 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: laura-codess <[email protected]>
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: surajrdy-aws <[email protected]>
Co-authored-by: Boyu <[email protected]>
Co-authored-by: Dung Dong <[email protected]>

Author: 23 people

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Let Enter invoke auto completion more consistently"
+}

packages/amazonq/.changes/next-release/Bug Fix-316fb610-0ea9-40d1-bdb7-d371a6be4a4e.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Use documentChangeEvent as auto trigger condition"
+}

packages/amazonq/.changes/next-release/Bug Fix-9d694e40-7fc7-4504-b08c-6b22a5ebcb1c.json

@@ -1,18 +1,3 @@
-## 1.88.0 2025-08-06
-
-- **Feature** Amazon Q Chat provides error explanations and fixes when hovering or right-clicking on error indicators and messages
-- **Feature** /transform: Show transformation history in Transformation Hub and allow users to resume jobs
-
-## 1.87.0 2025-07-31
-
-- Miscellaneous non-user-facing changes
-
-## 1.86.0 2025-07-30
-
-- **Bug Fix** Let Enter invoke auto completion more consistently
-- **Bug Fix** Faster and more responsive inline completion UX
-- **Bug Fix** Use documentChangeEvent as auto trigger condition
-
 ## 1.85.0 2025-07-19
 
 - Miscellaneous non-user-facing changes

packages/amazonq/CHANGELOG.md

@@ -1,8 +1,8 @@
 {
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
-    "description": "The most capable generative AI–powered assistant for software development.",
-    "version": "1.89.0-SNAPSHOT",
+    "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
+    "version": "1.86.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/package.json

@@ -37,6 +37,12 @@ export async function showEdits(
             return
         }
 
+        // TODO: To investigate why it fails and patch [generateDiffSvg]
+        if (newCode.length === 0) {
+            getLogger('nextEditPrediction').warn('not able to apply provided edit suggestion, skip rendering')
+            return
+        }
+
         if (svgImage) {
             // display the SVG image
             await displaySvgDecoration(

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { diffWordsWithSpace, diffLines } from 'diff'
+import { diffWordsWithSpace } from 'diff'
 import * as vscode from 'vscode'
 import { ToolkitError, getLogger } from 'aws-core-vscode/shared'
 import { diffUtilities } from 'aws-core-vscode/shared'

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

@@ -112,7 +112,6 @@ export class InlineCompletionManager implements Disposable {
         ) => {
             try {
                 vsCodeState.isCodeWhispererEditing = true
-                const startLine = position.line
                 // TODO: also log the seen state for other suggestions in session
                 // Calculate timing metrics before diagnostic delay
                 const totalSessionDisplayTime = performance.now() - requestStartTime
@@ -121,11 +120,6 @@ export class InlineCompletionManager implements Disposable {
                     this.sessionManager.getActiveSession()?.diagnosticsBeforeAccept,
                     getDiagnosticsOfCurrentFile()
                 )
-                // try remove the extra } ) ' " if there is a new reported problem
-                // the extra } will cause syntax error
-                if (diagnosticDiff.added.length > 0) {
-                    await handleExtraBrackets(editor, editor.selection.active, position)
-                }
                 const params: LogInlineCompletionSessionResultsParams = {
                     sessionId: sessionId,
                     completionSessionResult: {
@@ -170,22 +164,16 @@ export class InlineCompletionManager implements Disposable {
         const onInlineRejection = async () => {
             try {
                 vsCodeState.isCodeWhispererEditing = true
-                const session = this.sessionManager.getActiveSession()
-                if (session === undefined) {
-                    return
-                }
-                const requestStartTime = session.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()
                 this.disposable = languages.registerInlineCompletionItemProvider(
                     CodeWhispererConstants.platformLanguageIds,
                     this.inlineCompletionProvider
                 )
-                const sessionId = session.sessionId
+                const sessionId = this.sessionManager.getActiveSession()?.sessionId
                 const itemId = this.sessionManager.getActiveRecommendation()[0]?.itemId
-                if (!itemId) {
+                if (!sessionId || !itemId) {
                     return
                 }
                 const params: LogInlineCompletionSessionResultsParams = {
@@ -197,8 +185,6 @@ export class InlineCompletionManager implements Disposable {
                             discarded: false,
                         },
                     },
-                    firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
-                    totalSessionDisplayTime: totalSessionDisplayTime,
                 }
                 this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 // clear session manager states once rejected
@@ -264,16 +250,21 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
             return []
         }
 
-        // there is a bug in VS Code, when hitting Enter, the context.triggerKind is Invoke (0)
-        // when hitting other keystrokes, the context.triggerKind is Automatic (1)
-        // we only mark option + C as manual trigger
-        // this is a workaround since the inlineSuggest.trigger command take no params
-        const isAutoTrigger = performance.now() - vsCodeState.lastManualTriggerTime > 50
+        const isAutoTrigger = context.triggerKind === InlineCompletionTriggerKind.Automatic
         if (isAutoTrigger && !CodeSuggestionsState.instance.isSuggestionsEnabled()) {
             // return early when suggestions are disabled with auto trigger
             return []
         }
 
+        // yield event loop to let the document listen catch updates
+        await sleep(1)
+        // prevent user deletion invoking auto trigger
+        // this is a best effort estimate of deletion
+        if (this.documentEventListener.isLastEventDeletion(document.uri.fsPath)) {
+            getLogger().debug('Skip auto trigger when deleting code')
+            return []
+        }
+
         // yield event loop to let the document listen catch updates
         await sleep(1)
 
@@ -364,8 +355,8 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 },
                 token,
                 isAutoTrigger,
-                this.documentEventListener,
-                getAllRecommendationsOptions
+                getAllRecommendationsOptions,
+                this.documentEventListener.getLastDocumentChangeEvent(document.uri.fsPath)?.event
             )
             // get active item from session for displaying
             const items = this.sessionManager.getActiveRecommendation()

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

@@ -2,12 +2,12 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import * as vscode from 'vscode'
 import {
     InlineCompletionListWithReferences,
     InlineCompletionWithReferencesParams,
     inlineCompletionWithReferencesRequestType,
     TextDocumentContentChangeEvent,
-    editCompletionRequestType,
 } from '@aws/language-server-runtimes/protocol'
 import { CancellationToken, InlineCompletionContext, Position, TextDocument } from 'vscode'
 import { LanguageClient } from 'vscode-languageclient'
@@ -67,8 +67,8 @@ export class RecommendationService {
         context: InlineCompletionContext,
         token: CancellationToken,
         isAutoTrigger: boolean,
-        documentEventListener: DocumentEventListener,
-        options: GetAllRecommendationsOptions = { emitTelemetry: true, showUi: true }
+        options: GetAllRecommendationsOptions = { emitTelemetry: true, showUi: true },
+        documentChangeEvent?: vscode.TextDocumentChangeEvent
     ) {
         const documentChangeEvent = documentEventListener?.getLastDocumentChangeEvent(document.uri.fsPath)?.event
 
@@ -83,15 +83,13 @@ export class RecommendationService {
                   contentChanges: documentChangeEvent.contentChanges.map((x) => x as TextDocumentContentChangeEvent),
               }
             : undefined
-        const openTabs = await getOpenFilesInWindow()
         let request: InlineCompletionWithReferencesParams = {
             textDocument: {
                 uri: document.uri.toString(),
             },
             position,
             context,
             documentChangeParams: documentChangeParams,
-            openTabFilepaths: openTabs,
         }
         if (options.editsStreakToken) {
             request = { ...request, partialResultToken: options.editsStreakToken }
@@ -200,7 +198,6 @@ 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

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

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