Merge pull request aws#6824 from aws/autoMerge/feature/agentic-chat

Merge master into feature/agentic-chat

Author: mr-lee

.github/workflows/node.js.yml

@@ -126,6 +126,7 @@ jobs:
             matrix:
                 node-version: [18.x]
                 vscode-version: [minimum, stable, insiders]
+                package: [amazonq, toolkit]
         env:
             VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
             NODE_OPTIONS: '--max-old-space-size=8192'
@@ -141,28 +142,17 @@ jobs:
             - name: Tests
               uses: coactions/setup-xvfb@v1
               with:
-                  run: npm test
-            - name: Code coverage (Toolkit)
+                  run: npm run test -w packages/${{ matrix.package }}
+            - name: Code coverage for ${{ matrix.package }}
               env:
                   # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
                   NODE_OPTIONS: ''
               if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.event_name == 'pull_request' && github.base_ref == 'master' }}
               uses: codecov/codecov-action@v5
               with:
-                  flags: macos-toolkit-unittests
+                  flags: macos-${{ matrix.package }}-unittests
                   verbose: true
-                  file: ./coverage/toolkit/lcov.info
-                  token: ${{ secrets.CODECOV_TOKEN }}
-            - name: Code coverage (Amazon Q)
-              env:
-                  # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
-                  NODE_OPTIONS: ''
-              if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.event_name == 'pull_request' && github.base_ref == 'master' }}
-              uses: codecov/codecov-action@v5
-              with:
-                  flags: macos-amazonq-unittests
-                  verbose: true
-                  file: ./coverage/amazonq/lcov.info
+                  file: ./coverage/${{ matrix.package }}/lcov.info
                   token: ${{ secrets.CODECOV_TOKEN }}
 
     web:
@@ -200,6 +190,7 @@ jobs:
             matrix:
                 node-version: [18.x]
                 vscode-version: [stable, insiders]
+                package: [amazonq, toolkit]
         env:
             VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
             NODE_OPTIONS: '--max-old-space-size=8192'
@@ -211,15 +202,15 @@ jobs:
                   node-version: ${{ matrix.node-version }}
             - run: npm ci
             - name: Tests
-              run: npm test
-            - name: Code coverage
+              run: npm run test -w packages/${{ matrix.package }}
+            - name: Code coverage for ${{ matrix.package }}
               env:
                   # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
                   NODE_OPTIONS: ''
               if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.event_name == 'pull_request' && github.base_ref == 'master' }}
               uses: codecov/codecov-action@v5
               with:
-                  flags: windows-unittests
+                  flags: windows-${{ matrix.package }}-unittests
                   verbose: true
-                  file: ./coverage/lcov.info
+                  file: ./coverage/${{ matrix.package }}/lcov.info
                   token: ${{ secrets.CODECOV_TOKEN }}

CONTRIBUTING.md

@@ -427,6 +427,32 @@ Example:
 }
 ```
 
+<a name="amazonqLsp-settings">Overrides specifically for the Amazon Q language server</a> can be set using the `aws.dev.amazonqLsp` setting. This is a JSON object consisting of keys/values required to override language server: `manifestUrl`, `supportedVersions`, `id`, and `path`.
+
+Example:
+
+```json
+"aws.dev.amazonqLsp": {
+    "manifestUrl": "https://custom.url/manifest.json",
+    "supportedVersions": "4.0.0",
+    "id": "AmazonQ",
+    "path": "/custom/path/to/local/lsp/folder",
+}
+```
+
+<a name="amazonqWorkspaceLsp-settings">Overrides specifically for the Amazon Q Workspace Context language server</a> can be set using the `aws.dev.amazonqWorkspaceLsp` setting. This is a JSON object consisting of keys/values required to override language server: `manifestUrl`, `supportedVersions`, `id`, and `path`.
+
+Example:
+
+```json
+"aws.dev.amazonqWorkspaceLsp": {
+    "manifestUrl": "https://custom.url/manifest.json",
+    "supportedVersions": "4.0.0",
+    "id": "AmazonQ",
+    "path": "/custom/path/to/local/lsp/folder",
+}
+```
+
 ### Environment variables
 
 Environment variables can be used to modify the behaviour of VSCode. The following are environment variables that can be used to configure the extension:
@@ -472,6 +498,14 @@ Unlike the user setting overrides, not all of these environment variables have t
 
 -   `__CODEWHISPERER_REGION`: for aws.dev.codewhispererService.region
 -   `__CODEWHISPERER_ENDPOINT`: for aws.dev.codewhispererService.endpoint
+-   `__AMAZONQLSP_MANIFEST_URL`: for aws.dev.amazonqLsp.manifestUrl
+-   `__AMAZONQLSP_SUPPORTED_VERSIONS`: for aws.dev.amazonqLsp.supportedVersions
+-   `__AMAZONQLSP_ID`: for aws.dev.amazonqLsp.id
+-   `__AMAZONQLSP_PATH`: for aws.dev.amazonqWorkspaceLsp.locationOverride
+-   `__AMAZONQWORKSPACELSP_MANIFEST_URL`: for aws.dev.amazonqWorkspaceLsp.manifestUrl
+-   `__AMAZONQWORKSPACELSP_SUPPORTED_VERSIONS`: for aws.dev.amazonqWorkspaceLsp.supportedVersions
+-   `__AMAZONQWORKSPACELSP_ID`: for aws.dev.amazonqWorkspaceLsp.id
+-   `__AMAZONQWORKSPACELSP_PATH`: for aws.dev.amazonqWorkspaceLsp.locationOverride
 
 #### Lambda
 

docs/TEST_E2E.md

@@ -17,3 +17,27 @@ With this approach, the follow things can be tested:
 -   Whether or not certain features show/not show depending on the status of the users auth
 -   Run requests directly against the backend and see if we get results back
 -   Clicking any follow up buttons (including examples)
+
+## Flare Chat E2E Test flow (Not implemented yet)
+
+This is the new flow that should be introduced when we moved to Flare chat.
+
+```mermaid
+sequenceDiagram
+    participant test as Test
+    participant framework as Test Framework
+    participant ui as Virtual DOM
+    participant lsp as Language Server
+    participant mynah as Mynah UI
+
+    test->>test: starts
+    test->>framework: creates test framework
+    framework->>ui: adds mynah ui to virtual dom
+    test->>lsp: waits for language server activation
+    test->>mynah: triggers action on mynah ui
+    mynah->>framework: sends message
+    framework->>lsp: sends message
+    lsp->>framework: gets response
+    framework->>ui: displays response
+    test->>ui: assert test expectations
+```

docs/lsp.md

@@ -0,0 +1,53 @@
+# Flare Language Server
+
+## Chat Activation flow
+
+```mermaid
+sequenceDiagram
+    participant user as User
+    participant ext as Extension
+    participant webview as Chat Webview
+    participant flare as Amazon Q LSP
+    participant backend as Amazon Q Backend
+
+    user->>ext: opens IDE
+    ext->>ext: activates
+    ext->>webview: loads UI
+    ext->>flare: initialize process
+    flare->>flare: starts and waits
+    user->>webview: interacts
+    webview->>ext: sends message
+    ext->>flare: sends message
+    flare->>backend: call api
+    backend->>flare: returns
+    flare->>ext: display
+    ext->>webview: display
+```
+
+## 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.
+
+    ```
+    /aws-toolkit-vscode
+    /toolkit
+    /core
+    /amazonq
+    /language-servers
+    ```
+
+2. Inside of the language-servers project run:
+    ```
+    npm install
+    npm run compile
+    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
+
+## 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`