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

Author: Will-ShaoHua

.github/workflows/setup-release-candidate.yml

@@ -49,7 +49,8 @@ jobs:
 
                   # Add generated license files
                   git add LICENSE-THIRD-PARTY
-                  git commit -m "Update third-party license attribution for $BRANCH_NAME"
+                  # If there are no changes, then we don't need a new attribution commit
+                  git commit -m "Update third-party license attribution for $BRANCH_NAME" || true
 
                   # Push RC branch
                   git push origin $BRANCH_NAME

LICENSE-THIRD-PARTY

@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-10",
+	"version": "1.99.0",
+	"entries": []
+}

package-lock.json

@@ -1,3 +1,7 @@
+## 1.99.0 2025-10-10
+
+- Miscellaneous non-user-facing changes
+
 ## 1.98.0 2025-10-02
 
 - Miscellaneous non-user-facing changes

packages/amazonq/.changes/1.99.0.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.99.0-SNAPSHOT",
+    "version": "1.100.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/CHANGELOG.md

@@ -17,6 +17,7 @@ import type { AmazonQInlineCompletionItemProvider } from '../completion'
 import { vsCodeState } from 'aws-core-vscode/codewhisperer'
 
 const autoRejectEditCursorDistance = 25
+const autoDiscardEditCursorDistance = 10
 
 export class EditDecorationManager {
     private imageDecorationType: vscode.TextEditorDecorationType
@@ -312,6 +313,18 @@ export async function displaySvgDecoration(
     item: InlineCompletionItemWithReferences,
     inlineCompletionProvider?: AmazonQInlineCompletionItemProvider
 ) {
+    // Check if edit is too far from current cursor position
+    const currentCursorLine = editor.selection.active.line
+    if (Math.abs(startLine - currentCursorLine) >= autoDiscardEditCursorDistance) {
+        // Emit DISCARD telemetry for edit suggestion that can't be shown because the suggestion is too far away
+        const params = createDiscardTelemetryParams(session, item)
+        languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+        getLogger('nextEditPrediction').debug(
+            `Auto discarded edit suggestion for suggestion that is too far away: ${item.insertText as string}`
+        )
+        return
+    }
+
     const originalCode = editor.document.getText()
 
     // Set edit state immediately to prevent race condition with completion requests
@@ -399,9 +412,6 @@ export async function displaySvgDecoration(
             const endPosition = getEndOfEditPosition(originalCode, newCode)
             editor.selection = new vscode.Selection(endPosition, endPosition)
 
-            // Move cursor to end of the actual changed content
-            editor.selection = new vscode.Selection(endPosition, endPosition)
-
             await decorationManager.clearDecorations(editor)
             documentChangeListener.dispose()
             cursorChangeListener.dispose()
@@ -420,19 +430,6 @@ export async function displaySvgDecoration(
             }
             languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
             // session.triggerOnAcceptance = true
-            // VS Code triggers suggestion on every keystroke, temporarily disable trigger on acceptance
-            // if (inlineCompletionProvider && session.editsStreakPartialResultToken) {
-            //     await inlineCompletionProvider.provideInlineCompletionItems(
-            //         editor.document,
-            //         endPosition,
-            //         {
-            //             triggerKind: vscode.InlineCompletionTriggerKind.Automatic,
-            //             selectedCompletionInfo: undefined,
-            //         },
-            //         new vscode.CancellationTokenSource().token,
-            //         { emitTelemetry: false, showUi: false, editsStreakToken: session.editsStreakPartialResultToken }
-            //     )
-            // }
         },
         async (isDiscard: boolean) => {
             // Handle reject

packages/amazonq/package.json

@@ -213,6 +213,8 @@ export class InlineCompletionManager implements Disposable {
 
 export class AmazonQInlineCompletionItemProvider implements InlineCompletionItemProvider {
     private logger = getLogger()
+    private pendingRequest: Promise<InlineCompletionItem[]> | undefined
+
     constructor(
         private readonly languageClient: LanguageClient,
         private readonly recommendationService: RecommendationService,
@@ -300,6 +302,48 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
             options: JSON.stringify(getAllRecommendationsOptions),
         })
 
+        // If there's already a pending request, wait for it to complete instead of starting a new one
+        // This prevents race conditions where multiple concurrent calls cause the later (empty) response
+        // to override the earlier (valid) response
+        if (this.pendingRequest) {
+            getLogger().info('Reusing pending inline completion request to avoid race condition')
+            try {
+                const result = await this.pendingRequest
+                // Check if THIS call's token was cancelled (not the original call's token)
+                if (token.isCancellationRequested) {
+                    getLogger().info('Reused request completed but this call was cancelled')
+                    return []
+                }
+                return result
+            } catch (e) {
+                // If the pending request failed, continue with a new request
+                getLogger().info('Pending request failed, starting new request: %O', e)
+            }
+        }
+
+        // Start a new request and track it
+        this.pendingRequest = this._provideInlineCompletionItemsImpl(
+            document,
+            position,
+            context,
+            token,
+            getAllRecommendationsOptions
+        )
+
+        try {
+            return await this.pendingRequest
+        } finally {
+            this.pendingRequest = undefined
+        }
+    }
+
+    private async _provideInlineCompletionItemsImpl(
+        document: TextDocument,
+        position: Position,
+        context: InlineCompletionContext,
+        token: CancellationToken,
+        getAllRecommendationsOptions?: GetAllRecommendationsOptions
+    ): Promise<InlineCompletionItem[]> {
         if (vsCodeState.isCodeWhispererEditing) {
             getLogger().info('Q is editing, returning empty')
             return []

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

@@ -35,6 +35,8 @@ export interface GetAllRecommendationsOptions {
 }
 
 export class RecommendationService {
+    private logger = getLogger()
+
     constructor(
         private readonly sessionManager: SessionManager,
         private cursorUpdateRecorder?: ICursorUpdateRecorder
@@ -117,7 +119,7 @@ export class RecommendationService {
             }
 
             // Handle first request
-            getLogger().info('Sending inline completion request: %O', {
+            this.logger.info('Sending inline completion request: %O', {
                 method: inlineCompletionWithReferencesRequestType.method,
                 request: {
                     textDocument: request.textDocument,
@@ -174,7 +176,7 @@ export class RecommendationService {
                 }
             }
 
-            getLogger().info('Received inline completion response from LSP: %O', {
+            this.logger.info('Received inline completion response from LSP: %O', {
                 sessionId: result.sessionId,
                 latency: Date.now() - t0,
                 itemCount: result.items?.length || 0,
@@ -190,12 +192,14 @@ export class RecommendationService {
 
             if (result.items.length > 0 && result.items[0].isInlineEdit === false) {
                 if (isTriggerByDeletion) {
+                    this.logger.info(`Suggestions were discarded; reason: triggerByDeletion`)
                     return []
                 }
                 // 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) {
+                        this.logger.error(`Suggestions were discarded; reason: undefined conflicting session`)
                         return []
                     }
                     const params: LogInlineCompletionSessionResultsParams = {
@@ -213,14 +217,14 @@ export class RecommendationService {
                     }
                     languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
                     this.sessionManager.clear()
-                    getLogger().info(
-                        'Completion discarded due to active edit suggestion displayed longer than 1 second'
+                    this.logger.info(
+                        'Suggetions were discarded; reason: 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')
+                    this.logger.info('Discarding active edit suggestion displaying less than 1 second')
                 }
             }
 
@@ -244,24 +248,25 @@ export class RecommendationService {
 
             // TODO: question, is it possible that the first request returns empty suggestion but has non-empty next token?
             if (result.partialResultToken) {
+                let logstr = `found non null next token; `
                 if (!isInlineEdit) {
                     // If the suggestion is COMPLETIONS and there are more results to fetch, handle them in the background
-                    getLogger().info(
-                        'Suggestion type is COMPLETIONS. Start fetching for more items if partialResultToken exists.'
-                    )
-                    // this.processRemainingRequests(languageClient, request, result, token).catch((error) => {
-                    //     languageClient.warn(`Error when getting suggestions: ${error}`)
-                    // })
+                    logstr += 'Suggestion type is COMPLETIONS. Start pulling more items'
+                    this.processRemainingRequests(languageClient, request, result, token).catch((error) => {
+                        languageClient.warn(`Error when getting suggestions: ${error}`)
+                    })
                 } else {
                     // Skip fetching for more items if the suggesion is EDITS. If it is EDITS suggestion, only fetching for more
                     // suggestions when the user start to accept a suggesion.
                     // Save editsStreakPartialResultToken for the next EDITS suggestion trigger if user accepts.
-                    getLogger().info('Suggestion type is EDITS. Skip fetching for more items.')
+                    logstr += 'Suggestion type is EDITS. Skip pulling more items'
                     this.sessionManager.updateActiveEditsStreakToken(result.partialResultToken)
                 }
+
+                this.logger.info(logstr)
             }
         } catch (error: any) {
-            getLogger().error('Error getting recommendations: %O', error)
+            this.logger.error('Error getting recommendations: %O', error)
             // bearer token expired
             if (error.data && error.data.awsErrorCode === 'E_AMAZON_Q_CONNECTION_EXPIRED') {
                 // ref: https://github.com/aws/aws-toolkit-vscode/blob/amazonq/v1.74.0/packages/core/src/codewhisperer/service/inlineCompletionService.ts#L104