feat: ux changes for mcp http/sse support

Author: bywang56

chat-client/src/client/mcpMynahUi.ts

@@ -461,12 +461,13 @@ export class McpMynahUi {
                     this.messager.onListMcpServers()
                 },
                 onFilterValueChange: (filterValues: Record<string, any>) => {
-                    const newTransport = filterValues.transport
-                    // only fire when transport actually changes
-                    if (newTransport !== _lastTransport) {
-                        _lastTransport = newTransport
-                        this.messager.onMcpServerClick(MCP_IDS.CHANGE_TRANSPORT, filterValues.name, filterValues)
+                    const newTransport = filterValues?.transport
+                    if (!newTransport || newTransport === _lastTransport) {
+                        return
                     }
+
+                    _lastTransport = newTransport
+                    this.messager.onMcpServerClick(MCP_IDS.CHANGE_TRANSPORT, filterValues.name, filterValues)
                 },
                 onFilterActionClick: (
                     actionParams: McpServerClickResult,

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

@@ -552,26 +552,17 @@ export class McpEventHandler {
         }
 
         const transport = values.transport
-        const usingStdio = !!values.command?.trim()
-        const usingHttp = !!values.url?.trim()
+        const command = values.command?.trim() || ''
+        const url = values.url?.trim() || ''
 
-        if (transport) {
-            if (transport === 'stdio') {
-                if (!usingStdio) {
-                    errors.push('Command is required for stdio transport')
-                }
-            } else {
-                if (!usingHttp) {
-                    errors.push(`URL is required for ${transport} transport`)
-                }
-            }
-        }
-
-        // Validate mutual exclusivity and presence of either
-        if (usingStdio && usingHttp) {
-            errors.push('Provide either command OR url, not both')
-        } else if (!usingStdio && !usingHttp) {
+        if (!command && !url) {
             errors.push('Either command or url is required')
+        } else if (command && url) {
+            errors.push('Provide either command OR url, not both')
+        } else if (transport === 'stdio' && !command) {
+            errors.push('Command is required for stdio transport')
+        } else if (transport !== 'stdio' && !url) {
+            errors.push(`URL is required for ${transport} transport`)
         }
 
         if (values.timeout && values.timeout.trim() !== '') {
@@ -606,17 +597,19 @@ export class McpEventHandler {
 
         if (Array.isArray(values.headers)) {
             const hdrs = values.headers as Array<{ key: string; value: string }>
-            const emptyKeyWithValue = hdrs.some(
-                h => (!h.key || h.key.trim() === '') && h.value && h.value.trim() !== ''
-            )
-            const keyWithEmptyValue = hdrs.some(
-                h => h.key && h.key.trim() !== '' && (!h.value || h.value.trim() === '')
-            )
-            if (emptyKeyWithValue) {
-                errors.push('Header key cannot be empty when value is provided')
-            }
-            if (keyWithEmptyValue) {
-                errors.push('Header value cannot be empty when key is provided')
+            const invalidHeaders = hdrs.find(h => {
+                const key = h.key?.trim() || ''
+                const value = h.value?.trim() || ''
+                return (key === '' && value !== '') || (key !== '' && value === '')
+            })
+
+            if (invalidHeaders) {
+                const hasKey = invalidHeaders.key?.trim()
+                errors.push(
+                    hasKey
+                        ? 'Header value cannot be empty when key is provided'
+                        : 'Header key cannot be empty when value is provided'
+                )
             }
         }
 
@@ -665,7 +658,7 @@ export class McpEventHandler {
                     )
                     .filter(Boolean)
             } catch (e) {
-                this.#features.logging.warn(`Failed to process args: ${e}`)
+                this.#features.logging.warn(`MCP: Failed to process args: ${e}`)
             }
 
             try {
@@ -678,7 +671,7 @@ export class McpEventHandler {
                     return acc
                 }, {})
             } catch (e) {
-                this.#features.logging.warn(`Failed to process env variables: ${e}`)
+                this.#features.logging.warn(`MCP: Failed to process env variables: ${e}`)
             }
         }
 
@@ -699,7 +692,7 @@ export class McpEventHandler {
                     return acc
                 }, {})
             } catch (e) {
-                this.#features.logging.warn(`Failed to process headers: ${e}`)
+                this.#features.logging.warn(`MCP: Failed to process headers: ${e}`)
             }
         }
 
