Fix mcp for subagents!

Author: jahooma

.agents/types/util-types.ts

@@ -141,12 +141,12 @@ export type MCPConfig =
       command: string
       args?: string[]
       env?: Record<string, string>
-      headers?: Record<string, string>
     }
   | {
       type?: 'http' | 'sse'
       url: string
       params?: Record<string, string>
+      headers?: Record<string, string>
     }
 
 // ============================================================================

agents/types/util-types.ts

@@ -141,12 +141,12 @@ export type MCPConfig =
       command: string
       args?: string[]
       env?: Record<string, string>
-      headers?: Record<string, string>
     }
   | {
       type?: 'http' | 'sse'
       url: string
       params?: Record<string, string>
+      headers?: Record<string, string>
     }
 
 // ============================================================================

common/src/templates/initial-agents-dir/types/util-types.ts

@@ -134,12 +134,12 @@ export type MCPConfig =
       command: string
       args?: string[]
       env?: Record<string, string>
-      headers?: Record<string, string>
     }
   | {
       type?: 'http' | 'sse'
       url: string
       params?: Record<string, string>
+      headers?: Record<string, string>
     }
 
 // ============================================================================

sdk/src/run.ts

@@ -6,7 +6,7 @@ import {
   getCancelledAdditionalMessages,
 } from '@codebuff/agent-runtime/util/messages'
 import { MAX_AGENT_STEPS_DEFAULT } from '@codebuff/common/constants/agents'
-import { getMCPClient, listMCPTools } from '@codebuff/common/mcp/client'
+import { getMCPClient, listMCPTools, callMCPTool } from '@codebuff/common/mcp/client'
 import { toOptionalFile } from '@codebuff/common/old-constants'
 import { toolNames } from '@codebuff/common/tools/constants'
 import { clientToolCallSchema } from '@codebuff/common/tools/list'
@@ -552,6 +552,30 @@ async function handleToolCall({
   const toolName = action.toolName
   const input = action.input
 
+  // Handle MCP tool calls when mcpConfig is present
+  if (action.mcpConfig) {
+    try {
+      const mcpClientId = await getMCPClient(action.mcpConfig)
+      const result = await callMCPTool(mcpClientId, {
+        name: toolName,
+        arguments: input,
+      })
+      return { output: result }
+    } catch (error) {
+      return {
+        output: [
+          {
+            type: 'json',
+            value: {
+              errorMessage:
+                error instanceof Error ? error.message : String(error),
+            },
+          },
+        ],
+      }
+    }
+  }
+
   let result: ToolResultOutput[]
   if (toolNames.includes(toolName as ToolName)) {
     clientToolCallSchema.parse(action)