@openai/agents-core 0.5.4 → 0.7.0

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 (121) hide show
  1. package/dist/agentToolRunConfig.js +2 -10
  2. package/dist/agentToolRunConfig.js.map +1 -1
  3. package/dist/agentToolRunConfig.mjs +2 -10
  4. package/dist/agentToolRunConfig.mjs.map +1 -1
  5. package/dist/computer.d.ts +10 -2
  6. package/dist/events.d.ts +1 -1
  7. package/dist/events.js.map +1 -1
  8. package/dist/events.mjs.map +1 -1
  9. package/dist/extensions/handoffFilters.d.ts +4 -3
  10. package/dist/extensions/handoffFilters.js +8 -3
  11. package/dist/extensions/handoffFilters.js.map +1 -1
  12. package/dist/extensions/handoffFilters.mjs +9 -4
  13. package/dist/extensions/handoffFilters.mjs.map +1 -1
  14. package/dist/index.d.ts +6 -5
  15. package/dist/index.js +10 -2
  16. package/dist/index.js.map +1 -1
  17. package/dist/index.mjs +3 -2
  18. package/dist/index.mjs.map +1 -1
  19. package/dist/items.d.ts +1158 -32
  20. package/dist/items.js +56 -2
  21. package/dist/items.js.map +1 -1
  22. package/dist/items.mjs +53 -1
  23. package/dist/items.mjs.map +1 -1
  24. package/dist/metadata.js +3 -3
  25. package/dist/metadata.mjs +3 -3
  26. package/dist/model.d.ts +160 -2
  27. package/dist/run.js +6 -8
  28. package/dist/run.js.map +1 -1
  29. package/dist/run.mjs +8 -10
  30. package/dist/run.mjs.map +1 -1
  31. package/dist/runContext.js +116 -67
  32. package/dist/runContext.js.map +1 -1
  33. package/dist/runContext.mjs +116 -67
  34. package/dist/runContext.mjs.map +1 -1
  35. package/dist/runState.d.ts +493 -17
  36. package/dist/runState.js +303 -12
  37. package/dist/runState.js.map +1 -1
  38. package/dist/runState.mjs +304 -13
  39. package/dist/runState.mjs.map +1 -1
  40. package/dist/runner/modelOutputs.d.ts +5 -1
  41. package/dist/runner/modelOutputs.js +552 -12
  42. package/dist/runner/modelOutputs.js.map +1 -1
  43. package/dist/runner/modelOutputs.mjs +552 -13
  44. package/dist/runner/modelOutputs.mjs.map +1 -1
  45. package/dist/runner/modelPreparation.js +5 -2
  46. package/dist/runner/modelPreparation.js.map +1 -1
  47. package/dist/runner/modelPreparation.mjs +5 -2
  48. package/dist/runner/modelPreparation.mjs.map +1 -1
  49. package/dist/runner/modelRetry.d.ts +13 -0
  50. package/dist/runner/modelRetry.js +581 -0
  51. package/dist/runner/modelRetry.js.map +1 -0
  52. package/dist/runner/modelRetry.mjs +576 -0
  53. package/dist/runner/modelRetry.mjs.map +1 -0
  54. package/dist/runner/modelSettings.d.ts +1 -0
  55. package/dist/runner/modelSettings.js +9 -0
  56. package/dist/runner/modelSettings.js.map +1 -1
  57. package/dist/runner/modelSettings.mjs +7 -0
  58. package/dist/runner/modelSettings.mjs.map +1 -1
  59. package/dist/runner/modelSettingsMerge.d.ts +2 -0
  60. package/dist/runner/modelSettingsMerge.js +54 -0
  61. package/dist/runner/modelSettingsMerge.js.map +1 -0
  62. package/dist/runner/modelSettingsMerge.mjs +51 -0
  63. package/dist/runner/modelSettingsMerge.mjs.map +1 -0
  64. package/dist/runner/sessionPersistence.js +17 -3
  65. package/dist/runner/sessionPersistence.js.map +1 -1
  66. package/dist/runner/sessionPersistence.mjs +17 -3
  67. package/dist/runner/sessionPersistence.mjs.map +1 -1
  68. package/dist/runner/streaming.js +8 -0
  69. package/dist/runner/streaming.js.map +1 -1
  70. package/dist/runner/streaming.mjs +9 -1
  71. package/dist/runner/streaming.mjs.map +1 -1
  72. package/dist/runner/toolExecution.js +102 -67
  73. package/dist/runner/toolExecution.js.map +1 -1
  74. package/dist/runner/toolExecution.mjs +102 -67
  75. package/dist/runner/toolExecution.mjs.map +1 -1
  76. package/dist/runner/toolSearch.d.ts +23 -0
  77. package/dist/runner/toolSearch.js +426 -0
  78. package/dist/runner/toolSearch.js.map +1 -0
  79. package/dist/runner/toolSearch.mjs +416 -0
  80. package/dist/runner/toolSearch.mjs.map +1 -0
  81. package/dist/runner/turnResolution.js +2 -1
  82. package/dist/runner/turnResolution.js.map +1 -1
  83. package/dist/runner/turnResolution.mjs +2 -1
  84. package/dist/runner/turnResolution.mjs.map +1 -1
  85. package/dist/tool.d.ts +50 -0
  86. package/dist/tool.js +79 -0
  87. package/dist/tool.js.map +1 -1
  88. package/dist/tool.mjs +74 -0
  89. package/dist/tool.mjs.map +1 -1
  90. package/dist/toolIdentity.d.ts +23 -0
  91. package/dist/toolIdentity.js +105 -0
  92. package/dist/toolIdentity.js.map +1 -0
  93. package/dist/toolIdentity.mjs +89 -0
  94. package/dist/toolIdentity.mjs.map +1 -0
  95. package/dist/tooling.d.ts +24 -0
  96. package/dist/tooling.js +110 -0
  97. package/dist/tooling.js.map +1 -0
  98. package/dist/tooling.mjs +97 -0
  99. package/dist/tooling.mjs.map +1 -0
  100. package/dist/types/aliases.d.ts +3 -3
  101. package/dist/types/protocol.d.ts +417 -12
  102. package/dist/types/protocol.js +59 -4
  103. package/dist/types/protocol.js.map +1 -1
  104. package/dist/types/protocol.mjs +57 -2
  105. package/dist/types/protocol.mjs.map +1 -1
  106. package/dist/types/providerData.d.ts +2 -0
  107. package/dist/utils/index.d.ts +2 -0
  108. package/dist/utils/index.js +15 -1
  109. package/dist/utils/index.js.map +1 -1
  110. package/dist/utils/index.mjs +2 -0
  111. package/dist/utils/index.mjs.map +1 -1
  112. package/dist/utils/serialize.js +37 -6
  113. package/dist/utils/serialize.js.map +1 -1
  114. package/dist/utils/serialize.mjs +37 -6
  115. package/dist/utils/serialize.mjs.map +1 -1
  116. package/dist/utils/toolSearch.d.ts +1 -0
  117. package/dist/utils/toolSearch.js +13 -0
  118. package/dist/utils/toolSearch.js.map +1 -0
  119. package/dist/utils/toolSearch.mjs +2 -0
  120. package/dist/utils/toolSearch.mjs.map +1 -0
  121. package/package.json +2 -2
