Merging agentic-mcp into main

app/aws-lsp-codewhisperer-runtimes/src/agent-standalone.ts

@@ -9,7 +9,11 @@ import {
     WorkspaceContextServerTokenProxy,
 } from '@aws/lsp-codewhisperer'
 import { IdentityServer } from '@aws/lsp-identity'
-import { BashToolsServer, FsToolsServer } from '@aws/lsp-codewhisperer/out/language-server/agenticChat/tools/toolServer'
+import {
+    BashToolsServer,
+    FsToolsServer,
+    McpToolsServer,
+} from '@aws/lsp-codewhisperer/out/language-server/agenticChat/tools/toolServer'
 import { createTokenRuntimeProps } from './standalone-common'
 
 const MAJOR = 0
@@ -28,7 +32,7 @@ const props = createTokenRuntimeProps(VERSION, [
     BashToolsServer,
     QLocalProjectContextServerTokenProxy,
     WorkspaceContextServerTokenProxy,
-    // McpToolsServer,
+    McpToolsServer,
     // LspToolsServer,
 ])
 

chat-client/CHANGELOG.md

@@ -216,8 +216,8 @@
 
 ### Changed
 
-- Update `@aws/chat-client-ui-types` to 0.1.0
-- Update `@aws/language-server-runtimes-types` to 0.1.0
+- Update `@aws/chat-client-ui-types` to 0.1.35
+- Update `@aws/language-server-runtimes-types` to 0.1.29
 - Shortened legal text in the footer
 
 ## [0.0.9] - 2024-11-20
@@ -241,8 +241,8 @@
 ### Changed
 
 - Changed legal text in the footer
-- Update `@aws/chat-client-ui-types` to 0.0.8
-- Update `@aws/language-server-runtimes-types` to to 0.0.7
+- Update `@aws/chat-client-ui-types` to 0.1.35
+- Update `@aws/language-server-runtimes-types` to 0.1.29
 - Upgraded dependency: `@aws/mynah-ui` from 4.15.11 to 4.18.0:
     - Inline code elements now wrap onto new lines
     - Send button no longer shifts out of the window when horizontally filling the prompt input without spaces (now it wraps)

chat-client/src/client/chat.ts

@@ -62,9 +62,15 @@ import {
     InfoLinkClickParams,
     LINK_CLICK_NOTIFICATION_METHOD,
     LIST_CONVERSATIONS_REQUEST_METHOD,
+    LIST_MCP_SERVERS_REQUEST_METHOD,
     LinkClickParams,
     ListConversationsParams,
     ListConversationsResult,
+    ListMcpServersParams,
+    ListMcpServersResult,
+    MCP_SERVER_CLICK_REQUEST_METHOD,
+    McpServerClickParams,
+    McpServerClickResult,
     OPEN_TAB_REQUEST_METHOD,
     OpenTabParams,
     OpenTabResult,
@@ -162,9 +168,16 @@ export const createChat = (
             case CHAT_REQUEST_METHOD:
                 mynahApi.addChatResponse(message.params, message.tabId, message.isPartialResult)
                 break
-            case CHAT_UPDATE_NOTIFICATION_METHOD:
-                mynahApi.updateChat(message.params as ChatUpdateParams)
-                break
+            case CHAT_UPDATE_NOTIFICATION_METHOD: {
+                const messageParams = message.params as ChatUpdateParams
+                if (messageParams?.tabId === 'mcpserver') {
+                    mynahApi.mcpServerClick({ id: 'update-mcp-list' })
+                    break
+                } else {
+                    mynahApi.updateChat(message.params as ChatUpdateParams)
+                    break
+                }
+            }
             case OPEN_TAB_REQUEST_METHOD:
                 mynahApi.openTab(message.requestId, message.params as OpenTabParams)
                 break
@@ -186,6 +199,12 @@ export const createChat = (
             case CONVERSATION_CLICK_REQUEST_METHOD:
                 mynahApi.conversationClicked(message.params as ConversationClickResult)
                 break
+            case LIST_MCP_SERVERS_REQUEST_METHOD:
+                mynahApi.listMcpServers(message.params as ListMcpServersResult)
+                break
+            case MCP_SERVER_CLICK_REQUEST_METHOD:
+                mynahApi.mcpServerClick(message.params as McpServerClickResult)
+                break
             case GET_SERIALIZED_CHAT_REQUEST_METHOD:
                 mynahApi.getSerializedChat(message.requestId, message.params as GetSerializedChatParams)
                 break
@@ -220,6 +239,10 @@ export const createChat = (
                     tabFactory.updateQuickActionCommands(quickActionCommandGroups)
                 }
 
+                if (params?.mcpServers && config?.agenticMode) {
+                    tabFactory.enableMcp()
+                }
+
                 if (params?.history) {
                     tabFactory.enableHistory()
                 }
@@ -363,6 +386,12 @@ export const createChat = (
         conversationClick: (params: ConversationClickParams) => {
             sendMessageToClient({ command: CONVERSATION_CLICK_REQUEST_METHOD, params })
         },
+        listMcpServers: (params: ListMcpServersParams) => {
+            sendMessageToClient({ command: LIST_MCP_SERVERS_REQUEST_METHOD, params })
+        },
+        mcpServerClick: function (params: McpServerClickParams): void {
+            sendMessageToClient({ command: MCP_SERVER_CLICK_REQUEST_METHOD, params })
+        },
         tabBarAction: (params: TabBarActionParams) => {
             sendMessageToClient({ command: TAB_BAR_ACTION_REQUEST_METHOD, params })
         },

chat-client/src/client/messager.ts

@@ -34,6 +34,8 @@ import {
     InfoLinkClickParams,
     LinkClickParams,
     ListConversationsParams,
+    ListMcpServersParams,
+    McpServerClickParams,
     OpenTabResult,
     PromptInputOptionChangeParams,
     QuickActionParams,
@@ -89,6 +91,8 @@ export interface OutboundChatApi {
     fileClick(params: FileClickParams): void
     listConversations(params: ListConversationsParams): void
     conversationClick(params: ConversationClickParams): void
+    mcpServerClick(params: McpServerClickParams): void
+    listMcpServers(params: ListMcpServersParams): void
     tabBarAction(params: TabBarActionParams): void
     onGetSerializedChat(requestId: string, result: GetSerializedChatResult | ErrorResult): void
     promptInputOptionChange(params: PromptInputOptionChangeParams): void
@@ -217,6 +221,14 @@ export class Messager {
         this.chatApi.conversationClick({ id: conversationId, action })
     }
 
+    onListMcpServers = (filter?: Record<string, FilterValue>): void => {
+        this.chatApi.listMcpServers({ filter })
+    }
+
+    onMcpServerClick = (id: string, title?: string, options?: Record<string, string>): void => {
+        this.chatApi.mcpServerClick({ id: id, title: title, optionsValues: options })
+    }
+
     onTabBarAction = (params: TabBarActionParams): void => {
         this.chatApi.tabBarAction(params)
     }

chat-client/src/client/mynahUi.test.ts

@@ -61,6 +61,8 @@ describe('MynahUI', () => {
             fileClick: sinon.stub(),
             listConversations: sinon.stub(),
             conversationClick: sinon.stub(),
+            listMcpServers: sinon.stub(),
+            mcpServerClick: sinon.stub(),
             tabBarAction: sinon.stub(),
             onGetSerializedChat: sinon.stub(),
             promptInputOptionChange: sinon.stub(),