fix(amazonq): Merge master into feature/amazonqLSP-auth (#7227)

## Problem
The code changes that originated from the feature/hybridChat branch are
not merged in into feature/amazonqLSP-auth yet

## Solution
Merge master into feature/amazonqLSP-auth 

**Note: This is the first PR of the merge, which just fixes most
conflicts. A follow-up PR will address bugs and logic changes**

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

---------

Signed-off-by: nkomonen-amazon <[email protected]>
Co-authored-by: aws-toolkit-automation <[email protected]>
Co-authored-by: Josh Pinkney <[email protected]>
Co-authored-by: Josh Pinkney <[email protected]>
Co-authored-by: Justin M. Keyes <[email protected]>
Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: zuoyaofu <[email protected]>
Co-authored-by: aditya169 <[email protected]>
Co-authored-by: Zoe Lin <[email protected]>
Co-authored-by: Hweinstock <[email protected]>
Co-authored-by: Nikolas Komonen <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: chungjac <[email protected]>
Co-authored-by: Dogus Atasoy <[email protected]>
Co-authored-by: Avi Alpert <[email protected]>
Co-authored-by: nkomonen-amazon <[email protected]>
Co-authored-by: Frederic Mbea <[email protected]>
Co-authored-by: Tom Zu <[email protected]>
Co-authored-by: David <[email protected]>

Author: 18 people

docs/lsp.md

@@ -26,9 +26,7 @@ sequenceDiagram
 
 ## Language Server Debugging
 
-1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project
-
-    e.g.
+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.
 
     ```
     /aws-toolkit-vscode
@@ -52,9 +50,9 @@ sequenceDiagram
       "amazonqLSPChat": true // optional: enables chat from flare
     }
     ```
-4. Uncomment the `__AMAZONQLSP_PATH` variable in `amazonq/.vscode/launch.json` Extension configuration
-    1. Uncomment the `__AMAZONQLSP_UI` variable in `amazonq/.vscode/launch.json` Extension configuration if you want to debug the flare chat-client as well
+4. Uncomment the `__AMAZONQLSP_PATH` and `__AMAZONQLSP_UI` variables in the `amazonq/.vscode/launch.json` extension configuration
 5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server
+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
 
 ## Amazon Q Inline Activation
 

package-lock.json

@@ -41,7 +41,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.312",
+        "@aws-toolkits/telemetry": "^1.0.317",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

package.json

@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-22",
+	"version": "1.61.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Some users not signaled they needed to select a Region Profile to get features working"
+		},
+		{
+			"type": "bugfix",
+			"description": "/review: disable auto-review by default"
+		}
+	]
+}

packages/amazonq/.changes/1.61.0.json

@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-25",
+	"version": "1.62.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Toast message to warn users if Developer Profile is not selected"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix users can not log in successfully with 2+ IDE instnaces open due to throttle error throw by the service"
+		}
+	]
+}

packages/amazonq/.changes/1.62.0.json

@@ -0,0 +1,14 @@
+{
+	"date": "2025-05-01",
+	"version": "1.63.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Q profile selection hangs when a region is blocked"
+		},
+		{
+			"type": "Feature",
+			"description": "Agentic coding experience: Amazon Q can now write code and run shell commands on your behalf"
+		}
+	]
+}

packages/amazonq/.changes/1.63.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2025-05-02",
+	"version": "1.64.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Enable Amazon Q LSP in AL2 instances"
+		}
+	]
+}

packages/amazonq/.changes/1.64.0.json

@@ -14,7 +14,8 @@
             "env": {
                 "SSMDOCUMENT_LANGUAGESERVER_PORT": "6010",
                 "WEBPACK_DEVELOPER_SERVER": "http://localhost:8080"
-                // "__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/token-standalone.js",
+                // Below allows for overrides used during development
+                // "__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/agent-standalone.js",
                 // "__AMAZONQLSP_UI": "${workspaceFolder}/../../../language-servers/chat-client/build/amazonq-ui.js"
             },
             "envFile": "${workspaceFolder}/.local.env",

packages/amazonq/.vscode/launch.json

@@ -1,3 +1,22 @@
+## 1.64.0 2025-05-02
+
+- **Bug Fix** Enable Amazon Q LSP in AL2 instances
+
+## 1.63.0 2025-05-01
+
+- **Bug Fix** Q profile selection hangs when a region is blocked
+- **Feature** Agentic coding experience: Amazon Q can now write code and run shell commands on your behalf
+
+## 1.62.0 2025-04-25
+
+- **Bug Fix** Toast message to warn users if Developer Profile is not selected
+- **Bug Fix** Fix users can not log in successfully with 2+ IDE instnaces open due to throttle error throw by the service
+
+## 1.61.0 2025-04-22
+
+- **Bug Fix** Some users not signaled they needed to select a Region Profile to get features working
+- **bugfix** /review: disable auto-review by default
+
 ## 1.60.0 2025-04-18
 
 - **Bug Fix** Users might be bound to a customization which they dont have access with the selected profile and it causes service throwing 403 when using inline suggestion and chat features

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.61.0-SNAPSHOT",
+    "version": "1.65.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -131,6 +131,14 @@
                         "amazonQChatDisclaimer": {
                             "type": "boolean",
                             "default": false
+                        },
+                        "amazonQChatPairProgramming": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQSelectDeveloperProfile": {
+                            "type": "boolean",
+                            "default": false
                         }
                     },
                     "additionalProperties": false
@@ -177,7 +185,25 @@
                 "amazonQ.workspaceIndexMaxSize": {
                     "type": "number",
                     "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexMaxSize%",
-                    "default": 250,
+                    "default": 2048,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexMaxFileSize": {
+                    "type": "number",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexMaxFileSize%",
+                    "default": 10,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexCacheDirPath": {
+                    "type": "string",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexCacheDirPath%",
+                    "default": null,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexIgnoreFilePatterns": {
+                    "type": "array",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexIgnoreFilePatterns%",
+                    "default": [],
                     "scope": "application"
                 },
                 "amazonQ.ignoredSecurityIssues": {