@openai/agents-core 0.4.1 → 0.4.3
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 +5 -4
- package/dist/agent.js +22 -3
- package/dist/agent.js.map +1 -1
- package/dist/agent.mjs +22 -3
- package/dist/agent.mjs.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +1 -0
- package/dist/index.mjs.map +1 -1
- package/dist/logger.js +2 -2
- package/dist/logger.js.map +1 -1
- package/dist/logger.mjs +2 -2
- package/dist/logger.mjs.map +1 -1
- package/dist/mcpServers.d.ts +55 -0
- package/dist/mcpServers.js +472 -0
- package/dist/mcpServers.js.map +1 -0
- package/dist/mcpServers.mjs +467 -0
- package/dist/mcpServers.mjs.map +1 -0
- package/dist/metadata.js +2 -2
- package/dist/metadata.mjs +2 -2
- package/dist/result.d.ts +5 -0
- package/dist/result.js +62 -17
- package/dist/result.js.map +1 -1
- package/dist/result.mjs +62 -17
- package/dist/result.mjs.map +1 -1
- package/dist/run.d.ts +16 -9
- package/dist/run.js +55 -0
- package/dist/run.js.map +1 -1
- package/dist/run.mjs +56 -1
- package/dist/run.mjs.map +1 -1
- package/dist/runState.d.ts +10 -0
- package/dist/runState.js +11 -0
- package/dist/runState.js.map +1 -1
- package/dist/runState.mjs +11 -0
- package/dist/runState.mjs.map +1 -1
- package/dist/runner/errorHandlers.d.ts +57 -0
- package/dist/runner/errorHandlers.js +65 -0
- package/dist/runner/errorHandlers.js.map +1 -0
- package/dist/runner/errorHandlers.mjs +61 -0
- package/dist/runner/errorHandlers.mjs.map +1 -0
- package/dist/runner/runLoop.js +4 -0
- package/dist/runner/runLoop.js.map +1 -1
- package/dist/runner/runLoop.mjs +4 -0
- package/dist/runner/runLoop.mjs.map +1 -1
- package/dist/runner/tracing.d.ts +14 -1
- package/dist/runner/tracing.js +43 -0
- package/dist/runner/tracing.js.map +1 -1
- package/dist/runner/tracing.mjs +42 -0
- package/dist/runner/tracing.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { MaxTurnsExceededError } from "../errors.mjs";
|
|
2
|
+
import { assistant } from "../helpers/message.mjs";
|
|
3
|
+
import { RunMessageOutputItem } from "../items.mjs";
|
|
4
|
+
import { RunResult } from "../result.mjs";
|
|
5
|
+
import { runOutputGuardrails } from "./guardrails.mjs";
|
|
6
|
+
import { getTurnInput } from "./items.mjs";
|
|
7
|
+
import { streamStepItemsToRunResult } from "./streaming.mjs";
|
|
8
|
+
const buildRunData = (state) => ({
|
|
9
|
+
input: state._originalInput,
|
|
10
|
+
newItems: state._generatedItems,
|
|
11
|
+
history: getTurnInput(state._originalInput, state._generatedItems),
|
|
12
|
+
output: getTurnInput([], state._generatedItems),
|
|
13
|
+
rawResponses: state._modelResponses,
|
|
14
|
+
lastAgent: state._currentAgent,
|
|
15
|
+
state,
|
|
16
|
+
});
|
|
17
|
+
const formatFinalOutput = (agent, finalOutput) => {
|
|
18
|
+
if (agent.outputType === 'text') {
|
|
19
|
+
return String(finalOutput);
|
|
20
|
+
}
|
|
21
|
+
return JSON.stringify(finalOutput);
|
|
22
|
+
};
|
|
23
|
+
const createFinalOutputItem = (agent, outputText) => new RunMessageOutputItem(assistant(outputText), agent);
|
|
24
|
+
export const tryHandleRunError = async ({ error, state, errorHandlers, outputGuardrailDefs, emitAgentEnd, streamResult, }) => {
|
|
25
|
+
if (!(error instanceof MaxTurnsExceededError)) {
|
|
26
|
+
return undefined;
|
|
27
|
+
}
|
|
28
|
+
const handler = errorHandlers?.maxTurns ?? errorHandlers?.default;
|
|
29
|
+
if (!handler) {
|
|
30
|
+
return undefined;
|
|
31
|
+
}
|
|
32
|
+
const handlerResult = await handler({
|
|
33
|
+
error,
|
|
34
|
+
context: state._context,
|
|
35
|
+
runData: buildRunData(state),
|
|
36
|
+
});
|
|
37
|
+
if (!handlerResult) {
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
const includeInHistory = handlerResult.includeInHistory !== false;
|
|
41
|
+
const outputText = formatFinalOutput(state._currentAgent, handlerResult.finalOutput);
|
|
42
|
+
state._lastTurnResponse = undefined;
|
|
43
|
+
state._lastProcessedResponse = undefined;
|
|
44
|
+
const item = createFinalOutputItem(state._currentAgent, outputText);
|
|
45
|
+
if (includeInHistory) {
|
|
46
|
+
state._generatedItems.push(item);
|
|
47
|
+
}
|
|
48
|
+
if (streamResult) {
|
|
49
|
+
streamStepItemsToRunResult(streamResult, [item]);
|
|
50
|
+
}
|
|
51
|
+
state._currentStep = {
|
|
52
|
+
type: 'next_step_final_output',
|
|
53
|
+
output: outputText,
|
|
54
|
+
};
|
|
55
|
+
state._finalOutputSource = 'error_handler';
|
|
56
|
+
await runOutputGuardrails(state, outputGuardrailDefs, outputText);
|
|
57
|
+
state._currentTurnInProgress = false;
|
|
58
|
+
emitAgentEnd(state._context, state._currentAgent, outputText);
|
|
59
|
+
return new RunResult(state);
|
|
60
|
+
};
|
|
61
|
+
//# sourceMappingURL=errorHandlers.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errorHandlers.mjs","sourceRoot":"","sources":["../../src/runner/errorHandlers.ts"],"names":[],"mappings":"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"}
|
package/dist/runner/runLoop.js
CHANGED
|
@@ -15,6 +15,10 @@ function applyTurnResult(options) {
|
|
|
15
15
|
state.resetTurnPersistence();
|
|
16
16
|
}
|
|
17
17
|
state._currentStep = turnResult.nextStep;
|
|
18
|
+
state._finalOutputSource =
|
|
19
|
+
turnResult.nextStep.type === 'next_step_final_output'
|
|
20
|
+
? 'turn_resolution'
|
|
21
|
+
: undefined;
|
|
18
22
|
}
|
|
19
23
|
async function resumeInterruptedTurn(options) {
|
|
20
24
|
const { state, runner, onStepItems } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runLoop.js","sourceRoot":"","sources":["../../src/runner/runLoop.ts"],"names":[],"mappings":";;AA6BA,
|
|
1
|
+
{"version":3,"file":"runLoop.js","sourceRoot":"","sources":["../../src/runner/runLoop.ts"],"names":[],"mappings":"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"}
|
package/dist/runner/runLoop.mjs
CHANGED
|
@@ -10,6 +10,10 @@ export function applyTurnResult(options) {
|
|
|
10
10
|
state.resetTurnPersistence();
|
|
11
11
|
}
|
|
12
12
|
state._currentStep = turnResult.nextStep;
|
|
13
|
+
state._finalOutputSource =
|
|
14
|
+
turnResult.nextStep.type === 'next_step_final_output'
|
|
15
|
+
? 'turn_resolution'
|
|
16
|
+
: undefined;
|
|
13
17
|
}
|
|
14
18
|
export async function resumeInterruptedTurn(options) {
|
|
15
19
|
const { state, runner, onStepItems } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runLoop.mjs","sourceRoot":"","sources":["../../src/runner/runLoop.ts"],"names":[],"mappings":"OAKO,EAAE,sBAAsB,EAAE;AAwBjC,MAAM,UAAU,eAAe,CAG7B,OAAiD;IACjD,MAAM,EACJ,KAAK,EACL,UAAU,EACV,KAAK,EACL,SAAS,EACT,oBAAoB,EACpB,WAAW,GACZ,GAAG,OAAO,CAAC;IACZ,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC;IAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACnD,KAAK,CAAC,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC;IAChD,KAAK,CAAC,eAAe,GAAG,UAAU,CAAC,cAAc,CAAC;IAClD,IACE,oBAAoB;QACpB,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,qBAAqB,EAClD,CAAC;QACD,KAAK,CAAC,oBAAoB,EAAE,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"runLoop.mjs","sourceRoot":"","sources":["../../src/runner/runLoop.ts"],"names":[],"mappings":"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"}
|
package/dist/runner/tracing.d.ts
CHANGED
|
@@ -3,6 +3,15 @@ import { Handoff } from '../handoff';
|
|
|
3
3
|
import { ModelTracing } from '../model';
|
|
4
4
|
import { Tool } from '../tool';
|
|
5
5
|
import { createAgentSpan } from '../tracing';
|
|
6
|
+
import { Span } from '../tracing/spans';
|
|
7
|
+
import { Trace } from '../tracing/traces';
|
|
8
|
+
export type TraceOverrideConfig = {
|
|
9
|
+
traceId?: string;
|
|
10
|
+
workflowName?: string;
|
|
11
|
+
groupId?: string;
|
|
12
|
+
traceMetadata?: Record<string, any>;
|
|
13
|
+
tracingApiKey?: string;
|
|
14
|
+
};
|
|
6
15
|
type EnsureAgentSpanParams<TContext> = {
|
|
7
16
|
agent: Agent<TContext, any>;
|
|
8
17
|
handoffs: Handoff<any, any>[];
|
|
@@ -15,9 +24,13 @@ type EnsureAgentSpanParams<TContext> = {
|
|
|
15
24
|
* `'enabled_without_data'` to omit sensitive content while still emitting spans.
|
|
16
25
|
*/
|
|
17
26
|
export declare function getTracing(tracingDisabled: boolean, traceIncludeSensitiveData: boolean): ModelTracing;
|
|
27
|
+
export declare function applyTraceOverrides(trace: Trace, currentSpan: Span<any> | undefined, overrides: TraceOverrideConfig): {
|
|
28
|
+
trace: Trace;
|
|
29
|
+
currentSpan: Span<any> | undefined;
|
|
30
|
+
};
|
|
18
31
|
/**
|
|
19
32
|
* Ensures an agent span exists and updates tool metadata if already present.
|
|
20
33
|
* Returns the span so callers can pass it through run state.
|
|
21
34
|
*/
|
|
22
|
-
export declare function ensureAgentSpan<TContext>(params: EnsureAgentSpanParams<TContext>):
|
|
35
|
+
export declare function ensureAgentSpan<TContext>(params: EnsureAgentSpanParams<TContext>): Span<import("../tracing").AgentSpanData>;
|
|
23
36
|
export {};
|
package/dist/runner/tracing.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTracing = getTracing;
|
|
4
|
+
exports.applyTraceOverrides = applyTraceOverrides;
|
|
4
5
|
exports.ensureAgentSpan = ensureAgentSpan;
|
|
5
6
|
const context_1 = require("../tracing/context.js");
|
|
6
7
|
const tracing_1 = require("../tracing/index.js");
|
|
8
|
+
const provider_1 = require("../tracing/provider.js");
|
|
7
9
|
/**
|
|
8
10
|
* Normalizes tracing configuration into the format expected by model providers.
|
|
9
11
|
* Returns `false` to disable tracing, `true` to include full payload data, or
|
|
@@ -18,6 +20,47 @@ function getTracing(tracingDisabled, traceIncludeSensitiveData) {
|
|
|
18
20
|
}
|
|
19
21
|
return 'enabled_without_data';
|
|
20
22
|
}
|
|
23
|
+
function rebaseSpanChain(span, trace) {
|
|
24
|
+
const previousSpan = span.previousSpan
|
|
25
|
+
? rebaseSpanChain(span.previousSpan, trace)
|
|
26
|
+
: undefined;
|
|
27
|
+
const parent = previousSpan ?? trace;
|
|
28
|
+
const rebasedSpan = (0, provider_1.getGlobalTraceProvider)().createSpan({
|
|
29
|
+
spanId: span.spanId,
|
|
30
|
+
parentId: span.parentId ?? undefined,
|
|
31
|
+
startedAt: span.startedAt ?? undefined,
|
|
32
|
+
endedAt: span.endedAt ?? undefined,
|
|
33
|
+
data: span.spanData,
|
|
34
|
+
error: span.error ?? undefined,
|
|
35
|
+
tracingApiKey: span.tracingApiKey,
|
|
36
|
+
}, parent);
|
|
37
|
+
rebasedSpan.previousSpan = previousSpan;
|
|
38
|
+
return rebasedSpan;
|
|
39
|
+
}
|
|
40
|
+
function applyTraceOverrides(trace, currentSpan, overrides) {
|
|
41
|
+
const traceIdOverride = overrides.traceId !== undefined && overrides.traceId !== trace.traceId;
|
|
42
|
+
const tracingApiKeyOverride = overrides.tracingApiKey !== undefined &&
|
|
43
|
+
overrides.tracingApiKey !== trace.tracingApiKey;
|
|
44
|
+
if (overrides.traceId !== undefined) {
|
|
45
|
+
trace.traceId = overrides.traceId;
|
|
46
|
+
}
|
|
47
|
+
if (overrides.workflowName !== undefined) {
|
|
48
|
+
trace.name = overrides.workflowName;
|
|
49
|
+
}
|
|
50
|
+
if (overrides.groupId !== undefined) {
|
|
51
|
+
trace.groupId = overrides.groupId ?? null;
|
|
52
|
+
}
|
|
53
|
+
if (overrides.traceMetadata !== undefined) {
|
|
54
|
+
trace.metadata = overrides.traceMetadata;
|
|
55
|
+
}
|
|
56
|
+
if (overrides.tracingApiKey !== undefined) {
|
|
57
|
+
trace.tracingApiKey = overrides.tracingApiKey;
|
|
58
|
+
}
|
|
59
|
+
if (currentSpan && (traceIdOverride || tracingApiKeyOverride)) {
|
|
60
|
+
return { trace, currentSpan: rebaseSpanChain(currentSpan, trace) };
|
|
61
|
+
}
|
|
62
|
+
return { trace, currentSpan };
|
|
63
|
+
}
|
|
21
64
|
/**
|
|
22
65
|
* Ensures an agent span exists and updates tool metadata if already present.
|
|
23
66
|
* Returns the span so callers can pass it through run state.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/runner/tracing.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/runner/tracing.ts"],"names":[],"mappings":"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"}
|
package/dist/runner/tracing.mjs
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { setCurrentSpan } from "../tracing/context.mjs";
|
|
2
2
|
import { createAgentSpan } from "../tracing/index.mjs";
|
|
3
|
+
import { getGlobalTraceProvider } from "../tracing/provider.mjs";
|
|
3
4
|
/**
|
|
4
5
|
* Normalizes tracing configuration into the format expected by model providers.
|
|
5
6
|
* Returns `false` to disable tracing, `true` to include full payload data, or
|
|
@@ -14,6 +15,47 @@ export function getTracing(tracingDisabled, traceIncludeSensitiveData) {
|
|
|
14
15
|
}
|
|
15
16
|
return 'enabled_without_data';
|
|
16
17
|
}
|
|
18
|
+
function rebaseSpanChain(span, trace) {
|
|
19
|
+
const previousSpan = span.previousSpan
|
|
20
|
+
? rebaseSpanChain(span.previousSpan, trace)
|
|
21
|
+
: undefined;
|
|
22
|
+
const parent = previousSpan ?? trace;
|
|
23
|
+
const rebasedSpan = getGlobalTraceProvider().createSpan({
|
|
24
|
+
spanId: span.spanId,
|
|
25
|
+
parentId: span.parentId ?? undefined,
|
|
26
|
+
startedAt: span.startedAt ?? undefined,
|
|
27
|
+
endedAt: span.endedAt ?? undefined,
|
|
28
|
+
data: span.spanData,
|
|
29
|
+
error: span.error ?? undefined,
|
|
30
|
+
tracingApiKey: span.tracingApiKey,
|
|
31
|
+
}, parent);
|
|
32
|
+
rebasedSpan.previousSpan = previousSpan;
|
|
33
|
+
return rebasedSpan;
|
|
34
|
+
}
|
|
35
|
+
export function applyTraceOverrides(trace, currentSpan, overrides) {
|
|
36
|
+
const traceIdOverride = overrides.traceId !== undefined && overrides.traceId !== trace.traceId;
|
|
37
|
+
const tracingApiKeyOverride = overrides.tracingApiKey !== undefined &&
|
|
38
|
+
overrides.tracingApiKey !== trace.tracingApiKey;
|
|
39
|
+
if (overrides.traceId !== undefined) {
|
|
40
|
+
trace.traceId = overrides.traceId;
|
|
41
|
+
}
|
|
42
|
+
if (overrides.workflowName !== undefined) {
|
|
43
|
+
trace.name = overrides.workflowName;
|
|
44
|
+
}
|
|
45
|
+
if (overrides.groupId !== undefined) {
|
|
46
|
+
trace.groupId = overrides.groupId ?? null;
|
|
47
|
+
}
|
|
48
|
+
if (overrides.traceMetadata !== undefined) {
|
|
49
|
+
trace.metadata = overrides.traceMetadata;
|
|
50
|
+
}
|
|
51
|
+
if (overrides.tracingApiKey !== undefined) {
|
|
52
|
+
trace.tracingApiKey = overrides.tracingApiKey;
|
|
53
|
+
}
|
|
54
|
+
if (currentSpan && (traceIdOverride || tracingApiKeyOverride)) {
|
|
55
|
+
return { trace, currentSpan: rebaseSpanChain(currentSpan, trace) };
|
|
56
|
+
}
|
|
57
|
+
return { trace, currentSpan };
|
|
58
|
+
}
|
|
17
59
|
/**
|
|
18
60
|
* Ensures an agent span exists and updates tool metadata if already present.
|
|
19
61
|
* Returns the span so callers can pass it through run state.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.mjs","sourceRoot":"","sources":["../../src/runner/tracing.ts"],"names":[],"mappings":"OAIO,EAAE,cAAc,EAAE;OAClB,EAAE,eAAe,EAAE;
|
|
1
|
+
{"version":3,"file":"tracing.mjs","sourceRoot":"","sources":["../../src/runner/tracing.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@openai/agents-core",
|
|
3
3
|
"repository": "https://github.com/openai/openai-agents-js",
|
|
4
4
|
"homepage": "https://openai.github.io/openai-agents-js/",
|
|
5
|
-
"version": "0.4.
|
|
5
|
+
"version": "0.4.3",
|
|
6
6
|
"description": "The OpenAI Agents SDK is a lightweight yet powerful framework for building multi-agent workflows.",
|
|
7
7
|
"author": "OpenAI <support@openai.com>",
|
|
8
8
|
"main": "dist/index.js",
|