feat: ux changes for mcp http/sse support

Author: bywang56

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}`