Merge branch 'master' into nep-flare

Author: atonaamz

docs/lsp.md

@@ -25,6 +25,7 @@ sequenceDiagram
 ```
 
 ## Language Server Debugging
+If you want to connect a local version of language-servers to aws-toolkit-vscode, follow these steps:
 
 1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-servers folder that you just cloned. Your VS code folder structure should look like below.
 
@@ -55,6 +56,43 @@ sequenceDiagram
 5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server, Once you run "Launch LSP with Debugging" a new window should start, wait for the plugin to show up there. Then go to the run menu again and run "Attach to Language Server (amazonq)" after this you should be able to add breakpoints in the LSP code.
 6. (Optional): Enable `"amazonq.trace.server": "on"` or `"amazonq.trace.server": "verbose"` in your VSCode settings to view detailed log messages sent to/from the language server. These log messages will show up in the "Amazon Q Language Server" output channel
 
+### Breakpoints Work-Around
+If the breakpoints in your language-servers project remain greyed out and do not trigger when you run `Launch LSP with Debugging`, your debugger may be attaching to the language server before it has launched. You can follow the work-around below to avoid this problem. If anyone fixes this issue, please remove this section.
+1. Set your breakpoints and click `Launch LSP with Debugging`
+2. Once the debugging session has started, click `Launch LSP with Debugging` again, then `Cancel` on any pop-ups that appear
+3. On the debug panel, click `Attach to Language Server (amazonq)` next to the red stop button
+4. Click `Launch LSP with Debugging` again, then `Cancel` on any pop-ups that appear
+
+## Language Server Runtimes Debugging
+If you want to connect a local version of language-server-runtimes to aws-toolkit-vscode, follow these steps:
+
+1. Clone https://github.com/aws/language-server-runtimes.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-server-runtimes folder that you just cloned. Your VS code folder structure should look like below.
+
+    ```
+    /aws-toolkit-vscode
+    /toolkit
+    /core
+    /amazonq
+    /language-server-runtimes
+    ```
+2. Inside of the language-server-runtimes project run:
+    ```
+    npm install
+    npm run compile
+    cd runtimes
+    npm run prepub
+    cd out
+    npm link
+    cd ../../types
+    npm link
+    ```
+    If you get an error running `npm run prepub`, you can instead run `npm run prepub:copyFiles` to skip cleaning and testing.
+3. Inside of aws-toolkit-vscode run:
+    ```
+    npm install
+    npm link @aws/language-server-runtimes @aws/language-server-runtimes-types
+    ```
+
 ## Amazon Q Inline Activation
 
 -   In order to get inline completion working you must open a supported file type defined in CodewhispererInlineCompletionLanguages in `packages/amazonq/src/app/inline/completion.ts`

package-lock.json

@@ -0,0 +1,18 @@
+{
+	"date": "2025-07-09",
+	"version": "1.83.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Q /test, /doc, and /dev capabilities integrated into Agentic coding."
+		},
+		{
+			"type": "Feature",
+			"description": "Added image support to Amazon Q chat, users can now upload images from their local file system"
+		},
+		{
+			"type": "Removal",
+			"description": "Deprecate \"amazon q is generating...\" UI for inline suggestion"
+		}
+	]
+}

packages/amazonq/.changes/1.83.0.json

@@ -1,3 +1,9 @@
+## 1.83.0 2025-07-09
+
+- **Feature** Amazon Q /test, /doc, and /dev capabilities integrated into Agentic coding.
+- **Feature** Added image support to Amazon Q chat, users can now upload images from their local file system
+- **Removal** Deprecate "amazon q is generating..." UI for inline suggestion
+
 ## 1.82.0 2025-07-07
 
 - **Bug Fix** Prompt re-authenticate if auto trigger failed with expired token

packages/amazonq/.changes/next-release/Feature-a37e21b7-a68f-4554-92c9-9db35c0a3e51.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.83.0-SNAPSHOT",
+    "version": "1.84.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

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

@@ -13,6 +13,7 @@ import { InlineCompletionItemWithReferences } from '@aws/language-server-runtime
 import path from 'path'
 import { imageVerticalOffset } from './svgGenerator'
 import { AmazonQInlineCompletionItemProvider } from '../completion'
+import { vsCodeState } from 'aws-core-vscode/codewhisperer'
 
 export class EditDecorationManager {
     private imageDecorationType: vscode.TextEditorDecorationType
@@ -211,7 +212,7 @@ export const decorationManager = EditDecorationManager.getDecorationManager()
 /**
  * Function to replace editor's content with new code
  */
-function replaceEditorContent(editor: vscode.TextEditor, newCode: string): void {
+async function replaceEditorContent(editor: vscode.TextEditor, newCode: string): Promise<void> {
     const document = editor.document
     const fullRange = new vscode.Range(
         0,
@@ -220,7 +221,7 @@ function replaceEditorContent(editor: vscode.TextEditor, newCode: string): void
         document.lineAt(document.lineCount - 1).text.length
     )
 
-    void editor.edit((editBuilder) => {
+    await editor.edit((editBuilder) => {
         editBuilder.replace(fullRange, newCode)
     })
 }
@@ -294,7 +295,12 @@ export async function displaySvgDecoration(
             getLogger().info('Edit suggestion accepted')
 
             // Replace content
-            replaceEditorContent(editor, newCode)
+            try {
+                vsCodeState.isCodeWhispererEditing = true
+                await replaceEditorContent(editor, newCode)
+            } finally {
+                vsCodeState.isCodeWhispererEditing = false
+            }
 
             // Move cursor to end of the actual changed content
             const endPosition = getEndOfEditPosition(originalCode, newCode)
@@ -320,7 +326,7 @@ 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) {
+            // if (inlineCompletionProvider && session.editsStreakPartialResultToken) {
             //     await inlineCompletionProvider.provideInlineCompletionItems(
             //         editor.document,
             //         endPosition,

packages/amazonq/CHANGELOG.md

@@ -35,6 +35,9 @@ import {
     inlineCompletionsDebounceDelay,
     noInlineSuggestionsMsg,
     ReferenceInlineProvider,
+    getDiagnosticsDifferences,
+    getDiagnosticsOfCurrentFile,
+    toIdeDiagnostics,
 } from 'aws-core-vscode/codewhisperer'
 import { LineTracker } from './stateTracker/lineTracker'
 import { InlineTutorialAnnotation } from './tutorials/inlineTutorialAnnotation'
@@ -116,6 +119,13 @@ export class InlineCompletionManager implements Disposable {
             firstCompletionDisplayLatency?: number
         ) => {
             // TODO: also log the seen state for other suggestions in session
+            // Calculate timing metrics before diagnostic delay
+            const totalSessionDisplayTime = performance.now() - requestStartTime
+            await sleep(1000)
+            const diagnosticDiff = getDiagnosticsDifferences(
+                this.sessionManager.getActiveSession()?.diagnosticsBeforeAccept,
+                getDiagnosticsOfCurrentFile()
+            )
             const params: LogInlineCompletionSessionResultsParams = {
                 sessionId: sessionId,
                 completionSessionResult: {
@@ -125,8 +135,10 @@ export class InlineCompletionManager implements Disposable {
                         discarded: false,
                     },
                 },
-                totalSessionDisplayTime: Date.now() - requestStartTime,
+                totalSessionDisplayTime: totalSessionDisplayTime,
                 firstCompletionDisplayLatency: firstCompletionDisplayLatency,
+                addedDiagnostics: diagnosticDiff.added.map((it) => toIdeDiagnostics(it)),
+                removedDiagnostics: diagnosticDiff.removed.map((it) => toIdeDiagnostics(it)),
             }
             this.languageClient.sendNotification(this.logSessionResultMessageName, params)
             this.disposable.dispose()
@@ -221,13 +233,20 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
             position,
             context,
             triggerKind: context.triggerKind === InlineCompletionTriggerKind.Automatic ? 'Automatic' : 'Invoke',
+            options: JSON.stringify(getAllRecommendationsOptions),
         })
 
         // prevent concurrent API calls and write to shared state variables
         if (vsCodeState.isRecommendationsActive) {
             getLogger().info('Recommendations already active, returning empty')
             return []
         }
+
+        if (vsCodeState.isCodeWhispererEditing) {
+            getLogger().info('Q is editing, returning empty')
+            return []
+        }
+
         // yield event loop to let the document listen catch updates
         await sleep(1)
         // prevent user deletion invoking auto trigger
@@ -335,6 +354,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
             const t2 = performance.now()
 
             logstr = logstr += `- number of suggestions: ${items.length}
