fix: update shim return types and test mocks to use CallToolResult

- Update browser/node shim imports and return types from CallToolResultContent to CallToolResult
- Fix integration test mocks to return proper CallToolResult objects with content property
- Update mcpCache.test.ts to use correct CallToolResult type and format
- Update mcpToolFilter.integration.test.ts callTool method to return {content: [...]} format
- All tests pass, no linting errors

These are the final mechanical fixes for type consistency across the codebase.

Author: boice-sealint

packages/agents-core/src/shims/mcp-server/browser.ts

@@ -2,7 +2,7 @@ import {
   BaseMCPServerSSE,
   BaseMCPServerStdio,
   BaseMCPServerStreamableHttp,
-  CallToolResultContent,
+  CallToolResult,
   MCPServerSSEOptions,
   MCPServerStdioOptions,
   MCPServerStreamableHttpOptions,
@@ -28,7 +28,7 @@ export class MCPServerStdio extends BaseMCPServerStdio {
   callTool(
     _toolName: string,
     _args: Record<string, unknown> | null,
-  ): Promise<CallToolResultContent> {
+  ): Promise<CallToolResult> {
     throw new Error('Method not implemented.');
   }
   invalidateToolsCache(): Promise<void> {
@@ -55,7 +55,7 @@ export class MCPServerStreamableHttp extends BaseMCPServerStreamableHttp {
   callTool(
     _toolName: string,
     _args: Record<string, unknown> | null,
-  ): Promise<CallToolResultContent> {
+  ): Promise<CallToolResult> {
     throw new Error('Method not implemented.');
   }
   invalidateToolsCache(): Promise<void> {
@@ -84,7 +84,7 @@ export class MCPServerSSE extends BaseMCPServerSSE {
   callTool(
     _toolName: string,
     _args: Record<string, unknown> | null,
-  ): Promise<CallToolResultContent> {
+  ): Promise<CallToolResult> {
     throw new Error('Method not implemented.');
   }
 

packages/agents-core/src/shims/mcp-server/node.ts

@@ -5,7 +5,7 @@ import {
   BaseMCPServerStdio,
   BaseMCPServerStreamableHttp,
   BaseMCPServerSSE,
-  CallToolResultContent,
+  CallToolResult,
   DefaultMCPServerStdioOptions,
   InitializeResult,
   MCPServerStdioOptions,
@@ -124,7 +124,7 @@ export class NodeMCPServerStdio extends BaseMCPServerStdio {
   async callTool(
     toolName: string,
     args: Record<string, unknown> | null,
-  ): Promise<CallToolResultContent> {
+  ): Promise<CallToolResult> {
     const { CallToolResultSchema } = await import(
       '@modelcontextprotocol/sdk/types.js'
     ).catch(failedToImport);
@@ -149,7 +149,7 @@ export class NodeMCPServerStdio extends BaseMCPServerStdio {
       () =>
         `Called tool ${toolName} (args: ${JSON.stringify(args)}, result: ${JSON.stringify(result)})`,
     );
-    return result as CallToolResultContent;
+    return result as CallToolResult;
   }
 
   get name() {
@@ -245,7 +245,7 @@ export class NodeMCPServerSSE extends BaseMCPServerSSE {
   async callTool(
     toolName: string,
     args: Record<string, unknown> | null,
-  ): Promise<CallToolResultContent> {
+  ): Promise<CallToolResult> {
     const { CallToolResultSchema } = await import(
       '@modelcontextprotocol/sdk/types.js'
     ).catch(failedToImport);
@@ -270,7 +270,7 @@ export class NodeMCPServerSSE extends BaseMCPServerSSE {
       () =>
         `Called tool ${toolName} (args: ${JSON.stringify(args)}, result: ${JSON.stringify(result)})`,
     );
-    return result as CallToolResultContent;
+    return result as CallToolResult;
   }
 
   get name() {
@@ -371,7 +371,7 @@ export class NodeMCPServerStreamableHttp extends BaseMCPServerStreamableHttp {
   async callTool(
     toolName: string,
     args: Record<string, unknown> | null,
-  ): Promise<CallToolResultContent> {
+  ): Promise<CallToolResult> {
     const { CallToolResultSchema } = await import(
       '@modelcontextprotocol/sdk/types.js'
     ).catch(failedToImport);
@@ -396,7 +396,7 @@ export class NodeMCPServerStreamableHttp extends BaseMCPServerStreamableHttp {
       () =>
         `Called tool ${toolName} (args: ${JSON.stringify(args)}, result: ${JSON.stringify(result)})`,
     );
-    return result as CallToolResultContent;
+    return result as CallToolResult;
   }
 
   get name() {

packages/agents-core/test/mcpCache.test.ts

@@ -3,7 +3,7 @@ import { getAllMcpTools } from '../src/mcp';
 import type { FunctionTool } from '../src/tool';
 import { withTrace } from '../src/tracing';
 import { NodeMCPServerStdio } from '../src/shims/mcp-server/node';
-import type { CallToolResultContent } from '../src/mcp';
+import type { CallToolResult } from '../src/mcp';
 import { RunContext } from '../src/runContext';
 import { Agent } from '../src/agent';
 
@@ -27,8 +27,8 @@ class StubServer extends NodeMCPServerStdio {
   async callTool(
     _toolName: string,
     _args: Record<string, unknown> | null,
-  ): Promise<CallToolResultContent> {
-    return [];
+  ): Promise<CallToolResult> {
+    return { content: [] };
   }
 }
 

packages/agents-core/test/mcpToolFilter.integration.test.ts

@@ -60,23 +60,25 @@ class StubFilesystemServer extends NodeMCPServerStdio {
   async callTool(name: string, args: any) {
     const blocked = (this.toolFilter as any)?.blockedToolNames ?? [];
     if (blocked.includes(name)) {
-      return [
-        { type: 'text', text: `Tool "${name}" is blocked by MCP filter` },
-      ];
+      return {
+        content: [
+          { type: 'text', text: `Tool "${name}" is blocked by MCP filter` },
+        ],
+      };
     }
     if (name === 'list_directory') {
       const files = fs.readdirSync(this.dir);
-      return [{ type: 'text', text: files.join('\n') }];
+      return { content: [{ type: 'text', text: files.join('\n') }] };
     }
     if (name === 'read_file') {
       const text = fs.readFileSync(path.join(this.dir, args.path), 'utf8');
-      return [{ type: 'text', text }];
+      return { content: [{ type: 'text', text }] };
     }
     if (name === 'write_file') {
       fs.writeFileSync(path.join(this.dir, args.path), args.text, 'utf8');
-      return [{ type: 'text', text: 'ok' }];
+      return { content: [{ type: 'text', text: 'ok' }] };
     }
-    return [];
+    return { content: [] };
   }
 }