@@ -1072,29 +1065,26 @@ export class McpEventHandler {
     }
 
     async #handleChangeTransport(params: McpServerClickParams) {
+        const { optionsValues, title } = params
         const editingServerName = this.#currentEditingServerName
 
-        if (params.optionsValues) {
-            const transport = params.optionsValues.transport ?? 'stdio'
-            if (transport === 'http') {
-                delete params.optionsValues.command
-                delete params.optionsValues.args
-                delete params.optionsValues.env_variables
-            } else {
-                delete params.optionsValues.url
-                delete params.optionsValues.headers
-            }
+        // Clean up transport-specific fields
+        if (optionsValues) {
+            const transport = optionsValues.transport ?? 'stdio' // Maintain default to 'stdio'
+            const fieldsToDelete = transport === 'http' ? ['command', 'args', 'env_variables'] : ['url', 'headers']
+
+            fieldsToDelete.forEach(field => delete optionsValues[field])
         }
 
-        // Handle server name change if in edit mode
-        if (editingServerName && params.title && editingServerName !== params.title) {
+        // Handle server name change in edit mode
+        if (editingServerName && title && editingServerName !== title) {
             const servers = McpManager.instance.getAllServerConfigs()
             const existingConfig = servers.get(editingServerName)
 
             if (existingConfig) {
                 const updatedServers = new Map(servers)
                 updatedServers.delete(editingServerName)
-                updatedServers.set(params.title, existingConfig)
+                updatedServers.set(title, existingConfig)
                 await McpManager.instance.updateServerMap(updatedServers)
             }
             this.#serverNameBeforeUpdate = editingServerName

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

@@ -235,7 +235,22 @@ describe('addServer()', () => {
     })
 
     it('persists and initializes an HTTP server', async () => {
-        loadStub.resolves({ servers: new Map(), serverNameMapping: new Map(), errors: new Map() })
+        loadStub.resolves({
+            servers: new Map(),
+            serverNameMapping: new Map(),
+            errors: new Map(),
+            agentConfig: {
+                name: 'test-agent',
+                version: '1.0.0',
+                description: 'Test agent',
+                mcpServers: {},
+                tools: [],
+                allowedTools: [],
+                toolsSettings: {},
+                includedFiles: [],
+                resources: [],
+            },
+        })
         const mgr = await McpManager.init([], features)
 
         const httpCfg: MCPServerConfig = {

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

@@ -633,7 +633,6 @@ export class McpManager {
 
             // We don't need to store configPath anymore as we're using agent config
             const newCfg: MCPServerConfig = { ...cfg, __configPath__: agentPath }
-
             this.mcpServers.set(sanitizedName, newCfg)
             this.serverNameMapping.set(sanitizedName, serverName)
 

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

@@ -408,13 +408,17 @@ export async function loadAgentConfig(
                 serverNameMapping.set(sanitizedName, name)
 
                 // Add to agent config
-                agentConfig.mcpServers[name] = {
-                    command: cfg.command,
-                    args: cfg.args,
-                    env: cfg.env,
-                    initializationTimeout: cfg.initializationTimeout,
-                    timeout: cfg.timeout,
+                const agentEntry: any = {}
+                if (cfg.command) agentEntry.command = cfg.command
+                if (cfg.url) agentEntry.url = cfg.url
+                if (cfg.args && cfg.args.length) agentEntry.args = cfg.args
+                if (cfg.env && Object.keys(cfg.env).length) agentEntry.env = cfg.env
+                if (cfg.headers && Object.keys(cfg.headers).length) agentEntry.headers = cfg.headers
+                if (typeof cfg.initializationTimeout === 'number') {
+                    agentEntry.initializationTimeout = cfg.initializationTimeout
                 }
+                if (typeof cfg.timeout === 'number') agentEntry.timeout = cfg.timeout
+                agentConfig.mcpServers[name] = agentEntry
 
                 logging.info(
                     `Loaded MCP server with sanitizedName: '${sanitizedName}' and originalName: '${name}' from ${fsPath}`