@openai/agents-core 0.11.6 → 0.11.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (67) hide show
  1. package/dist/index.d.ts +3 -3
  2. package/dist/index.js.map +1 -1
  3. package/dist/index.mjs.map +1 -1
  4. package/dist/items.d.ts +4 -1
  5. package/dist/items.js +4 -1
  6. package/dist/items.js.map +1 -1
  7. package/dist/items.mjs +4 -1
  8. package/dist/items.mjs.map +1 -1
  9. package/dist/mcp.d.ts +56 -5
  10. package/dist/mcp.js +111 -10
  11. package/dist/mcp.js.map +1 -1
  12. package/dist/mcp.mjs +110 -10
  13. package/dist/mcp.mjs.map +1 -1
  14. package/dist/mcpUtil.d.ts +24 -0
  15. package/dist/mcpUtil.js.map +1 -1
  16. package/dist/mcpUtil.mjs.map +1 -1
  17. package/dist/metadata.js +2 -2
  18. package/dist/metadata.mjs +2 -2
  19. package/dist/run.d.ts +5 -0
  20. package/dist/run.js +5 -0
  21. package/dist/run.js.map +1 -1
  22. package/dist/run.mjs +5 -0
  23. package/dist/run.mjs.map +1 -1
  24. package/dist/runState.d.ts +5 -1
  25. package/dist/runState.js +25 -2
  26. package/dist/runState.js.map +1 -1
  27. package/dist/runState.mjs +25 -2
  28. package/dist/runState.mjs.map +1 -1
  29. package/dist/runner/toolExecution.js +88 -16
  30. package/dist/runner/toolExecution.js.map +1 -1
  31. package/dist/runner/toolExecution.mjs +89 -17
  32. package/dist/runner/toolExecution.mjs.map +1 -1
  33. package/dist/sandbox/errors.d.ts +1 -0
  34. package/dist/sandbox/errors.js +81 -0
  35. package/dist/sandbox/errors.js.map +1 -1
  36. package/dist/sandbox/errors.mjs +81 -0
  37. package/dist/sandbox/errors.mjs.map +1 -1
  38. package/dist/sandbox/events.d.ts +1 -0
  39. package/dist/sandbox/events.js +8 -0
  40. package/dist/sandbox/events.js.map +1 -1
  41. package/dist/sandbox/events.mjs +8 -0
  42. package/dist/sandbox/events.mjs.map +1 -1
  43. package/dist/sandbox/runtime/spans.js +15 -3
  44. package/dist/sandbox/runtime/spans.js.map +1 -1
  45. package/dist/sandbox/runtime/spans.mjs +15 -3
  46. package/dist/sandbox/runtime/spans.mjs.map +1 -1
  47. package/dist/shims/mcp-server/browser.d.ts +4 -1
  48. package/dist/shims/mcp-server/browser.js +9 -0
  49. package/dist/shims/mcp-server/browser.js.map +1 -1
  50. package/dist/shims/mcp-server/browser.mjs +9 -0
  51. package/dist/shims/mcp-server/browser.mjs.map +1 -1
  52. package/dist/shims/mcp-server/node.d.ts +4 -1
  53. package/dist/shims/mcp-server/node.js +20 -3
  54. package/dist/shims/mcp-server/node.js.map +1 -1
  55. package/dist/shims/mcp-server/node.mjs +21 -4
  56. package/dist/shims/mcp-server/node.mjs.map +1 -1
  57. package/dist/tool.d.ts +52 -0
  58. package/dist/tool.js +6 -1
  59. package/dist/tool.js.map +1 -1
  60. package/dist/tool.mjs +5 -0
  61. package/dist/tool.mjs.map +1 -1
  62. package/dist/utils/customData.d.ts +5 -0
  63. package/dist/utils/customData.js +69 -0
  64. package/dist/utils/customData.js.map +1 -0
  65. package/dist/utils/customData.mjs +65 -0
  66. package/dist/utils/customData.mjs.map +1 -0
  67. package/package.json +1 -1
