Merge from master

.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

buildspec/linuxTests.yml

@@ -48,7 +48,7 @@ phases:
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
-            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info
+            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info || true
 
 reports:
     unit-test:

docs/lsp.md

@@ -26,6 +26,8 @@ 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 +57,47 @@ 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.json

@@ -41,10 +41,11 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.324",
+        "@aws-toolkits/telemetry": "^1.0.329",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",
+        "@types/jaro-winkler": "^0.2.4",
         "@types/vscode": "^1.68.0",
         "@types/vscode-webview": "^1.57.1",
         "@types/webpack-env": "^1.18.5",
@@ -74,6 +75,7 @@
     },
     "dependencies": {
         "@types/node": "^22.7.5",
+        "jaro-winkler": "^0.2.8",
         "vscode-nls": "^5.2.0",
         "vscode-nls-dev": "^4.0.4"
     }

packages/amazonq/.changes/1.79.0.json

@@ -0,0 +1,18 @@
+{
+	"date": "2025-06-25",
+	"version": "1.79.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Added automatic system certificate detection and VSCode proxy settings support"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Improved Amazon Linux 2 support with better SageMaker environment detection"
+		},
+		{
+			"type": "Feature",
+			"description": "/transform: run all builds client-side"
+		}
+	]
+}

packages/amazonq/.changes/1.80.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-07-01",
+	"version": "1.80.0",
+	"entries": []
+}

packages/amazonq/.changes/1.81.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-07-02",
+	"version": "1.81.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Stop auto inline completion when deleting code"
+		}
+	]
+}

packages/amazonq/.changes/1.82.0.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.83.0.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.84.0.json

@@ -0,0 +1,18 @@
+{
+	"date": "2025-07-17",
+	"version": "1.84.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Slightly delay rendering inline completion when user is typing"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Render first response before receiving all paginated inline completion results"
+		},
+		{
+			"type": "Feature",
+			"description": "Explain and Fix for any issue in Code Issues panel will pull the experience into chat. Also no more view details tab."
+		}
+	]
+}

packages/amazonq/.changes/1.85.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-07-19",
+	"version": "1.85.0",
+	"entries": []
+}

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/.changes/1.87.0.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-07-31",
+	"version": "1.87.0",
+	"entries": []
+}

packages/amazonq/.changes/1.88.0.json

@@ -0,0 +1,14 @@
+{
+	"date": "2025-08-06",
+	"version": "1.88.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Q Chat provides error explanations and fixes when hovering or right-clicking on error indicators and messages"
+		},
+		{
+			"type": "Feature",
+			"description": "/transform: Show transformation history in Transformation Hub and allow users to resume jobs"
+		}
+	]
+}

packages/amazonq/CHANGELOG.md

@@ -1,3 +1,52 @@
+## 1.88.0 2025-08-06
+
+- **Feature** Amazon Q Chat provides error explanations and fixes when hovering or right-clicking on error indicators and messages
+- **Feature** /transform: Show transformation history in Transformation Hub and allow users to resume jobs
+
+## 1.87.0 2025-07-31
+
+- Miscellaneous non-user-facing changes
+
+## 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
+
+## 1.84.0 2025-07-17
+
+- **Bug Fix** Slightly delay rendering inline completion when user is typing
+- **Bug Fix** Render first response before receiving all paginated inline completion results
+- **Feature** Explain and Fix for any issue in Code Issues panel will pull the experience into chat. Also no more view details tab.
+
+## 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
+
+## 1.81.0 2025-07-02
+
+- **Bug Fix** Stop auto inline completion when deleting code
+
+## 1.80.0 2025-07-01
+
+- Miscellaneous non-user-facing changes
+
+## 1.79.0 2025-06-25
+
+- **Bug Fix** Added automatic system certificate detection and VSCode proxy settings support
+- **Bug Fix** Improved Amazon Linux 2 support with better SageMaker environment detection
+- **Feature** /transform: run all builds client-side
+
 ## 1.78.0 2025-06-20
 
 - **Bug Fix** Resolve missing chat options in Amazon Q chat interface.

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.