@@ -4,12 +4,12 @@ exports.setAgentToolParentRunConfigOnDetails = setAgentToolParentRunConfigOnDeta
4
4
  exports.getAgentToolParentRunConfigFromDetails = getAgentToolParentRunConfigFromDetails;
5
5
  exports.getInheritedAgentToolRunConfig = getInheritedAgentToolRunConfig;
6
6
  exports.mergeAgentToolRunConfig = mergeAgentToolRunConfig;
7
+ const modelSettingsMerge_1 = require("./runner/modelSettingsMerge.js");
7
8
  const TRANSPORT_OVERRIDE_PROVIDER_DATA_ALIAS_KEYS = [
8
9
  ['extra_headers', 'extraHeaders'],
9
10
  ['extra_query', 'extraQuery'],
10
11
  ['extra_body', 'extraBody'],
11
12
  ];
12
- const NESTED_MODEL_SETTINGS_MERGE_KEYS = ['reasoning', 'text'];
13
13
  const AGENT_TOOL_PARENT_RUN_CONFIG_SYMBOL = Symbol('openai.agents.agentToolParentRunConfig');
14
14
  function isPlainObjectLike(value) {
15
15
  return typeof value === 'object' && value !== null && !Array.isArray(value);
@@ -122,15 +122,7 @@ function mergeAgentToolModelSettings(inheritedRunConfig, toolRunConfigOverride)
122
122
  !toolModelSettings) {
123
123
  return undefined;
124
124
  }
125
- const mergedModelSettings = {
126
- ...inheritedModelSettings,
127
- ...toolModelSettings,
128
- };
129
- const inheritedModelSettingsRecord = inheritedModelSettings;
130
- const toolModelSettingsRecord = toolModelSettings;
131
- for (const key of NESTED_MODEL_SETTINGS_MERGE_KEYS) {
132
- mergeNestedObjectMap(mergedModelSettings, inheritedModelSettingsRecord, toolModelSettingsRecord, key);
133
- }
125
+ const mergedModelSettings = (0, modelSettingsMerge_1.mergeModelSettings)(inheritedModelSettings, toolModelSettings);
134
126
  const inheritedProviderData = inheritedModelSettings.providerData;
135
127
  const toolProviderData = toolModelSettings.providerData;
136
128
  const hasToolProviderDataOverride = hasOwn(toolModelSettings, 'providerData');