package/dist/index.d.ts CHANGED
@@ -14,9 +14,9 @@ export { extractAllTextOutput, RunHandoffCallItem, RunHandoffOutputItem, RunItem
14
14
  export { AgentHooks } from './lifecycle';
15
15
  export { getLogger } from './logger';
16
16
  export { applyDiff } from './utils/applyDiff';
17
- export { getAllMcpTools, invalidateServerToolsCache, mcpToFunctionTool, MCPBlobResourceContent, MCPListResourcesParams, MCPListResourcesResult, MCPListResourceTemplatesResult, MCPReadResourceResult, MCPResource, MCPResourceContent, MCPResourceTemplate, MCPServer, MCPServerWithResources, MCPServerStdio, MCPServerStreamableHttp, MCPServerSSE, MCPTextResourceContent, GetAllMcpToolsOptions, MCPToolCacheKeyGenerator, MCPToolErrorFunction, } from './mcp';
17
+ export { getAllMcpTools, invalidateServerToolsCache, mcpToFunctionTool, MCPBlobResourceContent, CallToolResult, CallToolResultContent, MCPListResourcesParams, MCPListResourcesResult, MCPListResourceTemplatesResult, MCPReadResourceResult, MCPResource, MCPResourceContent, MCPResourceTemplate, MCPServer, MCPServerWithResources, MCPServerStdio, MCPServerStreamableHttp, MCPServerSSE, MCPTextResourceContent, GetAllMcpToolsOptions, MCPToolCacheKeyGenerator, MCPToolErrorFunction, } from './mcp';
18
18
  export { MCPServers, MCPServersOptions, MCPServersReconnectOptions, connectMcpServers, } from './mcpServers';
19
- export { MCPToolFilterCallable, MCPToolFilterContext, MCPToolFilterStatic, MCPToolMetaContext, MCPToolMetaResolver, createMCPToolStaticFilter, } from './mcpUtil';
19
+ export { MCPToolFilterCallable, MCPToolFilterContext, MCPToolFilterStatic, MCPToolCustomDataContext, MCPToolCustomDataExtractor, MCPToolMetaContext, MCPToolMetaResolver, createMCPToolStaticFilter, } from './mcpUtil';
20
20
  export { Model, ModelProvider, ModelRetryAdvice, ModelRetryAdviceRequest, ModelRetryBackoffSettings, ModelRetryNormalizedError, ModelRetrySettings, ModelRequest, ModelResponse, ModelSettings, ModelSettingsContextManagement, ModelSettingsToolChoice, RetryDecision, RetryPolicy, RetryPolicyContext, SerializedHandoff, SerializedTool, SerializedOutputType, } from './model';
21
21
  export { OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME, gpt5ReasoningSettingsRequired, getDefaultModel, getDefaultModelSettings, isGpt5Default, } from './defaultModel';
22
22
  export { setDefaultModelProvider } from './providers';
@@ -29,7 +29,7 @@ export type { AgentToolInvocation } from './agentToolInvocation';
29
29
  export { RunState } from './runState';
30
30
  export type { TracingConfig } from './tracing';
31
31
  export { HostedTool, attachClientToolSearchExecutor, ComputerTool, computerTool, ShellTool, shellTool, ApplyPatchTool, applyPatchTool, HostedMCPTool, hostedMcpTool, FunctionTool, FunctionToolResult, FunctionToolTimeoutBehavior, ToolTimeoutErrorFunction, Tool, tool, toolNamespace, invokeFunctionTool, getClientToolSearchExecutor, getToolSearchRuntimeToolKey, ToolExecuteArgument, ToolEnabledFunction, ToolOptionsWithGuardrails, } from './tool';
32
- export type { ClientToolSearchExecutor, ClientToolSearchExecutorArgs, ClientToolSearchExecutorResult, ComputerOnSafetyCheckFunction, ComputerSafetyCheck, ComputerSafetyCheckResult, ShellToolEnvironment, ShellToolLocalEnvironment, ShellToolLocalSkill, ShellToolHostedEnvironment, ShellToolContainerAutoEnvironment, ShellToolContainerReferenceEnvironment, ShellToolContainerSkill, ShellToolSkillReference, ShellToolInlineSkill, ShellToolInlineSkillSource, ShellToolContainerNetworkPolicy, ShellToolContainerNetworkPolicyAllowlist, ShellToolContainerNetworkPolicyDisabled, ShellToolContainerNetworkPolicyDomainSecret, ToolInputParameters, ToolOptions, ToolNamespaceOptions, } from './tool';
32
+ export type { ClientToolSearchExecutor, ClientToolSearchExecutorArgs, ClientToolSearchExecutorResult, ComputerOnSafetyCheckFunction, ComputerSafetyCheck, ComputerSafetyCheckResult, ShellToolEnvironment, ShellToolLocalEnvironment, ShellToolLocalSkill, ShellToolHostedEnvironment, ShellToolContainerAutoEnvironment, ShellToolContainerReferenceEnvironment, ShellToolContainerSkill, ShellToolSkillReference, ShellToolInlineSkill, ShellToolInlineSkillSource, ShellToolContainerNetworkPolicy, ShellToolContainerNetworkPolicyAllowlist, ShellToolContainerNetworkPolicyDisabled, ShellToolContainerNetworkPolicyDomainSecret, ToolInputParameters, ToolOptions, ToolNamespaceOptions, ToolOutputCustomData, FunctionToolCustomDataContext, FunctionToolCustomDataExtractor, ComputerToolCustomDataContext, ComputerToolCustomDataExtractor, ApplyPatchToolCustomDataContext, ApplyPatchToolCustomDataExtractor, } from './tool';
33
33
  export type { ToolOutputText, ToolOutputImage, ToolOutputFileContent, ToolCallStructuredOutput, ToolCallOutputContent, } from './types/protocol';
34
34
  export * from './tracing';
35
35
  export { getGlobalTraceProvider, TraceProvider } from './tracing/provider';
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"OAAO,EAAE,iBAAiB,EAAE;OACrB,EAAE,gBAAgB,EAAE;OAEpB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B;OACzD,EACL,KAAK,GASN;OAUM,EACL,WAAW,EACX,uBAAuB,EACvB,+BAA+B,EAC/B,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,EACjB,gCAAgC,EAChC,mCAAmC,EACnC,oCAAoC,EACpC,aAAa,EACb,gBAAgB,EAChB,SAAS,EACT,WAAW,GACZ;OACM,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,GAEnB;OACM,EACL,qBAAqB,GAatB;OACM,EAYL,kCAAkC,EAClC,wBAAwB,EACxB,yBAAyB,EACzB,0BAA0B,EAC1B,2BAA2B,GAC5B;OACM,EACL,UAAU,EACV,kBAAkB,EAClB,OAAO,EAEP,OAAO,GAGR;OACM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE;OAC3B,EACL,oBAAoB,EACpB,kBAAkB,EAClB,oBAAoB,EAEpB,oBAAoB,EACpB,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,qBAAqB,EACrB,qBAAqB,EACrB,uBAAuB,GACxB;OACM,EAAE,UAAU,EAAE;OACd,EAAE,SAAS,EAAE;OACb,EAAE,SAAS,EAAE;OACb,EACL,cAAc,EACd,0BAA0B,EAC1B,iBAAiB,EAWjB,cAAc,EACd,uBAAuB,EACvB,YAAY,GAKb;OACM,EACL,UAAU,EAGV,iBAAiB,GAClB;OACM,EAML,yBAAyB,GAC1B;OAqBM,EACL,sCAAsC,EACtC,6BAA6B,EAC7B,eAAe,EACf,uBAAuB,EACvB,aAAa,GACd;OACM,EAAE,uBAAuB,EAAE;OAC3B,EAAE,aAAa,EAAE;OACjB,EAAE,SAAS,EAAE,iBAAiB,EAAE;OAChC,EAGL,GAAG,EAEH,MAAM,GAEP;OAkBM,EAAE,UAAU,EAAE;OAEd,EAAE,QAAQ,EAAE;OAEZ,EAEL,8BAA8B,EAE9B,YAAY,EAEZ,SAAS,EAET,cAAc,EAEd,aAAa,EAMb,IAAI,EACJ,aAAa,EACb,kBAAkB,EAClB,2BAA2B,EAC3B,2BAA2B,GAI5B;;OAkCM,EAAE,sBAAsB,EAAE,aAAa,EAAE;OACzC,EACL,sBAAsB,EACtB,uBAAuB,GACxB;OAkCM,EAAE,YAAY,EAAE,KAAK,EAAE;OAYvB,EACL,uCAAuC,EACvC,mCAAmC,GACpC;OACM,EAAE,4BAA4B,EAAE;OAChC,EAAE,aAAa,EAAE;OAMjB,KAAK,QAAQ;AAEpB;;;;;GAKG;AACH,iBAAiB,CAAC,gBAAgB,EAAE,CAAC,CAAC"}
1
+ {"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"OAAO,EAAE,iBAAiB,EAAE;OACrB,EAAE,gBAAgB,EAAE;OAEpB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B;OACzD,EACL,KAAK,GASN;OAUM,EACL,WAAW,EACX,uBAAuB,EACvB,+BAA+B,EAC/B,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,EACjB,gCAAgC,EAChC,mCAAmC,EACnC,oCAAoC,EACpC,aAAa,EACb,gBAAgB,EAChB,SAAS,EACT,WAAW,GACZ;OACM,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,GAEnB;OACM,EACL,qBAAqB,GAatB;OACM,EAYL,kCAAkC,EAClC,wBAAwB,EACxB,yBAAyB,EACzB,0BAA0B,EAC1B,2BAA2B,GAC5B;OACM,EACL,UAAU,EACV,kBAAkB,EAClB,OAAO,EAEP,OAAO,GAGR;OACM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE;OAC3B,EACL,oBAAoB,EACpB,kBAAkB,EAClB,oBAAoB,EAEpB,oBAAoB,EACpB,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,qBAAqB,EACrB,qBAAqB,EACrB,uBAAuB,GACxB;OACM,EAAE,UAAU,EAAE;OACd,EAAE,SAAS,EAAE;OACb,EAAE,SAAS,EAAE;OACb,EACL,cAAc,EACd,0BAA0B,EAC1B,iBAAiB,EAajB,cAAc,EACd,uBAAuB,EACvB,YAAY,GAKb;OACM,EACL,UAAU,EAGV,iBAAiB,GAClB;OACM,EAQL,yBAAyB,GAC1B;OAqBM,EACL,sCAAsC,EACtC,6BAA6B,EAC7B,eAAe,EACf,uBAAuB,EACvB,aAAa,GACd;OACM,EAAE,uBAAuB,EAAE;OAC3B,EAAE,aAAa,EAAE;OACjB,EAAE,SAAS,EAAE,iBAAiB,EAAE;OAChC,EAGL,GAAG,EAEH,MAAM,GAEP;OAkBM,EAAE,UAAU,EAAE;OAEd,EAAE,QAAQ,EAAE;OAEZ,EAEL,8BAA8B,EAE9B,YAAY,EAEZ,SAAS,EAET,cAAc,EAEd,aAAa,EAMb,IAAI,EACJ,aAAa,EACb,kBAAkB,EAClB,2BAA2B,EAC3B,2BAA2B,GAI5B;;OAyCM,EAAE,sBAAsB,EAAE,aAAa,EAAE;OACzC,EACL,sBAAsB,EACtB,uBAAuB,GACxB;OAkCM,EAAE,YAAY,EAAE,KAAK,EAAE;OAYvB,EACL,uCAAuC,EACvC,mCAAmC,GACpC;OACM,EAAE,4BAA4B,EAAE;OAChC,EAAE,aAAa,EAAE;OAMjB,KAAK,QAAQ;AAEpB;;;;;GAKG;AACH,iBAAiB,CAAC,gBAAgB,EAAE,CAAC,CAAC"}
package/dist/items.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { Agent } from './agent';
2
2
  import * as protocol from './types/protocol';
3
+ import type { ToolOutputCustomData } from './utils/customData';
3
4
  export declare class RunItemBase {
4
5
  readonly type: string;
5
6
  rawItem?: protocol.ModelItem;
@@ -1702,13 +1703,15 @@ export declare class RunToolCallOutputItem extends RunItemBase {
1702
1703
  rawItem: protocol.FunctionCallResultItem | protocol.ComputerCallResultItem | protocol.ShellCallResultItem | protocol.ApplyPatchCallResultItem;
1703
1704
  agent: Agent<any, any>;
1704
1705
  output: string | unknown;
1706
+ customData?: ToolOutputCustomData | undefined;
1705
1707
  readonly type: "tool_call_output_item";
1706
- constructor(rawItem: protocol.FunctionCallResultItem | protocol.ComputerCallResultItem | protocol.ShellCallResultItem | protocol.ApplyPatchCallResultItem, agent: Agent<any, any>, output: string | unknown);
1708
+ constructor(rawItem: protocol.FunctionCallResultItem | protocol.ComputerCallResultItem | protocol.ShellCallResultItem | protocol.ApplyPatchCallResultItem, agent: Agent<any, any>, output: string | unknown, customData?: ToolOutputCustomData | undefined);
1707
1709
  toJSON(): {
1708
1710
  agent: {
1709
1711
  name: string;
1710
1712
  };
1711
1713
  output: string;
1714
+ customData: ToolOutputCustomData | undefined;
1712
1715
  type: string;
1713
1716
  rawItem: {
1714
1717
  role: "assistant";
package/dist/items.js CHANGED
@@ -103,18 +103,21 @@ class RunToolCallOutputItem extends RunItemBase {
103
103
  rawItem;
104
104
  agent;
105
105
  output;
106
+ customData;
106
107
  type = 'tool_call_output_item';
107
- constructor(rawItem, agent, output) {
108
+ constructor(rawItem, agent, output, customData) {
108
109
  super();
109
110
  this.rawItem = rawItem;
110
111
  this.agent = agent;
111
112
  this.output = output;
113
+ this.customData = customData;
112
114
  }
113
115
  toJSON() {
114
116
  return {
115
117
  ...super.toJSON(),
116
118
  agent: this.agent.toJSON(),
117
119
  output: (0, smartString_1.toSmartString)(this.output),
120
+ customData: this.customData,
118
121
  };
119
122
  }
120
123
  get callId() {
package/dist/items.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"items.js","sourceRoot":"","sources":["../src/items.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"items.js","sourceRoot":"","sources":["../src/items.ts"],"names":[],"mappings":"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"}
package/dist/items.mjs CHANGED
@@ -94,18 +94,21 @@ export class RunToolCallOutputItem extends RunItemBase {
94
94
  rawItem;
95
95
  agent;
96
96
  output;
97
+ customData;
97
98
  type = 'tool_call_output_item';
98
- constructor(rawItem, agent, output) {
99
+ constructor(rawItem, agent, output, customData) {
99
100
  super();
100
101
  this.rawItem = rawItem;
101
102
  this.agent = agent;
102
103
  this.output = output;
104
+ this.customData = customData;
103
105
  }
104
106
  toJSON() {
105
107
  return {
106
108
  ...super.toJSON(),
107
109
  agent: this.agent.toJSON(),
108
110
  output: toSmartString(this.output),
111
+ customData: this.customData,
109
112
  };
110
113
  }
111
114
  get callId() {
@@ -1 +1 @@
1
- {"version":3,"file":"items.mjs","sourceRoot":"","sources":["../src/items.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"items.mjs","sourceRoot":"","sources":["../src/items.ts"],"names":[],"mappings":"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"}
package/dist/mcp.d.ts CHANGED
@@ -2,7 +2,7 @@ import { FunctionTool, Tool } from './tool';
2
2
  import { Logger } from './logger';
3
3
  import { z } from 'zod';
4
4
  import { JsonObjectSchemaNonStrict, JsonObjectSchemaStrict, UnknownContext } from './types';
5
- import type { MCPToolFilterCallable, MCPToolFilterStatic, MCPToolMetaResolver } from './mcpUtil';
5
+ import type { MCPToolCustomDataExtractor, MCPToolFilterCallable, MCPToolFilterStatic, MCPToolMetaResolver } from './mcpUtil';
6
6
  import type { RunContext } from './runContext';
7
7
  import type { Agent } from './agent';
8
8
  export declare const DEFAULT_STDIO_MCP_CLIENT_LOGGER_NAME = "openai-agents:stdio-mcp-client";
@@ -20,6 +20,12 @@ export interface MCPServer {
20
20
  cacheToolsList: boolean;
21
21
  toolFilter?: MCPToolFilterCallable | MCPToolFilterStatic;
22
22
  toolMetaResolver?: MCPToolMetaResolver;
23
+ customDataExtractor?: MCPToolCustomDataExtractor;
24
+ /**
25
+ * Whether to use MCP `structuredContent` as the model-visible tool output when available.
26
+ * Defaults to false to preserve the existing content-based output behavior.
27
+ */
28
+ useStructuredContent?: boolean;
23
29
  /**
24
30
  * Optional function to convert MCP tool failures into model-visible messages.
25
31
  * Set to null to rethrow errors instead of converting them.
@@ -30,6 +36,10 @@ export interface MCPServer {
30
36
  close(): Promise<void>;
31
37
  listTools(): Promise<MCPTool[]>;
32
38
  callTool(toolName: string, args: Record<string, unknown> | null, meta?: Record<string, unknown> | null): Promise<CallToolResultContent>;
39
+ /**
40
+ * Invoke a tool and return the full serializable MCP result.
41
+ */
42
+ callToolResult?(toolName: string, args: Record<string, unknown> | null, meta?: Record<string, unknown> | null): Promise<CallToolResult>;
33
43
  invalidateToolsCache(): Promise<void>;
34
44
  }
35
45
  /**
@@ -119,6 +129,8 @@ export declare abstract class BaseMCPServerStdio implements MCPServer {
119
129
  protected _cachedTools: any[] | undefined;
120
130
  toolFilter?: MCPToolFilterCallable | MCPToolFilterStatic;
121
131
  toolMetaResolver?: MCPToolMetaResolver;
132
+ customDataExtractor?: MCPToolCustomDataExtractor;
133
+ useStructuredContent?: boolean;
122
134
  errorFunction?: MCPToolErrorFunction | null;
123
135
  protected logger: Logger;
124
136
  constructor(options: MCPServerStdioOptions);
@@ -127,6 +139,7 @@ export declare abstract class BaseMCPServerStdio implements MCPServer {
127
139
  abstract close(): Promise<void>;
128
140
  abstract listTools(): Promise<any[]>;
129
141
  abstract callTool(_toolName: string, _args: Record<string, unknown> | null, _meta?: Record<string, unknown> | null): Promise<CallToolResultContent>;
142
+ abstract callToolResult(_toolName: string, _args: Record<string, unknown> | null, _meta?: Record<string, unknown> | null): Promise<CallToolResult>;
130
143
  abstract listResources(_params?: MCPListResourcesParams): Promise<MCPListResourcesResult>;
131
144
  abstract listResourceTemplates(_params?: MCPListResourcesParams): Promise<MCPListResourceTemplatesResult>;
132
145
  abstract readResource(_uri: string): Promise<MCPReadResourceResult>;
@@ -142,6 +155,8 @@ export declare abstract class BaseMCPServerStreamableHttp implements MCPServer {
142
155
  protected _cachedTools: any[] | undefined;
143
156
  toolFilter?: MCPToolFilterCallable | MCPToolFilterStatic;
144
157
  toolMetaResolver?: MCPToolMetaResolver;
158
+ customDataExtractor?: MCPToolCustomDataExtractor;
159
+ useStructuredContent?: boolean;
145
160
  errorFunction?: MCPToolErrorFunction | null;
146
161
  protected logger: Logger;
147
162
  constructor(options: MCPServerStreamableHttpOptions);
@@ -150,6 +165,7 @@ export declare abstract class BaseMCPServerStreamableHttp implements MCPServer {
150
165
  abstract close(): Promise<void>;
151
166
  abstract listTools(): Promise<any[]>;
152
167
  abstract callTool(_toolName: string, _args: Record<string, unknown> | null, _meta?: Record<string, unknown> | null): Promise<CallToolResultContent>;
168
+ abstract callToolResult(_toolName: string, _args: Record<string, unknown> | null, _meta?: Record<string, unknown> | null): Promise<CallToolResult>;
153
169
  abstract listResources(_params?: MCPListResourcesParams): Promise<MCPListResourcesResult>;
154
170
  abstract listResourceTemplates(_params?: MCPListResourcesParams): Promise<MCPListResourceTemplatesResult>;
155
171
  abstract readResource(_uri: string): Promise<MCPReadResourceResult>;
@@ -166,6 +182,8 @@ export declare abstract class BaseMCPServerSSE implements MCPServer {
166
182
  protected _cachedTools: any[] | undefined;
167
183
  toolFilter?: MCPToolFilterCallable | MCPToolFilterStatic;
168
184
  toolMetaResolver?: MCPToolMetaResolver;
185
+ customDataExtractor?: MCPToolCustomDataExtractor;
186
+ useStructuredContent?: boolean;
169
187
  errorFunction?: MCPToolErrorFunction | null;
170
188
  protected logger: Logger;
171
189
  constructor(options: MCPServerSSEOptions);
@@ -174,6 +192,7 @@ export declare abstract class BaseMCPServerSSE implements MCPServer {
174
192
  abstract close(): Promise<void>;
175
193
  abstract listTools(): Promise<any[]>;
176
194
  abstract callTool(_toolName: string, _args: Record<string, unknown> | null, _meta?: Record<string, unknown> | null): Promise<CallToolResultContent>;
195
+ abstract callToolResult(_toolName: string, _args: Record<string, unknown> | null, _meta?: Record<string, unknown> | null): Promise<CallToolResult>;
177
196
  abstract listResources(_params?: MCPListResourcesParams): Promise<MCPListResourcesResult>;
178
197
  abstract listResourceTemplates(_params?: MCPListResourcesParams): Promise<MCPListResourceTemplatesResult>;
179
198
  abstract readResource(_uri: string): Promise<MCPReadResourceResult>;
@@ -212,6 +231,7 @@ export declare class MCPServerStdio extends BaseMCPServerStdio implements MCPSer
212
231
  close(): Promise<void>;
213
232
  listTools(): Promise<MCPTool[]>;
214
233
  callTool(toolName: string, args: Record<string, unknown> | null, meta?: Record<string, unknown> | null): Promise<CallToolResultContent>;
234
+ callToolResult(toolName: string, args: Record<string, unknown> | null, meta?: Record<string, unknown> | null): Promise<CallToolResult>;
215
235
  listResources(params?: MCPListResourcesParams): Promise<MCPListResourcesResult>;
216
236
  listResourceTemplates(params?: MCPListResourcesParams): Promise<MCPListResourceTemplatesResult>;
217
237
  readResource(uri: string): Promise<MCPReadResourceResult>;
@@ -228,6 +248,7 @@ export declare class MCPServerStreamableHttp extends BaseMCPServerStreamableHttp
228
248
  close(): Promise<void>;
229
249
  listTools(): Promise<MCPTool[]>;
230
250
  callTool(toolName: string, args: Record<string, unknown> | null, meta?: Record<string, unknown> | null): Promise<CallToolResultContent>;
251
+ callToolResult(toolName: string, args: Record<string, unknown> | null, meta?: Record<string, unknown> | null): Promise<CallToolResult>;
231
252
  listResources(params?: MCPListResourcesParams): Promise<MCPListResourcesResult>;
232
253
  listResourceTemplates(params?: MCPListResourcesParams): Promise<MCPListResourceTemplatesResult>;
233
254
  readResource(uri: string): Promise<MCPReadResourceResult>;
@@ -241,6 +262,7 @@ export declare class MCPServerSSE extends BaseMCPServerSSE implements MCPServerW
241
262
  close(): Promise<void>;
242
263
  listTools(): Promise<MCPTool[]>;
243
264
  callTool(toolName: string, args: Record<string, unknown> | null, meta?: Record<string, unknown> | null): Promise<CallToolResultContent>;
265
+ callToolResult(toolName: string, args: Record<string, unknown> | null, meta?: Record<string, unknown> | null): Promise<CallToolResult>;
244
266
  listResources(params?: MCPListResourcesParams): Promise<MCPListResourcesResult>;
245
267
  listResourceTemplates(params?: MCPListResourcesParams): Promise<MCPListResourceTemplatesResult>;
246
268
  readResource(uri: string): Promise<MCPReadResourceResult>;
@@ -311,6 +333,14 @@ export interface BaseMCPServerStdioOptions {
311
333
  * Invoked before calling `callTool`.
312
334
  */
313
335
  toolMetaResolver?: MCPToolMetaResolver;
336
+ /**
337
+ * Whether to use MCP `structuredContent` as model-visible output when available.
338
+ */
339
+ useStructuredContent?: boolean;
340
+ /**
341
+ * Optional callback that attaches SDK-only custom data to local MCP tool output items.
342
+ */
343
+ customDataExtractor?: MCPToolCustomDataExtractor;
314
344
  /**
315
345
  * Optional function to convert MCP tool failures into model-visible messages.
316
346
  * Set to null to rethrow errors instead of converting them.
@@ -338,6 +368,14 @@ export interface MCPServerStreamableHttpOptions {
338
368
  * Invoked before calling `callTool`.
339
369
  */
340
370
  toolMetaResolver?: MCPToolMetaResolver;
371
+ /**
372
+ * Whether to use MCP `structuredContent` as model-visible output when available.
373
+ */
374
+ useStructuredContent?: boolean;
375
+ /**
376
+ * Optional callback that attaches SDK-only custom data to local MCP tool output items.
377
+ */
378
+ customDataExtractor?: MCPToolCustomDataExtractor;
341
379
  /**
342
380
  * Optional function to convert MCP tool failures into model-visible messages.
343
381
  * Set to null to rethrow errors instead of converting them.
@@ -362,6 +400,14 @@ export interface MCPServerSSEOptions {
362
400
  * Invoked before calling `callTool`.
363
401
  */
364
402
  toolMetaResolver?: MCPToolMetaResolver;
403
+ /**
404
+ * Whether to use MCP `structuredContent` as model-visible output when available.
405
+ */
406
+ useStructuredContent?: boolean;
407
+ /**
408
+ * Optional callback that attaches SDK-only custom data to local MCP tool output items.
409
+ */
410
+ customDataExtractor?: MCPToolCustomDataExtractor;
365
411
  /**
366
412
  * Optional function to convert MCP tool failures into model-visible messages.
367
413
  * Set to null to rethrow errors instead of converting them.
@@ -401,14 +447,19 @@ export interface JsonRpcResponse {
401
447
  }
402
448
  export interface CallToolResponse extends JsonRpcResponse {
403
449
  result: {
404
- content: {
450
+ content: Array<{
405
451
  type: string;
406
- text: string;
407
- }[];
452
+ [key: string]: unknown;
453
+ }>;
454
+ _meta?: Record<string, unknown>;
455
+ structuredContent?: Record<string, unknown>;
456
+ isError?: boolean;
408
457
  };
409
458
  }
410
459
  export type CallToolResult = CallToolResponse['result'];
411
- export type CallToolResultContent = CallToolResult['content'];
460
+ export type CallToolResultMetadata = Pick<CallToolResult, '_meta' | 'structuredContent' | 'isError'>;
461
+ export type CallToolResultContent = CallToolResult['content'] & CallToolResultMetadata;
462
+ export declare function attachCallToolResultMetadata(content: CallToolResult['content'], metadata: CallToolResultMetadata): CallToolResultContent;
412
463
  export interface InitializeResponse extends JsonRpcResponse {
413
464
  result: {
414
465
  protocolVersion: string;
package/dist/mcp.js CHANGED
@@ -7,6 +7,7 @@ exports.defaultMCPToolCacheKey = exports.MCPServerSSE = exports.MCPServerStreama
7
7
  exports.invalidateServerToolsCache = invalidateServerToolsCache;
8
8
  exports.getAllMcpTools = getAllMcpTools;
9
9
  exports.mcpToFunctionTool = mcpToFunctionTool;
10
+ exports.attachCallToolResultMetadata = attachCallToolResultMetadata;
10
11
  const tool_1 = require("./tool.js");
11
12
  const errors_1 = require("./errors.js");
12
13
  const _shims_1 = require("@openai/agents-core/_shims");
@@ -14,6 +15,7 @@ const tracing_1 = require("./tracing/index.js");
14
15
  const logger_1 = require("./logger.js");
15
16
  const debug_1 = __importDefault(require("debug"));
16
17
  const zod_1 = require("zod");
18
+ const customData_1 = require("./utils/customData.js");
17
19
  exports.DEFAULT_STDIO_MCP_CLIENT_LOGGER_NAME = 'openai-agents:stdio-mcp-client';
18
20
  exports.DEFAULT_STREAMABLE_HTTP_MCP_CLIENT_LOGGER_NAME = 'openai-agents:streamable-http-mcp-client';
19
21
  exports.DEFAULT_SSE_MCP_CLIENT_LOGGER_NAME = 'openai-agents:sse-mcp-client';
@@ -24,6 +26,8 @@ class BaseMCPServerStdio {
24
26
  _cachedTools = undefined;
25
27
  toolFilter;
26
28
  toolMetaResolver;
29
+ customDataExtractor;
30
+ useStructuredContent;
27
31
  errorFunction;
28
32
  logger;
29
33
  constructor(options) {
@@ -32,6 +36,8 @@ class BaseMCPServerStdio {
32
36
  this.cacheToolsList = options.cacheToolsList ?? false;
33
37
  this.toolFilter = options.toolFilter;
34
38
  this.toolMetaResolver = options.toolMetaResolver;
39
+ this.customDataExtractor = options.customDataExtractor;
40
+ this.useStructuredContent = options.useStructuredContent;
35
41
  this.errorFunction = options.errorFunction;
36
42
  }
37
43
  /**
@@ -51,6 +57,8 @@ class BaseMCPServerStreamableHttp {
51
57
  _cachedTools = undefined;
52
58
  toolFilter;
53
59
  toolMetaResolver;
60
+ customDataExtractor;
61
+ useStructuredContent;
54
62
  errorFunction;
55
63
  logger;
56
64
  constructor(options) {
@@ -60,6 +68,8 @@ class BaseMCPServerStreamableHttp {
60
68
  this.cacheToolsList = options.cacheToolsList ?? false;
61
69
  this.toolFilter = options.toolFilter;
62
70
  this.toolMetaResolver = options.toolMetaResolver;
71
+ this.customDataExtractor = options.customDataExtractor;
72
+ this.useStructuredContent = options.useStructuredContent;
63
73
  this.errorFunction = options.errorFunction;
64
74
  }
65
75
  /**
@@ -79,6 +89,8 @@ class BaseMCPServerSSE {
79
89
  _cachedTools = undefined;
80
90
  toolFilter;
81
91
  toolMetaResolver;
92
+ customDataExtractor;
93
+ useStructuredContent;
82
94
  errorFunction;
83
95
  logger;
84
96
  constructor(options) {
@@ -87,6 +99,8 @@ class BaseMCPServerSSE {
87
99
  this.cacheToolsList = options.cacheToolsList ?? false;
88
100
  this.toolFilter = options.toolFilter;
89
101
  this.toolMetaResolver = options.toolMetaResolver;
102
+ this.customDataExtractor = options.customDataExtractor;
103
+ this.useStructuredContent = options.useStructuredContent;
90
104
  this.errorFunction = options.errorFunction;
91
105
  }
92
106
  /**
@@ -145,8 +159,11 @@ class MCPServerStdio extends BaseMCPServerStdio {
145
159
  }
146
160
  return tools;
147
161
  }
148
- callTool(toolName, args, meta) {
149
- return this.underlying.callTool(toolName, args, meta);
162
+ async callTool(toolName, args, meta) {
163
+ return (await this.callToolResult(toolName, args, meta)).content;
164
+ }
165
+ callToolResult(toolName, args, meta) {
166
+ return this.underlying.callToolResult(toolName, args, meta);
150
167
  }
151
168
  listResources(params) {
152
169
  return this.underlying.listResources(params);
@@ -207,9 +224,12 @@ class MCPServerStreamableHttp extends BaseMCPServerStreamableHttp {
207
224
  return tools;
208
225
  }
209
226
  async callTool(toolName, args, meta) {
227
+ return (await this.callToolResult(toolName, args, meta)).content;
228
+ }
229
+ async callToolResult(toolName, args, meta) {
210
230
  const previousSessionId = this.sessionId;
211
231
  try {
212
- return await this.underlying.callTool(toolName, args, meta);
232
+ return await this.underlying.callToolResult(toolName, args, meta);
213
233
  }
214
234
  finally {
215
235
  if (previousSessionId !== this.sessionId) {
@@ -257,8 +277,11 @@ class MCPServerSSE extends BaseMCPServerSSE {
257
277
  }
258
278
  return tools;
259
279
  }
260
- callTool(toolName, args, meta) {
261
- return this.underlying.callTool(toolName, args, meta);
280
+ async callTool(toolName, args, meta) {
281
+ return (await this.callToolResult(toolName, args, meta)).content;
282
+ }
283
+ callToolResult(toolName, args, meta) {
284
+ return this.underlying.callToolResult(toolName, args, meta);
262
285
  }
263
286
  listResources(params) {
264
287
  return this.underlying.listResources(params);
@@ -665,6 +688,7 @@ async function resolveMcpToolMeta(server, runContext, toolName, args) {
665
688
  }
666
689
  function mcpToFunctionTool(mcpTool, server, convertSchemasToStrict, options = {}) {
667
690
  const toolName = options.toolNameOverride ?? mcpTool.name;
691
+ const customDataByCall = new WeakMap();
668
692
  const serverErrorFunction = server.errorFunction;
669
693
  const mcpErrorFunction = serverErrorFunction !== undefined
670
694
  ? serverErrorFunction
@@ -672,7 +696,7 @@ function mcpToFunctionTool(mcpTool, server, convertSchemasToStrict, options = {}
672
696
  const errorFunction = typeof mcpErrorFunction === 'function'
673
697
  ? (context, error) => mcpErrorFunction({ context, error })
674
698
  : mcpErrorFunction;
675
- async function invoke(input, runContext) {
699
+ async function invoke(input, runContext, details) {
676
700
  let args = {};
677
701
  if (typeof input === 'string' && input) {
678
702
  args = JSON.parse(input);
@@ -687,10 +711,47 @@ function mcpToFunctionTool(mcpTool, server, convertSchemasToStrict, options = {}
687
711
  const meta = runContext
688
712
  ? await resolveMcpToolMeta(server, runContext, mcpTool.name, args)
689
713
  : undefined;
690
- const content = meta === undefined
691
- ? await server.callTool(mcpTool.name, args)
692
- : await server.callTool(mcpTool.name, args, meta);
693
- return content.length === 1 ? content[0] : content;
714
+ const result = (server.useStructuredContent === true ||
715
+ server.customDataExtractor !== undefined) &&
716
+ server.callToolResult
717
+ ? meta === undefined
718
+ ? await server.callToolResult(mcpTool.name, args)
719
+ : await server.callToolResult(mcpTool.name, args, meta)
720
+ : {
721
+ content: meta === undefined
722
+ ? await server.callTool(mcpTool.name, args)
723
+ : await server.callTool(mcpTool.name, args, meta),
724
+ };
725
+ const content = result.content;
726
+ const resultMeta = result._meta ?? content._meta;
727
+ const structuredContent = result.structuredContent ?? content.structuredContent;
728
+ const isError = result.isError ?? content.isError;
729
+ const toolOutput = server.useStructuredContent === true &&
730
+ isError !== true &&
731
+ structuredContent !== undefined
732
+ ? JSON.stringify(structuredContent)
733
+ : content.length === 1
734
+ ? content[0]
735
+ : content;
736
+ if (runContext && details?.toolCall?.callId && server.customDataExtractor) {
737
+ let byCall = customDataByCall.get(runContext);
738
+ if (!byCall) {
739
+ byCall = new Map();
740
+ customDataByCall.set(runContext, byCall);
741
+ }
742
+ byCall.set(details.toolCall.callId, {
743
+ runContext,
744
+ serverName: server.name,
745
+ toolName: mcpTool.name,
746
+ toolDisplayName: toolName,
747
+ arguments: cloneMcpCustomDataContextValue(args),
748
+ resultMeta: cloneMcpCustomDataContextValue(resultMeta),
749
+ structuredContent: cloneMcpCustomDataContextValue(structuredContent),
750
+ isError,
751
+ toolOutput: cloneMcpCustomDataContextValue(toolOutput),
752
+ });
753
+ }
754
+ return toolOutput;
694
755
  }
695
756
  const schema = {
696
757
  ...mcpTool.inputSchema,
@@ -709,6 +770,12 @@ function mcpToFunctionTool(mcpTool, server, convertSchemasToStrict, options = {}
709
770
  strict: true,
710
771
  execute: invoke,
711
772
  errorFunction,
773
+ customDataExtractor: async (context) => {
774
+ const mcpContext = getMcpCustomDataContext(customDataByCall, context.runContext, context.toolCall.callId);
775
+ return mcpContext
776
+ ? (0, customData_1.maybeExtractToolOutputCustomData)(server.customDataExtractor, mcpContext)
777
+ : undefined;
778
+ },
712
779
  });
713
780
  }
714
781
  catch (e) {
@@ -726,8 +793,28 @@ function mcpToFunctionTool(mcpTool, server, convertSchemasToStrict, options = {}
726
793
  strict: false,
727
794
  execute: invoke,
728
795
  errorFunction,
796
+ customDataExtractor: async (context) => {
797
+ const mcpContext = getMcpCustomDataContext(customDataByCall, context.runContext, context.toolCall.callId);
798
+ return mcpContext
799
+ ? (0, customData_1.maybeExtractToolOutputCustomData)(server.customDataExtractor, mcpContext)
800
+ : undefined;
801
+ },
729
802
  });
730
803
  }
804
+ function getMcpCustomDataContext(contexts, runContext, callId) {
805
+ const byCall = contexts.get(runContext);
806
+ const context = byCall?.get(callId);
807
+ byCall?.delete(callId);
808
+ return context;
809
+ }
810
+ function cloneMcpCustomDataContextValue(value) {
811
+ try {
812
+ return structuredClone(value);
813
+ }
814
+ catch {
815
+ return value;
816
+ }
817
+ }
731
818
  /**
732
819
  * Ensures the given JSON schema is strict (no additional properties, required fields set).
733
820
  */
@@ -740,4 +827,18 @@ function ensureStrictJsonSchema(schema) {
740
827
  out.required = [];
741
828
  return out;
742
829
  }
830
+ function attachCallToolResultMetadata(content, metadata) {
831
+ const result = content;
832
+ for (const [key, value] of Object.entries(metadata)) {
833
+ if (typeof value === 'undefined') {
834
+ continue;
835
+ }
836
+ Object.defineProperty(result, key, {
837
+ value,
838
+ enumerable: false,
839
+ configurable: true,
840
+ });
841
+ }
842
+ return result;
843
+ }
743
844
  //# sourceMappingURL=mcp.js.map