aws
diff --git a/‎app/aws-lsp-codewhisperer-runtimes/src/agent-standalone.ts
Lines changed: 6 additions & 2 deletions b/‎app/aws-lsp-codewhisperer-runtimes/src/agent-standalone.ts
Lines changed: 6 additions & 2 deletions
diff --git a/‎chat-client/CHANGELOG.md
Lines changed: 4 additions & 4 deletions b/‎chat-client/CHANGELOG.md
Lines changed: 4 additions & 4 deletions
diff --git a/‎chat-client/src/client/chat.test.ts
Lines changed: 195 additions & 0 deletions b/‎chat-client/src/client/chat.test.ts
Lines changed: 195 additions & 0 deletions
diff --git a/‎chat-client/src/client/chat.ts
Lines changed: 32 additions & 3 deletions b/‎chat-client/src/client/chat.ts
Lines changed: 32 additions & 3 deletions
@@ -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,
 ])
 
 
@@ -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)
 
@@ -336,6 +336,201 @@ describe('Chat', () => {
             // @ts-expect-error: accessing prototype method
             assert.notCalled(TabFactory.prototype.enableExport)
         }).timeout(20000)
+
+        it('enables MCP when params.mcpServers is true and config.agenticMode is true', function () {
+            // Create a separate sandbox for this test
+            const testSandbox = sinon.createSandbox()
+
+            // Save original window functions
+            const originalAddEventListener = window.addEventListener
+            const originalDispatchEvent = window.dispatchEvent
+
+            try {
+                // Create a clean stub for this test
+                const enableMcpStub = testSandbox.stub(TabFactory.prototype, 'enableMcp')
+                const localClientApi = { postMessage: testSandbox.stub() }
+
+                // Mock the event handling to isolate this test
+                let messageHandler: any
+                window.addEventListener = (type: string, handler: any) => {
+                    if (type === 'message') {
+                        messageHandler = handler
+                    }
+                    return undefined as any
+                }
+
+                // Create a new chat instance specifically for this test
+                const localMynahUi = createChat(localClientApi, { agenticMode: true })
+
+                // Create a new event
+                const chatOptionsRequest = createInboundEvent({
+                    command: CHAT_OPTIONS,
+                    params: {
+                        mcpServers: true,
+                        chatNotifications: [],
+                    },
+                })
+
+                // Manually call the handler with our event
+                if (messageHandler) {
+                    messageHandler(chatOptionsRequest)
+                }
+
+                // Verify enableMcp was called exactly once
+                assert.calledOnce(enableMcpStub)
+            } finally {
+                // Restore window functions
+                window.addEventListener = originalAddEventListener
+                window.dispatchEvent = originalDispatchEvent
+                testSandbox.restore()
+            }
+        })
+
+        it('does not enable MCP when params.mcpServers is true but config.agenticMode is false', function () {
+            // Create a separate sandbox for this test
+            const testSandbox = sinon.createSandbox()
+
+            // Save original window functions
+            const originalAddEventListener = window.addEventListener
+            const originalDispatchEvent = window.dispatchEvent
+
+            try {
+                // Create a clean stub for this test
+                const enableMcpStub = testSandbox.stub(TabFactory.prototype, 'enableMcp')
+                const localClientApi = { postMessage: testSandbox.stub() }
+
+                // Mock the event handling to isolate this test
+                let messageHandler: any
+                window.addEventListener = (type: string, handler: any) => {
+                    if (type === 'message') {
+                        messageHandler = handler
+                    }
+                    return undefined as any
+                }
+
+                // Create a new chat instance specifically for this test
+                const localMynahUi = createChat(localClientApi, { agenticMode: false })
+
+                // Create a new event
+                const chatOptionsRequest = createInboundEvent({
+                    command: CHAT_OPTIONS,
+                    params: {
+                        mcpServers: true,
+                        chatNotifications: [],
+                    },
+                })
+
+                // Manually call the handler with our event
+                if (messageHandler) {
+                    messageHandler(chatOptionsRequest)
+                }
+
+                // Verify enableMcp was not called
+                assert.notCalled(enableMcpStub)
+            } finally {
+                // Restore window functions
+                window.addEventListener = originalAddEventListener
+                window.dispatchEvent = originalDispatchEvent
+                testSandbox.restore()
+            }
+        })
+
+        it('does not enable MCP when params.mcpServers is false and config.agenticMode is true', function () {
+            // Create a separate sandbox for this test
+            const testSandbox = sinon.createSandbox()
+
+            // Save original window functions
+            const originalAddEventListener = window.addEventListener
+            const originalDispatchEvent = window.dispatchEvent
+
+            try {
+                // Create a clean stub for this test
+                const enableMcpStub = testSandbox.stub(TabFactory.prototype, 'enableMcp')
+                const localClientApi = { postMessage: testSandbox.stub() }
+
+                // Mock the event handling to isolate this test
+                let messageHandler: any
+                window.addEventListener = (type: string, handler: any) => {
+                    if (type === 'message') {
+                        messageHandler = handler
+                    }
+                    return undefined as any
+                }
+
+                // Create a new chat instance specifically for this test
+                const localMynahUi = createChat(localClientApi, { agenticMode: true })
+
+                // Create a new event
+                const chatOptionsRequest = createInboundEvent({
+                    command: CHAT_OPTIONS,
+                    params: {
+                        mcpServers: false,
+                        chatNotifications: [],
+                    },
+                })
+
+                // Manually call the handler with our event
+                if (messageHandler) {
+                    messageHandler(chatOptionsRequest)
+                }
+
+                // Verify enableMcp was not called
+                assert.notCalled(enableMcpStub)
+            } finally {
+                // Restore window functions
+                window.addEventListener = originalAddEventListener
+                window.dispatchEvent = originalDispatchEvent
+                testSandbox.restore()
+            }
+        })
+
+        it('does not enable MCP when params.mcpServers is undefined and config.agenticMode is true', function () {
+            // Create a separate sandbox for this test
+            const testSandbox = sinon.createSandbox()
+
+            // Save original window functions
+            const originalAddEventListener = window.addEventListener
+            const originalDispatchEvent = window.dispatchEvent
+
+            try {
+                // Create a clean stub for this test
+                const enableMcpStub = testSandbox.stub(TabFactory.prototype, 'enableMcp')
+                const localClientApi = { postMessage: testSandbox.stub() }
+
+                // Mock the event handling to isolate this test
+                let messageHandler: any
+                window.addEventListener = (type: string, handler: any) => {
+                    if (type === 'message') {
+                        messageHandler = handler
+                    }
+                    return undefined as any
+                }
+
+                // Create a new chat instance specifically for this test
+                const localMynahUi = createChat(localClientApi, { agenticMode: true })
+
+                // Create a new event
+                const chatOptionsRequest = createInboundEvent({
+                    command: CHAT_OPTIONS,
+                    params: {
+                        chatNotifications: [],
+                    },
+                })
+
+                // Manually call the handler with our event
+                if (messageHandler) {
+                    messageHandler(chatOptionsRequest)
+                }
+
+                // Verify enableMcp was not called
+                assert.notCalled(enableMcpStub)
+            } finally {
+                // Restore window functions
+                window.addEventListener = originalAddEventListener
+                window.dispatchEvent = originalDispatchEvent
+                testSandbox.restore()
+            }
+        })
     })
 
     describe('onGetSerializedChat', () => {
 
@@ -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 })
         },