@openai/agents-core 0.0.17 → 0.1.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.
- package/dist/agent.d.ts +4 -2
- package/dist/agent.js +17 -1
- package/dist/agent.js.map +1 -1
- package/dist/agent.mjs +17 -1
- package/dist/agent.mjs.map +1 -1
- package/dist/defaultModel.d.ts +22 -0
- package/dist/defaultModel.js +56 -0
- package/dist/defaultModel.js.map +1 -0
- package/dist/defaultModel.mjs +49 -0
- package/dist/defaultModel.mjs.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +8 -2
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +1 -0
- package/dist/index.mjs.map +1 -1
- package/dist/metadata.js +3 -3
- package/dist/metadata.js.map +1 -1
- package/dist/metadata.mjs +3 -3
- package/dist/metadata.mjs.map +1 -1
- package/dist/model.d.ts +7 -0
- package/dist/run.d.ts +1 -0
- package/dist/run.js +39 -0
- package/dist/run.js.map +1 -1
- package/dist/run.mjs +39 -0
- package/dist/run.mjs.map +1 -1
- package/dist/runContext.d.ts +1 -1
- package/dist/runContext.js +1 -1
- package/dist/runContext.mjs +1 -1
- package/dist/runImplementation.js +1 -1
- package/dist/runImplementation.js.map +1 -1
- package/dist/runImplementation.mjs +1 -1
- package/dist/runImplementation.mjs.map +1 -1
- package/dist/tool.d.ts +10 -3
- package/dist/tool.js +84 -25
- package/dist/tool.js.map +1 -1
- package/dist/tool.mjs +84 -25
- package/dist/tool.mjs.map +1 -1
- package/dist/tracing/processor.js +1 -1
- package/dist/tracing/processor.js.map +1 -1
- package/dist/tracing/processor.mjs +1 -1
- package/dist/tracing/processor.mjs.map +1 -1
- package/dist/types/providerData.d.ts +11 -3
- package/package.json +3 -3
package/dist/agent.d.ts
CHANGED
|
@@ -107,8 +107,10 @@ export interface AgentConfiguration<TContext = UnknownContext, TOutput extends A
|
|
|
107
107
|
*/
|
|
108
108
|
handoffOutputTypeWarningEnabled?: boolean;
|
|
109
109
|
/**
|
|
110
|
-
* The model implementation to use when invoking the LLM.
|
|
111
|
-
*
|
|
110
|
+
* The model implementation to use when invoking the LLM.
|
|
111
|
+
*
|
|
112
|
+
* By default, if not set, the agent will use the default model returned by
|
|
113
|
+
* getDefaultModel (currently "gpt-4.1").
|
|
112
114
|
*/
|
|
113
115
|
model: string | Model;
|
|
114
116
|
/**
|
package/dist/agent.js
CHANGED
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.Agent = void 0;
|
|
7
7
|
const lifecycle_1 = require("./lifecycle.js");
|
|
8
8
|
const mcp_1 = require("./mcp.js");
|
|
9
|
+
const defaultModel_1 = require("./defaultModel.js");
|
|
9
10
|
const tool_1 = require("./tool.js");
|
|
10
11
|
const run_1 = require("./run.js");
|
|
11
12
|
const tools_1 = require("./utils/tools.js");
|
|
@@ -62,7 +63,7 @@ class Agent extends lifecycle_1.AgentHooks {
|
|
|
62
63
|
this.handoffDescription = config.handoffDescription ?? '';
|
|
63
64
|
this.handoffs = config.handoffs ?? [];
|
|
64
65
|
this.model = config.model ?? '';
|
|
65
|
-
this.modelSettings = config.modelSettings ??
|
|
66
|
+
this.modelSettings = config.modelSettings ?? (0, defaultModel_1.getDefaultModelSettings)();
|
|
66
67
|
this.tools = config.tools ?? [];
|
|
67
68
|
this.mcpServers = config.mcpServers ?? [];
|
|
68
69
|
this.inputGuardrails = config.inputGuardrails ?? [];
|
|
@@ -72,6 +73,21 @@ class Agent extends lifecycle_1.AgentHooks {
|
|
|
72
73
|
}
|
|
73
74
|
this.toolUseBehavior = config.toolUseBehavior ?? 'run_llm_again';
|
|
74
75
|
this.resetToolChoice = config.resetToolChoice ?? true;
|
|
76
|
+
if (
|
|
77
|
+
// The user sets a non-default model
|
|
78
|
+
config.model !== undefined &&
|
|
79
|
+
// The default model is gpt-5
|
|
80
|
+
(0, defaultModel_1.isGpt5Default)() &&
|
|
81
|
+
// However, the specified model is not a gpt-5 model
|
|
82
|
+
(typeof config.model !== 'string' ||
|
|
83
|
+
!(0, defaultModel_1.gpt5ReasoningSettingsRequired)(config.model)) &&
|
|
84
|
+
// The model settings are not customized for the specified model
|
|
85
|
+
config.modelSettings === undefined) {
|
|
86
|
+
// In this scenario, we should use a generic model settings
|
|
87
|
+
// because non-gpt-5 models are not compatible with the default gpt-5 model settings.
|
|
88
|
+
// This is a best-effort attempt to make the agent work with non-gpt-5 models.
|
|
89
|
+
this.modelSettings = {};
|
|
90
|
+
}
|
|
75
91
|
// --- Runtime warning for handoff output type compatibility ---
|
|
76
92
|
if (config.handoffOutputTypeWarningEnabled === undefined ||
|
|
77
93
|
config.handoffOutputTypeWarningEnabled) {
|
package/dist/agent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":";;;;;;AAGA,8CAAyC;AACzC,kCAAuD;
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"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"}
|
package/dist/agent.mjs
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AgentHooks } from "./lifecycle.mjs";
|
|
2
2
|
import { getAllMcpTools } from "./mcp.mjs";
|
|
3
|
+
import { getDefaultModelSettings, gpt5ReasoningSettingsRequired, isGpt5Default, } from "./defaultModel.mjs";
|
|
3
4
|
import { tool, } from "./tool.mjs";
|
|
4
5
|
import { Runner } from "./run.mjs";
|
|
5
6
|
import { toFunctionToolName } from "./utils/tools.mjs";
|
|
@@ -56,7 +57,7 @@ export class Agent extends AgentHooks {
|
|
|
56
57
|
this.handoffDescription = config.handoffDescription ?? '';
|
|
57
58
|
this.handoffs = config.handoffs ?? [];
|
|
58
59
|
this.model = config.model ?? '';
|
|
59
|
-
this.modelSettings = config.modelSettings ??
|
|
60
|
+
this.modelSettings = config.modelSettings ?? getDefaultModelSettings();
|
|
60
61
|
this.tools = config.tools ?? [];
|
|
61
62
|
this.mcpServers = config.mcpServers ?? [];
|
|
62
63
|
this.inputGuardrails = config.inputGuardrails ?? [];
|
|
@@ -66,6 +67,21 @@ export class Agent extends AgentHooks {
|
|
|
66
67
|
}
|
|
67
68
|
this.toolUseBehavior = config.toolUseBehavior ?? 'run_llm_again';
|
|
68
69
|
this.resetToolChoice = config.resetToolChoice ?? true;
|
|
70
|
+
if (
|
|
71
|
+
// The user sets a non-default model
|
|
72
|
+
config.model !== undefined &&
|
|
73
|
+
// The default model is gpt-5
|
|
74
|
+
isGpt5Default() &&
|
|
75
|
+
// However, the specified model is not a gpt-5 model
|
|
76
|
+
(typeof config.model !== 'string' ||
|
|
77
|
+
!gpt5ReasoningSettingsRequired(config.model)) &&
|
|
78
|
+
// The model settings are not customized for the specified model
|
|
79
|
+
config.modelSettings === undefined) {
|
|
80
|
+
// In this scenario, we should use a generic model settings
|
|
81
|
+
// because non-gpt-5 models are not compatible with the default gpt-5 model settings.
|
|
82
|
+
// This is a best-effort attempt to make the agent work with non-gpt-5 models.
|
|
83
|
+
this.modelSettings = {};
|
|
84
|
+
}
|
|
69
85
|
// --- Runtime warning for handoff output type compatibility ---
|
|
70
86
|
if (config.handoffOutputTypeWarningEnabled === undefined ||
|
|
71
87
|
config.handoffOutputTypeWarningEnabled) {
|
package/dist/agent.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.mjs","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"OAGO,EAAE,UAAU,EAAE;OACd,EAAE,cAAc,EAAkB;
|
|
1
|
+
{"version":3,"file":"agent.mjs","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { ModelSettings } from './model';
|
|
2
|
+
export declare const OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME = "OPENAI_DEFAULT_MODEL";
|
|
3
|
+
/**
|
|
4
|
+
* Returns True if the model name is a GPT-5 model and reasoning settings are required.
|
|
5
|
+
*/
|
|
6
|
+
export declare function gpt5ReasoningSettingsRequired(modelName: string): boolean;
|
|
7
|
+
/**
|
|
8
|
+
* Returns True if the default model is a GPT-5 model.
|
|
9
|
+
* This is used to determine if the default model settings are compatible with GPT-5 models.
|
|
10
|
+
* If the default model is not a GPT-5 model, the model settings are compatible with other models.
|
|
11
|
+
*/
|
|
12
|
+
export declare function isGpt5Default(): boolean;
|
|
13
|
+
/**
|
|
14
|
+
* Returns the default model name.
|
|
15
|
+
*/
|
|
16
|
+
export declare function getDefaultModel(): string;
|
|
17
|
+
/**
|
|
18
|
+
* Returns the default model settings.
|
|
19
|
+
* If the default model is a GPT-5 model, returns the GPT-5 default model settings.
|
|
20
|
+
* Otherwise, returns the legacy default model settings.
|
|
21
|
+
*/
|
|
22
|
+
export declare function getDefaultModelSettings(model?: string): ModelSettings;
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME = void 0;
|
|
4
|
+
exports.gpt5ReasoningSettingsRequired = gpt5ReasoningSettingsRequired;
|
|
5
|
+
exports.isGpt5Default = isGpt5Default;
|
|
6
|
+
exports.getDefaultModel = getDefaultModel;
|
|
7
|
+
exports.getDefaultModelSettings = getDefaultModelSettings;
|
|
8
|
+
const config_1 = require("./config.js");
|
|
9
|
+
exports.OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME = 'OPENAI_DEFAULT_MODEL';
|
|
10
|
+
/**
|
|
11
|
+
* Returns True if the model name is a GPT-5 model and reasoning settings are required.
|
|
12
|
+
*/
|
|
13
|
+
function gpt5ReasoningSettingsRequired(modelName) {
|
|
14
|
+
if (modelName.startsWith('gpt-5-chat')) {
|
|
15
|
+
// gpt-5-chat-latest does not require reasoning settings
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
// matches any of gpt-5 models
|
|
19
|
+
return modelName.startsWith('gpt-5');
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Returns True if the default model is a GPT-5 model.
|
|
23
|
+
* This is used to determine if the default model settings are compatible with GPT-5 models.
|
|
24
|
+
* If the default model is not a GPT-5 model, the model settings are compatible with other models.
|
|
25
|
+
*/
|
|
26
|
+
function isGpt5Default() {
|
|
27
|
+
return gpt5ReasoningSettingsRequired(getDefaultModel());
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Returns the default model name.
|
|
31
|
+
*/
|
|
32
|
+
function getDefaultModel() {
|
|
33
|
+
const env = (0, config_1.loadEnv)();
|
|
34
|
+
return (env[exports.OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME]?.toLowerCase() ?? 'gpt-4.1');
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Returns the default model settings.
|
|
38
|
+
* If the default model is a GPT-5 model, returns the GPT-5 default model settings.
|
|
39
|
+
* Otherwise, returns the legacy default model settings.
|
|
40
|
+
*/
|
|
41
|
+
function getDefaultModelSettings(model) {
|
|
42
|
+
const _model = model ?? getDefaultModel();
|
|
43
|
+
if (gpt5ReasoningSettingsRequired(_model)) {
|
|
44
|
+
return {
|
|
45
|
+
providerData: {
|
|
46
|
+
// We chose "low" instead of "minimal" because some of the built-in tools
|
|
47
|
+
// (e.g., file search, image generation, etc.) do not support "minimal"
|
|
48
|
+
// If you want to use "minimal" reasoning effort, you can pass your own model settings
|
|
49
|
+
reasoning: { effort: 'low' },
|
|
50
|
+
text: { verbosity: 'low' },
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
return {};
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=defaultModel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"defaultModel.js","sourceRoot":"","sources":["../src/defaultModel.ts"],"names":[],"mappings":";;;AAQA,sEAOC;AAOD,sCAEC;AAKD,0CAKC;AAOD,0DAcC;AAvDD,wCAAmC;AAGtB,QAAA,sCAAsC,GAAG,sBAAsB,CAAC;AAE7E;;GAEG;AACH,SAAgB,6BAA6B,CAAC,SAAiB;IAC7D,IAAI,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACvC,wDAAwD;QACxD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,8BAA8B;IAC9B,OAAO,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,SAAgB,aAAa;IAC3B,OAAO,6BAA6B,CAAC,eAAe,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED;;GAEG;AACH,SAAgB,eAAe;IAC7B,MAAM,GAAG,GAAG,IAAA,gBAAO,GAAE,CAAC;IACtB,OAAO,CACL,GAAG,CAAC,8CAAsC,CAAC,EAAE,WAAW,EAAE,IAAI,SAAS,CACxE,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,KAAc;IACpD,MAAM,MAAM,GAAG,KAAK,IAAI,eAAe,EAAE,CAAC;IAC1C,IAAI,6BAA6B,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1C,OAAO;YACL,YAAY,EAAE;gBACZ,yEAAyE;gBACzE,uEAAuE;gBACvE,sFAAsF;gBACtF,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;gBAC5B,IAAI,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;aAC3B;SACF,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { loadEnv } from "./config.mjs";
|
|
2
|
+
export const OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME = 'OPENAI_DEFAULT_MODEL';
|
|
3
|
+
/**
|
|
4
|
+
* Returns True if the model name is a GPT-5 model and reasoning settings are required.
|
|
5
|
+
*/
|
|
6
|
+
export function gpt5ReasoningSettingsRequired(modelName) {
|
|
7
|
+
if (modelName.startsWith('gpt-5-chat')) {
|
|
8
|
+
// gpt-5-chat-latest does not require reasoning settings
|
|
9
|
+
return false;
|
|
10
|
+
}
|
|
11
|
+
// matches any of gpt-5 models
|
|
12
|
+
return modelName.startsWith('gpt-5');
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Returns True if the default model is a GPT-5 model.
|
|
16
|
+
* This is used to determine if the default model settings are compatible with GPT-5 models.
|
|
17
|
+
* If the default model is not a GPT-5 model, the model settings are compatible with other models.
|
|
18
|
+
*/
|
|
19
|
+
export function isGpt5Default() {
|
|
20
|
+
return gpt5ReasoningSettingsRequired(getDefaultModel());
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Returns the default model name.
|
|
24
|
+
*/
|
|
25
|
+
export function getDefaultModel() {
|
|
26
|
+
const env = loadEnv();
|
|
27
|
+
return (env[OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME]?.toLowerCase() ?? 'gpt-4.1');
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Returns the default model settings.
|
|
31
|
+
* If the default model is a GPT-5 model, returns the GPT-5 default model settings.
|
|
32
|
+
* Otherwise, returns the legacy default model settings.
|
|
33
|
+
*/
|
|
34
|
+
export function getDefaultModelSettings(model) {
|
|
35
|
+
const _model = model ?? getDefaultModel();
|
|
36
|
+
if (gpt5ReasoningSettingsRequired(_model)) {
|
|
37
|
+
return {
|
|
38
|
+
providerData: {
|
|
39
|
+
// We chose "low" instead of "minimal" because some of the built-in tools
|
|
40
|
+
// (e.g., file search, image generation, etc.) do not support "minimal"
|
|
41
|
+
// If you want to use "minimal" reasoning effort, you can pass your own model settings
|
|
42
|
+
reasoning: { effort: 'low' },
|
|
43
|
+
text: { verbosity: 'low' },
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
return {};
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=defaultModel.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"defaultModel.mjs","sourceRoot":"","sources":["../src/defaultModel.ts"],"names":[],"mappings":"OAAO,EAAE,OAAO,EAAE;AAGlB,MAAM,CAAC,MAAM,sCAAsC,GAAG,sBAAsB,CAAC;AAE7E;;GAEG;AACH,MAAM,UAAU,6BAA6B,CAAC,SAAiB;IAC7D,IAAI,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACvC,wDAAwD;QACxD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,8BAA8B;IAC9B,OAAO,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa;IAC3B,OAAO,6BAA6B,CAAC,eAAe,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe;IAC7B,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IACtB,OAAO,CACL,GAAG,CAAC,sCAAsC,CAAC,EAAE,WAAW,EAAE,IAAI,SAAS,CACxE,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,MAAM,MAAM,GAAG,KAAK,IAAI,eAAe,EAAE,CAAC;IAC1C,IAAI,6BAA6B,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1C,OAAO;YACL,YAAY,EAAE;gBACZ,yEAAyE;gBACzE,uEAAuE;gBACvE,sFAAsF;gBACtF,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;gBAC5B,IAAI,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;aAC3B;SACF,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ export { getLogger } from './logger';
|
|
|
12
12
|
export { getAllMcpTools, invalidateServerToolsCache, mcpToFunctionTool, MCPServer, MCPServerStdio, MCPServerStreamableHttp, MCPServerSSE, GetAllMcpToolsOptions, } from './mcp';
|
|
13
13
|
export { MCPToolFilterCallable, MCPToolFilterContext, MCPToolFilterStatic, createMCPToolStaticFilter, } from './mcpUtil';
|
|
14
14
|
export { Model, ModelProvider, ModelRequest, ModelResponse, ModelSettings, ModelSettingsToolChoice, SerializedHandoff, SerializedTool, SerializedOutputType, } from './model';
|
|
15
|
+
export { OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME, gpt5ReasoningSettingsRequired, getDefaultModel, getDefaultModelSettings, isGpt5Default, } from './defaultModel';
|
|
15
16
|
export { setDefaultModelProvider } from './providers';
|
|
16
17
|
export { RunResult, StreamedRunResult } from './result';
|
|
17
18
|
export { IndividualRunOptions, NonStreamRunOptions, run, RunConfig, Runner, StreamRunOptions, } from './run';
|
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.
|
|
40
|
-
exports.protocol = exports.Usage = exports.TraceProvider = void 0;
|
|
39
|
+
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.MCPServerSSE = exports.MCPServerStreamableHttp = exports.MCPServerStdio = exports.mcpToFunctionTool = exports.invalidateServerToolsCache = exports.getAllMcpTools = 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.defineOutputGuardrail = exports.RunItemStreamEvent = exports.RunRawModelStreamEvent = exports.RunAgentUpdatedStreamEvent = exports.SystemError = exports.UserError = exports.ToolCallError = exports.OutputGuardrailTripwireTriggered = exports.ModelBehaviorError = exports.MaxTurnsExceededError = exports.InputGuardrailTripwireTriggered = exports.GuardrailExecutionError = exports.AgentsError = exports.Agent = exports.RuntimeEventEmitter = void 0;
|
|
40
|
+
exports.protocol = exports.Usage = exports.TraceProvider = exports.getGlobalTraceProvider = exports.tool = exports.hostedMcpTool = exports.computerTool = exports.RunState = 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");
|
|
@@ -91,6 +91,12 @@ Object.defineProperty(exports, "MCPServerStreamableHttp", { enumerable: true, ge
|
|
|
91
91
|
Object.defineProperty(exports, "MCPServerSSE", { enumerable: true, get: function () { return mcp_1.MCPServerSSE; } });
|
|
92
92
|
var mcpUtil_1 = require("./mcpUtil.js");
|
|
93
93
|
Object.defineProperty(exports, "createMCPToolStaticFilter", { enumerable: true, get: function () { return mcpUtil_1.createMCPToolStaticFilter; } });
|
|
94
|
+
var defaultModel_1 = require("./defaultModel.js");
|
|
95
|
+
Object.defineProperty(exports, "OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME", { enumerable: true, get: function () { return defaultModel_1.OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME; } });
|
|
96
|
+
Object.defineProperty(exports, "gpt5ReasoningSettingsRequired", { enumerable: true, get: function () { return defaultModel_1.gpt5ReasoningSettingsRequired; } });
|
|
97
|
+
Object.defineProperty(exports, "getDefaultModel", { enumerable: true, get: function () { return defaultModel_1.getDefaultModel; } });
|
|
98
|
+
Object.defineProperty(exports, "getDefaultModelSettings", { enumerable: true, get: function () { return defaultModel_1.getDefaultModelSettings; } });
|
|
99
|
+
Object.defineProperty(exports, "isGpt5Default", { enumerable: true, get: function () { return defaultModel_1.isGpt5Default; } });
|
|
94
100
|
var providers_1 = require("./providers.js");
|
|
95
101
|
Object.defineProperty(exports, "setDefaultModelProvider", { enumerable: true, get: function () { return providers_1.setDefaultModelProvider; } });
|
|
96
102
|
var result_1 = require("./result.js");
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA8C;AAC9C,sDAAuD;AAEvD,qDAAiE;AAAxD,6GAAA,mBAAmB,OAAA;AAC5B,oCAUiB;AATf,8FAAA,KAAK,OAAA;AAWP,sCAUkB;AAThB,qGAAA,WAAW,OAAA;AACX,iHAAA,uBAAuB,OAAA;AACvB,yHAAA,+BAA+B,OAAA;AAC/B,+GAAA,qBAAqB,OAAA;AACrB,4GAAA,kBAAkB,OAAA;AAClB,0HAAA,gCAAgC,OAAA;AAChC,uGAAA,aAAa,OAAA;AACb,mGAAA,SAAS,OAAA;AACT,qGAAA,WAAW,OAAA;AAEb,sCAKkB;AAJhB,oHAAA,0BAA0B,OAAA;AAC1B,gHAAA,sBAAsB,OAAA;AACtB,4GAAA,kBAAkB,OAAA;AAGpB,4CAcqB;AAbnB,kHAAA,qBAAqB,OAAA;AAcvB,wCAMmB;AALjB,qGAAA,UAAU,OAAA;AACV,6GAAA,kBAAkB,OAAA;AAClB,kGAAA,OAAO,OAAA;AACP,kGAAA,OAAO,OAAA;AAGT,gDAA4D;AAAnD,oGAAA,SAAS,OAAA;AAAE,iGAAA,MAAM,OAAA;AAAE,+FAAA,IAAI,OAAA;AAChC,oCAUiB;AATf,6GAAA,oBAAoB,OAAA;AACpB,2GAAA,kBAAkB,OAAA;AAClB,6GAAA,oBAAoB,OAAA;AAEpB,6GAAA,oBAAoB,OAAA;AACpB,yGAAA,gBAAgB,OAAA;AAChB,4GAAA,mBAAmB,OAAA;AACnB,wGAAA,eAAe,OAAA;AACf,8GAAA,qBAAqB,OAAA;AAEvB,4CAAyC;AAAhC,uGAAA,UAAU,OAAA;AACnB,sCAAqC;AAA5B,mGAAA,SAAS,OAAA;AAClB,gCASe;AARb,qGAAA,cAAc,OAAA;AACd,iHAAA,0BAA0B,OAAA;AAC1B,wGAAA,iBAAiB,OAAA;AAEjB,qGAAA,cAAc,OAAA;AACd,8GAAA,uBAAuB,OAAA;AACvB,mGAAA,YAAY,OAAA;AAGd,wCAKmB;AADjB,oHAAA,yBAAyB,OAAA;AAa3B,4CAAsD;AAA7C,oHAAA,uBAAuB,OAAA;AAChC,sCAAwD;AAA/C,mGAAA,SAAS,OAAA;AAAE,2GAAA,iBAAiB,OAAA;AACrC,gCAOe;AAJb,0FAAA,GAAG,OAAA;AAEH,6FAAA,MAAM,OAAA;AAGR,8CAA0C;AAAjC,wGAAA,UAAU,OAAA;AACnB,0CAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,kCAWgB;AARd,oGAAA,YAAY,OAAA;AAEZ,qGAAA,aAAa,OAAA;AAIb,4FAAA,IAAI,OAAA;AAGN,qDAA0B;AAC1B,kDAA2E;AAAlE,kHAAA,sBAAsB,OAAA;AAAE,yGAAA,aAAa,OAAA;AAyB9C,oCAAgC;AAAvB,8FAAA,KAAK,OAAA;AAEd;;;GAGG;AACH,gEAA6C;AAE7C;;;;;GAKG;AACH,IAAA,2BAAiB,EAAC,IAAA,4BAAgB,GAAE,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA8C;AAC9C,sDAAuD;AAEvD,qDAAiE;AAAxD,6GAAA,mBAAmB,OAAA;AAC5B,oCAUiB;AATf,8FAAA,KAAK,OAAA;AAWP,sCAUkB;AAThB,qGAAA,WAAW,OAAA;AACX,iHAAA,uBAAuB,OAAA;AACvB,yHAAA,+BAA+B,OAAA;AAC/B,+GAAA,qBAAqB,OAAA;AACrB,4GAAA,kBAAkB,OAAA;AAClB,0HAAA,gCAAgC,OAAA;AAChC,uGAAA,aAAa,OAAA;AACb,mGAAA,SAAS,OAAA;AACT,qGAAA,WAAW,OAAA;AAEb,sCAKkB;AAJhB,oHAAA,0BAA0B,OAAA;AAC1B,gHAAA,sBAAsB,OAAA;AACtB,4GAAA,kBAAkB,OAAA;AAGpB,4CAcqB;AAbnB,kHAAA,qBAAqB,OAAA;AAcvB,wCAMmB;AALjB,qGAAA,UAAU,OAAA;AACV,6GAAA,kBAAkB,OAAA;AAClB,kGAAA,OAAO,OAAA;AACP,kGAAA,OAAO,OAAA;AAGT,gDAA4D;AAAnD,oGAAA,SAAS,OAAA;AAAE,iGAAA,MAAM,OAAA;AAAE,+FAAA,IAAI,OAAA;AAChC,oCAUiB;AATf,6GAAA,oBAAoB,OAAA;AACpB,2GAAA,kBAAkB,OAAA;AAClB,6GAAA,oBAAoB,OAAA;AAEpB,6GAAA,oBAAoB,OAAA;AACpB,yGAAA,gBAAgB,OAAA;AAChB,4GAAA,mBAAmB,OAAA;AACnB,wGAAA,eAAe,OAAA;AACf,8GAAA,qBAAqB,OAAA;AAEvB,4CAAyC;AAAhC,uGAAA,UAAU,OAAA;AACnB,sCAAqC;AAA5B,mGAAA,SAAS,OAAA;AAClB,gCASe;AARb,qGAAA,cAAc,OAAA;AACd,iHAAA,0BAA0B,OAAA;AAC1B,wGAAA,iBAAiB,OAAA;AAEjB,qGAAA,cAAc,OAAA;AACd,8GAAA,uBAAuB,OAAA;AACvB,mGAAA,YAAY,OAAA;AAGd,wCAKmB;AADjB,oHAAA,yBAAyB,OAAA;AAa3B,kDAMwB;AALtB,sIAAA,sCAAsC,OAAA;AACtC,6HAAA,6BAA6B,OAAA;AAC7B,+GAAA,eAAe,OAAA;AACf,uHAAA,uBAAuB,OAAA;AACvB,6GAAA,aAAa,OAAA;AAEf,4CAAsD;AAA7C,oHAAA,uBAAuB,OAAA;AAChC,sCAAwD;AAA/C,mGAAA,SAAS,OAAA;AAAE,2GAAA,iBAAiB,OAAA;AACrC,gCAOe;AAJb,0FAAA,GAAG,OAAA;AAEH,6FAAA,MAAM,OAAA;AAGR,8CAA0C;AAAjC,wGAAA,UAAU,OAAA;AACnB,0CAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,kCAWgB;AARd,oGAAA,YAAY,OAAA;AAEZ,qGAAA,aAAa,OAAA;AAIb,4FAAA,IAAI,OAAA;AAGN,qDAA0B;AAC1B,kDAA2E;AAAlE,kHAAA,sBAAsB,OAAA;AAAE,yGAAA,aAAa,OAAA;AAyB9C,oCAAgC;AAAvB,8FAAA,KAAK,OAAA;AAEd;;;GAGG;AACH,gEAA6C;AAE7C;;;;;GAKG;AACH,IAAA,2BAAiB,EAAC,IAAA,4BAAgB,GAAE,CAAC,CAAC"}
|
package/dist/index.mjs
CHANGED
|
@@ -12,6 +12,7 @@ export { AgentHooks } from "./lifecycle.mjs";
|
|
|
12
12
|
export { getLogger } from "./logger.mjs";
|
|
13
13
|
export { getAllMcpTools, invalidateServerToolsCache, mcpToFunctionTool, MCPServerStdio, MCPServerStreamableHttp, MCPServerSSE, } from "./mcp.mjs";
|
|
14
14
|
export { createMCPToolStaticFilter, } from "./mcpUtil.mjs";
|
|
15
|
+
export { OPENAI_DEFAULT_MODEL_ENV_VARIABLE_NAME, gpt5ReasoningSettingsRequired, getDefaultModel, getDefaultModelSettings, isGpt5Default, } from "./defaultModel.mjs";
|
|
15
16
|
export { setDefaultModelProvider } from "./providers.mjs";
|
|
16
17
|
export { RunResult, StreamedRunResult } from "./result.mjs";
|
|
17
18
|
export { run, Runner, } from "./run.mjs";
|
package/dist/index.mjs.map
CHANGED
|
@@ -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;OAEM,EACL,WAAW,EACX,uBAAuB,EACvB,+BAA+B,EAC/B,qBAAqB,EACrB,kBAAkB,EAClB,gCAAgC,EAChC,aAAa,EACb,SAAS,EACT,WAAW,GACZ;OACM,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,GAEnB;OACM,EACL,qBAAqB,GAatB;OACM,EACL,UAAU,EACV,kBAAkB,EAClB,OAAO,EACP,OAAO,GAER;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,EACL,cAAc,EACd,0BAA0B,EAC1B,iBAAiB,EAEjB,cAAc,EACd,uBAAuB,EACvB,YAAY,GAEb;OACM,EAIL,yBAAyB,GAC1B;OAYM,EAAE,uBAAuB,EAAE;OAC3B,EAAE,SAAS,EAAE,iBAAiB,EAAE;OAChC,EAGL,GAAG,EAEH,MAAM,GAEP;OACM,EAAE,UAAU,EAAE;OACd,EAAE,QAAQ,EAAE;OACZ,EAGL,YAAY,EAEZ,aAAa,EAIb,IAAI,GAEL;;OAEM,EAAE,sBAAsB,EAAE,aAAa,EAAE;OAyBzC,EAAE,KAAK,EAAE;OAMT,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;OAEM,EACL,WAAW,EACX,uBAAuB,EACvB,+BAA+B,EAC/B,qBAAqB,EACrB,kBAAkB,EAClB,gCAAgC,EAChC,aAAa,EACb,SAAS,EACT,WAAW,GACZ;OACM,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,GAEnB;OACM,EACL,qBAAqB,GAatB;OACM,EACL,UAAU,EACV,kBAAkB,EAClB,OAAO,EACP,OAAO,GAER;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,EACL,cAAc,EACd,0BAA0B,EAC1B,iBAAiB,EAEjB,cAAc,EACd,uBAAuB,EACvB,YAAY,GAEb;OACM,EAIL,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;OACM,EAAE,UAAU,EAAE;OACd,EAAE,QAAQ,EAAE;OACZ,EAGL,YAAY,EAEZ,aAAa,EAIb,IAAI,GAEL;;OAEM,EAAE,sBAAsB,EAAE,aAAa,EAAE;OAyBzC,EAAE,KAAK,EAAE;OAMT,KAAK,QAAQ;AAEpB;;;;;GAKG;AACH,iBAAiB,CAAC,gBAAgB,EAAE,CAAC,CAAC"}
|
package/dist/metadata.js
CHANGED
|
@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
4
4
|
exports.METADATA = void 0;
|
|
5
5
|
exports.METADATA = {
|
|
6
6
|
"name": "@openai/agents-core",
|
|
7
|
-
"version": "0.0
|
|
7
|
+
"version": "0.1.0",
|
|
8
8
|
"versions": {
|
|
9
|
-
"@openai/agents-core": "0.0
|
|
10
|
-
"openai": "^5.
|
|
9
|
+
"@openai/agents-core": "0.1.0",
|
|
10
|
+
"openai": "^5.16.0"
|
|
11
11
|
}
|
|
12
12
|
};
|
|
13
13
|
exports.default = exports.METADATA;
|
package/dist/metadata.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":";AACA,uCAAuC;;;AAE1B,QAAA,QAAQ,GAAG;IACtB,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":";AACA,uCAAuC;;;AAE1B,QAAA,QAAQ,GAAG;IACtB,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,OAAO;IAClB,UAAU,EAAE;QACV,qBAAqB,EAAE,OAAO;QAC9B,QAAQ,EAAE,SAAS;KACpB;CACF,CAAC;AAEF,kBAAe,gBAAQ,CAAC"}
|
package/dist/metadata.mjs
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
// This file is automatically generated
|
|
2
2
|
export const METADATA = {
|
|
3
3
|
"name": "@openai/agents-core",
|
|
4
|
-
"version": "0.0
|
|
4
|
+
"version": "0.1.0",
|
|
5
5
|
"versions": {
|
|
6
|
-
"@openai/agents-core": "0.0
|
|
7
|
-
"openai": "^5.
|
|
6
|
+
"@openai/agents-core": "0.1.0",
|
|
7
|
+
"openai": "^5.16.0"
|
|
8
8
|
}
|
|
9
9
|
};
|
|
10
10
|
export default METADATA;
|
package/dist/metadata.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.mjs","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":"AACA,uCAAuC;AAEvC,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"metadata.mjs","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":"AACA,uCAAuC;AAEvC,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,OAAO;IAClB,UAAU,EAAE;QACV,qBAAqB,EAAE,OAAO;QAC9B,QAAQ,EAAE,SAAS;KACpB;CACF,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
package/dist/model.d.ts
CHANGED
|
@@ -133,6 +133,13 @@ export type ModelRequest = {
|
|
|
133
133
|
* The ID of the previous response to use for the model.
|
|
134
134
|
*/
|
|
135
135
|
previousResponseId?: string;
|
|
136
|
+
/**
|
|
137
|
+
* The ID of stored conversation to use for the model.
|
|
138
|
+
*
|
|
139
|
+
* see https://platform.openai.com/docs/guides/conversation-state?api-mode=responses#openai-apis-for-conversation-state
|
|
140
|
+
* see https://platform.openai.com/docs/api-reference/conversations/create
|
|
141
|
+
*/
|
|
142
|
+
conversationId?: string;
|
|
136
143
|
/**
|
|
137
144
|
* The model settings to use for the model.
|
|
138
145
|
*/
|
package/dist/run.d.ts
CHANGED
package/dist/run.js
CHANGED
|
@@ -26,6 +26,7 @@ const events_1 = require("./events.js");
|
|
|
26
26
|
const runState_1 = require("./runState.js");
|
|
27
27
|
const protocol_1 = require("./types/protocol.js");
|
|
28
28
|
const tools_1 = require("./utils/tools.js");
|
|
29
|
+
const defaultModel_1 = require("./defaultModel.js");
|
|
29
30
|
const DEFAULT_MAX_TURNS = 10;
|
|
30
31
|
/**
|
|
31
32
|
* @internal
|
|
@@ -87,6 +88,9 @@ class Runner extends lifecycle_1.RunHooks {
|
|
|
87
88
|
: new runContext_1.RunContext(options.context), input, startingAgent, options.maxTurns ?? DEFAULT_MAX_TURNS);
|
|
88
89
|
try {
|
|
89
90
|
while (true) {
|
|
91
|
+
const explictlyModelSet = (state._currentAgent.model !== undefined &&
|
|
92
|
+
state._currentAgent.model !== '') ||
|
|
93
|
+
(this.config.model !== undefined && this.config.model !== '');
|
|
90
94
|
let model = selectModel(state._currentAgent.model, this.config.model);
|
|
91
95
|
if (typeof model === 'string') {
|
|
92
96
|
model = await this.config.modelProvider.getModel(model);
|
|
@@ -157,12 +161,15 @@ class Runner extends lifecycle_1.RunHooks {
|
|
|
157
161
|
...this.config.modelSettings,
|
|
158
162
|
...state._currentAgent.modelSettings,
|
|
159
163
|
};
|
|
164
|
+
const agentModelSettings = state._currentAgent.modelSettings;
|
|
165
|
+
modelSettings = adjustModelSettingsForNonGPT5RunnerModel(explictlyModelSet, agentModelSettings, model, modelSettings);
|
|
160
166
|
modelSettings = (0, runImplementation_1.maybeResetToolChoice)(state._currentAgent, state._toolUseTracker, modelSettings);
|
|
161
167
|
state._lastTurnResponse = await model.getResponse({
|
|
162
168
|
systemInstructions: await state._currentAgent.getSystemPrompt(state._context),
|
|
163
169
|
prompt: await state._currentAgent.getPrompt(state._context),
|
|
164
170
|
input: turnInput,
|
|
165
171
|
previousResponseId: options.previousResponseId,
|
|
172
|
+
conversationId: options.conversationId,
|
|
166
173
|
modelSettings,
|
|
167
174
|
tools: serializedTools,
|
|
168
175
|
outputType: (0, tools_1.convertAgentOutputTypeToSerializable)(state._currentAgent.outputType),
|
|
@@ -361,6 +368,8 @@ class Runner extends lifecycle_1.RunHooks {
|
|
|
361
368
|
throw new errors_1.MaxTurnsExceededError(`Max turns (${result.state._maxTurns}) exceeded`, result.state);
|
|
362
369
|
}
|
|
363
370
|
logger_1.default.debug(`Running agent ${currentAgent.name} (turn ${result.state._currentTurn})`);
|
|
371
|
+
const explictlyModelSet = (currentAgent.model !== undefined && currentAgent.model !== '') ||
|
|
372
|
+
(this.config.model !== undefined && this.config.model !== '');
|
|
364
373
|
let model = selectModel(currentAgent.model, this.config.model);
|
|
365
374
|
if (typeof model === 'string') {
|
|
366
375
|
model = await this.config.modelProvider.getModel(model);
|
|
@@ -372,6 +381,8 @@ class Runner extends lifecycle_1.RunHooks {
|
|
|
372
381
|
...this.config.modelSettings,
|
|
373
382
|
...currentAgent.modelSettings,
|
|
374
383
|
};
|
|
384
|
+
const agentModelSettings = currentAgent.modelSettings;
|
|
385
|
+
modelSettings = adjustModelSettingsForNonGPT5RunnerModel(explictlyModelSet, agentModelSettings, model, modelSettings);
|
|
375
386
|
modelSettings = (0, runImplementation_1.maybeResetToolChoice)(currentAgent, result.state._toolUseTracker, modelSettings);
|
|
376
387
|
const turnInput = getTurnInput(result.input, result.newItems);
|
|
377
388
|
if (result.state._noActiveAgentRun) {
|
|
@@ -384,6 +395,7 @@ class Runner extends lifecycle_1.RunHooks {
|
|
|
384
395
|
prompt: await currentAgent.getPrompt(result.state._context),
|
|
385
396
|
input: turnInput,
|
|
386
397
|
previousResponseId: options.previousResponseId,
|
|
398
|
+
conversationId: options.conversationId,
|
|
387
399
|
modelSettings,
|
|
388
400
|
tools: serializedTools,
|
|
389
401
|
handoffs: serializedHandoffs,
|
|
@@ -423,6 +435,8 @@ class Runner extends lifecycle_1.RunHooks {
|
|
|
423
435
|
}
|
|
424
436
|
if (result.state._currentStep.type === 'next_step_final_output') {
|
|
425
437
|
await this.#runOutputGuardrails(result.state, result.state._currentStep.output);
|
|
438
|
+
this.emit('agent_end', result.state._context, currentAgent, result.state._currentStep.output);
|
|
439
|
+
currentAgent.emit('agent_end', result.state._context, result.state._currentStep.output);
|
|
426
440
|
return;
|
|
427
441
|
}
|
|
428
442
|
else if (result.state._currentStep.type === 'next_step_interruption') {
|
|
@@ -557,4 +571,29 @@ async function run(agent, input, options) {
|
|
|
557
571
|
return await runner.run(agent, input, options);
|
|
558
572
|
}
|
|
559
573
|
}
|
|
574
|
+
/**
|
|
575
|
+
* When the default model is a GPT-5 variant, agents may carry GPT-5-specific providerData
|
|
576
|
+
* (e.g., reasoning effort, text verbosity). If a run resolves to a non-GPT-5 model and the
|
|
577
|
+
* agent relied on the default model (i.e., no explicit model set), these GPT-5-only settings
|
|
578
|
+
* are incompatible and should be stripped to avoid runtime errors.
|
|
579
|
+
*/
|
|
580
|
+
function adjustModelSettingsForNonGPT5RunnerModel(explictlyModelSet, agentModelSettings, runnerModel, modelSettings) {
|
|
581
|
+
if (
|
|
582
|
+
// gpt-5 is enabled for the default model for agents
|
|
583
|
+
(0, defaultModel_1.isGpt5Default)() &&
|
|
584
|
+
// explicitly set model for the agent
|
|
585
|
+
explictlyModelSet &&
|
|
586
|
+
// this runner uses a non-gpt-5 model
|
|
587
|
+
(typeof runnerModel !== 'string' ||
|
|
588
|
+
!(0, defaultModel_1.gpt5ReasoningSettingsRequired)(runnerModel)) &&
|
|
589
|
+
(agentModelSettings.providerData?.reasoning ||
|
|
590
|
+
agentModelSettings.providerData?.text?.verbosity ||
|
|
591
|
+
agentModelSettings.providerData?.reasoning_effort)) {
|
|
592
|
+
// the incompatible parameters should be removed to avoid runtime errors
|
|
593
|
+
delete modelSettings.providerData?.reasoning;
|
|
594
|
+
delete modelSettings.providerData?.text?.verbosity;
|
|
595
|
+
delete modelSettings.providerData?.reasoning_effort;
|
|
596
|
+
}
|
|
597
|
+
return modelSettings;
|
|
598
|
+
}
|
|
560
599
|
//# sourceMappingURL=run.js.map
|