merge: resolve conflicts

Author: Hweinstock

CONTRIBUTING.md

@@ -42,8 +42,11 @@ Then clone the repository and install NPM packages:
 
 ### Run
 
-Due to the monorepo structure of the project, you must have the `aws-toolkit-vscode/packages/toolkit` folder open as root folder in the workspace.
-The easiest way to open the project: File > Open Workspace from File > choose `aws-toolkit-vscode/aws-toolkit-vscode.code-workspace`
+Due to the monorepo structure of the project, you must open the project using the
+`aws-toolkit-vscode.code-workspace` project file.
+
+1. Run the `File: Open Workspace from File...` command in vscode.
+2. Select the `aws-toolkit-vscode.code-workspace` project file.
 
 To run the extension from VSCode as a Node.js app:
 
@@ -164,8 +167,7 @@ See [web.md](./docs/web.md) for working with the web mode implementation of the
 See [TESTPLAN.md](./docs/TESTPLAN.md) to understand the project's test
 structure, mechanics and philosophy.
 
-You can run tests directly from VSCode. Due to the monorepo structure of the project, you must have the `aws-toolkit-vscode/packages/toolkit` folder open as root folder in the workspace.
-The easiest way to open the project: File > Open Workspace from File > choose `aws-toolkit-vscode/aws-toolkit-vscode.code-workspace`
+You can run tests directly from VSCode. Due to the monorepo structure of the project, you must [open the project via the `aws-toolkit-vscode.code-workspace` project file](#run).
 
 1. Select `View > Debug`, or select the Debug pane from the sidebar.
 2. From the dropdown at the top of the Debug pane, select the `Extension Tests` configuration.
@@ -180,12 +182,13 @@ Tests will write logs to `./.test-reports/testLog.log`.
 
 #### Run a specific test
 
-To run a single test in VSCode, do any one of:
+To run a single test in VSCode, do any _one_ of the following:
 
 -   Run the _Extension Tests (current file)_ launch-config.
--   Use Mocha's [it.only()](https://mochajs.org/#exclusive-tests) or `describe.only()`.
--   Run in your terminal:
-
+    -   Note: if you don't see this in the vscode debug menu, confirm that you opened the project
+        [via the `aws-toolkit-vscode.code-workspace` project file](#run).
+-   or... Use Mocha's [it.only()](https://mochajs.org/#exclusive-tests) or `describe.only()`.
+-   or... Run in your terminal:
     -   Unix/macOS/POSIX shell:
         ```
         TEST_FILE=../core/src/test/foo.test.ts npm run test
@@ -194,8 +197,7 @@ To run a single test in VSCode, do any one of:
         ```
         $Env:TEST_FILE = "../core/src/test/foo.test.ts"; npm run test
         ```
-
--   To run all tests in a particular subdirectory, you can edit
+-   or... To run all tests in a particular subdirectory, you can edit
     `src/test/index.ts:rootTestsPath` to point to a subdirectory:
     ```
     rootTestsPath: __dirname + '/shared/sam/debugger/'

docs/lsp.md

@@ -45,8 +45,16 @@ sequenceDiagram
     npm run package
     ```
     to get the project setup
-3. Uncomment the `__AMAZONQLSP_PATH` variable in `amazonq/.vscode/launch.json` Extension configuration
-4. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server
+3. Enable the lsp experiment:
+    ```
+    "aws.experiments": {
+      "amazonqLSP": true,
+      "amazonqLSPInline": true, // optional: enables inline completion from flare
+      "amazonqLSPChat": true // optional: enables chat from flare
+    }
+    ```
+4. Uncomment the `__AMAZONQLSP_PATH` variable in `amazonq/.vscode/launch.json` Extension configuration
+5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server
 
 ## Amazon Q Inline Activation
 

package-lock.json

@@ -0,0 +1,22 @@
+{
+	"date": "2025-03-28",
+	"version": "1.53.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Choosing a nested subfolder for `/doc` on Windows results in `The folder you chose did not contain any source files` error"
+		},
+		{
+			"type": "Feature",
+			"description": "Add support for Code search in Q chat"
+		},
+		{
+			"type": "Feature",
+			"description": "(Experimental) Amazon Q inline code suggestions via Amazon Q Language Server. (enable with `aws.experiments.amazonqLSP: true`)"
+		},
+		{
+			"type": "Feature",
+			"description": "Command Palette: Add `Amazon Q: Open Chat` command."
+		}
+	]
+}

packages/amazonq/.changes/1.53.0.json

@@ -1,3 +1,10 @@
+## 1.53.0 2025-03-28
+
+- **Bug Fix** Amazon Q Chat: Choosing a nested subfolder for `/doc` on Windows results in `The folder you chose did not contain any source files` error
+- **Feature** Add support for Code search in Q chat
+- **Feature** (Experimental) Amazon Q inline code suggestions via Amazon Q Language Server. (enable with `aws.experiments.amazonqLSP: true`)
+- **Feature** Command Palette: Add `Amazon Q: Open Chat` command.
+
 ## 1.52.0 2025-03-20
 
 - **Bug Fix** Amazon Q chat: @Folders and @Files are missing `@` prefix in chat history

packages/amazonq/.changes/next-release/Bug Fix-3f6a2026-9dd8-4b50-8a73-765ead8717b4.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.53.0-SNAPSHOT",
+    "version": "1.54.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -119,6 +119,14 @@
                         "ssoCacheError": {
                             "type": "boolean",
                             "default": false
+                        },
+                        "amazonQLspManifestMessage": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQWorkspaceLspManifestMessage": {
+                            "type": "boolean",
+                            "default": false
                         }
                     },
                     "additionalProperties": false