Merge master into feature/ui-e2e-tests

.gitignore

@@ -56,3 +56,6 @@ packages/*/resources/css/icons.css
 
 # Created by `npm run webRun` when testing extension in web mode
 .vscode-test-web
+
+# Generated by E2E UI Tests
+packages/amazonq/test/e2e/amazonq/resources

package.json

@@ -28,6 +28,10 @@
         "test": "npm run test -w packages/ --if-present",
         "testWeb": "npm run testWeb -w packages/ --if-present",
         "testE2E": "npm run testE2E -w packages/ --if-present",
+        "test:ui:prepare": "./node_modules/.bin/extest get-vscode -s ~/.vscode-test-resources -n && extest get-chromedriver -s ~/.vscode-test-resources -n",
+        "test:ui:install": "cd packages/amazonq && npm run package 2>&1 | grep -o 'VSIX Version: [^ ]*' | cut -d' ' -f3 | xargs -I{} bash -c 'cd ../../ && ./node_modules/.bin/extest install-vsix -f amazon-q-vscode-{}.vsix -e packages/amazonq/test/e2e_new/amazonq/resources -s ~/.vscode-test-resources'",
+        "test:ui:run": "npm run testCompile && ./node_modules/.bin/extest run-tests -s ~/.vscode-test-resources -e packages/amazonq/test/e2e_new/amazonq/resources packages/amazonq/dist/test/e2e_new/amazonq/tests/*.js",
+        "test:ui": "npm run test:ui:prepare && npm run test:ui:install && npm run test:ui:run",
         "testInteg": "npm run testInteg -w packages/ --if-present",
         "package": "npm run package -w packages/toolkit -w packages/amazonq",
         "newChange": "echo 'Must specify subproject/workspace with -w packages/<subproject>' && false",
@@ -41,7 +45,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.328",
+        "@aws-toolkits/telemetry": "^1.0.329",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",
@@ -71,7 +75,7 @@
         "ts-node": "^10.9.1",
         "typescript": "^5.0.4",
         "util": "^0.12.5",
-        "vscode-extension-tester": "^8.15.0",
+        "vscode-extension-tester": "^8.16.2",
         "webpack": "^5.95.0",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.2",

packages/amazonq/.changes/1.84.0.json

@@ -0,0 +1,18 @@
+{
+	"date": "2025-07-17",
+	"version": "1.84.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Slightly delay rendering inline completion when user is typing"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Render first response before receiving all paginated inline completion results"
+		},
+		{
+			"type": "Feature",
+			"description": "Explain and Fix for any issue in Code Issues panel will pull the experience into chat. Also no more view details tab."
+		}
+	]
+}

packages/amazonq/.changes/1.85.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-07-19",
+	"version": "1.85.0",
+	"entries": []
+}

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

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

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

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

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.85.0 2025-07-19
+
+- Miscellaneous non-user-facing changes
+
+## 1.84.0 2025-07-17
+
+- **Bug Fix** Slightly delay rendering inline completion when user is typing
+- **Bug Fix** Render first response before receiving all paginated inline completion results
+- **Feature** Explain and Fix for any issue in Code Issues panel will pull the experience into chat. Also no more view details tab.
+
 ## 1.83.0 2025-07-09
 
 - **Feature** Amazon Q /test, /doc, and /dev capabilities integrated into Agentic coding.

packages/amazonq/package.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
-    "version": "1.84.0-SNAPSHOT",
+    "version": "1.86.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -405,6 +405,11 @@
                     "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected && !aws.isSageMakerUnifiedStudio",
                     "group": "2_amazonQ@4"
                 },
+                {
+                    "command": "aws.amazonq.showLogs",
+                    "when": "!aws.isSageMakerUnifiedStudio",
+                    "group": "1_amazonQ@5"
+                },
                 {
                     "command": "aws.amazonq.reconnect",
                     "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connectionExpired",
@@ -557,6 +562,21 @@
             ]
         },
         "commands": [
+            {
+                "command": "aws.amazonq.stopCmdExecution",
+                "title": "Stop Amazon Q",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.runCmdExecution",
+                "title": "Run Amazon Q Tool",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.rejectCmdExecution",
+                "title": "Reject Amazon Q Tool",
+                "category": "%AWS.amazonq.title%"
+            },
             {
                 "command": "_aws.amazonq.notifications.dismiss",
                 "title": "%AWS.generic.dismiss%",
@@ -618,6 +638,11 @@
                 "category": "%AWS.amazonq.title%",
                 "enablement": "aws.codewhisperer.connected"
             },
+            {
+                "command": "aws.amazonq.showLogs",
+                "title": "%AWS.command.codewhisperer.showLogs%",
+                "category": "%AWS.amazonq.title%"
+            },
             {
                 "command": "aws.amazonq.selectRegionProfile",
                 "title": "Change Profile",
@@ -847,6 +872,24 @@
             }
         ],
         "keybindings": [
+            {
+                "command": "aws.amazonq.stopCmdExecution",
+                "key": "ctrl+shift+backspace",
+                "mac": "cmd+shift+backspace",
+                "when": "aws.amazonq.amazonqChatLSP.isFocus"
+            },
+            {
+                "command": "aws.amazonq.runCmdExecution",
+                "key": "ctrl+shift+enter",
+                "mac": "cmd+shift+enter",
+                "when": "aws.amazonq.amazonqChatLSP.isFocus"
+            },
+            {
+                "command": "aws.amazonq.rejectCmdExecution",
+                "key": "ctrl+shift+r",
+                "mac": "cmd+shift+r",
+                "when": "aws.amazonq.amazonqChatLSP.isFocus"
+            },
             {
                 "command": "_aws.amazonq.focusChat.keybinding",
                 "win": "win+alt+i",

packages/amazonq/src/app/chat/node/activateAgents.ts

@@ -11,9 +11,6 @@ export function activateAgents() {
     const appInitContext = DefaultAmazonQAppInitContext.instance
 
     amazonqNode.cwChatAppInit(appInitContext)
-    amazonqNode.featureDevChatAppInit(appInitContext)
     amazonqNode.gumbyChatAppInit(appInitContext)
-    amazonqNode.testChatAppInit(appInitContext)
-    amazonqNode.docChatAppInit(appInitContext)
     scanChatAppInit(appInitContext)
 }

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

@@ -29,6 +29,12 @@ export async function showEdits(
         const { svgImage, startLine, newCode, origionalCodeHighlightRange } =
             await svgGenerationService.generateDiffSvg(currentFile, item.insertText as string)
 
+        // 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/svgGenerator.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { diffChars } 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'
@@ -413,45 +413,6 @@ export class SvgGenerationService {
         const originalRanges: Range[] = []
         const afterRanges: Range[] = []
 
-        /**
-         * Merges ranges on the same line that are separated by only one character
-         */
-        const mergeAdjacentRanges = (ranges: Range[]): Range[] => {
-            const sortedRanges = [...ranges].sort((a, b) => {
-                if (a.line !== b.line) {
-                    return a.line - b.line
-                }
-                return a.start - b.start
-            })
-
-            const result: Range[] = []
-
-            // Process all ranges
-            for (let i = 0; i < sortedRanges.length; i++) {
-                const current = sortedRanges[i]
-
-                // If this is the last range or ranges are on different lines, add it directly
-                if (i === sortedRanges.length - 1 || current.line !== sortedRanges[i + 1].line) {
-                    result.push(current)
-                    continue
-                }
-
-                // Check if current range and next range can be merged
-                const next = sortedRanges[i + 1]
-                if (current.line === next.line && next.start - current.end <= 1) {
-                    sortedRanges[i + 1] = {
-                        line: current.line,
-                        start: current.start,
-                        end: Math.max(current.end, next.end),
-                    }
-                } else {
-                    result.push(current)
-                }
-            }
-
-            return result
-        }
-
         // Create reverse mapping for quicker lookups
         const reverseMap = new Map<string, string>()
         for (const [original, modified] of modifiedLines.entries()) {
@@ -465,7 +426,7 @@ export class SvgGenerationService {
             // If line exists in modifiedLines as a key, process character diffs
             if (Array.from(modifiedLines.keys()).includes(line)) {
                 const modifiedLine = modifiedLines.get(line)!
-                const changes = diffChars(line, modifiedLine)
+                const changes = diffWordsWithSpace(line, modifiedLine)
 
                 let charPos = 0
                 for (const part of changes) {
@@ -497,7 +458,7 @@ export class SvgGenerationService {
 
             if (reverseMap.has(line)) {
                 const originalLine = reverseMap.get(line)!
-                const changes = diffChars(originalLine, line)
+                const changes = diffWordsWithSpace(originalLine, line)
 
                 let charPos = 0
                 for (const part of changes) {
@@ -522,12 +483,9 @@ export class SvgGenerationService {
             }
         }
 
-        const mergedOriginalRanges = mergeAdjacentRanges(originalRanges)
-        const mergedAfterRanges = mergeAdjacentRanges(afterRanges)
-
         return {
-            removedRanges: mergedOriginalRanges,
-            addedRanges: mergedAfterRanges,
+            removedRanges: originalRanges,
+            addedRanges: afterRanges,
         }
     }
 }