@openai/agents-core 0.6.0 → 0.7.1

package/dist/agentToolRunConfig.js

@@ -4,12 +4,12 @@ exports.setAgentToolParentRunConfigOnDetails = setAgentToolParentRunConfigOnDeta
 exports.getAgentToolParentRunConfigFromDetails = getAgentToolParentRunConfigFromDetails;
 exports.getInheritedAgentToolRunConfig = getInheritedAgentToolRunConfig;
 exports.mergeAgentToolRunConfig = mergeAgentToolRunConfig;
+const modelSettingsMerge_1 = require("./runner/modelSettingsMerge.js");
 const TRANSPORT_OVERRIDE_PROVIDER_DATA_ALIAS_KEYS = [
     ['extra_headers', 'extraHeaders'],
     ['extra_query', 'extraQuery'],
     ['extra_body', 'extraBody'],
 ];
-const NESTED_MODEL_SETTINGS_MERGE_KEYS = ['reasoning', 'text'];
 const AGENT_TOOL_PARENT_RUN_CONFIG_SYMBOL = Symbol('openai.agents.agentToolParentRunConfig');
 function isPlainObjectLike(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
@@ -122,15 +122,7 @@ function mergeAgentToolModelSettings(inheritedRunConfig, toolRunConfigOverride)
         !toolModelSettings) {
         return undefined;
     }
-    const mergedModelSettings = {
-        ...inheritedModelSettings,
-        ...toolModelSettings,
-    };
-    const inheritedModelSettingsRecord = inheritedModelSettings;
-    const toolModelSettingsRecord = toolModelSettings;
-    for (const key of NESTED_MODEL_SETTINGS_MERGE_KEYS) {
-        mergeNestedObjectMap(mergedModelSettings, inheritedModelSettingsRecord, toolModelSettingsRecord, key);
-    }
+    const mergedModelSettings = (0, modelSettingsMerge_1.mergeModelSettings)(inheritedModelSettings, toolModelSettings);
     const inheritedProviderData = inheritedModelSettings.providerData;
     const toolProviderData = toolModelSettings.providerData;
     const hasToolProviderDataOverride = hasOwn(toolModelSettings, 'providerData');

package/dist/agentToolRunConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentToolRunConfig.js","sourceRoot":"","sources":["../src/agentToolRunConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentToolRunConfig.js","sourceRoot":"","sources":["../src/agentToolRunConfig.ts"],"names":[],"mappings":"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"}

package/dist/agentToolRunConfig.mjs

@@ -1,9 +1,9 @@
+import { mergeModelSettings } from "./runner/modelSettingsMerge.mjs";
 const TRANSPORT_OVERRIDE_PROVIDER_DATA_ALIAS_KEYS = [
     ['extra_headers', 'extraHeaders'],
     ['extra_query', 'extraQuery'],
     ['extra_body', 'extraBody'],
 ];
-const NESTED_MODEL_SETTINGS_MERGE_KEYS = ['reasoning', 'text'];
 const AGENT_TOOL_PARENT_RUN_CONFIG_SYMBOL = Symbol('openai.agents.agentToolParentRunConfig');
 function isPlainObjectLike(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
@@ -116,15 +116,7 @@ function mergeAgentToolModelSettings(inheritedRunConfig, toolRunConfigOverride)
         !toolModelSettings) {
         return undefined;
     }
-    const mergedModelSettings = {
-        ...inheritedModelSettings,
-        ...toolModelSettings,
-    };
-    const inheritedModelSettingsRecord = inheritedModelSettings;
-    const toolModelSettingsRecord = toolModelSettings;
-    for (const key of NESTED_MODEL_SETTINGS_MERGE_KEYS) {
-        mergeNestedObjectMap(mergedModelSettings, inheritedModelSettingsRecord, toolModelSettingsRecord, key);
-    }
+    const mergedModelSettings = mergeModelSettings(inheritedModelSettings, toolModelSettings);
     const inheritedProviderData = inheritedModelSettings.providerData;
     const toolProviderData = toolModelSettings.providerData;
     const hasToolProviderDataOverride = hasOwn(toolModelSettings, 'providerData');

package/dist/agentToolRunConfig.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"agentToolRunConfig.mjs","sourceRoot":"","sources":["../src/agentToolRunConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentToolRunConfig.mjs","sourceRoot":"","sources":["../src/agentToolRunConfig.ts"],"names":[],"mappings":"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"}