+- sessionId: ${this.sessionManager.getActiveSession()?.sessionId}
 - first suggestion content (next line):
 ${itemLog}
 - duration since trigger to before sending Flare call: ${t1 - t0}ms
@@ -382,11 +402,10 @@ ${itemLog}
                 if (item.isInlineEdit) {
                     // Check if Next Edit Prediction feature flag is enabled
                     if (Experiments.instance.isExperimentEnabled('amazonqLSPNEP')) {
-                        void showEdits(item, editor, session, this.languageClient, this).then(() => {
-                            const t3 = performance.now()
-                            logstr = logstr + `- duration since trigger to NEP suggestion is displayed: ${t3 - t0}ms`
-                            this.logger.info(logstr)
-                        })
+                        await showEdits(item, editor, session, this.languageClient, this)
+                        const t3 = performance.now()
+                        logstr = logstr + `- duration since trigger to NEP suggestion is displayed: ${t3 - t0}ms`
+                        this.logger.info(logstr)
                     }
                     return []
                 }

packages/amazonq/package.json

@@ -77,7 +77,7 @@ export class RecommendationService {
                     textDocument: request.textDocument,
                     position: request.position,
                     context: request.context,
-                    partialResultToken: request.partialResultToken,
+                    nextToken: request.partialResultToken,
                 },
             })
             let result: InlineCompletionListWithReferences = await languageClient.sendRequest(