Add allowed_tools and headers to hosted mcp server factory method

Author: seratch

examples/mcp/filesystem-example.ts

@@ -16,7 +16,7 @@ async function main() {
   try {
     await withTrace('MCP Filesystem Example', async () => {
       const agent = new Agent({
-        name: 'Assistant',
+        name: 'MCP Assistant',
         instructions:
           'Use the tools to read the filesystem and answer questions based on those files. If you are unable to find any files, you can say so instead of assuming they exist.',
         mcpServers: [mcpServer],
@@ -25,20 +25,20 @@ async function main() {
       let message = 'Read the files and list them.';
       console.log(`Running: ${message}`);
       let result = await run(agent, message);
-      console.log(result.finalOutput ?? result.output ?? result);
+      console.log(result.finalOutput);
 
       // Ask about books
       message = 'What is my #1 favorite book?';
       console.log(`\nRunning: ${message}\n`);
       result = await run(agent, message);
-      console.log(result.finalOutput ?? result.output ?? result);
+      console.log(result.finalOutput);
 
       // Ask a question that reads then reasons
       message =
         'Look at my favorite songs. Suggest one new song that I might like.';
       console.log(`\nRunning: ${message}\n`);
       result = await run(agent, message);
-      console.log(result.finalOutput ?? result.output ?? result);
+      console.log(result.finalOutput);
     });
   } finally {
     await mcpServer.close();

examples/mcp/hosted-mcp-human-in-the-loop.ts

@@ -1,8 +1,8 @@
-import * as readline from 'readline/promises';
-import { stdin, stdout } from 'node:process';
 import { Agent, run, hostedMcpTool, RunToolApprovalItem } from '@openai/agents';
+import * as readline from 'node:readline/promises';
+import { stdin, stdout } from 'node:process';
 
-async function promptApproval(item: RunToolApprovalItem): Promise<boolean> {
+async function confirm(item: RunToolApprovalItem): Promise<boolean> {
   const rl = readline.createInterface({ input: stdin, output: stdout });
   const name = item.rawItem.name;
   const params = JSON.parse(item.rawItem.providerData?.arguments || '{}');
@@ -14,9 +14,7 @@ async function promptApproval(item: RunToolApprovalItem): Promise<boolean> {
 }
 
 async function main(verbose: boolean, stream: boolean): Promise<void> {
-  // 'always' |
-  // 'never'  |
-  // { never?: { toolNames: string[] }; always?: { toolNames: string[] } }
+  // 'always' | 'never' | { never, always }
   const requireApproval = {
     never: { toolNames: ['search_codex_code', 'fetch_codex_documentation'] },
     always: { toolNames: ['fetch_generic_url_content'] },
@@ -54,17 +52,18 @@ async function main(verbose: boolean, stream: boolean): Promise<void> {
     console.log(`Done streaming; final result: ${result.finalOutput}`);
   } else {
     // Non-streaming
-    let result = await run(agent, input, { maxTurns: 100 });
+    let result = await run(agent, input);
     while (result.interruptions && result.interruptions.length) {
       for (const interruption of result.interruptions) {
-        const approval = await promptApproval(interruption);
+        // Human in the loop here
+        const approval = await confirm(interruption);
         if (approval) {
           result.state.approve(interruption);
         } else {
           result.state.reject(interruption);
         }
       }
-      result = await run(agent, result.state, { maxTurns: 100 });
+      result = await run(agent, result.state);
     }
     console.log(result.finalOutput);
 

examples/mcp/hosted-mcp-on-approval.ts

@@ -14,9 +14,7 @@ async function promptApproval(item: RunToolApprovalItem): Promise<boolean> {
 }
 
 async function main(verbose: boolean, stream: boolean): Promise<void> {
-  // 'always' |
-  // 'never'  |
-  // { never?: { toolNames: string[] }; always?: { toolNames: string[] } }
+  // 'always' | 'never' | { never, always }
   const requireApproval = {
     never: {
       toolNames: ['fetch_codex_documentation', 'fetch_generic_url_content'],
@@ -34,6 +32,7 @@ async function main(verbose: boolean, stream: boolean): Promise<void> {
         serverUrl: 'https://gitmcp.io/openai/codex',
         requireApproval,
         onApproval: async (_context, item) => {
+          // Human in the loop here
           const approval = await promptApproval(item);
           return { approve: approval, reason: undefined };
         },

examples/mcp/hosted-mcp-simple.ts

@@ -9,7 +9,6 @@ async function main(verbose: boolean, stream: boolean): Promise<void> {
         hostedMcpTool({
           serverLabel: 'gitmcp',
           serverUrl: 'https://gitmcp.io/openai/codex',
-          requireApproval: 'never',
         }),
       ],
     });

packages/agents-core/src/tool.ts

@@ -136,8 +136,10 @@ export function hostedMcpTool<Context = UnknownContext>(
   options: {
     serverLabel: string;
     serverUrl: string;
+    allowedTools?: string[] | { toolNames?: string[] };
+    headers?: Record<string, string>;
   } & (
-    | { requireApproval: never }
+    | { requireApproval?: never }
     | { requireApproval: 'never' }
     | {
         requireApproval:
@@ -151,20 +153,25 @@ export function hostedMcpTool<Context = UnknownContext>(
   ),
 ): HostedMCPTool<Context> {
   const providerData: ProviderData.HostedMCPTool<Context> =
+    typeof options.requireApproval === 'undefined' ||
     options.requireApproval === 'never'
       ? {
           type: 'mcp',
           server_label: options.serverLabel,
           server_url: options.serverUrl,
           require_approval: 'never',
+          allowed_tools: toMcpAllowedToolsFilter(options.allowedTools),
+          headers: options.headers,
         }
       : {
           type: 'mcp',
           server_label: options.serverLabel,
           server_url: options.serverUrl,
+          allowed_tools: toMcpAllowedToolsFilter(options.allowedTools),
+          headers: options.headers,
           require_approval:
             typeof options.requireApproval === 'string'
-              ? options.requireApproval
+              ? 'always'
               : buildRequireApproval(options.requireApproval),
           on_approval: options.onApproval,
         };
@@ -595,3 +602,15 @@ function buildRequireApproval(requireApproval: {
   }
   return result;
 }
+
+function toMcpAllowedToolsFilter(
+  allowedTools: string[] | { toolNames?: string[] } | undefined,
+): { tool_names: string[] } | undefined {
+  if (typeof allowedTools === 'undefined') {
+    return undefined;
+  }
+  if (Array.isArray(allowedTools)) {
+    return { tool_names: allowedTools };
+  }
+  return { tool_names: allowedTools?.toolNames ?? [] };
+}

packages/agents-core/src/types/providerData.ts

@@ -8,6 +8,8 @@ export type HostedMCPTool<Context = UnknownContext> = {
   type: 'mcp';
   server_label: string;
   server_url: string;
+  allowed_tools?: string[] | { tool_names: string[] };
+  headers?: Record<string, string>;
 } & (
   | { require_approval?: 'never'; on_approval?: never }
   | {

packages/agents-openai/src/openaiResponsesModel.ts

@@ -191,6 +191,8 @@ function converTool<_TContext = unknown>(
           type: 'mcp',
           server_label: tool.providerData.server_label,
           server_url: tool.providerData.server_url,
+          allowed_tools: tool.providerData.allowed_tools,
+          headers: tool.providerData.headers,
           require_approval: convertMCPRequireApproval(
             tool.providerData.require_approval,
           ),