Merge branch 'master' into diagnostics

Author: liumofei-amazon

package-lock.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-07-07",
+	"version": "1.82.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Prompt re-authenticate if auto trigger failed with expired token"
+		}
+	]
+}

packages/amazonq/.changes/1.82.0.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q /test, /doc, and /dev capabilities integrated into Agentic coding."
+}

packages/amazonq/.changes/next-release/Feature-a37e21b7-a68f-4554-92c9-9db35c0a3e51.json

@@ -0,0 +1,4 @@
+{
+	"type": "Removal",
+	"description": "Deprecate \"amazon q is generating...\" UI for inline suggestion"
+}

packages/amazonq/.changes/next-release/Removal-083c6e6d-e543-4df7-86ae-0c0f8c0a27ee.json

@@ -1,3 +1,7 @@
+## 1.82.0 2025-07-07
+
+- **Bug Fix** Prompt re-authenticate if auto trigger failed with expired token
+
 ## 1.81.0 2025-07-02
 
 - **Bug Fix** Stop auto inline completion when deleting code

packages/amazonq/CHANGELOG.md

@@ -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.82.0-SNAPSHOT",
+    "version": "1.83.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/package.json

@@ -122,19 +122,19 @@ export class EditDecorationManager {
     /**
      * Displays an edit suggestion as an SVG image in the editor and highlights removed code
      */
-    public displayEditSuggestion(
+    public async displayEditSuggestion(
         editor: vscode.TextEditor,
         svgImage: vscode.Uri,
         startLine: number,
-        onAccept: () => void,
-        onReject: () => void,
+        onAccept: () => Promise<void>,
+        onReject: () => Promise<void>,
         originalCode: string,
         newCode: string,
         originalCodeHighlightRanges: Array<{ line: number; start: number; end: number }>
-    ): void {
-        this.clearDecorations(editor)
+    ): Promise<void> {
+        await this.clearDecorations(editor)
 
-        void setContext('aws.amazonq.editSuggestionActive' as any, true)
+        await setContext('aws.amazonq.editSuggestionActive' as any, true)
 
         this.acceptHandler = onAccept
         this.rejectHandler = onReject
@@ -157,14 +157,14 @@ export class EditDecorationManager {
     /**
      * Clears all edit suggestion decorations
      */
-    public clearDecorations(editor: vscode.TextEditor): void {
+    public async clearDecorations(editor: vscode.TextEditor): Promise<void> {
         editor.setDecorations(this.imageDecorationType, [])
         editor.setDecorations(this.removedCodeDecorationType, [])
         this.currentImageDecoration = undefined
         this.currentRemovedCodeDecorations = []
         this.acceptHandler = undefined
         this.rejectHandler = undefined
-        void setContext('aws.amazonq.editSuggestionActive' as any, false)
+        await setContext('aws.amazonq.editSuggestionActive' as any, false)
     }
 
     /**
@@ -285,7 +285,7 @@ export async function displaySvgDecoration(
 ) {
     const originalCode = editor.document.getText()
 
-    decorationManager.displayEditSuggestion(
+    await decorationManager.displayEditSuggestion(
         editor,
         svgImage,
         startLine,
@@ -303,7 +303,7 @@ export async function displaySvgDecoration(
             // Move cursor to end of the actual changed content
             editor.selection = new vscode.Selection(endPosition, endPosition)
 
-            decorationManager.clearDecorations(editor)
+            await decorationManager.clearDecorations(editor)
             const params: LogInlineCompletionSessionResultsParams = {
                 sessionId: session.sessionId,
                 completionSessionResult: {
@@ -326,14 +326,14 @@ export async function displaySvgDecoration(
                         selectedCompletionInfo: undefined,
                     },
                     new vscode.CancellationTokenSource().token,
-                    { emitTelemetry: false, showUi: false }
+                    { emitTelemetry: false, showUi: false, editsStreakToken: session.editsStreakPartialResultToken }
                 )
             }
         },
-        () => {
+        async () => {
             // Handle reject
             getLogger().info('Edit suggestion rejected')
-            decorationManager.clearDecorations(editor)
+            await decorationManager.clearDecorations(editor)
             const params: LogInlineCompletionSessionResultsParams = {
                 sessionId: session.sessionId,
                 completionSessionResult: {

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

@@ -39,7 +39,6 @@ import {
     getDiagnosticsOfCurrentFile,
     toIdeDiagnostics,
 } from 'aws-core-vscode/codewhisperer'
-import { InlineGeneratingMessage } from './inlineGeneratingMessage'
 import { LineTracker } from './stateTracker/lineTracker'
 import { InlineTutorialAnnotation } from './tutorials/inlineTutorialAnnotation'
 import { TelemetryHelper } from './telemetryHelper'
@@ -58,7 +57,7 @@ export class InlineCompletionManager implements Disposable {
     private sessionManager: SessionManager
     private recommendationService: RecommendationService
     private lineTracker: LineTracker
-    private incomingGeneratingMessage: InlineGeneratingMessage
+
     private inlineTutorialAnnotation: InlineTutorialAnnotation
     private readonly logSessionResultMessageName = 'aws/logInlineCompletionSessionResults'
     private documentChangeListener: Disposable
@@ -73,12 +72,7 @@ export class InlineCompletionManager implements Disposable {
         this.languageClient = languageClient
         this.sessionManager = sessionManager
         this.lineTracker = lineTracker
-        this.incomingGeneratingMessage = new InlineGeneratingMessage(this.lineTracker)
-        this.recommendationService = new RecommendationService(
-            this.sessionManager,
-            this.incomingGeneratingMessage,
-            cursorUpdateRecorder
-        )
+        this.recommendationService = new RecommendationService(this.sessionManager, cursorUpdateRecorder)
         this.inlineTutorialAnnotation = inlineTutorialAnnotation
         this.inlineCompletionProvider = new AmazonQInlineCompletionItemProvider(
             languageClient,
@@ -108,7 +102,6 @@ export class InlineCompletionManager implements Disposable {
     public dispose(): void {
         if (this.disposable) {
             this.disposable.dispose()
-            this.incomingGeneratingMessage.dispose()
             this.lineTracker.dispose()
         }
         if (this.documentChangeListener) {
@@ -277,6 +270,10 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 const prefix = document.getText(new Range(prevStartPosition, position))
                 const prevItemMatchingPrefix = []
                 for (const item of this.sessionManager.getActiveRecommendation()) {
+                    // if item is an Edit suggestion, insertText is a diff instead of new code contents, skip the logic to check for prefix.
+                    if (item.isInlineEdit) {
+                        continue
+                    }
                     const text = typeof item.insertText === 'string' ? item.insertText : item.insertText.value
                     if (text.startsWith(prefix) && position.isAfterOrEqual(prevStartPosition)) {
                         item.command = {
@@ -331,6 +328,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 position,
                 context,
                 token,
+                isAutoTrigger,
                 getAllRecommendationsOptions
             )
             // get active item from session for displaying