Merge remote-tracking branch 'upstream/master' into inline

Author: Will-ShaoHua

package-lock.json

@@ -0,0 +1,18 @@
+{
+	"date": "2025-08-28",
+	"version": "1.92.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Q supports admin control for MCP servers to restrict MCP server usage"
+		},
+		{
+			"type": "Feature",
+			"description": "Enabling dynamic model fetching capabilities in Amazon Q chat"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q: Support for configuring and utilizing remote MCP servers."
+		}
+	]
+}

packages/amazonq/.changes/1.92.0.json

@@ -1,3 +1,9 @@
+## 1.92.0 2025-08-28
+
+- **Feature** Amazon Q supports admin control for MCP servers to restrict MCP server usage
+- **Feature** Enabling dynamic model fetching capabilities in Amazon Q chat
+- **Feature** Amazon Q: Support for configuring and utilizing remote MCP servers.
+
 ## 1.91.0 2025-08-22
 
 - **Bug Fix** Enable inline completion in Jupyter Notebook

packages/amazonq/.changes/next-release/Feature-5e9de7e7-cf7b-4ed3-824f-062b82b3f4b9.json

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI–powered assistant for software development.",
-    "version": "1.92.0-SNAPSHOT",
+    "version": "1.93.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -925,7 +925,7 @@
             },
             {
                 "command": "aws.amazonq.fixCode",
-                "win": "win+alt+y",
+                "win": "win+alt+h",
                 "mac": "cmd+alt+y",
                 "linux": "meta+alt+y"
             },
@@ -943,7 +943,7 @@
             },
             {
                 "command": "aws.amazonq.generateUnitTests",
-                "key": "win+alt+t",
+                "key": "win+alt+n",
                 "mac": "cmd+alt+t",
                 "linux": "meta+alt+t"
             },

packages/amazonq/CHANGELOG.md