package/dist/events.d.ts

@@ -7,6 +7,7 @@ import { ResponseStreamEvent } from './types';
  */
 export declare class RunRawModelStreamEvent {
     data: ResponseStreamEvent;
+    readonly source: string | undefined;
     /**
      * The type of the event.
      */
@@ -14,7 +15,7 @@ export declare class RunRawModelStreamEvent {
     /**
      * @param data The raw responses stream events from the LLM.
      */
-    constructor(data: ResponseStreamEvent);
+    constructor(data: ResponseStreamEvent, source?: string | undefined);
 }
 /**
  * The names of the events that can be generated by the agent.

package/dist/events.js

@@ -1,12 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RunAgentUpdatedStreamEvent = exports.RunItemStreamEvent = exports.RunRawModelStreamEvent = void 0;
+function getRawModelEventSource(data) {
+    if (data.type !== 'model') {
+        return undefined;
+    }
+    const source = data.providerData?.rawModelEventSource;
+    return typeof source === 'string' ? source : undefined;
+}
 /**
  * Streaming event from the LLM. These are `raw` events, i.e. they are directly passed through from
  * the LLM.
  */
 class RunRawModelStreamEvent {
     data;
+    source;
     /**
      * The type of the event.
      */
@@ -14,8 +22,9 @@ class RunRawModelStreamEvent {
     /**
      * @param data The raw responses stream events from the LLM.
      */
-    constructor(data) {
+    constructor(data, source = getRawModelEventSource(data)) {
         this.data = data;
+        this.source = source;
     }
 }
 exports.RunRawModelStreamEvent = RunRawModelStreamEvent;

package/dist/events.js.map

@@ -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;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"}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":";;;AAIA,SAAS,sBAAsB,CAAC,IAAyB;IACvD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,mBAAmB,CAAC;IACtD,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AACzD,CAAC;AAED;;;GAGG;AACH,MAAa,sBAAsB;IAUxB;IACS;IAVlB;;OAEG;IACa,IAAI,GAAG,wBAAwB,CAAC;IAEhD;;OAEG;IACH,YACS,IAAyB,EAChB,SAA6B,sBAAsB,CAAC,IAAI,CAAC;QADlE,SAAI,GAAJ,IAAI,CAAqB;QAChB,WAAM,GAAN,MAAM,CAAmD;IACxE,CAAC;CACL;AAbD,wDAaC;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"}

package/dist/events.mjs

@@ -1,9 +1,17 @@
+function getRawModelEventSource(data) {
+    if (data.type !== 'model') {
+        return undefined;
+    }
+    const source = data.providerData?.rawModelEventSource;
+    return typeof source === 'string' ? source : undefined;
+}
 /**
  * Streaming event from the LLM. These are `raw` events, i.e. they are directly passed through from
  * the LLM.
  */
 export class RunRawModelStreamEvent {
     data;
+    source;
     /**
      * The type of the event.
      */
@@ -11,8 +19,9 @@ export class RunRawModelStreamEvent {
     /**
      * @param data The raw responses stream events from the LLM.
      */
-    constructor(data) {
+    constructor(data, source = getRawModelEventSource(data)) {
         this.data = data;
+        this.source = source;
     }
 }
 /**

package/dist/events.mjs.map

@@ -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;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"}
+{"version":3,"file":"events.mjs","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"AAIA,SAAS,sBAAsB,CAAC,IAAyB;IACvD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,mBAAmB,CAAC;IACtD,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AACzD,CAAC;AAED;;;GAGG;AACH,MAAM,OAAO,sBAAsB;IAUxB;IACS;IAVlB;;OAEG;IACa,IAAI,GAAG,wBAAwB,CAAC;IAEhD;;OAEG;IACH,YACS,IAAyB,EAChB,SAA6B,sBAAsB,CAAC,IAAI,CAAC;QADlE,SAAI,GAAJ,IAAI,CAAqB;QAChB,WAAM,GAAN,MAAM,CAAmD;IACxE,CAAC;CACL;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"}

package/dist/index.d.ts

@@ -17,9 +17,10 @@ export { applyDiff } from './utils/applyDiff';
 export { getAllMcpTools, invalidateServerToolsCache, mcpToFunctionTool, MCPServer, MCPServerStdio, MCPServerStreamableHttp, MCPServerSSE, GetAllMcpToolsOptions, MCPToolCacheKeyGenerator, } from './mcp';
 export { MCPServers, MCPServersOptions, MCPServersReconnectOptions, connectMcpServers, } from './mcpServers';
 export { MCPToolFilterCallable, MCPToolFilterContext, MCPToolFilterStatic, MCPToolMetaContext, MCPToolMetaResolver, createMCPToolStaticFilter, } from './mcpUtil';
-export { Model, ModelProvider, ModelRequest, ModelResponse, ModelSettings, ModelSettingsToolChoice, SerializedHandoff, SerializedTool, SerializedOutputType, } from './model';
+export { Model, ModelProvider, ModelRetryAdvice, ModelRetryAdviceRequest, ModelRetryBackoffSettings, ModelRetryNormalizedError, ModelRetrySettings, ModelRequest, ModelResponse, ModelSettings, ModelSettingsToolChoice, RetryDecision, RetryPolicy, RetryPolicyContext, SerializedHandoff, SerializedTool, SerializedOutputType, } from './model';
 export { OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME, gpt5ReasoningSettingsRequired, getDefaultModel, getDefaultModelSettings, isGpt5Default, } from './defaultModel';
 export { setDefaultModelProvider } from './providers';
+export { retryPolicies } from './runner/modelRetry';
 export { RunResult, StreamedRunResult } from './result';
 export { IndividualRunOptions, NonStreamRunOptions, run, RunConfig, Runner, StreamRunOptions, } from './run';
 export type { ModelInputData, CallModelInputFilter, CallModelInputFilterArgs, ToolErrorFormatter, ToolErrorFormatterArgs, ReasoningItemIdPolicy, RunErrorData, RunErrorHandler, RunErrorHandlerInput, RunErrorHandlerResult, RunErrorHandlers, RunErrorKind, } from './run';

package/dist/index.js

@@ -37,7 +37,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 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;
-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.setDefaultModelProvider = exports.isGpt5Default = exports.getDefaultModelSettings = exports.getDefaultModel = exports.gpt5ReasoningSettingsRequired = exports.OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME = exports.createMCPToolStaticFilter = exports.connectMcpServers = void 0;
+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;
 const tracing_1 = require("./tracing/index.js");
 const processor_1 = require("./tracing/processor.js");
 var _shims_1 = require("@openai/agents-core/_shims");
@@ -115,6 +115,8 @@ Object.defineProperty(exports, "getDefaultModelSettings", { enumerable: true, ge
 Object.defineProperty(exports, "isGpt5Default", { enumerable: true, get: function () { return defaultModel_1.isGpt5Default; } });
 var providers_1 = require("./providers.js");
 Object.defineProperty(exports, "setDefaultModelProvider", { enumerable: true, get: function () { return providers_1.setDefaultModelProvider; } });
+var modelRetry_1 = require("./runner/modelRetry.js");
+Object.defineProperty(exports, "retryPolicies", { enumerable: true, get: function () { return modelRetry_1.retryPolicies; } });
 var result_1 = require("./result.js");
 Object.defineProperty(exports, "RunResult", { enumerable: true, get: function () { return result_1.RunResult; } });
 Object.defineProperty(exports, "StreamedRunResult", { enumerable: true, get: function () { return result_1.StreamedRunResult; } });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.mjs

@@ -17,6 +17,7 @@ export { MCPServers, connectMcpServers, } from "./mcpServers.mjs";
 export { createMCPToolStaticFilter, } from "./mcpUtil.mjs";
 export { OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME, gpt5ReasoningSettingsRequired, getDefaultModel, getDefaultModelSettings, isGpt5Default, } from "./defaultModel.mjs";
 export { setDefaultModelProvider } from "./providers.mjs";
+export { retryPolicies } from "./runner/modelRetry.mjs";
 export { RunResult, StreamedRunResult } from "./result.mjs";
 export { run, Runner, } from "./run.mjs";
 export { RunContext } from "./runContext.mjs";

package/dist/index.mjs.map

@@ -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,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;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,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"}
+{"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"}

package/dist/metadata.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.METADATA = void 0;
 exports.METADATA = {
     "name": "@openai/agents-core",
-    "version": "0.6.0",
+    "version": "0.7.1",
     "versions": {
-        "@openai/agents-core": "0.6.0",
+        "@openai/agents-core": "0.7.1",
         "openai": "^6.26.0"
     }
 };

package/dist/metadata.mjs

@@ -1,9 +1,9 @@
 // This file is automatically generated
 export const METADATA = {
     "name": "@openai/agents-core",
-    "version": "0.6.0",
+    "version": "0.7.1",
     "versions": {
-        "@openai/agents-core": "0.6.0",
+        "@openai/agents-core": "0.7.1",
         "openai": "^6.26.0"
     }
 };

package/dist/model.d.ts

@@ -36,6 +36,126 @@ export interface ModelSettingsText {
      */
     verbosity?: 'low' | 'medium' | 'high' | null;
 }
+export type RetryDecision = boolean | {
+    /**
+     * Whether the failed request should be retried.
+     */
+    retry: boolean;
+    /**
+     * Optional delay override in milliseconds before the next retry attempt.
+     */
+    delayMs?: number;
+    /**
+     * Optional explanation for logging or debugging.
+     */
+    reason?: string;
+};
+export type ModelRetryNormalizedError = {
+    /**
+     * HTTP status code when the provider exposes one.
+     */
+    statusCode?: number;
+    /**
+     * Suggested delay in milliseconds derived from retry-after style headers.
+     */
+    retryAfterMs?: number;
+    /**
+     * Provider or transport-specific error code when exposed.
+     */
+    errorCode?: string;
+    /**
+     * Whether the error appears to come from a transient transport or connectivity problem.
+     */
+    isNetworkError: boolean;
+    /**
+     * Whether the error was caused by an abort signal or abort exception.
+     */
+    isAbort: boolean;
+};
+export type ModelRetryAdvice = {
+    /**
+     * Optional provider recommendation for whether this error is retryable.
+     * The runner still applies safety vetoes first and user policy remains the final authority.
+     */
+    suggested?: boolean;
+    /**
+     * Optional delay hint in milliseconds from the provider or transport layer.
+     */
+    retryAfterMs?: number;
+    /**
+     * Optional explanation for why the provider suggested or vetoed a retry.
+     */
+    reason?: string;
+    /**
+     * Provider confidence about whether replaying the request is safe.
+     * Omit this field when replay safety is unknown.
+     */
+    replaySafety?: 'unsafe' | 'safe';
+    /**
+     * Provider-supplied normalized facts that should override generic extraction when present.
+     */
+    normalized?: Partial<ModelRetryNormalizedError>;
+};
+export type RetryPolicyContext = {
+    /**
+     * The error thrown by the failed model attempt.
+     */
+    error: unknown;
+    /**
+     * The 1-based number of the failed attempt.
+     */
+    attempt: number;
+    /**
+     * The configured number of retries allowed after the initial attempt.
+     */
+    maxRetries: number;
+    /**
+     * Whether the failed request was streaming.
+     */
+    stream: boolean;
+    /**
+     * Optional provider guidance for the failure.
+     */
+    providerAdvice?: ModelRetryAdvice;
+    /**
+     * Generic normalized facts extracted from the error and provider advice.
+     */
+    normalized: ModelRetryNormalizedError;
+};
+export type RetryPolicy = (context: RetryPolicyContext) => RetryDecision | Promise<RetryDecision>;
+export type ModelRetryBackoffSettings = {
+    /**
+     * Delay for the first retry in milliseconds.
+     */
+    initialDelayMs?: number;
+    /**
+     * Maximum delay between retries in milliseconds.
+     */
+    maxDelayMs?: number;
+    /**
+     * Multiplier applied after each retry attempt.
+     */
+    multiplier?: number;
+    /**
+     * Whether to apply jitter to the computed backoff delay.
+     */
+    jitter?: boolean;
+};
+export type ModelRetrySettings = {
+    /**
+     * Number of retries allowed after the initial model request.
+     * Retries remain opt-in; no retries occur unless `policy` returns `true`.
+     */
+    maxRetries?: number;
+    /**
+     * Backoff configuration used when the retry policy requests a retry without returning an explicit delay.
+     */
+    backoff?: ModelRetryBackoffSettings;
+    /**
+     * Runtime-only retry policy. This callback is not serialized into persisted run state.
+     */
+    policy?: RetryPolicy;
+};
 /**
  * Settings to use when calling an LLM.
  *
@@ -102,6 +222,10 @@ export type ModelSettings = {
      * request.
      */
     providerData?: Record<string, any>;
+    /**
+     * Runtime-only retry configuration for the model request.
+     */
+    retry?: ModelRetrySettings;
 };
 export type ModelTracing = boolean | 'enabled_without_data';
 export type SerializedFunctionTool = {
@@ -247,6 +371,24 @@ export type ModelRequest = {
      */
     overridePromptModel?: boolean;
 };
+export type ModelRetryAdviceRequest = {
+    /**
+     * The failed request that is being evaluated for replay.
+     */
+    request: ModelRequest;
+    /**
+     * The error thrown by the failed attempt.
+     */
+    error: unknown;
+    /**
+     * Whether the failed request used streaming.
+     */
+    stream: boolean;
+    /**
+     * The 1-based number of the failed attempt.
+     */
+    attempt: number;
+};
 export type ModelResponse = {
     /**
      * The usage information for response.
@@ -285,6 +427,10 @@ export interface Model {
      *
      */
     getStreamedResponse(request: ModelRequest): AsyncIterable<StreamEvent>;
+    /**
+     * Provide optional retry advice for a failed request.
+     */
+    getRetryAdvice?(args: ModelRetryAdviceRequest): Promise<ModelRetryAdvice | undefined> | ModelRetryAdvice | undefined;
 }
 /**
  * The base interface for a model provider.

package/dist/run.js

@@ -24,6 +24,7 @@ const protocol_1 = require("./types/protocol.js");
 const conversation_1 = require("./runner/conversation.js");
 const guardrails_1 = require("./runner/guardrails.js");
 const modelSettings_1 = require("./runner/modelSettings.js");
+const modelRetry_1 = require("./runner/modelRetry.js");
 const modelOutputs_1 = require("./runner/modelOutputs.js");
 const streaming_1 = require("./runner/streaming.js");
 const sessionPersistence_1 = require("./runner/sessionPersistence.js");
@@ -337,7 +338,7 @@ class Runner extends lifecycle_1.RunHooks {
                         guardrailTracker.setPromise(parallelGuardrailPromise);
                         const preparedCall = await this.#prepareModelCall(state, options, artifacts, turnInput, serverConversationTracker, sessionInputUpdate);
                         guardrailTracker.throwIfError();
-                        state._lastTurnResponse = await preparedCall.model.getResponse({
+                        state._lastTurnResponse = await (0, modelRetry_1.getResponseWithRetry)(preparedCall.model, {
                             systemInstructions: preparedCall.modelInput.instructions,
                             prompt: preparedCall.prompt,
                             // Explicit agent/run config models should take precedence over prompt defaults.
@@ -617,7 +618,7 @@ class Runner extends lifecycle_1.RunHooks {
                         await persistStreamInputIfNeeded();
                     }
                     try {
-                        for await (const event of preparedCall.model.getStreamedResponse({
+                        for await (const event of (0, modelRetry_1.getStreamedResponseWithRetry)(preparedCall.model, {
                             systemInstructions: preparedCall.modelInput.instructions,
                             prompt: preparedCall.prompt,
                             // Streaming requests should also honor explicitly chosen models.
@@ -861,10 +862,7 @@ class Runner extends lifecycle_1.RunHooks {
      */
     async #prepareModelCall(state, options, artifacts, turnInput, serverConversationTracker, sessionInputUpdate) {
         const { model, explictlyModelSet, resolvedModelName } = await this.#resolveModelForAgent(state._currentAgent);
-        let modelSettings = {
-            ...this.config.modelSettings,
-            ...state._currentAgent.modelSettings,
-        };
+        let modelSettings = (0, modelSettings_1.mergeModelSettings)(this.config.modelSettings, state._currentAgent.modelSettings);
         modelSettings = (0, modelSettings_1.adjustModelSettingsForNonGPT5RunnerModel)(explictlyModelSet, state._currentAgent.modelSettings, model, modelSettings, resolvedModelName);
         modelSettings = (0, modelSettings_1.maybeResetToolChoice)(state._currentAgent, state._toolUseTracker, modelSettings);
         state._lastModelSettings = modelSettings;