Merge master into feature/LSP-gamma

.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

packages/amazonq/.changes/1.86.0.json

@@ -0,0 +1,18 @@
+{
+	"date": "2025-07-30",
+	"version": "1.86.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Let Enter invoke auto completion more consistently"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Faster and more responsive inline completion UX"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Use documentChangeEvent as auto trigger condition"
+		}
+	]
+}

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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/README.md

@@ -3,49 +3,47 @@
 [![Youtube Channel Views](https://img.shields.io/youtube/channel/views/UCd6MoB9NC6uYN2grvUNT-Zg?style=flat-square&logo=youtube&label=Youtube)](https://www.youtube.com/@amazonwebservices)
 ![Marketplace Installs](https://img.shields.io/vscode-marketplace/i/AmazonWebServices.amazon-q-vscode.svg?label=Installs&style=flat-square)
 
-# Agent capabilities
+# Agentic coding experience
+
+Amazon Q Developer uses information across native and MCP server-based tools to intelligently perform actions beyond code suggestions, such as reading files, generating code diffs, and running commands based on your natural language instruction. Simply type your prompt in your preferred language and Q Developer will provide continuous status updates and iteratively apply changes based on your feedback, helping you accomplish tasks faster.
 
 ### Implement new features
 
-`/dev` to task Amazon Q with generating new code across your entire project and implement features.
+Generate new code across your entire project and implement features.
 
 ### Generate documentation
 
-`/doc` to task Amazon Q with writing API, technical design, and onboarding documentation.
+Write API, technical design, and onboarding documentation.
 
 ### Automate code reviews
 
-`/review` to ask Amazon Q to perform code reviews, flagging suspicious code patterns and assessing deployment risk.
+Perform code reviews, flagging suspicious code patterns and assessing deployment risk.
 
 ### Generate unit tests
 
-`/test` to ask Amazon Q to generate unit tests and add them to your project, helping you improve code quality, fast.
-
-### Transform workloads
-
-`/transform` to upgrade your Java applications in minutes, not weeks.
+Generate unit tests and add them to your project, helping you improve code quality, fast.
 
 <br>
 
 # Core features
 
-### Inline chat
-
-Seamlessly initiate chat within the inline coding experience. Select a section of code that you need assistance with and initiate chat within the editor to request actions such as "Optimize this code", "Add comments", or "Write tests".
-
-### Chat
+### MCP support
 
-Generate code, explain code, and get answers about software development.
+Add Model Context Protocol (MCP) servers to give Amazon Q Developer access to important context.
 
 ### Inline suggestions
 
 Receive real-time code suggestions ranging from snippets to full functions based on your comments and existing code.
 
 [_15+ languages supported including Python, TypeScript, Rust, Terraform, AWS Cloudformation, and more_](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-language-ide-support.html)
 
-### Code reference log
+### Inline chat
+
+Seamlessly chat within the inline coding experience. Select a section of code that you need assistance with and initiate chat within the editor to request actions such as "Optimize this code", "Add comments", or "Write tests".
 
-Attribute code from Amazon Q that is similar to training data. When code suggestions similar to training data are accepted, they will be added to the code reference log.
+### Chat
+
+Generate code, explain code, and get answers about software development.
 
 <br>
 
@@ -55,8 +53,6 @@ Attribute code from Amazon Q that is similar to training data. When code suggest
 
 **Pro Tier** - if your organization is on the Amazon Q Developer Pro tier, log in with single sign-on.
 
-![Authentication gif](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/amazonq/auth-Q.gif)
-
 # Troubleshooting & feedback
 
 [File a bug](https://github.com/aws/aws-toolkit-vscode/issues/new?assignees=&labels=bug&projects=&template=bug_report.md) or [submit a feature request](https://github.com/aws/aws-toolkit-vscode/issues/new?assignees=&labels=feature-request&projects=&template=feature_request.md) on our Github repository.

packages/amazonq/package.json

@@ -1,8 +1,8 @@
 {
     "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.86.0-SNAPSHOT",
+    "description": "The most capable generative AI–powered assistant for software development.",
+    "version": "1.87.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -524,22 +524,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": [
@@ -846,12 +841,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%"
@@ -975,6 +964,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/src/app/amazonqScan/app.ts

@@ -19,6 +19,7 @@ import { Messenger } from './chat/controller/messenger/messenger'
 import { UIMessageListener } from './chat/views/actions/uiMessageListener'
 import { debounce } from 'lodash'
 import { Commands, placeholder } from 'aws-core-vscode/shared'
+import { codeReviewInChat } from './models/constants'
 
 export function init(appContext: AmazonQAppInitContext) {
     const scanChatControllerEventEmitters: ScanChatControllerEventEmitters = {
@@ -74,17 +75,19 @@ export function init(appContext: AmazonQAppInitContext) {
         return debouncedEvent()
     })
 
-    Commands.register('aws.amazonq.security.scan-statusbar', async () => {
-        if (AuthUtil.instance.isConnectionExpired()) {
-            await AuthUtil.instance.notifyReauthenticate()
-        }
-        return focusAmazonQPanel.execute(placeholder, 'amazonq.security.scan').then(() => {
-            DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessagePublisher().publish({
-                sender: 'amazonqCore',
-                command: 'review',
+    if (!codeReviewInChat) {
+        Commands.register('aws.amazonq.security.scan-statusbar', async () => {
+            if (AuthUtil.instance.isConnectionExpired()) {
+                await AuthUtil.instance.notifyReauthenticate()
+            }
+            return focusAmazonQPanel.execute(placeholder, 'amazonq.security.scan').then(() => {
+                DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessagePublisher().publish({
+                    sender: 'amazonqCore',
+                    command: 'review',
+                })
             })
         })
-    })
+    }
 
     codeScanState.setChatControllers(scanChatControllerEventEmitters)
     onDemandFileScanState.setChatControllers(scanChatControllerEventEmitters)

packages/amazonq/src/app/amazonqScan/models/constants.ts

@@ -97,3 +97,5 @@ const getIconForStep = (targetStep: number, currentStep: number) => {
           ? checkIcons.done
           : checkIcons.wait
 }
+
+export const codeReviewInChat = true

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

@@ -26,8 +26,10 @@ export async function showEdits(
         const svgGenerationService = new SvgGenerationService()
         // Generate your SVG image with the file contents
         const currentFile = editor.document.uri.fsPath
-        const { svgImage, startLine, newCode, origionalCodeHighlightRange } =
-            await svgGenerationService.generateDiffSvg(currentFile, item.insertText as string)
+        const { svgImage, startLine, newCode, originalCodeHighlightRange } = await svgGenerationService.generateDiffSvg(
+            currentFile,
+            item.insertText as string
+        )
 
         // TODO: To investigate why it fails and patch [generateDiffSvg]
         if (newCode.length === 0) {
@@ -42,7 +44,7 @@ export async function showEdits(
                 svgImage,
                 startLine,
                 newCode,
-                origionalCodeHighlightRange,
+                originalCodeHighlightRange,
                 session,
                 languageClient,
                 item,

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

@@ -11,6 +11,12 @@ type Range = { line: number; start: number; end: number }
 
 const logger = getLogger('nextEditPrediction')
 export const imageVerticalOffset = 1
+export const emptyDiffSvg = {
+    svgImage: vscode.Uri.parse(''),
+    startLine: 0,
+    newCode: '',
+    originalCodeHighlightRange: [],
+}
 
 export class SvgGenerationService {
     /**
@@ -27,10 +33,10 @@ export class SvgGenerationService {
         svgImage: vscode.Uri
         startLine: number
         newCode: string
-        origionalCodeHighlightRange: Range[]
+        originalCodeHighlightRange: 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')
@@ -52,6 +58,21 @@ export class SvgGenerationService {
 
         // Get edit diffs with highlight
         const { addedLines, removedLines } = this.getEditedLinesFromDiff(udiff)
+
+        // Calculate dimensions based on code content
+        const { offset, editStartLine, isPositionValid } = this.calculatePosition(
+            originalCode.split('\n'),
+            newCode.split('\n'),
+            addedLines,
+            currentTheme
+        )
+
+        // if the position for the EDITS suggestion is not valid (there is no difference between new
+        // and current code content), return EMPTY_DIFF_SVG and skip the suggestion.
+        if (!isPositionValid) {
+            return emptyDiffSvg
+        }
+
         const highlightRanges = this.generateHighlightRanges(removedLines, addedLines, modifiedLines)
         const diffAddedWithHighlight = this.getHighlightEdit(addedLines, highlightRanges.addedRanges)
 
@@ -61,13 +82,6 @@ export class SvgGenerationService {
         registerWindow(window, document)
         const draw = SVG(document.documentElement) as any
 
-        // Calculate dimensions based on code content
-        const { offset, editStartLine } = this.calculatePosition(
-            originalCode.split('\n'),
-            newCode.split('\n'),
-            addedLines,
-            currentTheme
-        )
         const { width, height } = this.calculateDimensions(addedLines, currentTheme)
         draw.size(width + offset, height)
 
@@ -86,7 +100,7 @@ export class SvgGenerationService {
             svgImage: vscode.Uri.parse(svgResult),
             startLine: editStartLine,
             newCode: newCode,
-            origionalCodeHighlightRange: highlightRanges.removedRanges,
+            originalCodeHighlightRange: highlightRanges.removedRanges,
         }
     }
 
@@ -356,12 +370,23 @@ export class SvgGenerationService {
         newLines: string[],
         diffLines: string[],
         theme: editorThemeInfo
-    ): { offset: number; editStartLine: number } {
+    ): { offset: number; editStartLine: number; isPositionValid: boolean } {
         // Determine the starting line of the edit in the original file
         let editStartLineInOldFile = 0
         const maxLength = Math.min(originalLines.length, newLines.length)
 
         for (let i = 0; i <= maxLength; i++) {
+            // if there is no difference between the original lines and the new lines, skip calculating for the start position.
+            if (i === maxLength && originalLines[i] === newLines[i] && originalLines.length === newLines.length) {
+                logger.info(
+                    'There is no difference between current and new code suggestion. Skip calculating for start position.'
+                )
+                return {
+                    offset: 0,
+                    editStartLine: 0,
+                    isPositionValid: false,
+                }
+            }
             if (originalLines[i] !== newLines[i] || i === maxLength) {
                 editStartLineInOldFile = i
                 break
@@ -386,7 +411,7 @@ export class SvgGenerationService {
         const startLineLength = originalLines[startLine]?.length || 0
         const offset = (maxLineLength - startLineLength) * theme.fontSize * 0.7 + 10 // padding
 
-        return { offset, editStartLine: editStartLineInOldFile }
+        return { offset, editStartLine: editStartLineInOldFile, isPositionValid: true }
     }
 
     private escapeHtml(text: string): string {