@@ -1 +1 @@
1
- {"version":3,"file":"agentToolRunConfig.js","sourceRoot":"","sources":["../src/agentToolRunConfig.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"agentToolRunConfig.js","sourceRoot":"","sources":["../src/agentToolRunConfig.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,9 @@
1
+ import { mergeModelSettings } from "./runner/modelSettingsMerge.mjs";
1
2
  const TRANSPORT_OVERRIDE_PROVIDER_DATA_ALIAS_KEYS = [
2
3
  ['extra_headers', 'extraHeaders'],
3
4
  ['extra_query', 'extraQuery'],
4
5
  ['extra_body', 'extraBody'],
5
6
  ];
6
- const NESTED_MODEL_SETTINGS_MERGE_KEYS = ['reasoning', 'text'];
7
7
  const AGENT_TOOL_PARENT_RUN_CONFIG_SYMBOL = Symbol('openai.agents.agentToolParentRunConfig');
8
8
  function isPlainObjectLike(value) {
9
9
  return typeof value === 'object' && value !== null && !Array.isArray(value);
@@ -116,15 +116,7 @@ function mergeAgentToolModelSettings(inheritedRunConfig, toolRunConfigOverride)
116
116
  !toolModelSettings) {
117
117
  return undefined;
118
118
  }
119
- const mergedModelSettings = {
120
- ...inheritedModelSettings,
121
- ...toolModelSettings,
122
- };
123
- const inheritedModelSettingsRecord = inheritedModelSettings;
124
- const toolModelSettingsRecord = toolModelSettings;
125
- for (const key of NESTED_MODEL_SETTINGS_MERGE_KEYS) {
126
- mergeNestedObjectMap(mergedModelSettings, inheritedModelSettingsRecord, toolModelSettingsRecord, key);
127
- }
119
+ const mergedModelSettings = mergeModelSettings(inheritedModelSettings, toolModelSettings);
128
120
  const inheritedProviderData = inheritedModelSettings.providerData;
129
121
  const toolProviderData = toolModelSettings.providerData;
130
122
  const hasToolProviderDataOverride = hasOwn(toolModelSettings, 'providerData');
@@ -1 +1 @@
1
- {"version":3,"file":"agentToolRunConfig.mjs","sourceRoot":"","sources":["../src/agentToolRunConfig.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"agentToolRunConfig.mjs","sourceRoot":"","sources":["../src/agentToolRunConfig.ts"],"names":[],"mappings":"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"}
@@ -8,8 +8,16 @@ type Promisable<T> = T | Promise<T>;
8
8
  * Interface to implement for a computer environment to be used by the agent.
9
9
  */
10
10
  interface ComputerBase {
11
- environment: Environment;
12
- dimensions: [number, number];
11
+ /**
12
+ * Optional display environment metadata.
13
+ * Required when targeting preview computer tool wire formats.
14
+ */
15
+ environment?: Environment;
16
+ /**
17
+ * Optional display dimensions metadata.
18
+ * Required when targeting preview computer tool wire formats.
19
+ */
20
+ dimensions?: [number, number];
13
21
  initRun?(runContext?: RunContext): Promisable<void>;
14
22
  screenshot(runContext?: RunContext): Promisable<string>;
15
23
  click(x: number, y: number, button: Button, runContext?: RunContext): Promisable<void>;
package/dist/events.d.ts CHANGED
@@ -19,7 +19,7 @@ export declare class RunRawModelStreamEvent {
19
19
  /**
20
20
  * The names of the events that can be generated by the agent.
21
21
  */
22
- export type RunItemStreamEventName = 'message_output_created' | 'handoff_requested' | 'handoff_occurred' | 'tool_called' | 'tool_output' | 'reasoning_item_created' | 'tool_approval_requested';
22
+ export type RunItemStreamEventName = 'message_output_created' | 'handoff_requested' | 'handoff_occurred' | 'tool_search_called' | 'tool_search_output_created' | 'tool_called' | 'tool_output' | 'reasoning_item_created' | 'tool_approval_requested';
23
23
  /**
24
24
  * Streaming events that wrap a `RunItem`. As the agent processes the LLM response, it will generate
25
25
  * these events from new messages, tool calls, tool outputs, handoffs, etc.
@@ -1 +1 @@
1
- {"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":";;;AAIA;;;GAGG;AACH,MAAa,sBAAsB;IASd;IARnB;;OAEG;IACa,IAAI,GAAG,wBAAwB,CAAC;IAEhD;;OAEG;IACH,YAAmB,IAAyB;QAAzB,SAAI,GAAJ,IAAI,CAAqB;IAAG,CAAC;CACjD;AAVD,wDAUC;AAcD;;;GAGG;AACH,MAAa,kBAAkB;IAQpB;IACA;IARO,IAAI,GAAG,uBAAuB,CAAC;IAE/C;;;OAGG;IACH,YACS,IAA4B,EAC5B,IAAa;QADb,SAAI,GAAJ,IAAI,CAAwB;QAC5B,SAAI,GAAJ,IAAI,CAAS;IACnB,CAAC;CACL;AAXD,gDAWC;AAED;;GAEG;AACH,MAAa,0BAA0B;IAMlB;IALH,IAAI,GAAG,4BAA4B,CAAC;IAEpD;;OAEG;IACH,YAAmB,KAAsB;QAAtB,UAAK,GAAL,KAAK,CAAiB;IAAG,CAAC;CAC9C;AAPD,gEAOC"}
1
+ {"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":";;;AAIA;;;GAGG;AACH,MAAa,sBAAsB;IASd;IARnB;;OAEG;IACa,IAAI,GAAG,wBAAwB,CAAC;IAEhD;;OAEG;IACH,YAAmB,IAAyB;QAAzB,SAAI,GAAJ,IAAI,CAAqB;IAAG,CAAC;CACjD;AAVD,wDAUC;AAgBD;;;GAGG;AACH,MAAa,kBAAkB;IAQpB;IACA;IARO,IAAI,GAAG,uBAAuB,CAAC;IAE/C;;;OAGG;IACH,YACS,IAA4B,EAC5B,IAAa;QADb,SAAI,GAAJ,IAAI,CAAwB;QAC5B,SAAI,GAAJ,IAAI,CAAS;IACnB,CAAC;CACL;AAXD,gDAWC;AAED;;GAEG;AACH,MAAa,0BAA0B;IAMlB;IALH,IAAI,GAAG,4BAA4B,CAAC;IAEpD;;OAEG;IACH,YAAmB,KAAsB;QAAtB,UAAK,GAAL,KAAK,CAAiB;IAAG,CAAC;CAC9C;AAPD,gEAOC"}
@@ -1 +1 @@
1
- {"version":3,"file":"events.mjs","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,MAAM,OAAO,sBAAsB;IASd;IARnB;;OAEG;IACa,IAAI,GAAG,wBAAwB,CAAC;IAEhD;;OAEG;IACH,YAAmB,IAAyB;QAAzB,SAAI,GAAJ,IAAI,CAAqB;IAAG,CAAC;CACjD;AAcD;;;GAGG;AACH,MAAM,OAAO,kBAAkB;IAQpB;IACA;IARO,IAAI,GAAG,uBAAuB,CAAC;IAE/C;;;OAGG;IACH,YACS,IAA4B,EAC5B,IAAa;QADb,SAAI,GAAJ,IAAI,CAAwB;QAC5B,SAAI,GAAJ,IAAI,CAAS;IACnB,CAAC;CACL;AAED;;GAEG;AACH,MAAM,OAAO,0BAA0B;IAMlB;IALH,IAAI,GAAG,4BAA4B,CAAC;IAEpD;;OAEG;IACH,YAAmB,KAAsB;QAAtB,UAAK,GAAL,KAAK,CAAiB;IAAG,CAAC;CAC9C"}
1
+ {"version":3,"file":"events.mjs","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,MAAM,OAAO,sBAAsB;IASd;IARnB;;OAEG;IACa,IAAI,GAAG,wBAAwB,CAAC;IAEhD;;OAEG;IACH,YAAmB,IAAyB;QAAzB,SAAI,GAAJ,IAAI,CAAqB;IAAG,CAAC;CACjD;AAgBD;;;GAGG;AACH,MAAM,OAAO,kBAAkB;IAQpB;IACA;IARO,IAAI,GAAG,uBAAuB,CAAC;IAE/C;;;OAGG;IACH,YACS,IAA4B,EAC5B,IAAa;QADb,SAAI,GAAJ,IAAI,CAAwB;QAC5B,SAAI,GAAJ,IAAI,CAAS;IACnB,CAAC;CACL;AAED;;GAEG;AACH,MAAM,OAAO,0BAA0B;IAMlB;IALH,IAAI,GAAG,4BAA4B,CAAC;IAEpD;;OAEG;IACH,YAAmB,KAAsB;QAAtB,UAAK,GAAL,KAAK,CAAiB;IAAG,CAAC;CAC9C"}
@@ -1,7 +1,8 @@
1
1
  import { HandoffInputData } from '../handoff';
2
2
  /**
3
- * Filters out all tool items: file search, web search and function calls+output
4
- * @param handoffInputData
5
- * @returns
3
+ * Filters out tool-related history and run items before a handoff.
4
+ *
5
+ * @param handoffInputData The collected handoff input to sanitize.
6
+ * @returns Handoff input without tool calls, tool outputs, or tool search items.
6
7
  */
7
8
  export declare function removeAllTools(handoffInputData: HandoffInputData): HandoffInputData;
@@ -5,6 +5,8 @@ const items_1 = require("../items.js");
5
5
  const TOOL_TYPES = new Set([
6
6
  'function_call',
7
7
  'function_call_result',
8
+ 'tool_search_call',
9
+ 'tool_search_output',
8
10
  'computer_call',
9
11
  'computer_call_result',
10
12
  'shell_call',
@@ -14,9 +16,10 @@ const TOOL_TYPES = new Set([
14
16
  'hosted_tool_call',
15
17
  ]);
16
18
  /**
17
- * Filters out all tool items: file search, web search and function calls+output
18
- * @param handoffInputData
19
- * @returns
19
+ * Filters out tool-related history and run items before a handoff.
20
+ *
21
+ * @param handoffInputData The collected handoff input to sanitize.
22
+ * @returns Handoff input without tool calls, tool outputs, or tool search items.
20
23
  */
21
24
  function removeAllTools(handoffInputData) {
22
25
  const { inputHistory, preHandoffItems, newItems, runContext } = handoffInputData;
@@ -35,6 +38,8 @@ function removeAllTools(handoffInputData) {
35
38
  function removeToolsFromItems(items) {
36
39
  return items.filter((item) => !(item instanceof items_1.RunHandoffCallItem) &&
37
40
  !(item instanceof items_1.RunHandoffOutputItem) &&
41
+ !(item instanceof items_1.RunToolSearchCallItem) &&
42
+ !(item instanceof items_1.RunToolSearchOutputItem) &&
38
43
  !(item instanceof items_1.RunToolCallItem) &&
39
44
  !(item instanceof items_1.RunToolCallOutputItem));
40
45
  }
@@ -1 +1 @@
1
- {"version":3,"file":"handoffFilters.js","sourceRoot":"","sources":["../../src/extensions/handoffFilters.ts"],"names":[],"mappings":";;AA2BA,wCAmBC;AA7CD,uCAMkB;AAGlB,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC;IACzB,eAAe;IACf,sBAAsB;IACtB,eAAe;IACf,sBAAsB;IACtB,YAAY;IACZ,mBAAmB;IACnB,kBAAkB;IAClB,yBAAyB;IACzB,kBAAkB;CACnB,CAAC,CAAC;AAEH;;;;GAIG;AACH,SAAgB,cAAc,CAC5B,gBAAkC;IAElC,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,GAC3D,gBAAgB,CAAC;IAEnB,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;QACjD,CAAC,CAAC,wBAAwB,CAAC,YAAY,CAAC;QACxC,CAAC,CAAC,YAAY,CAAC;IAEjB,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAExD,OAAO;QACL,YAAY,EAAE,eAAe;QAC7B,eAAe,EAAE,uBAAuB;QACxC,QAAQ,EAAE,gBAAgB;QAC1B,UAAU;KACX,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAgB;IAC5C,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,CAAC,IAAI,YAAY,0BAAkB,CAAC;QACrC,CAAC,CAAC,IAAI,YAAY,4BAAoB,CAAC;QACvC,CAAC,CAAC,IAAI,YAAY,uBAAe,CAAC;QAClC,CAAC,CAAC,IAAI,YAAY,6BAAqB,CAAC,CAC3C,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAuB;IACvD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;AAClE,CAAC"}
1
+ {"version":3,"file":"handoffFilters.js","sourceRoot":"","sources":["../../src/extensions/handoffFilters.ts"],"names":[],"mappings":";;AAgCA,wCAmBC;AAlDD,uCAQkB;AAGlB,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC;IACzB,eAAe;IACf,sBAAsB;IACtB,kBAAkB;IAClB,oBAAoB;IACpB,eAAe;IACf,sBAAsB;IACtB,YAAY;IACZ,mBAAmB;IACnB,kBAAkB;IAClB,yBAAyB;IACzB,kBAAkB;CACnB,CAAC,CAAC;AAEH;;;;;GAKG;AACH,SAAgB,cAAc,CAC5B,gBAAkC;IAElC,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,GAC3D,gBAAgB,CAAC;IAEnB,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;QACjD,CAAC,CAAC,wBAAwB,CAAC,YAAY,CAAC;QACxC,CAAC,CAAC,YAAY,CAAC;IAEjB,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAExD,OAAO;QACL,YAAY,EAAE,eAAe;QAC7B,eAAe,EAAE,uBAAuB;QACxC,QAAQ,EAAE,gBAAgB;QAC1B,UAAU;KACX,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAgB;IAC5C,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,CAAC,IAAI,YAAY,0BAAkB,CAAC;QACrC,CAAC,CAAC,IAAI,YAAY,4BAAoB,CAAC;QACvC,CAAC,CAAC,IAAI,YAAY,6BAAqB,CAAC;QACxC,CAAC,CAAC,IAAI,YAAY,+BAAuB,CAAC;QAC1C,CAAC,CAAC,IAAI,YAAY,uBAAe,CAAC;QAClC,CAAC,CAAC,IAAI,YAAY,6BAAqB,CAAC,CAC3C,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAuB;IACvD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;AAClE,CAAC"}
@@ -1,7 +1,9 @@
1
- import { RunHandoffCallItem, RunHandoffOutputItem, RunToolCallItem, RunToolCallOutputItem, } from "../items.mjs";
1
+ import { RunHandoffCallItem, RunHandoffOutputItem, RunToolCallItem, RunToolCallOutputItem, RunToolSearchCallItem, RunToolSearchOutputItem, } from "../items.mjs";
2
2
  const TOOL_TYPES = new Set([
3
3
  'function_call',
4
4
  'function_call_result',
5
+ 'tool_search_call',
6
+ 'tool_search_output',
5
7
  'computer_call',
6
8
  'computer_call_result',
7
9
  'shell_call',
@@ -11,9 +13,10 @@ const TOOL_TYPES = new Set([
11
13
  'hosted_tool_call',
12
14
  ]);
13
15
  /**
14
- * Filters out all tool items: file search, web search and function calls+output
15
- * @param handoffInputData
16
- * @returns
16
+ * Filters out tool-related history and run items before a handoff.
17
+ *
18
+ * @param handoffInputData The collected handoff input to sanitize.
19
+ * @returns Handoff input without tool calls, tool outputs, or tool search items.
17
20
  */
18
21
  export function removeAllTools(handoffInputData) {
19
22
  const { inputHistory, preHandoffItems, newItems, runContext } = handoffInputData;
@@ -32,6 +35,8 @@ export function removeAllTools(handoffInputData) {
32
35
  function removeToolsFromItems(items) {
33
36
  return items.filter((item) => !(item instanceof RunHandoffCallItem) &&
34
37
  !(item instanceof RunHandoffOutputItem) &&
38
+ !(item instanceof RunToolSearchCallItem) &&
39
+ !(item instanceof RunToolSearchOutputItem) &&
35
40
  !(item instanceof RunToolCallItem) &&
36
41
  !(item instanceof RunToolCallOutputItem));
37
42
  }
@@ -1 +1 @@
1
- {"version":3,"file":"handoffFilters.mjs","sourceRoot":"","sources":["../../src/extensions/handoffFilters.ts"],"names":[],"mappings":"OACO,EACL,kBAAkB,EAClB,oBAAoB,EAEpB,eAAe,EACf,qBAAqB,GACtB;AAGD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC;IACzB,eAAe;IACf,sBAAsB;IACtB,eAAe;IACf,sBAAsB;IACtB,YAAY;IACZ,mBAAmB;IACnB,kBAAkB;IAClB,yBAAyB;IACzB,kBAAkB;CACnB,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAC5B,gBAAkC;IAElC,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,GAC3D,gBAAgB,CAAC;IAEnB,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;QACjD,CAAC,CAAC,wBAAwB,CAAC,YAAY,CAAC;QACxC,CAAC,CAAC,YAAY,CAAC;IAEjB,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAExD,OAAO;QACL,YAAY,EAAE,eAAe;QAC7B,eAAe,EAAE,uBAAuB;QACxC,QAAQ,EAAE,gBAAgB;QAC1B,UAAU;KACX,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAgB;IAC5C,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,CAAC,IAAI,YAAY,kBAAkB,CAAC;QACrC,CAAC,CAAC,IAAI,YAAY,oBAAoB,CAAC;QACvC,CAAC,CAAC,IAAI,YAAY,eAAe,CAAC;QAClC,CAAC,CAAC,IAAI,YAAY,qBAAqB,CAAC,CAC3C,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAuB;IACvD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;AAClE,CAAC"}
1
+ {"version":3,"file":"handoffFilters.mjs","sourceRoot":"","sources":["../../src/extensions/handoffFilters.ts"],"names":[],"mappings":"OACO,EACL,kBAAkB,EAClB,oBAAoB,EAEpB,eAAe,EACf,qBAAqB,EACrB,qBAAqB,EACrB,uBAAuB,GACxB;AAGD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC;IACzB,eAAe;IACf,sBAAsB;IACtB,kBAAkB;IAClB,oBAAoB;IACpB,eAAe;IACf,sBAAsB;IACtB,YAAY;IACZ,mBAAmB;IACnB,kBAAkB;IAClB,yBAAyB;IACzB,kBAAkB;CACnB,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAC5B,gBAAkC;IAElC,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,GAC3D,gBAAgB,CAAC;IAEnB,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;QACjD,CAAC,CAAC,wBAAwB,CAAC,YAAY,CAAC;QACxC,CAAC,CAAC,YAAY,CAAC;IAEjB,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IAExD,OAAO;QACL,YAAY,EAAE,eAAe;QAC7B,eAAe,EAAE,uBAAuB;QACxC,QAAQ,EAAE,gBAAgB;QAC1B,UAAU;KACX,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAgB;IAC5C,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,CAAC,IAAI,YAAY,kBAAkB,CAAC;QACrC,CAAC,CAAC,IAAI,YAAY,oBAAoB,CAAC;QACvC,CAAC,CAAC,IAAI,YAAY,qBAAqB,CAAC;QACxC,CAAC,CAAC,IAAI,YAAY,uBAAuB,CAAC;QAC1C,CAAC,CAAC,IAAI,YAAY,eAAe,CAAC;QAClC,CAAC,CAAC,IAAI,YAAY,qBAAqB,CAAC,CAC3C,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAuB;IACvD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;AAClE,CAAC"}
package/dist/index.d.ts CHANGED
@@ -10,16 +10,17 @@ export { defineOutputGuardrail, GuardrailFunctionOutput, InputGuardrail, InputGu
10
10
  export { ToolGuardrailBehavior, ToolGuardrailFunctionOutput, ToolGuardrailMetadata, ToolInputGuardrailData, ToolInputGuardrailDefinition, ToolInputGuardrailFunction, ToolInputGuardrailResult, ToolOutputGuardrailData, ToolOutputGuardrailDefinition, ToolOutputGuardrailFunction, ToolOutputGuardrailResult, ToolGuardrailFunctionOutputFactory, defineToolInputGuardrail, defineToolOutputGuardrail, resolveToolInputGuardrails, resolveToolOutputGuardrails, } from './toolGuardrail';
11
11
  export { getHandoff, getTransferMessage, Handoff, handoff, HandoffInputData, HandoffEnabledFunction, } from './handoff';
12
12
  export { assistant, system, user } from './helpers/message';
13
- export { extractAllTextOutput, RunHandoffCallItem, RunHandoffOutputItem, RunItem, RunMessageOutputItem, RunReasoningItem, RunToolApprovalItem, RunToolCallItem, RunToolCallOutputItem, } from './items';
13
+ export { extractAllTextOutput, RunHandoffCallItem, RunHandoffOutputItem, RunItem, RunMessageOutputItem, RunReasoningItem, RunToolApprovalItem, RunToolCallItem, RunToolCallOutputItem, RunToolSearchCallItem, RunToolSearchOutputItem, } from './items';
14
14
  export { AgentHooks } from './lifecycle';
15
15
  export { getLogger } from './logger';
16
16
  export { applyDiff } from './utils/applyDiff';
17
17
  export { getAllMcpTools, invalidateServerToolsCache, mcpToFunctionTool, MCPServer, MCPServerStdio, MCPServerStreamableHttp, MCPServerSSE, GetAllMcpToolsOptions, MCPToolCacheKeyGenerator, } from './mcp';
18
18
  export { MCPServers, MCPServersOptions, MCPServersReconnectOptions, connectMcpServers, } from './mcpServers';
19
19
  export { MCPToolFilterCallable, MCPToolFilterContext, MCPToolFilterStatic, MCPToolMetaContext, MCPToolMetaResolver, createMCPToolStaticFilter, } from './mcpUtil';
20
- export { Model, ModelProvider, ModelRequest, ModelResponse, ModelSettings, ModelSettingsToolChoice, SerializedHandoff, SerializedTool, SerializedOutputType, } from './model';
20
+ export { Model, ModelProvider, ModelRetryAdvice, ModelRetryAdviceRequest, ModelRetryBackoffSettings, ModelRetryNormalizedError, ModelRetrySettings, ModelRequest, ModelResponse, ModelSettings, 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';
23
+ export { retryPolicies } from './runner/modelRetry';
23
24
  export { RunResult, StreamedRunResult } from './result';
24
25
  export { IndividualRunOptions, NonStreamRunOptions, run, RunConfig, Runner, StreamRunOptions, } from './run';
25
26
  export type { ModelInputData, CallModelInputFilter, CallModelInputFilterArgs, ToolErrorFormatter, ToolErrorFormatterArgs, ReasoningItemIdPolicy, RunErrorData, RunErrorHandler, RunErrorHandlerInput, RunErrorHandlerResult, RunErrorHandlers, RunErrorKind, } from './run';
@@ -27,13 +28,13 @@ export { RunContext } from './runContext';
27
28
  export type { AgentToolInvocation } from './agentToolInvocation';
28
29
  export { RunState } from './runState';
29
30
  export type { TracingConfig } from './tracing';
30
- export { HostedTool, ComputerTool, computerTool, ShellTool, shellTool, ApplyPatchTool, applyPatchTool, HostedMCPTool, hostedMcpTool, FunctionTool, FunctionToolResult, FunctionToolTimeoutBehavior, ToolTimeoutErrorFunction, Tool, tool, invokeFunctionTool, ToolExecuteArgument, ToolEnabledFunction, ToolOptionsWithGuardrails, } from './tool';
31
- export type { ComputerOnSafetyCheckFunction, ComputerSafetyCheck, ComputerSafetyCheckResult, ShellToolEnvironment, ShellToolLocalEnvironment, ShellToolLocalSkill, ShellToolHostedEnvironment, ShellToolContainerAutoEnvironment, ShellToolContainerReferenceEnvironment, ShellToolContainerSkill, ShellToolSkillReference, ShellToolInlineSkill, ShellToolInlineSkillSource, ShellToolContainerNetworkPolicy, ShellToolContainerNetworkPolicyAllowlist, ShellToolContainerNetworkPolicyDisabled, ShellToolContainerNetworkPolicyDomainSecret, ToolInputParameters, ToolOptions, } from './tool';
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
33
  export type { ToolOutputText, ToolOutputImage, ToolOutputFileContent, ToolCallStructuredOutput, ToolCallOutputContent, } from './types/protocol';
33
34
  export * from './tracing';
34
35
  export { getGlobalTraceProvider, TraceProvider } from './tracing/provider';
35
36
  export { runToolInputGuardrails, runToolOutputGuardrails, } from './utils/toolGuardrails';
36
- export type { AgentInputItem, AgentOutputItem, AssistantMessageItem, HostedToolCallItem, ComputerCallResultItem, ComputerUseCallItem, ShellCallItem, ShellCallResultItem, ApplyPatchCallItem, ApplyPatchCallResultItem, FunctionCallItem, FunctionCallResultItem, JsonSchemaDefinition, ReasoningItem, ResponseStreamEvent, SystemMessageItem, TextOutput, UnknownContext, UnknownItem, UserMessageItem, StreamEvent, StreamEventTextStream, StreamEventResponseCompleted, StreamEventResponseStarted, StreamEventGenericItem, } from './types';
37
+ export type { AgentInputItem, AgentOutputItem, AssistantMessageItem, HostedToolCallItem, ComputerCallResultItem, ComputerUseCallItem, ShellCallItem, ShellCallResultItem, ApplyPatchCallItem, ApplyPatchCallResultItem, FunctionCallItem, FunctionCallResultItem, JsonSchemaDefinition, ReasoningItem, ToolReference, ToolSearchOutputTool, ToolSearchCallArguments, ToolSearchCallItem, ToolSearchOutputItem, ResponseStreamEvent, SystemMessageItem, TextOutput, UnknownContext, UnknownItem, UserMessageItem, StreamEvent, StreamEventTextStream, StreamEventResponseCompleted, StreamEventResponseStarted, StreamEventGenericItem, } from './types';
37
38
  export { RequestUsage, Usage } from './usage';
38
39
  export type { Session, SessionInputCallback, OpenAIResponsesCompactionArgs, OpenAIResponsesCompactionAwareSession, OpenAIResponsesCompactionResult, } from './memory/session';
39
40
  export { isOpenAIResponsesCompactionAwareSession } from './memory/session';
package/dist/index.js CHANGED
@@ -36,8 +36,8 @@ var __importStar = (this && this.__importStar) || (function () {
36
36
  };
37
37
  })();
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
- exports.createMCPToolStaticFilter = exports.connectMcpServers = exports.MCPServers = exports.MCPServerSSE = exports.MCPServerStreamableHttp = exports.MCPServerStdio = exports.mcpToFunctionTool = exports.invalidateServerToolsCache = exports.getAllMcpTools = exports.applyDiff = exports.getLogger = exports.AgentHooks = exports.RunToolCallOutputItem = exports.RunToolCallItem = exports.RunToolApprovalItem = exports.RunReasoningItem = exports.RunMessageOutputItem = exports.RunHandoffOutputItem = exports.RunHandoffCallItem = exports.extractAllTextOutput = exports.user = exports.system = exports.assistant = exports.handoff = exports.Handoff = exports.getTransferMessage = exports.getHandoff = exports.resolveToolOutputGuardrails = exports.resolveToolInputGuardrails = exports.defineToolOutputGuardrail = exports.defineToolInputGuardrail = exports.ToolGuardrailFunctionOutputFactory = exports.defineOutputGuardrail = exports.RunItemStreamEvent = exports.RunRawModelStreamEvent = exports.RunAgentUpdatedStreamEvent = exports.SystemError = exports.UserError = exports.ToolTimeoutError = exports.ToolCallError = exports.ToolOutputGuardrailTripwireTriggered = exports.ToolInputGuardrailTripwireTriggered = exports.OutputGuardrailTripwireTriggered = exports.ModelBehaviorError = exports.MaxTurnsExceededError = exports.InputGuardrailTripwireTriggered = exports.GuardrailExecutionError = exports.AgentsError = exports.Agent = exports.RuntimeEventEmitter = void 0;
40
- exports.protocol = exports.MemorySession = exports.isOpenAIResponsesCompactionAwareSession = exports.Usage = exports.RequestUsage = exports.runToolOutputGuardrails = exports.runToolInputGuardrails = exports.TraceProvider = exports.getGlobalTraceProvider = exports.invokeFunctionTool = exports.tool = exports.hostedMcpTool = exports.applyPatchTool = exports.shellTool = exports.computerTool = exports.RunState = exports.RunContext = exports.Runner = exports.run = exports.StreamedRunResult = exports.RunResult = exports.setDefaultModelProvider = exports.isGpt5Default = exports.getDefaultModelSettings = exports.getDefaultModel = exports.gpt5ReasoningSettingsRequired = exports.OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME = void 0;
39
+ exports.MCPServers = exports.MCPServerSSE = exports.MCPServerStreamableHttp = exports.MCPServerStdio = exports.mcpToFunctionTool = exports.invalidateServerToolsCache = exports.getAllMcpTools = exports.applyDiff = exports.getLogger = exports.AgentHooks = exports.RunToolSearchOutputItem = exports.RunToolSearchCallItem = exports.RunToolCallOutputItem = exports.RunToolCallItem = exports.RunToolApprovalItem = exports.RunReasoningItem = exports.RunMessageOutputItem = exports.RunHandoffOutputItem = exports.RunHandoffCallItem = exports.extractAllTextOutput = exports.user = exports.system = exports.assistant = exports.handoff = exports.Handoff = exports.getTransferMessage = exports.getHandoff = exports.resolveToolOutputGuardrails = exports.resolveToolInputGuardrails = exports.defineToolOutputGuardrail = exports.defineToolInputGuardrail = exports.ToolGuardrailFunctionOutputFactory = exports.defineOutputGuardrail = exports.RunItemStreamEvent = exports.RunRawModelStreamEvent = exports.RunAgentUpdatedStreamEvent = exports.SystemError = exports.UserError = exports.ToolTimeoutError = exports.ToolCallError = exports.ToolOutputGuardrailTripwireTriggered = exports.ToolInputGuardrailTripwireTriggered = exports.OutputGuardrailTripwireTriggered = exports.ModelBehaviorError = exports.MaxTurnsExceededError = exports.InputGuardrailTripwireTriggered = exports.GuardrailExecutionError = exports.AgentsError = exports.Agent = exports.RuntimeEventEmitter = void 0;
40
+ exports.protocol = exports.MemorySession = exports.isOpenAIResponsesCompactionAwareSession = exports.Usage = exports.RequestUsage = exports.runToolOutputGuardrails = exports.runToolInputGuardrails = exports.TraceProvider = exports.getGlobalTraceProvider = exports.getToolSearchRuntimeToolKey = exports.getClientToolSearchExecutor = exports.invokeFunctionTool = exports.toolNamespace = exports.tool = exports.hostedMcpTool = exports.applyPatchTool = exports.shellTool = exports.computerTool = exports.attachClientToolSearchExecutor = exports.RunState = exports.RunContext = exports.Runner = exports.run = exports.StreamedRunResult = exports.RunResult = exports.retryPolicies = exports.setDefaultModelProvider = exports.isGpt5Default = exports.getDefaultModelSettings = exports.getDefaultModel = exports.gpt5ReasoningSettingsRequired = exports.OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME = exports.createMCPToolStaticFilter = exports.connectMcpServers = void 0;
41
41
  const tracing_1 = require("./tracing/index.js");
42
42
  const processor_1 = require("./tracing/processor.js");
43
43
  var _shims_1 = require("@openai/agents-core/_shims");
@@ -87,6 +87,8 @@ Object.defineProperty(exports, "RunReasoningItem", { enumerable: true, get: func
87
87
  Object.defineProperty(exports, "RunToolApprovalItem", { enumerable: true, get: function () { return items_1.RunToolApprovalItem; } });
88
88
  Object.defineProperty(exports, "RunToolCallItem", { enumerable: true, get: function () { return items_1.RunToolCallItem; } });
89
89
  Object.defineProperty(exports, "RunToolCallOutputItem", { enumerable: true, get: function () { return items_1.RunToolCallOutputItem; } });
90
+ Object.defineProperty(exports, "RunToolSearchCallItem", { enumerable: true, get: function () { return items_1.RunToolSearchCallItem; } });
91
+ Object.defineProperty(exports, "RunToolSearchOutputItem", { enumerable: true, get: function () { return items_1.RunToolSearchOutputItem; } });
90
92
  var lifecycle_1 = require("./lifecycle.js");
91
93
  Object.defineProperty(exports, "AgentHooks", { enumerable: true, get: function () { return lifecycle_1.AgentHooks; } });
92
94
  var logger_1 = require("./logger.js");
@@ -113,6 +115,8 @@ Object.defineProperty(exports, "getDefaultModelSettings", { enumerable: true, ge
113
115
  Object.defineProperty(exports, "isGpt5Default", { enumerable: true, get: function () { return defaultModel_1.isGpt5Default; } });
114
116
  var providers_1 = require("./providers.js");
115
117
  Object.defineProperty(exports, "setDefaultModelProvider", { enumerable: true, get: function () { return providers_1.setDefaultModelProvider; } });
118
+ var modelRetry_1 = require("./runner/modelRetry.js");
119
+ Object.defineProperty(exports, "retryPolicies", { enumerable: true, get: function () { return modelRetry_1.retryPolicies; } });
116
120
  var result_1 = require("./result.js");
117
121
  Object.defineProperty(exports, "RunResult", { enumerable: true, get: function () { return result_1.RunResult; } });
118
122
  Object.defineProperty(exports, "StreamedRunResult", { enumerable: true, get: function () { return result_1.StreamedRunResult; } });
@@ -124,12 +128,16 @@ Object.defineProperty(exports, "RunContext", { enumerable: true, get: function (
124
128
  var runState_1 = require("./runState.js");
125
129
  Object.defineProperty(exports, "RunState", { enumerable: true, get: function () { return runState_1.RunState; } });
126
130
  var tool_1 = require("./tool.js");
131
+ Object.defineProperty(exports, "attachClientToolSearchExecutor", { enumerable: true, get: function () { return tool_1.attachClientToolSearchExecutor; } });
127
132
  Object.defineProperty(exports, "computerTool", { enumerable: true, get: function () { return tool_1.computerTool; } });
128
133
  Object.defineProperty(exports, "shellTool", { enumerable: true, get: function () { return tool_1.shellTool; } });
129
134
  Object.defineProperty(exports, "applyPatchTool", { enumerable: true, get: function () { return tool_1.applyPatchTool; } });
130
135
  Object.defineProperty(exports, "hostedMcpTool", { enumerable: true, get: function () { return tool_1.hostedMcpTool; } });
131
136
  Object.defineProperty(exports, "tool", { enumerable: true, get: function () { return tool_1.tool; } });
137
+ Object.defineProperty(exports, "toolNamespace", { enumerable: true, get: function () { return tool_1.toolNamespace; } });
132
138
  Object.defineProperty(exports, "invokeFunctionTool", { enumerable: true, get: function () { return tool_1.invokeFunctionTool; } });
139
+ Object.defineProperty(exports, "getClientToolSearchExecutor", { enumerable: true, get: function () { return tool_1.getClientToolSearchExecutor; } });
140
+ Object.defineProperty(exports, "getToolSearchRuntimeToolKey", { enumerable: true, get: function () { return tool_1.getToolSearchRuntimeToolKey; } });
133
141
  __exportStar(require("./tracing/index.js"), exports);
134
142
  var provider_1 = require("./tracing/provider.js");
135
143
  Object.defineProperty(exports, "getGlobalTraceProvider", { enumerable: true, get: function () { return provider_1.getGlobalTraceProvider; } });
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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"}
package/dist/index.mjs CHANGED
@@ -8,7 +8,7 @@ export { defineOutputGuardrail, } from "./guardrail.mjs";
8
8
  export { ToolGuardrailFunctionOutputFactory, defineToolInputGuardrail, defineToolOutputGuardrail, resolveToolInputGuardrails, resolveToolOutputGuardrails, } from "./toolGuardrail.mjs";
9
9
  export { getHandoff, getTransferMessage, Handoff, handoff, } from "./handoff.mjs";
10
10
  export { assistant, system, user } from "./helpers/message.mjs";
11
- export { extractAllTextOutput, RunHandoffCallItem, RunHandoffOutputItem, RunMessageOutputItem, RunReasoningItem, RunToolApprovalItem, RunToolCallItem, RunToolCallOutputItem, } from "./items.mjs";
11
+ export { extractAllTextOutput, RunHandoffCallItem, RunHandoffOutputItem, RunMessageOutputItem, RunReasoningItem, RunToolApprovalItem, RunToolCallItem, RunToolCallOutputItem, RunToolSearchCallItem, RunToolSearchOutputItem, } from "./items.mjs";
12
12
  export { AgentHooks } from "./lifecycle.mjs";
13
13
  export { getLogger } from "./logger.mjs";
14
14
  export { applyDiff } from "./utils/applyDiff.mjs";
@@ -17,11 +17,12 @@ export { MCPServers, connectMcpServers, } from "./mcpServers.mjs";
17
17
  export { createMCPToolStaticFilter, } from "./mcpUtil.mjs";
18
18
  export { OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME, gpt5ReasoningSettingsRequired, getDefaultModel, getDefaultModelSettings, isGpt5Default, } from "./defaultModel.mjs";
19
19
  export { setDefaultModelProvider } from "./providers.mjs";
20
+ export { retryPolicies } from "./runner/modelRetry.mjs";
20
21
  export { RunResult, StreamedRunResult } from "./result.mjs";
21
22
  export { run, Runner, } from "./run.mjs";
22
23
  export { RunContext } from "./runContext.mjs";
23
24
  export { RunState } from "./runState.mjs";
24
- export { computerTool, shellTool, applyPatchTool, hostedMcpTool, tool, invokeFunctionTool, } from "./tool.mjs";
25
+ export { attachClientToolSearchExecutor, computerTool, shellTool, applyPatchTool, hostedMcpTool, tool, toolNamespace, invokeFunctionTool, getClientToolSearchExecutor, getToolSearchRuntimeToolKey, } from "./tool.mjs";
25
26
  export * from "./tracing/index.mjs";
26
27
  export { getGlobalTraceProvider, TraceProvider } from "./tracing/provider.mjs";
27
28
  export { runToolInputGuardrails, runToolOutputGuardrails, } from "./utils/toolGuardrails.mjs";
@@ -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,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,EACP,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,GACtB;OACM,EAAE,UAAU,EAAE;OACd,EAAE,SAAS,EAAE;OACb,EAAE,SAAS,EAAE;OACb,EACL,cAAc,EACd,0BAA0B,EAC1B,iBAAiB,EAEjB,cAAc,EACd,uBAAuB,EACvB,YAAY,GAGb;OACM,EACL,UAAU,EAGV,iBAAiB,GAClB;OACM,EAML,yBAAyB,GAC1B;OAYM,EACL,sCAAsC,EACtC,6BAA6B,EAC7B,eAAe,EACf,uBAAuB,EACvB,aAAa,GACd;OACM,EAAE,uBAAuB,EAAE;OAC3B,EAAE,SAAS,EAAE,iBAAiB,EAAE;OAChC,EAGL,GAAG,EAEH,MAAM,GAEP;OAeM,EAAE,UAAU,EAAE;OAEd,EAAE,QAAQ,EAAE;OAEZ,EAGL,YAAY,EAEZ,SAAS,EAET,cAAc,EAEd,aAAa,EAMb,IAAI,EACJ,kBAAkB,GAInB;;OA8BM,EAAE,sBAAsB,EAAE,aAAa,EAAE;OACzC,EACL,sBAAsB,EACtB,uBAAuB,GACxB;OA6BM,EAAE,YAAY,EAAE,KAAK,EAAE;OAQvB,EAAE,uCAAuC,EAAE;OAC3C,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,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,EACP,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,EAEjB,cAAc,EACd,uBAAuB,EACvB,YAAY,GAGb;OACM,EACL,UAAU,EAGV,iBAAiB,GAClB;OACM,EAML,yBAAyB,GAC1B;OAoBM,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;OAeM,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;OAQvB,EAAE,uCAAuC,EAAE;OAC3C,EAAE,aAAa,EAAE;OAMjB,KAAK,QAAQ;AAEpB;;;;;GAKG;AACH,iBAAiB,CAAC,gBAAgB,EAAE,CAAC,CAAC"}