Merging agentic-mcp into main #1544

ashishrp-aws · 2025-06-05T23:06:50Z

Problem

Need to release MCP servers feature. Worked on MCP features on seperate feature branch

Solution

Need to merge mcp feature branch into Main

License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

- Add basic invoking and result messages for MCP - Require acceptance for MCP tool invocation - Minor fixes for regression

* feat: basic invoking and result message for MCP (#1251) * feat: add basic CRUD methods for MCP servers/tools

* fix: update listDirectory tool to output in tree-like format to reduce toolSize (#1260) * fix: clear history for `inputTooLong` errors (#1268) * fix: errors/cancellation not resetting undoAll state (#1273) * fix: errors/cancellation not resetting undoAll state * test: add unit tests * test: update test * style: revert formatting change * feat: adding a check before invoking workspace context (#1227) Co-authored-by: Supraja Venkatesh <[email protected]> * fix: improve data synchronization of server side workspace context (#1278) * fix: improve data synchronization of server side workspace context * fix: adding catch to snapshotWorkspace call --------- Co-authored-by: Weitao Wang <[email protected]> Co-authored-by: Paras <[email protected]> * chore: update netTransform unsupportedViewComponents * chore(release): release packages from branch main * fix: update versions manually (release-please bug) * fix: use the correct command name for testing bundles (#1280) * fix: use the correct command name for testing bundles * chore: change return type to pipe to see if more logs can be available --------- Co-authored-by: Paras <[email protected]> * fix: regex should match workspace text in bold style and startLine can be 0 (#1272) * fix: regex should match workspace text in bold style and startLine can be 0 * fix: remove unintended debug lines * fix: abandon requests with invalid toolResults (#1274) * fix: prevent timeout messages from displaying (#1282) * fix: set streamingClient timeout config (#1283) * fix: filter out .git folder from listDirectory (#1286) * fix: add requestId to chat for QModelResponse errors (#1284) * fix: add more common ignore patterns for listDirectory (#1287) * fix: wrap load chats on ready in try-catch (#1289) Problem Currently when the chat loads up a UI ready event is sent to the lsp, to load up previous chats and start indexing. If loading of previous chats fail, the LSP process crashes. This is particularly evident when openTab event has not been handled by the client. An error in that flow should not crash the LSP process or block the rest of the indexing from continuing. Solution This change surrounds the load chat logic within a try catch of its own to allow the rest of the indexing logic to proceed and not crash the server process * fix: stop chat response first when close tab (#1292) * fix: undo buttom not dimmed the card (#1276) * fix: undo buttom not dimmed the card * fix: fix more regression case for reject * fix: permission check ux changes (#1290) * fix: permission ux * fix: minor edits * fix: address bugs impacting indexing disabled functionality (#1293) * fix(amazonq): add codewhispererCustomizationArn to codewhisperer_perceivedLatency (#1285) ## Problem events between vscode and flare are not aligned ## Solution add codewhispererCustomizationArn * fix: show tooltip for warning message and remove the warning text (#1259) * fix: add tooltip for warning message * fix: fix the string * fix: add enum * fix: remove numbers * fix: the icon for different category icon and reject button * fix: add visibleName property to fix empty directory name when the directory ends with a slash (#1302) * fix: add visibleName property to fix empty directory name when the directory ends with a slash * fix: format --------- Co-authored-by: Francesco Piccoli <[email protected]> * chore: bump mynah-ui version (#1303) Co-authored-by: Francesco Piccoli <[email protected]> * chore(release): release packages from branch main (#1279) * chore(release): release packages from branch main * fix: update versions manually (release-please bug) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Francesco Piccoli <[email protected]> * feat: merge updates for inline completions (#1299) * fix: stop buttom work expected (#1307) * fix: allowing reading multiple files with fsRead, minor tool validation fix (#1297) * fix: bug fix for exportResultsArchive to call with profileArn as parameter (#1300) * fix: for exportResultsArchive to call with profileArn --------- Co-authored-by: Pranav Firake <[email protected]> * chore: refactor common customization logic to a function and update corresponding CONTRIBUTION.md (#1281) Co-authored-by: Paras <[email protected]> * fix: remove @ mention in placeholder q chat text if agentic mode not available (#1311) * fix: remove @ mention in placeholder q chat text if agentic mode not available * style: rename DEFAULT_TAB_DATA to getDefaultTabConfig --------- Co-authored-by: Francesco Piccoli <[email protected]> * chore: update netTransform unsupportedViewComponents (#1306) * chore: update netTransform unsupportedViewComponents * chore: update netTransform unsupportedViewComponents * feat: add userWrittenCodeTracker (#1308) * feat: add userWrittenCodeTracker * fix: add unit test * fix: bug in skip edit for userWrittenCode (#1315) --------- Co-authored-by: Jason Guo <[email protected]> Co-authored-by: tsmithsz <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: suprajaven <[email protected]> Co-authored-by: Supraja Venkatesh <[email protected]> Co-authored-by: Ivan <[email protected]> Co-authored-by: Weitao Wang <[email protected]> Co-authored-by: Paras <[email protected]> Co-authored-by: Jiayu Wang <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Ivan Mykhailovskyi <[email protected]> Co-authored-by: pras0131 <[email protected]> Co-authored-by: andrewyuq <[email protected]> Co-authored-by: Shruti Sinha <[email protected]> Co-authored-by: Na Yue <[email protected]> Co-authored-by: Randall-Jiang <[email protected]> Co-authored-by: Nicolas <[email protected]> Co-authored-by: Josh Pinkney <[email protected]> Co-authored-by: Francesco Piccoli <[email protected]> Co-authored-by: Francesco Piccoli <[email protected]> Co-authored-by: Zoe Lin <[email protected]> Co-authored-by: Pranav Firake <[email protected]> Co-authored-by: Pranav Firake <[email protected]> Co-authored-by: JiayuW2 <[email protected]>

* chore: bump up language server version * chore: bump up language server version chat-client-ui-types

* fix: update listDirectory tool to output in tree-like format to reduce toolSize (#1260) * fix: clear history for `inputTooLong` errors (#1268) * fix: errors/cancellation not resetting undoAll state (#1273) * fix: errors/cancellation not resetting undoAll state * test: add unit tests * test: update test * style: revert formatting change * feat: adding a check before invoking workspace context (#1227) Co-authored-by: Supraja Venkatesh <[email protected]> * fix: improve data synchronization of server side workspace context (#1278) * fix: improve data synchronization of server side workspace context * fix: adding catch to snapshotWorkspace call --------- Co-authored-by: Weitao Wang <[email protected]> Co-authored-by: Paras <[email protected]> * chore: update netTransform unsupportedViewComponents * chore(release): release packages from branch main * fix: update versions manually (release-please bug) * fix: use the correct command name for testing bundles (#1280) * fix: use the correct command name for testing bundles * chore: change return type to pipe to see if more logs can be available --------- Co-authored-by: Paras <[email protected]> * fix: regex should match workspace text in bold style and startLine can be 0 (#1272) * fix: regex should match workspace text in bold style and startLine can be 0 * fix: remove unintended debug lines * fix: abandon requests with invalid toolResults (#1274) * fix: prevent timeout messages from displaying (#1282) * fix: set streamingClient timeout config (#1283) * fix: filter out .git folder from listDirectory (#1286) * fix: add requestId to chat for QModelResponse errors (#1284) * fix: add more common ignore patterns for listDirectory (#1287) * fix: wrap load chats on ready in try-catch (#1289) Problem Currently when the chat loads up a UI ready event is sent to the lsp, to load up previous chats and start indexing. If loading of previous chats fail, the LSP process crashes. This is particularly evident when openTab event has not been handled by the client. An error in that flow should not crash the LSP process or block the rest of the indexing from continuing. Solution This change surrounds the load chat logic within a try catch of its own to allow the rest of the indexing logic to proceed and not crash the server process * fix: stop chat response first when close tab (#1292) * fix: undo buttom not dimmed the card (#1276) * fix: undo buttom not dimmed the card * fix: fix more regression case for reject * fix: permission check ux changes (#1290) * fix: permission ux * fix: minor edits * fix: address bugs impacting indexing disabled functionality (#1293) * fix(amazonq): add codewhispererCustomizationArn to codewhisperer_perceivedLatency (#1285) ## Problem events between vscode and flare are not aligned ## Solution add codewhispererCustomizationArn * fix: show tooltip for warning message and remove the warning text (#1259) * fix: add tooltip for warning message * fix: fix the string * fix: add enum * fix: remove numbers * fix: the icon for different category icon and reject button * fix: add visibleName property to fix empty directory name when the directory ends with a slash (#1302) * fix: add visibleName property to fix empty directory name when the directory ends with a slash * fix: format --------- Co-authored-by: Francesco Piccoli <[email protected]> * chore: bump mynah-ui version (#1303) Co-authored-by: Francesco Piccoli <[email protected]> * chore(release): release packages from branch main (#1279) * chore(release): release packages from branch main * fix: update versions manually (release-please bug) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Francesco Piccoli <[email protected]> * feat: merge updates for inline completions (#1299) * fix: stop buttom work expected (#1307) * fix: allowing reading multiple files with fsRead, minor tool validation fix (#1297) * fix: bug fix for exportResultsArchive to call with profileArn as parameter (#1300) * fix: for exportResultsArchive to call with profileArn --------- Co-authored-by: Pranav Firake <[email protected]> * chore: refactor common customization logic to a function and update corresponding CONTRIBUTION.md (#1281) Co-authored-by: Paras <[email protected]> * fix: remove @ mention in placeholder q chat text if agentic mode not available (#1311) * fix: remove @ mention in placeholder q chat text if agentic mode not available * style: rename DEFAULT_TAB_DATA to getDefaultTabConfig --------- Co-authored-by: Francesco Piccoli <[email protected]> * chore: update netTransform unsupportedViewComponents (#1306) * chore: update netTransform unsupportedViewComponents * chore: update netTransform unsupportedViewComponents * feat: add userWrittenCodeTracker (#1308) * feat: add userWrittenCodeTracker * fix: add unit test * fix: bug in skip edit for userWrittenCode (#1315) * fix: update ignore pattern of glob for sspc (#1319) * chore: stub timeout (#1316) * fix: open initial tab using mynahUI defaults instead of waiting for ChatOptions (#1322) * fix: open initial tab using mynahUI defaults instead of waiting for ChatOptions * fix: push banner message to initial tab after chat options are received * fix: bump runtimes and fix broken test (#1323) * chore: bump runtimes version * fix: broken test after bumping runtimes --------- Co-authored-by: Francesco Piccoli <[email protected]> * feat(amazonq): telemetry for chat history and export (#1314) * fix: update fileSearch toolSpec and implementation (#1320) * fix: update fileSearch toolSpec and implementation * fix: update unit test * fix(amazonq): 500k max input limit in user input box. Align payload prompt with user typed prompt. (#1325) * fix: truncate userInputMessage to first 500k characters (#1327) * fix: truncate userInputMessage to 500k * fix: duplicate suggestion in inline response (#1331) * fix: welcome card shows everytime (#1332) * chore: script to create local build (#1301) * chore: script to create local build * fix: refactor custom webpack config to allow .node files to be created inside build directory add local-build script usage to package.json add README for local-build --------- Co-authored-by: Paras <[email protected]> * chore(release): release packages from branch main (#1305) * chore(release): release packages from branch main * fix: update versions manually (release-please bug) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Francesco Piccoli <[email protected]> * chore: bump runtimes-types and chat-client-ui-types version to latest (#1333) Co-authored-by: Francesco Piccoli <[email protected]> * fix(amazonq): export q chat in windows not working due to invalid path (#1330) * fix(amazonq): export chat in Windows not working due to invalid path * chore: emit telemetry for inline chat result (#1131) * feat: change to emit STE event for inline chat action * chore: add support for emitting telemetry related to inlineChatResult * fix: fix merge conflict * chore: remove the unused imports from TelemetryService class --------- Co-authored-by: Paras <[email protected]> * refactor(amazonq): optimization: remove validation call for selected profile (#1329) * refactor(amazonq): optimization: only call listAvailableProfile with region associated with the arn * revert(amazonq): console.log * refactor(amazonq): stop validating profile availability on configurationChanged * fix(amazonq): fix typo * fix(amazonq): test * test(amazonq): amazonQTokenServiceManager.test.ts * refactor(amazonq): revert unneeded changes * refactor(amazonq): nit * refactor(amazonq): more nit * refactor(amazonq): fix test * refactor(amazonq): fix test * refactor(amazonq): nit * refactor(amazonq): revert unneeded changes * chore(release): release packages from branch main (#1334) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: don't force commit-lint locally (#1337) Problem: Forcing commit-lint locally is very disruptive. Solution: Drop it. * fix: add requestIds for each LLM call for amazonq_addMessage metric (#1338) * fix: adding new telemetry metrics and addtional fields for existing metrics (#1341) * fix: adding new telemetry metrics and addtional fields for existing metrics * Minor edits * fix: failing tests * fix: adding agenticCodingMode to emitMessageResponseError metric * chore: bumping language server runtime versions (#1344) * feat: migrate inline completion telemetry to Flare (#1336) * feat: migrate inline completion telemetry to Flare * feat: migrate inline completion telemetry to Flare * chore: bump the typescript-eslint group with 2 updates (#1255) Bumps the typescript-eslint group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@typescript-eslint/eslint-plugin` from 8.31.0 to 8.31.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.31.1/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.31.0 to 8.31.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.31.1/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.31.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: typescript-eslint - dependency-name: "@typescript-eslint/parser" dependency-version: 8.31.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: typescript-eslint ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: adding error handling for export tab (#1350) Current export chat functionality doesn't properly handle user cancellation of the save dialog, leading to incorrect telemetry reporting and runs into errors. Solution Added proper handling of save dialog cancellation. Enhanced error handling to differentiate between user cancellation and other failure cases. Updated telemetry emission to accurately reflect the export operation outcome. * fix: add robust validation logic to fixHistory (#1340) * fix: Reduce perceived latency of fsWrite. Show fsWrite errors in the UX (#1351) * fix: reduce perceived latency * fix: only do render on partial results for fsWrite (#1354) * fix: re-categorize error status code (#1355) * chore: revert "chore: bump the typescript-eslint group with 2 updates (#1255)" (#1357) This reverts commit 140104a. * fix: convert RTS improperly formed request error to 500 (#1356) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Jason Guo <[email protected]> Co-authored-by: tsmithsz <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: suprajaven <[email protected]> Co-authored-by: Supraja Venkatesh <[email protected]> Co-authored-by: Ivan <[email protected]> Co-authored-by: Weitao Wang <[email protected]> Co-authored-by: Paras <[email protected]> Co-authored-by: Jiayu Wang <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Ivan Mykhailovskyi <[email protected]> Co-authored-by: pras0131 <[email protected]> Co-authored-by: andrewyuq <[email protected]> Co-authored-by: Shruti Sinha <[email protected]> Co-authored-by: Na Yue <[email protected]> Co-authored-by: Randall-Jiang <[email protected]> Co-authored-by: Nicolas <[email protected]> Co-authored-by: Josh Pinkney <[email protected]> Co-authored-by: Francesco Piccoli <[email protected]> Co-authored-by: Francesco Piccoli <[email protected]> Co-authored-by: Zoe Lin <[email protected]> Co-authored-by: Pranav Firake <[email protected]> Co-authored-by: Pranav Firake <[email protected]> Co-authored-by: JiayuW2 <[email protected]> Co-authored-by: wweitao <[email protected]> Co-authored-by: Oksana Volodkevych <[email protected]> Co-authored-by: Viktor Shcherba <[email protected]> Co-authored-by: Avi Alpert <[email protected]> Co-authored-by: Lei Gao <[email protected]> Co-authored-by: Will Lo <[email protected]> Co-authored-by: Justin M. Keyes <[email protected]> Co-authored-by: chungjac <[email protected]> Co-authored-by: yzhangok <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lokesh <[email protected]> Co-authored-by: Natalia Durlik <[email protected]>

chore: Merge from main.

Merge from main

…1413)

…resh

Agentic mcp merge 2

fix: fix for scope change to keep only copy of mcp server

fix: fix to refresh only one server that is enabled

fix: fix for correct initialization of tools with namespacing for ref…

merge from main

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

leigaol · 2025-06-05T23:53:16Z

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

-            body: warning ? (toolType === 'executeBash' ? '' : '\n\n') + body : body,
+        // Determine if this is a built-in tool or MCP tool
+        const isStandardTool =
+            toolName !== undefined && ['executeBash', 'fsWrite', 'fsRead', 'listDirectory'].includes(toolName)


this boolean needs to be changed if https://github.com/aws/language-servers/pull/1533/files is merged. Need to add fsReplace

and can you move this to a constant file so that people will NOT forget to update this list as we add more tools

if that PR is merged...i'll do another merge from main into agentic-mcp to keep the branch up to date.

But moving it to constants...can be a folllowup task after merge

leigaol · 2025-06-05T23:54:36Z

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

+        )
+
+        McpManager.instance.setToolNameMapping(tempMapping)
+        const writeToolNames = new Set(['fsWrite', 'executeBash'])


does fsReplace affect this line

is fsReplace PR merged? if it is merged, i'll do another merge from main

It would be great if each tool could contain a bool flag indicating if it could mutate data. Then we wouldn't duplicate this logic in many places.

(this comment is not related to merging to main)

* fix: two telemetry events are emitted for mcp except init case * fix: emitting amazonq_mcpConfig metric from init function of mcpManager. * fix: adding amazonq_mcpConfig to enable and disable config cases * fix: refactoring code

…n to original choice (#1551)

Merge main into Agentic-mcp

awschristou

I didn't look at the MCP specific business logic. I was reviewing to identify backwards compatibility issues. I found a few things that need to be adjusted before this merges to main.

awschristou · 2025-06-06T16:31:51Z

chat-client/src/client/chat.ts

@@ -220,6 +239,10 @@ export const createChat = (
                    tabFactory.updateQuickActionCommands(quickActionCommandGroups)
                }

+                if (params?.mcpServers && config?.agenticMode) {


Is it possible to add tests that assert:

when mcpServers is absent there are no mcp controls on the UI

when mcpServers is false there are no mcp controls on the UI

when mcpServers is true the mcp controls are on the UI

awschristou · 2025-06-06T17:05:34Z

server/aws-lsp-codewhisperer/src/language-server/agenticChat/qAgenticChatServer.ts

+        })
+
+        chat.onMcpServerClick(params => {
+            return chatController.onMcpServerClick(params)


Should this only do something if enabledMCP is true?

awschristou · 2025-06-06T17:10:03Z

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tabBarController.ts

@@ -232,7 +232,8 @@ export class TabBarController {
        const defaultFileName = `q-dev-chat-${new Date().toISOString().split('T')[0]}.md`
        try {
            let defaultUri
-            let workspaceFolders = this.#features.workspace.getAllWorkspaceFolders()
+            const clientParams = this.#features.lsp.getClientInitializeParams()
+            let workspaceFolders = clientParams?.workspaceFolders


This is a regression from #1353 - workspace folders must be obtained from the utility function

(cc @shruti0085 )

Yes please do not change this logic. This introduces a lot of unexpected behavior and errors on windows devices and breaks it fully for VS users

awschristou · 2025-06-06T17:25:41Z

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

+    async onListMcpServers(params: ListMcpServersParams) {
+        return this.#mcpEventHandler.onListMcpServers(params)
+    }
+
+    async onMcpServerClick(params: McpServerClickParams) {
+        return this.#mcpEventHandler.onMcpServerClick(params)
+    }


Should these functions have an inner check if the clientcapabilities support mcp, and do nothing if there is no support?

awschristou · 2025-06-06T17:36:57Z

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

@@ -991,13 +1019,51 @@ export class AgenticChatController implements ChatHandlers {
                    case 'codeSearch':
                        // no need to write tool message for code search.
                        break
+                    // — DEFAULT ⇒ MCP tools


In places like this (through this file) consider extending the comment to say that this also handles non-mcp tools for older clients. That way future maintainers don't mistakenly add something mcp specific, which could lead to an error or unexpected results.

awschristou · 2025-06-06T17:45:36Z

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

+        )
+
+        McpManager.instance.setToolNameMapping(tempMapping)
+        const writeToolNames = new Set(['fsWrite', 'executeBash'])


It would be great if each tool could contain a bool flag indicating if it could mutate data. Then we wouldn't duplicate this logic in many places.

(this comment is not related to merging to main)

awschristou · 2025-06-06T17:49:00Z

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/toolServer.ts

        }
+
+        const wsUris = lsp.getClientInitializeParams()?.workspaceFolders?.map(f => f.uri) ?? []


This also needs to follow #1353 - please check the entire branch for any direct workspaceFolders lookups, I may have missed some

+1, please take another pass at reconciling changes into this branch from main

awschristou · 2025-06-06T17:56:19Z

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/mcp/mcpUtils.ts

@@ -23,17 +36,20 @@ export async function loadMcpServerConfigs(
        } catch {
            fsPath = raw
        }
+        fsPath = require('path').normalize(fsPath)


Any time we leave the flare platform and try to use bare functionality is a place that could break in different environments. core\aws-lsp-core\src\util\path.ts appears to have a normalize, would this work here?

Are there equivalents available for anywhere that this branch directly calls require ?

manodnyab · 2025-06-06T17:46:27Z

server/aws-lsp-codewhisperer/src/shared/utils.ts

@@ -321,6 +321,8 @@ export function isStringOrNull(object: any): object is string | null {
 // Port of implementation in AWS Toolkit for VSCode
 // https://github.com/aws/aws-toolkit-vscode/blob/c22efa03e73b241564c8051c35761eb8620edb83/packages/core/src/shared/errors.ts#L648
 export function getHttpStatusCode(err: unknown): number | undefined {
+    // RTS throws validation errors with a 400 status code to LSP, we convert them to 500 from the perspective of the user


Should we be doing this conversion? Will this affect how we debug the error? The code can stay the same but we can append the error message maybe?

manodnyab · 2025-06-06T18:02:57Z

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/mcp/mcpUtils.ts


+/**
+ * Load, validate, and parse MCP server configurations from JSON files.


How often are these configs updated? Will they be stored in the same location for all IDEs and CLI?

…m persona file (#1565)

bywang56 and others added 30 commits May 2, 2025 14:41

feat: basic invoking and result message for MCP (#1251)

4dce33c

- Add basic invoking and result messages for MCP - Require acceptance for MCP tool invocation - Minor fixes for regression

Merge remote-tracking branch 'upstream/main' into agentic-mcp

dd1aae5

feat: add CRUD methods for MCP servers (#1271)

c6f96d7

* feat: basic invoking and result message for MCP (#1251) * feat: add basic CRUD methods for MCP servers/tools

feat: add MCP init timeut and minor fixes (#1304)

79624fe

feat: expose MCP server init status (#1324)

0d6708f

feat: initial MCP servers list ui changes (#1345)

d7807b7

feat: support mcp exec timeout, add tool state interface (#1335)

55b4cd8

feat: handle mcp config conflicts, support infinity timeout (#1352)

3345baa

chore: bump up language server version (#1360)

17b7fe8

* chore: bump up language server version * chore: bump up language server version chat-client-ui-types

feat: add update server permission method without re-init server (#1363)

c9933c1

fix: refresh mcp server functionality (#1349)

7eb9cbc

feat: setup for MCP server tools permission UX (#1375)

89de199

feat: adding tool count to the MCP list (#1380)

4777236

Merge remote-tracking branch 'upstream/main' into parity

d088750

fix: fixing merge conflicts

fd4af1b

Merge pull request #1383 from laileni-aws/parity

020d453

chore: Merge from main.

fix: refresh button (#1381)

822bcf0

feat: adding add mcp configuration UX (#1385)

2399ce9

fix: refresh button should not reset singleton instance (#1391)

14af43a

feat: adding disable and delete mcp server functions (#1390)

d2cbeaa

Merge pull request #1392 from aws/main

a11aeb7

Merge from main

feat: adding optional values field to add mcp configuration ux (#1393)

6f20a66

feat: support persona file (#1411)

379d38d

feat: enable mcp server and fix for permission list mandatory items (#…

c619d58

…1413)

fix: handle wilcar for enable/disable server (#1414)

b377746

feat: adding correct icons for MCP servers state (#1417)

73b8025

fix: success and error case for adding mcp server (#1412)

11fa3d8

chore: bumping up language server version (#1418)

e0889e5

chungjac and others added 12 commits June 4, 2025 16:29

fix: don't show erros on mcp server list page (#1513)

1f23675

fix: persist only copy of mcp server when scope is changed

8b2edc9

fix: fix for correct initialization of tools with namespacing for ref…

38df958

…resh

fix: fix to refresh only one server that is enabled

4f26777

Merge upstream/main into temp-merge-branch

ea47a76

Merge pull request #1539 from ashishrp-aws/agentic-mcp-merge-2

a06bed8

Agentic mcp merge 2

Merge pull request #1529 from ashishrp-aws/agentic-mcp

00cf308

fix: fix for scope change to keep only copy of mcp server

Merge pull request #1532 from ashishrp-aws/enable-mcp-server-refresh

42bc2bb

fix: fix to refresh only one server that is enabled

Merge pull request #1531 from ashishrp-aws/agentic-mcp-tool-number

386d0ee

fix: fix for correct initialization of tools with namespacing for ref…

Merge main into agentic-mcp, resolving conflicts in package-lock.json

0851ffb

Merge pull request #1541 from ashishrp-aws/agentic-mcp

f7529bd

merge from main

fix: correcting fuzzysearch to fileSearch from merge conflicts (#1543)

bbd0162

ashishrp-aws requested a review from a team as a code owner June 5, 2025 23:06

leigaol reviewed Jun 5, 2025

View reviewed changes

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts Outdated Show resolved Hide resolved

leigaol reviewed Jun 5, 2025

View reviewed changes

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts Outdated Show resolved Hide resolved

leigaol reviewed Jun 5, 2025

View reviewed changes

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts Outdated Show resolved Hide resolved

leigaol reviewed Jun 5, 2025

View reviewed changes

ashishrp-aws and others added 8 commits June 5, 2025 16:57

fix: fix for merge conflict errors (#1545)

b2ac384

fix: fix merge conflicts for fuzzySearch (#1546)

0e68803

telemetry(mcp): adding mcp telemetry metrics (#1528)

86ec96f

* fix: two telemetry events are emitted for mcp except init case * fix: emitting amazonq_mcpConfig metric from init function of mcpManager. * fix: adding amazonq_mcpConfig to enable and disable config cases * fix: refactoring code

fix: adding mcp server through UI for Windows (#1547)

60f255f

fix: mcp server should use workspace persona first (#1530)

0e2488a

fix: fix to correctly store permissions if user reverts his permissio…

fb7a5e2

…n to original choice (#1551)

Merge remote-tracking branch 'upstream/main' into agentic-mcp

74fd76c

Merge pull request #1556 from ashishrp-aws/agentic-mcp

af92731

Merge main into Agentic-mcp

awschristou requested changes Jun 6, 2025

View reviewed changes

manodnyab reviewed Jun 6, 2025

View reviewed changes

chungjac and others added 2 commits June 6, 2025 11:53

fix: timeout displayed and accepted in seconds (#1535)

e072208

fix: when user remove the mcp server, it should also been removed fro…

058aff4

…m persona file (#1565)

		}

		const wsUris = lsp.getClientInitializeParams()?.workspaceFolders?.map(f => f.uri) ?? []


		/**
		* Load, validate, and parse MCP server configurations from JSON files.

Merging agentic-mcp into main #1544

Are you sure you want to change the base?

Merging agentic-mcp into main #1544

Conversation

ashishrp-aws commented Jun 5, 2025

Problem

Solution

License

Uh oh!

Uh oh!

Uh oh!

Uh oh!

leigaol Jun 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ashishrp-aws Jun 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

awschristou left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

leigaol Jun 5, 2025 •

edited

Loading

ashishrp-aws Jun 6, 2025 •

edited

Loading