@@ -24,7 +24,7 @@ export class EditDecorationManager {
     private currentImageDecoration: vscode.DecorationOptions | undefined
     private currentRemovedCodeDecorations: vscode.DecorationOptions[] = []
     private acceptHandler: (() => void) | undefined
-    private rejectHandler: (() => void) | undefined
+    private rejectHandler: ((isDiscard: boolean) => void) | undefined
 
     constructor() {
         this.registerCommandHandlers()
@@ -131,7 +131,7 @@ export class EditDecorationManager {
         svgImage: vscode.Uri,
         startLine: number,
         onAccept: () => Promise<void>,
-        onReject: () => Promise<void>,
+        onReject: (isDiscard: boolean) => Promise<void>,
         originalCode: string,
         newCode: string,
         originalCodeHighlightRanges: Array<{ line: number; start: number; end: number }>
@@ -185,9 +185,9 @@ export class EditDecorationManager {
         })
 
         // Register Esc key handler for rejecting suggestion
-        vscode.commands.registerCommand('aws.amazonq.inline.rejectEdit', () => {
+        vscode.commands.registerCommand('aws.amazonq.inline.rejectEdit', (isDiscard: boolean = false) => {
             if (this.rejectHandler) {
-                this.rejectHandler()
+                this.rejectHandler(isDiscard)
             }
         })
     }
@@ -416,20 +416,31 @@ export async function displaySvgDecoration(
             //     )
             // }
         },
-        async () => {
+        async (isDiscard: boolean) => {
             // Handle reject
-            getLogger().info('Edit suggestion rejected')
+            if (isDiscard) {
+                getLogger().info('Edit suggestion discarded')
+            } else {
+                getLogger().info('Edit suggestion rejected')
+            }
             await decorationManager.clearDecorations(editor)
             documentChangeListener.dispose()
             cursorChangeListener.dispose()
+            const suggestionState = isDiscard
+                ? {
+                      seen: false,
+                      accepted: false,
+                      discarded: true,
+                  }
+                : {
+                      seen: true,
+                      accepted: false,
+                      discarded: false,
+                  }
             const params: LogInlineCompletionSessionResultsParams = {
                 sessionId: session.sessionId,
                 completionSessionResult: {
-                    [item.itemId]: {
-                        seen: true,
-                        accepted: false,
-                        discarded: false,
-                    },
+                    [item.itemId]: suggestionState,
                 },
                 totalSessionDisplayTime: Date.now() - session.requestStartTime,
                 firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,

packages/amazonq/package.json

@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Strips common indentation from each line of code that may contain HTML tags
+ * @param lines Array of code lines (may contain HTML tags)
+ * @returns Array of code lines with common indentation removed
+ */
+export function stripCommonIndentation(lines: string[]): string[] {
+    if (lines.length === 0) {
+        return lines
+    }
+    const removeFirstTag = (line: string) => line.replace(/^<[^>]*>/, '')
+    const getLeadingWhitespace = (text: string) => text.match(/^\s*/)?.[0] || ''
+
+    // Find minimum indentation across all lines
+    const minIndentLength = Math.min(...lines.map((line) => getLeadingWhitespace(removeFirstTag(line)).length))
+
+    // Remove common indentation from each line
+    return lines.map((line) => {
+        const firstTagRemovedLine = removeFirstTag(line)
+        const leadingWhitespace = getLeadingWhitespace(firstTagRemovedLine)
+        const reducedWhitespace = leadingWhitespace.substring(minIndentLength)
+        return line.replace(leadingWhitespace, reducedWhitespace)
+    })
+}

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

@@ -7,6 +7,7 @@ import { diffWordsWithSpace, diffLines } from 'diff'
 import * as vscode from 'vscode'
 import { ToolkitError, getLogger } from 'aws-core-vscode/shared'
 import { diffUtilities } from 'aws-core-vscode/shared'
+import { stripCommonIndentation } from './stringUtils'
 type Range = { line: number; start: number; end: number }
 
 const logger = getLogger('nextEditPrediction')
@@ -78,6 +79,7 @@ export class SvgGenerationService {
 
         const highlightRanges = this.generateHighlightRanges(removedLines, addedLines, modifiedLines)
         const diffAddedWithHighlight = this.getHighlightEdit(addedLines, highlightRanges.addedRanges)
+        const normalizedDiffLines = stripCommonIndentation(diffAddedWithHighlight)
 
         // Create SVG window, document, and container
         const window = createSVGWindow()
@@ -90,7 +92,7 @@ export class SvgGenerationService {
 
         // Generate CSS for syntax highlighting HTML content based on theme
         const styles = this.generateStyles(currentTheme)
-        const htmlContent = this.generateHtmlContent(diffAddedWithHighlight, styles, offset)
+        const htmlContent = this.generateHtmlContent(normalizedDiffLines, styles, offset)
 
         // Create foreignObject to embed HTML
         const foreignObject = draw.foreignObject(width + offset, height)
@@ -162,6 +164,9 @@ export class SvgGenerationService {
                 white-space: pre-wrap; /* Preserve whitespace */
                 background-color: ${diffAdded};
             }
+            .diff-unchanged {
+                white-space: pre-wrap; /* Preserve indentation for unchanged lines */
+            }
         `
     }
 
@@ -229,7 +234,7 @@ export class SvgGenerationService {
 
             // If no ranges for this line, leave it as-is with HTML escaping
             if (lineRanges.length === 0) {
-                result.push(this.escapeHtml(line))
+                result.push(`<span class="diff-unchanged">${this.escapeHtml(line)}</span>`)
                 continue
             }
 
@@ -244,7 +249,7 @@ export class SvgGenerationService {
                 // Add text before the current range (with HTML escaping)
                 if (range.start > currentPos) {
                     const beforeText = line.substring(currentPos, range.start)
-                    highlightedLine += this.escapeHtml(beforeText)
+                    highlightedLine += `<span class="diff-unchanged">${this.escapeHtml(beforeText)}</span>`
                 }
 
                 // Add the highlighted part (with HTML escaping)
@@ -258,7 +263,7 @@ export class SvgGenerationService {
             // Add any remaining text after the last range (with HTML escaping)
             if (currentPos < line.length) {
                 const afterText = line.substring(currentPos)
-                highlightedLine += this.escapeHtml(afterText)
+                highlightedLine += `<span class="diff-unchanged">${this.escapeHtml(afterText)}</span>`
             }
 
             result.push(highlightedLine)

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

@@ -8,12 +8,20 @@
  */
 export class EditSuggestionState {
     private static isEditSuggestionCurrentlyActive = false
+    private static displayStartTime = performance.now()
 
     static setEditSuggestionActive(active: boolean): void {
         this.isEditSuggestionCurrentlyActive = active
+        if (active) {
+            this.displayStartTime = performance.now()
+        }
     }
 
     static isEditSuggestionActive(): boolean {
         return this.isEditSuggestionCurrentlyActive
     }
+
+    static isEditSuggestionDisplayingOverOneSecond(): boolean {
+        return this.isEditSuggestionActive() && performance.now() - this.displayStartTime > 1000
+    }
 }

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

@@ -8,8 +8,9 @@ import {
     inlineCompletionWithReferencesRequestType,
     TextDocumentContentChangeEvent,
     editCompletionRequestType,
+    LogInlineCompletionSessionResultsParams,
 } from '@aws/language-server-runtimes/protocol'
-import { CancellationToken, InlineCompletionContext, Position, TextDocument } from 'vscode'
+import { CancellationToken, InlineCompletionContext, Position, TextDocument, commands } from 'vscode'
 import { LanguageClient } from 'vscode-languageclient'
 import { SessionManager } from './sessionManager'
 import {
@@ -24,8 +25,8 @@ 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'
 import { extractFileContextInNotebooks } from './notebookUtil'
+import { EditSuggestionState } from './editSuggestionState'
 
 export interface GetAllRecommendationsOptions {
     emitTelemetry?: boolean
@@ -137,7 +138,7 @@ export class RecommendationService {
              * 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()) {
+            if (!isTriggerByDeletion && !request.partialResultToken) {
                 const completionPromise: Promise<InlineCompletionListWithReferences> = languageClient.sendRequest(
                     inlineCompletionWithReferencesRequestType.method,
                     request,
@@ -187,6 +188,39 @@ export class RecommendationService {
                 })),
             })
 
+            if (result.items.length > 0 && result.items[0].isInlineEdit === false) {
+                // Completion will not be rendered if an edit suggestion has been active for longer than 1 second
+                if (EditSuggestionState.isEditSuggestionDisplayingOverOneSecond()) {
+                    const session = this.sessionManager.getActiveSession()
+                    if (!session) {
+                        return []
+                    }
+                    const params: LogInlineCompletionSessionResultsParams = {
+                        sessionId: session.sessionId,
+                        completionSessionResult: Object.fromEntries(
+                            result.items.map((item) => [
+                                item.itemId,
+                                {
+                                    seen: false,
+                                    accepted: false,
+                                    discarded: true,
+                                },
+                            ])
+                        ),
+                    }
+                    languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+                    this.sessionManager.clear()
+                    getLogger().info(
+                        'Completion discarded due to active edit suggestion displayed longer than 1 second'
+                    )
+                    return []
+                } else if (EditSuggestionState.isEditSuggestionActive()) {
+                    // discard the current edit suggestion if its display time is less than 1 sec
+                    await commands.executeCommand('aws.amazonq.inline.rejectEdit', true)
+                    getLogger().info('Discarding active edit suggestion displaying less than 1 second')
+                }
+            }
+
             TelemetryHelper.instance.setSdkApiCallEndTime()
             TelemetryHelper.instance.setSessionId(result.sessionId)
             if (result.items.length > 0 && result.items[0].itemId !== undefined) {