@openai/agents-core 0.12.0 → 0.13.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/handoff.d.ts +1 -1
- package/dist/handoff.js +2 -2
- package/dist/handoff.js.map +1 -1
- package/dist/handoff.mjs +2 -2
- package/dist/handoff.mjs.map +1 -1
- package/dist/metadata.js +2 -2
- package/dist/metadata.mjs +2 -2
- package/dist/run.d.ts +2 -13
- package/dist/run.js +12 -37
- package/dist/run.js.map +1 -1
- package/dist/run.mjs +11 -36
- package/dist/run.mjs.map +1 -1
- package/dist/runState.d.ts +1 -1
- package/dist/runState.js +7 -184
- package/dist/runState.js.map +1 -1
- package/dist/runState.mjs +2 -179
- package/dist/runState.mjs.map +1 -1
- package/dist/runStateIdentity.d.ts +6 -0
- package/dist/runStateIdentity.js +171 -0
- package/dist/runStateIdentity.js.map +1 -0
- package/dist/runStateIdentity.mjs +168 -0
- package/dist/runStateIdentity.mjs.map +1 -0
- package/dist/runner/conversation.js +46 -4
- package/dist/runner/conversation.js.map +1 -1
- package/dist/runner/conversation.mjs +46 -4
- package/dist/runner/conversation.mjs.map +1 -1
- package/dist/runner/errorHandlers.d.ts +7 -4
- package/dist/runner/errorHandlers.js +31 -10
- package/dist/runner/errorHandlers.js.map +1 -1
- package/dist/runner/errorHandlers.mjs +31 -10
- package/dist/runner/errorHandlers.mjs.map +1 -1
- package/dist/runner/items.js +3 -8
- package/dist/runner/items.js.map +1 -1
- package/dist/runner/items.mjs +3 -8
- package/dist/runner/items.mjs.map +1 -1
- package/dist/runner/modelSettings.d.ts +1 -1
- package/dist/runner/modelSettings.js +2 -2
- package/dist/runner/modelSettings.js.map +1 -1
- package/dist/runner/modelSettings.mjs +2 -2
- package/dist/runner/modelSettings.mjs.map +1 -1
- package/dist/runner/runConfig.d.ts +16 -0
- package/dist/runner/runConfig.js +31 -0
- package/dist/runner/runConfig.js.map +1 -0
- package/dist/runner/runConfig.mjs +27 -0
- package/dist/runner/runConfig.mjs.map +1 -0
- package/dist/runner/runLoop.js +1 -1
- package/dist/runner/runLoop.js.map +1 -1
- package/dist/runner/runLoop.mjs +1 -1
- package/dist/runner/runLoop.mjs.map +1 -1
- package/dist/runner/steps.d.ts +3 -1
- package/dist/runner/steps.js +3 -1
- package/dist/runner/steps.js.map +1 -1
- package/dist/runner/steps.mjs +3 -1
- package/dist/runner/steps.mjs.map +1 -1
- package/dist/runner/toolExecution.js +12 -347
- package/dist/runner/toolExecution.js.map +1 -1
- package/dist/runner/toolExecution.mjs +10 -345
- package/dist/runner/toolExecution.mjs.map +1 -1
- package/dist/runner/toolOutputNormalization.d.ts +16 -0
- package/dist/runner/toolOutputNormalization.js +328 -0
- package/dist/runner/toolOutputNormalization.js.map +1 -0
- package/dist/runner/toolOutputNormalization.mjs +324 -0
- package/dist/runner/toolOutputNormalization.mjs.map +1 -0
- package/dist/runner/toolResultCorrelation.d.ts +22 -0
- package/dist/runner/toolResultCorrelation.js +138 -0
- package/dist/runner/toolResultCorrelation.js.map +1 -0
- package/dist/runner/toolResultCorrelation.mjs +130 -0
- package/dist/runner/toolResultCorrelation.mjs.map +1 -0
- package/dist/runner/turnResolution.js +66 -15
- package/dist/runner/turnResolution.js.map +1 -1
- package/dist/runner/turnResolution.mjs +67 -16
- package/dist/runner/turnResolution.mjs.map +1 -1
- package/dist/runner/types.d.ts +1 -1
- package/dist/sandbox/internal/process.d.ts +1 -0
- package/dist/sandbox/internal/process.js +7 -0
- package/dist/sandbox/internal/process.js.map +1 -0
- package/dist/sandbox/internal/process.mjs +2 -0
- package/dist/sandbox/internal/process.mjs.map +1 -0
- package/dist/sandbox/internal.d.ts +2 -0
- package/dist/sandbox/internal.js +15 -1
- package/dist/sandbox/internal.js.map +1 -1
- package/dist/sandbox/internal.mjs +2 -0
- package/dist/sandbox/internal.mjs.map +1 -1
- package/dist/sandbox/sandboxes/docker.js +8 -3
- package/dist/sandbox/sandboxes/docker.js.map +1 -1
- package/dist/sandbox/sandboxes/docker.mjs +8 -3
- package/dist/sandbox/sandboxes/docker.mjs.map +1 -1
- package/dist/sandbox/shared/credentials.d.ts +9 -0
- package/dist/sandbox/shared/credentials.js +10 -0
- package/dist/sandbox/shared/credentials.js.map +1 -0
- package/dist/sandbox/shared/credentials.mjs +7 -0
- package/dist/sandbox/shared/credentials.mjs.map +1 -0
- package/dist/sandbox/shared/typeGuards.d.ts +6 -1
- package/dist/sandbox/shared/typeGuards.js +23 -1
- package/dist/sandbox/shared/typeGuards.js.map +1 -1
- package/dist/sandbox/shared/typeGuards.mjs +18 -1
- package/dist/sandbox/shared/typeGuards.mjs.map +1 -1
- package/dist/utils/inlineData.d.ts +2 -0
- package/dist/utils/inlineData.js +22 -0
- package/dist/utils/inlineData.js.map +1 -0
- package/dist/utils/inlineData.mjs +18 -0
- package/dist/utils/inlineData.mjs.map +1 -0
- package/dist/utils/internal.d.ts +1 -0
- package/dist/utils/internal.js +7 -0
- package/dist/utils/internal.js.map +1 -0
- package/dist/utils/internal.mjs +2 -0
- package/dist/utils/internal.mjs.map +1 -0
- package/package.json +21 -2
|
@@ -5,6 +5,7 @@ exports.applyCallModelInputFilter = applyCallModelInputFilter;
|
|
|
5
5
|
const errors_1 = require("../errors.js");
|
|
6
6
|
const context_1 = require("../tracing/context.js");
|
|
7
7
|
const items_1 = require("./items.js");
|
|
8
|
+
const toolResultCorrelation_1 = require("./toolResultCorrelation.js");
|
|
8
9
|
var items_2 = require("./items.js");
|
|
9
10
|
Object.defineProperty(exports, "getTurnInput", { enumerable: true, get: function () { return items_2.getTurnInput; } });
|
|
10
11
|
/**
|
|
@@ -114,6 +115,37 @@ async function applyCallModelInputFilter(agent, callModelInputFilter, context, i
|
|
|
114
115
|
throw error;
|
|
115
116
|
}
|
|
116
117
|
}
|
|
118
|
+
function getResumeResponseBoundary(modelResponses, conversationId) {
|
|
119
|
+
let latestResponseId;
|
|
120
|
+
let latestResponseIdIndex = -1;
|
|
121
|
+
for (const [responseIndex, response] of modelResponses.entries()) {
|
|
122
|
+
if (response.responseId) {
|
|
123
|
+
latestResponseId = response.responseId;
|
|
124
|
+
latestResponseIdIndex = responseIndex;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
// A conversation advances with every response. A previous-response chain only advances when the
|
|
128
|
+
// response has an ID that the next request can reference.
|
|
129
|
+
return {
|
|
130
|
+
latestResponseId,
|
|
131
|
+
acknowledgingResponseIndex: conversationId
|
|
132
|
+
? modelResponses.length - 1
|
|
133
|
+
: latestResponseIdIndex,
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
function incrementCorrelationCount(counts, correlation) {
|
|
137
|
+
const key = (0, toolResultCorrelation_1.getToolResultCorrelationKey)(correlation);
|
|
138
|
+
counts.set(key, (counts.get(key) ?? 0) + 1);
|
|
139
|
+
}
|
|
140
|
+
function consumeCorrelationCount(counts, correlation) {
|
|
141
|
+
const key = (0, toolResultCorrelation_1.getToolResultCorrelationKey)(correlation);
|
|
142
|
+
const remaining = counts.get(key) ?? 0;
|
|
143
|
+
if (remaining === 0) {
|
|
144
|
+
return false;
|
|
145
|
+
}
|
|
146
|
+
counts.set(key, remaining - 1);
|
|
147
|
+
return true;
|
|
148
|
+
}
|
|
117
149
|
/**
|
|
118
150
|
* Tracks which items have already been sent to or received from the Responses API when the caller
|
|
119
151
|
* supplies `conversationId`/`previousResponseId`. This ensures we only send the delta each turn.
|
|
@@ -147,10 +179,14 @@ class ServerConversationTracker {
|
|
|
147
179
|
const originalItems = (0, items_1.toAgentInputList)(originalInput);
|
|
148
180
|
const hasResponses = modelResponses.length > 0;
|
|
149
181
|
const serverItemKeys = new Set();
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
182
|
+
const acknowledgedToolCallCounts = new Map();
|
|
183
|
+
const { latestResponseId, acknowledgingResponseIndex } = getResumeResponseBoundary(modelResponses, this.conversationId);
|
|
184
|
+
for (const [responseIndex, response] of modelResponses.entries()) {
|
|
185
|
+
if (responseIndex < acknowledgingResponseIndex) {
|
|
186
|
+
const unresolvedCorrelations = (0, toolResultCorrelation_1.getUnresolvedToolResultCorrelationsForResponse)(response.output);
|
|
187
|
+
for (const correlation of unresolvedCorrelations) {
|
|
188
|
+
incrementCorrelationCount(acknowledgedToolCallCounts, correlation);
|
|
189
|
+
}
|
|
154
190
|
}
|
|
155
191
|
for (const item of response.output) {
|
|
156
192
|
if (item && typeof item === 'object') {
|
|
@@ -181,6 +217,12 @@ class ServerConversationTracker {
|
|
|
181
217
|
const rawItemKey = (0, items_1.getAgentInputItemKey)(rawItem);
|
|
182
218
|
if (this.serverItems.has(rawItem) || serverItemKeys.has(rawItemKey)) {
|
|
183
219
|
this.sentItems.add(rawItem);
|
|
220
|
+
continue;
|
|
221
|
+
}
|
|
222
|
+
const correlation = (0, toolResultCorrelation_1.getToolResultCorrelationForResult)(rawItem);
|
|
223
|
+
if (correlation &&
|
|
224
|
+
consumeCorrelationCount(acknowledgedToolCallCounts, correlation)) {
|
|
225
|
+
this.sentItems.add(rawItem);
|
|
184
226
|
}
|
|
185
227
|
}
|
|
186
228
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.js","sourceRoot":"","sources":["../../src/runner/conversation.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"conversation.js","sourceRoot":"","sources":["../../src/runner/conversation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { UserError } from "../errors.mjs";
|
|
2
2
|
import { addErrorToCurrentSpan } from "../tracing/context.mjs";
|
|
3
3
|
import { buildAgentInputPool, extractOutputItemsFromRunItems, getAgentInputItemKey, removeAgentInputFromPool, takeAgentInputFromPool, toAgentInputList, } from "./items.mjs";
|
|
4
|
+
import { getToolResultCorrelationForResult, getToolResultCorrelationKey, getUnresolvedToolResultCorrelationsForResponse, } from "./toolResultCorrelation.mjs";
|
|
4
5
|
export { getTurnInput } from "./items.mjs";
|
|
5
6
|
/**
|
|
6
7
|
* Applies the optional callModelInputFilter and returns the filtered input alongside the original
|
|
@@ -109,6 +110,37 @@ export async function applyCallModelInputFilter(agent, callModelInputFilter, con
|
|
|
109
110
|
throw error;
|
|
110
111
|
}
|
|
111
112
|
}
|
|
113
|
+
function getResumeResponseBoundary(modelResponses, conversationId) {
|
|
114
|
+
let latestResponseId;
|
|
115
|
+
let latestResponseIdIndex = -1;
|
|
116
|
+
for (const [responseIndex, response] of modelResponses.entries()) {
|
|
117
|
+
if (response.responseId) {
|
|
118
|
+
latestResponseId = response.responseId;
|
|
119
|
+
latestResponseIdIndex = responseIndex;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
// A conversation advances with every response. A previous-response chain only advances when the
|
|
123
|
+
// response has an ID that the next request can reference.
|
|
124
|
+
return {
|
|
125
|
+
latestResponseId,
|
|
126
|
+
acknowledgingResponseIndex: conversationId
|
|
127
|
+
? modelResponses.length - 1
|
|
128
|
+
: latestResponseIdIndex,
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
function incrementCorrelationCount(counts, correlation) {
|
|
132
|
+
const key = getToolResultCorrelationKey(correlation);
|
|
133
|
+
counts.set(key, (counts.get(key) ?? 0) + 1);
|
|
134
|
+
}
|
|
135
|
+
function consumeCorrelationCount(counts, correlation) {
|
|
136
|
+
const key = getToolResultCorrelationKey(correlation);
|
|
137
|
+
const remaining = counts.get(key) ?? 0;
|
|
138
|
+
if (remaining === 0) {
|
|
139
|
+
return false;
|
|
140
|
+
}
|
|
141
|
+
counts.set(key, remaining - 1);
|
|
142
|
+
return true;
|
|
143
|
+
}
|
|
112
144
|
/**
|
|
113
145
|
* Tracks which items have already been sent to or received from the Responses API when the caller
|
|
114
146
|
* supplies `conversationId`/`previousResponseId`. This ensures we only send the delta each turn.
|
|
@@ -142,10 +174,14 @@ export class ServerConversationTracker {
|
|
|
142
174
|
const originalItems = toAgentInputList(originalInput);
|
|
143
175
|
const hasResponses = modelResponses.length > 0;
|
|
144
176
|
const serverItemKeys = new Set();
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
177
|
+
const acknowledgedToolCallCounts = new Map();
|
|
178
|
+
const { latestResponseId, acknowledgingResponseIndex } = getResumeResponseBoundary(modelResponses, this.conversationId);
|
|
179
|
+
for (const [responseIndex, response] of modelResponses.entries()) {
|
|
180
|
+
if (responseIndex < acknowledgingResponseIndex) {
|
|
181
|
+
const unresolvedCorrelations = getUnresolvedToolResultCorrelationsForResponse(response.output);
|
|
182
|
+
for (const correlation of unresolvedCorrelations) {
|
|
183
|
+
incrementCorrelationCount(acknowledgedToolCallCounts, correlation);
|
|
184
|
+
}
|
|
149
185
|
}
|
|
150
186
|
for (const item of response.output) {
|
|
151
187
|
if (item && typeof item === 'object') {
|
|
@@ -176,6 +212,12 @@ export class ServerConversationTracker {
|
|
|
176
212
|
const rawItemKey = getAgentInputItemKey(rawItem);
|
|
177
213
|
if (this.serverItems.has(rawItem) || serverItemKeys.has(rawItemKey)) {
|
|
178
214
|
this.sentItems.add(rawItem);
|
|
215
|
+
continue;
|
|
216
|
+
}
|
|
217
|
+
const correlation = getToolResultCorrelationForResult(rawItem);
|
|
218
|
+
if (correlation &&
|
|
219
|
+
consumeCorrelationCount(acknowledgedToolCallCounts, correlation)) {
|
|
220
|
+
this.sentItems.add(rawItem);
|
|
179
221
|
}
|
|
180
222
|
}
|
|
181
223
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.mjs","sourceRoot":"","sources":["../../src/runner/conversation.ts"],"names":[],"mappings":"OACO,EAAE,SAAS,EAAE;OAKb,EAAE,qBAAqB,EAAE;OACzB,EACL,mBAAmB,EACnB,8BAA8B,EAC9B,oBAAoB,EACpB,wBAAwB,EACxB,sBAAsB,EACtB,gBAAgB,GAEjB;OAEM,EAAE,YAAY,EAAE;AAkCvB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,KAAuC,EACvC,oBAA2D,EAC3D,OAA6B,EAC7B,UAA4B,EAC5B,kBAAsC;IAEtC,MAAM,eAAe,GAAG,CACtB,KAAuB,EACvB,GAAqC,EACrC,EAAE,CACF,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACjB,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAmB,CAAC;QACvD,IAAI,GAAG,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAChD,GAAG,CAAC,GAAG,CAAC,MAAgB,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEL,8FAA8F;IAC9F,MAAM,QAAQ,GAAG,IAAI,OAAO,EAA0B,CAAC;IACvD,MAAM,YAAY,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IACrD,MAAM,iBAAiB,GAAqB,EAAE,CAAC;IAC/C,8FAA8F;IAC9F,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IACD,MAAM,kBAAkB,GAAG,CAAC,SAAqC,EAAE,EAAE;QACnE,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YAChD,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,iBAAiB,CAAC,SAAS,CACvC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,SAAS,CACrC,CAAC;QACF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACjB,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC,CAAC;IACF,MAAM,oBAAoB,GAAG,GAA+B,EAAE;QAC5D,MAAM,IAAI,GAAG,iBAAiB,CAAC,KAAK,EAAE,CAAC;QACvC,IAAI,IAAI,EAAE,CAAC;YACT,wBAAwB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,iFAAiF;IACjF,yBAAyB;IACzB,MAAM,eAAe,GAAG,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG;QACX,KAAK,EAAE,eAAe;QACtB,YAAY,EAAE,kBAAkB;KACjC,CAAC;IACF,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAO;YACL,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,CAAC,GAAG,UAAU,CAAC;YAC5B,cAAc,EAAE,EAAE;YAClB,aAAa,EAAE,KAAK;SACrB,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC;YACxC,SAAS,EAAE,IAAI;YACf,KAAK;YACL,OAAO,EAAE,OAAO,CAAC,OAAO;SACQ,CAAC,CAAC;QAEpC,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,SAAS,CACjB,+EAA+E,CAChF,CAAC;QACJ,CAAC;QAED,sFAAsF;QACtF,uEAAuE;QACvE,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5C,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtC,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAc,CAAC,CAAC;YAC9C,IAAI,QAAQ,EAAE,CAAC;gBACb,kBAAkB,CAAC,QAAQ,CAAC,CAAC;gBAC7B,wBAAwB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;gBACjD,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,MAAM,GAAG,GAAG,oBAAoB,CAAC,IAAsB,CAAC,CAAC;YACzD,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;YACnE,IAAI,gBAAgB,EAAE,CAAC;gBACrB,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;gBACrC,OAAO,gBAAgB,CAAC;YAC1B,CAAC;YACD,MAAM,QAAQ,GAAG,oBAAoB,EAAE,CAAC;YACxC,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1D,OAAO;YACL,UAAU,EAAE;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,YAAY,EACV,OAAO,MAAM,CAAC,YAAY,KAAK,WAAW;oBACxC,CAAC,CAAC,kBAAkB;oBACpB,CAAC,CAAC,MAAM,CAAC,YAAY;aAC1B;YACD,WAAW;YACX,cAAc,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YACxE,aAAa,EAAE,IAAI;SACpB,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,qBAAqB,CAAC;YACpB,OAAO,EAAE,+BAA+B;YACxC,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;SAC/B,CAAC,CAAC;QACH,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,OAAO,yBAAyB;IAC7B,cAAc,CAAU;IACxB,kBAAkB,CAAU;IAClB,qBAAqB,CAAyB;IAE/D,4EAA4E;IACpE,gBAAgB,GAAG,KAAK,CAAC;IACjC,4EAA4E;IACpE,SAAS,GAAG,IAAI,OAAO,EAAU,CAAC;IAC1C,2EAA2E;IACnE,WAAW,GAAG,IAAI,OAAO,EAAU,CAAC;IAC5C,6EAA6E;IACrE,mBAAmB,GAAG,IAAI,OAAO,EAA0B,CAAC;IACpE,+FAA+F;IACvF,qBAAqB,GAA4B,IAAI,CAAC;IAE9D,YAAY,EACV,cAAc,EACd,kBAAkB,EAClB,qBAAqB,GAKtB;QACC,IAAI,CAAC,cAAc,GAAG,cAAc,IAAI,SAAS,CAAC;QAClD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,IAAI,SAAS,CAAC;QAC1D,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,EACb,aAAa,EACb,cAAc,EACd,cAAc,GAKf;QACC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;QAE/C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QACzC,IAAI,gBAAoC,CAAC;QACzC,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE,CAAC;YACtC,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;gBACxB,gBAAgB,GAAG,QAAQ,CAAC,UAAU,CAAC;YACzC,CAAC;YACD,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACnC,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACrC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC3B,cAAc,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAsB,CAAC,CAAC,CAAC;gBACnE,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;gBACjC,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACrC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;YAED,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC7B,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QACpC,CAAC;QAED,oFAAoF;QACpF,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,gBAAgB,EAAE,CAAC;YAC7C,IAAI,CAAC,kBAAkB,GAAG,gBAAgB,CAAC;QAC7C,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;gBAClC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC7B,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;oBAC5C,SAAS;gBACX,CAAC;gBACD,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAyB,CAAC,CAAC;gBACnE,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;oBACpE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,aAAwC;QACvD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YACxC,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACrC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,aAAa,CAAC,UAAU,EAAE,CAAC;YACrD,IAAI,CAAC,kBAAkB,GAAG,aAAa,CAAC,UAAU,CAAC;QACrD,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,YAAY,CACV,aAAwC,EACxC,cAAyB,EACzB,6BAA+C,EAAE;QAEjD,MAAM,UAAU,GAAqB,EAAE,CAAC;QACxC,MAAM,sBAAsB,GAAc,EAAE,CAAC;QAE7C,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3B,MAAM,YAAY,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;YACrD,+FAA+F;YAC/F,UAAU,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;YACjC,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;gBAChC,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,CAAC,qBAAqB,GAAG,YAAY,CAAC,MAAM,CAC9C,CAAC,IAAI,EAA0B,EAAE,CAC/B,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,IAAI,KAAK,QAAQ,CAC5C,CAAC;YACF,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC/B,CAAC;aAAM,IACL,IAAI,CAAC,qBAAqB;YAC1B,IAAI,CAAC,qBAAqB,CAAC,MAAM,GAAG,CAAC,EACrC,CAAC;YACD,0FAA0F;YAC1F,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAC/C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC9C,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;YAClC,IAAI,IAAI,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;gBACvC,SAAS;YACX,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC7B,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC5C,SAAS;YACX,CAAC;YACD,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjE,SAAS;YACX,CAAC;YACD,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,sBAAsB,GAAG,8BAA8B,CAC3D,sBAAsB,EACtB,IAAI,CAAC,qBAAqB,CAC3B,CAAC;QACF,KAAK,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,sBAAsB,CAAC,OAAO,EAAE,EAAE,CAAC;YACrE,MAAM,UAAU,GAAG,sBAAsB,CAAC,KAAK,CAAC,EAAE,OAErC,CAAC;YACd,IAAI,CAAC,0BAA0B,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAC5D,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC;QAC3C,MAAM,yBAAyB,GAAG,gCAAgC,CAChE,0BAA0B,EAC1B,sBAAsB,EACtB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,WAAW,CACjB,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,yBAAyB,EAAE,CAAC;YAC7C,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,GAAG,yBAAyB,CAAC,CAAC;QAE9C,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;OAGG;IACH,eAAe,CACb,KAAqC,EACrC,OAAsE;QAEtE,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC5C,MAAM,yBAAyB,GAAG,OAAO,EAAE,aAAa,IAAI,KAAK,CAAC;QAClE,MAAM,uBAAuB,GAC3B,OAAO,EAAE,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAE1D,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAEzC,MAAM,YAAY,GAAG,OAAO,EAAE,YAAY,CAAC;QAC3C,IAAI,uBAAuB,IAAI,YAAY,EAAE,CAAC;YAC5C,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,CAAC,2BAA2B,CAC9B,SAAS,EACT,OAAO,CAAC,yBAAyB,CAAC,CACnC,CAAC;IACJ,CAAC;IAEO,iBAAiB,CACvB,SAA8B,EAC9B,KAAqC;QAErC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtC,SAAS;YACX,CAAC;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;YACxD,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;gBAClD,SAAS;YACX,CAAC;YACD,IAAI,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC9B,SAAS;YACX,CAAC;YACD,qFAAqF;YACrF,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC1B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAEO,0BAA0B,CAChC,YAA4B,EAC5B,UAA2B;QAE3B,IAAI,CAAC,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;YACtD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YAClD,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YACzD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IACzD,CAAC;IAEO,yBAAyB,CAAC,IAAoB;QACpD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IACpD,CAAC;IAEO,2BAA2B,CACjC,SAA8B,EAC9B,yBAAkC;QAElC,IACE,CAAC,IAAI,CAAC,qBAAqB;YAC3B,IAAI,CAAC,qBAAqB,CAAC,MAAM,KAAK,CAAC;YACvC,SAAS,CAAC,IAAI,KAAK,CAAC,EACpB,CAAC;YACD,IAAI,yBAAyB,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC5D,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;YACpC,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAC5D,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAC/B,CAAC;QACF,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QACpC,CAAC;aAAM,IAAI,yBAAyB,EAAE,CAAC;YACrC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QACpC,CAAC;IACH,CAAC;CACF;AAED,SAAS,gCAAgC,CACvC,0BAA4C,EAC5C,sBAAwC,EACxC,SAA0B,EAC1B,WAA4B;IAE5B,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAC3C,sBAAsB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACtC,IACE,CAAC,IAAI;YACL,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,CAAC,IAAI,KAAK,sBAAsB;YACpC,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAC/B,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,0BAA0B,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QAChD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACjD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IACE,IAAI,CAAC,IAAI,KAAK,sBAAsB;YACpC,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAC/B,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,CAAC,6BAA6B,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"conversation.mjs","sourceRoot":"","sources":["../../src/runner/conversation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Agent, AgentOutputType } from '../agent';
|
|
2
|
-
import { MaxTurnsExceededError, ModelRefusalError } from '../errors';
|
|
2
|
+
import { MaxTurnsExceededError, ModelBehaviorError, ModelRefusalError } from '../errors';
|
|
3
3
|
import { RunItem, RunMessageOutputItem } from '../items';
|
|
4
4
|
import { ModelResponse } from '../model';
|
|
5
5
|
import { RunResult, StreamedRunResult } from '../result';
|
|
@@ -10,7 +10,7 @@ import type { OutputGuardrailDefinition, OutputGuardrailMetadata } from '../guar
|
|
|
10
10
|
/**
|
|
11
11
|
* Error kinds supported by run error handlers.
|
|
12
12
|
*/
|
|
13
|
-
export type RunErrorKind = 'maxTurns' | 'modelRefusal';
|
|
13
|
+
export type RunErrorKind = 'maxTurns' | 'modelRefusal' | 'invalidFinalOutput';
|
|
14
14
|
/**
|
|
15
15
|
* Snapshot of run data passed to error handlers.
|
|
16
16
|
*/
|
|
@@ -24,7 +24,7 @@ export type RunErrorData<TContext, TAgent extends Agent<any, any>> = {
|
|
|
24
24
|
state?: RunState<TContext, TAgent>;
|
|
25
25
|
};
|
|
26
26
|
export type RunErrorHandlerInput<TContext, TAgent extends Agent<any, any>> = {
|
|
27
|
-
error: MaxTurnsExceededError | ModelRefusalError;
|
|
27
|
+
error: MaxTurnsExceededError | ModelRefusalError | ModelBehaviorError;
|
|
28
28
|
context: RunContext<TContext>;
|
|
29
29
|
runData: RunErrorData<TContext, TAgent>;
|
|
30
30
|
};
|
|
@@ -55,12 +55,15 @@ type TryHandleRunErrorArgs<TContext, TAgent extends Agent<any, any>> = {
|
|
|
55
55
|
};
|
|
56
56
|
type ResolveRunErrorHandlerArgs<TContext, TAgent extends Agent<any, any>> = {
|
|
57
57
|
error: unknown;
|
|
58
|
+
errorKind?: RunErrorKind;
|
|
58
59
|
errorHandlers?: RunErrorHandlers<TContext, TAgent>;
|
|
59
60
|
context: RunContext<TContext>;
|
|
60
61
|
runData: RunErrorData<TContext, TAgent>;
|
|
61
62
|
};
|
|
63
|
+
declare function validateRunErrorFinalOutput<TAgent extends Agent<any, any>>(agent: TAgent, outputText: string): void;
|
|
62
64
|
export declare const formatRunErrorFinalOutput: <TAgent extends Agent<any, any>>(agent: TAgent, finalOutput: ResolvedAgentOutput<TAgent["outputType"]>) => string;
|
|
63
65
|
export declare const createRunErrorFinalOutputItem: <TAgent extends Agent<any, any>>(agent: TAgent, outputText: string) => RunMessageOutputItem;
|
|
64
|
-
export declare const
|
|
66
|
+
export declare const validateRunErrorHandlerFinalOutput: typeof validateRunErrorFinalOutput;
|
|
67
|
+
export declare const resolveRunErrorHandler: <TContext, TAgent extends Agent<any, any>>({ error, errorKind, errorHandlers, context, runData, }: ResolveRunErrorHandlerArgs<TContext, TAgent>) => Promise<RunErrorHandlerResult<TAgent> | undefined>;
|
|
65
68
|
export declare const tryHandleRunError: <TContext, TAgent extends Agent<TContext, AgentOutputType>>({ error, state, errorHandlers, outputGuardrailDefs, emitAgentEnd, streamResult, }: TryHandleRunErrorArgs<TContext, TAgent>) => Promise<RunResult<TContext, TAgent> | undefined>;
|
|
66
69
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.tryHandleRunError = exports.resolveRunErrorHandler = exports.createRunErrorFinalOutputItem = exports.formatRunErrorFinalOutput = void 0;
|
|
3
|
+
exports.tryHandleRunError = exports.resolveRunErrorHandler = exports.validateRunErrorHandlerFinalOutput = exports.createRunErrorFinalOutputItem = exports.formatRunErrorFinalOutput = void 0;
|
|
4
4
|
const errors_1 = require("../errors.js");
|
|
5
5
|
const message_1 = require("../helpers/message.js");
|
|
6
6
|
const items_1 = require("../items.js");
|
|
@@ -24,24 +24,44 @@ const formatFinalOutput = (agent, finalOutput) => {
|
|
|
24
24
|
return JSON.stringify(finalOutput);
|
|
25
25
|
};
|
|
26
26
|
const createFinalOutputItem = (agent, outputText) => new items_1.RunMessageOutputItem((0, message_1.assistant)(outputText), agent);
|
|
27
|
+
function validateRunErrorFinalOutput(agent, outputText) {
|
|
28
|
+
try {
|
|
29
|
+
agent.processFinalOutput(outputText);
|
|
30
|
+
}
|
|
31
|
+
catch (error) {
|
|
32
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
33
|
+
throw new errors_1.UserError(`Invalid run error handler finalOutput: ${message}`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
27
36
|
exports.formatRunErrorFinalOutput = formatFinalOutput;
|
|
28
37
|
exports.createRunErrorFinalOutputItem = createFinalOutputItem;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
38
|
+
exports.validateRunErrorHandlerFinalOutput = validateRunErrorFinalOutput;
|
|
39
|
+
const resolveRunErrorHandler = async ({ error, errorKind, errorHandlers, context, runData, }) => {
|
|
40
|
+
const kind = errorKind ??
|
|
41
|
+
(error instanceof errors_1.MaxTurnsExceededError
|
|
42
|
+
? 'maxTurns'
|
|
43
|
+
: error instanceof errors_1.ModelRefusalError
|
|
44
|
+
? 'modelRefusal'
|
|
45
|
+
: undefined);
|
|
46
|
+
if (!kind) {
|
|
47
|
+
return undefined;
|
|
36
48
|
}
|
|
37
|
-
|
|
49
|
+
const typedError = kind === 'maxTurns' && error instanceof errors_1.MaxTurnsExceededError
|
|
50
|
+
? error
|
|
51
|
+
: kind === 'modelRefusal' && error instanceof errors_1.ModelRefusalError
|
|
52
|
+
? error
|
|
53
|
+
: kind === 'invalidFinalOutput' && error instanceof errors_1.ModelBehaviorError
|
|
54
|
+
? error
|
|
55
|
+
: undefined;
|
|
56
|
+
if (!typedError) {
|
|
38
57
|
return undefined;
|
|
39
58
|
}
|
|
59
|
+
const handler = errorHandlers?.[kind] ?? errorHandlers?.default;
|
|
40
60
|
if (!handler) {
|
|
41
61
|
return undefined;
|
|
42
62
|
}
|
|
43
63
|
const handlerResult = await handler({
|
|
44
|
-
error,
|
|
64
|
+
error: typedError,
|
|
45
65
|
context,
|
|
46
66
|
runData,
|
|
47
67
|
});
|
|
@@ -60,6 +80,7 @@ const tryHandleRunError = async ({ error, state, errorHandlers, outputGuardrailD
|
|
|
60
80
|
}
|
|
61
81
|
const includeInHistory = handlerResult.includeInHistory !== false;
|
|
62
82
|
const outputText = formatFinalOutput(state._currentAgent, handlerResult.finalOutput);
|
|
83
|
+
validateRunErrorFinalOutput(state._currentAgent, outputText);
|
|
63
84
|
state._lastTurnResponse = undefined;
|
|
64
85
|
state._lastProcessedResponse = undefined;
|
|
65
86
|
const item = createFinalOutputItem(state._currentAgent, outputText);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandlers.js","sourceRoot":"","sources":["../../src/runner/errorHandlers.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"errorHandlers.js","sourceRoot":"","sources":["../../src/runner/errorHandlers.ts"],"names":[],"mappings":";;;AACA,yCAKmB;AACnB,mDAA+C;AAC/C,uCAAyD;AAEzD,yCAAyD;AAYzD,gDAAmD;AACnD,sCAAuC;AACvC,8CAAyD;AA8EzD,MAAM,YAAY,GAAG,CACnB,KAAiC,EACD,EAAE,CAAC,CAAC;IACpC,KAAK,EAAE,KAAK,CAAC,cAAc;IAC3B,QAAQ,EAAE,KAAK,CAAC,eAAe;IAC/B,OAAO,EAAE,IAAA,oBAAY,EACnB,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,eAAe,EACrB,KAAK,CAAC,sBAAsB,CAC7B;IACD,MAAM,EAAE,IAAA,oBAAY,EAAC,EAAE,EAAE,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,sBAAsB,CAAC;IAC7E,YAAY,EAAE,KAAK,CAAC,eAAe;IACnC,SAAS,EAAE,KAAK,CAAC,aAAa;IAC9B,KAAK;CACN,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,CACxB,KAAa,EACb,WAAsD,EAC9C,EAAE;IACV,IAAI,KAAK,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;QAChC,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC5B,KAAa,EACb,UAAkB,EACI,EAAE,CACxB,IAAI,4BAAoB,CAAC,IAAA,mBAAS,EAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;AAEzD,SAAS,2BAA2B,CAClC,KAAa,EACb,UAAkB;IAElB,IAAI,CAAC;QACH,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,kBAAS,CAAC,0CAA0C,OAAO,EAAE,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC;AAEY,QAAA,yBAAyB,GAAG,iBAAiB,CAAC;AAC9C,QAAA,6BAA6B,GAAG,qBAAqB,CAAC;AACtD,QAAA,kCAAkC,GAAG,2BAA2B,CAAC;AAEvE,MAAM,sBAAsB,GAAG,KAAK,EAGzC,EACA,KAAK,EACL,SAAS,EACT,aAAa,EACb,OAAO,EACP,OAAO,GACsC,EAE7C,EAAE;IACF,MAAM,IAAI,GACR,SAAS;QACT,CAAC,KAAK,YAAY,8BAAqB;YACrC,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,KAAK,YAAY,0BAAiB;gBAClC,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAC,SAAS,CAAC,CAAC;IAEnB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,UAAU,GACd,IAAI,KAAK,UAAU,IAAI,KAAK,YAAY,8BAAqB;QAC3D,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAI,KAAK,cAAc,IAAI,KAAK,YAAY,0BAAiB;YAC7D,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,IAAI,KAAK,oBAAoB,IAAI,KAAK,YAAY,2BAAkB;gBACpE,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,SAAS,CAAC;IAEpB,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,aAAa,EAAE,OAAO,CAAC;IAChE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC;QAClC,KAAK,EAAE,UAAU;QACjB,OAAO;QACP,OAAO;KACR,CAAC,CAAC;IACH,OAAO,aAAa,IAAI,SAAS,CAAC;AACpC,CAAC,CAAC;AAhDW,QAAA,sBAAsB,0BAgDjC;AAEK,MAAM,iBAAiB,GAAG,KAAK,EAGpC,EACA,KAAK,EACL,KAAK,EACL,aAAa,EACb,mBAAmB,EACnB,YAAY,EACZ,YAAY,GAC4B,EAExC,EAAE;IACF,MAAM,aAAa,GAAG,MAAM,IAAA,8BAAsB,EAAC;QACjD,KAAK;QACL,aAAa;QACb,OAAO,EAAE,KAAK,CAAC,QAAQ;QACvB,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;KAC7B,CAAC,CAAC;IACH,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,KAAK,KAAK,CAAC;IAClE,MAAM,UAAU,GAAG,iBAAiB,CAClC,KAAK,CAAC,aAAa,EACnB,aAAa,CAAC,WAAW,CAC1B,CAAC;IACF,2BAA2B,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAC7D,KAAK,CAAC,iBAAiB,GAAG,SAAS,CAAC;IACpC,KAAK,CAAC,sBAAsB,GAAG,SAAS,CAAC;IACzC,MAAM,IAAI,GAAG,qBAAqB,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACpE,IAAI,gBAAgB,EAAE,CAAC;QACrB,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,YAAY,EAAE,CAAC;QACjB,IAAA,sCAA0B,EAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACnD,CAAC;IACD,KAAK,CAAC,YAAY,GAAG;QACnB,IAAI,EAAE,wBAAwB;QAC9B,MAAM,EAAE,UAAU;KACnB,CAAC;IACF,KAAK,CAAC,kBAAkB,GAAG,eAAe,CAAC;IAC3C,MAAM,IAAA,gCAAmB,EAAC,KAAK,EAAE,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAClE,KAAK,CAAC,sBAAsB,GAAG,KAAK,CAAC;IACrC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAC9D,OAAO,IAAI,kBAAS,CAAmB,KAAK,CAAC,CAAC;AAChD,CAAC,CAAC;AA9CW,QAAA,iBAAiB,qBA8C5B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { MaxTurnsExceededError, ModelRefusalError } from "../errors.mjs";
|
|
1
|
+
import { MaxTurnsExceededError, ModelBehaviorError, ModelRefusalError, UserError, } from "../errors.mjs";
|
|
2
2
|
import { assistant } from "../helpers/message.mjs";
|
|
3
3
|
import { RunMessageOutputItem } from "../items.mjs";
|
|
4
4
|
import { RunResult } from "../result.mjs";
|
|
@@ -21,24 +21,44 @@ const formatFinalOutput = (agent, finalOutput) => {
|
|
|
21
21
|
return JSON.stringify(finalOutput);
|
|
22
22
|
};
|
|
23
23
|
const createFinalOutputItem = (agent, outputText) => new RunMessageOutputItem(assistant(outputText), agent);
|
|
24
|
+
function validateRunErrorFinalOutput(agent, outputText) {
|
|
25
|
+
try {
|
|
26
|
+
agent.processFinalOutput(outputText);
|
|
27
|
+
}
|
|
28
|
+
catch (error) {
|
|
29
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
30
|
+
throw new UserError(`Invalid run error handler finalOutput: ${message}`);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
24
33
|
export const formatRunErrorFinalOutput = formatFinalOutput;
|
|
25
34
|
export const createRunErrorFinalOutputItem = createFinalOutputItem;
|
|
26
|
-
export const
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
35
|
+
export const validateRunErrorHandlerFinalOutput = validateRunErrorFinalOutput;
|
|
36
|
+
export const resolveRunErrorHandler = async ({ error, errorKind, errorHandlers, context, runData, }) => {
|
|
37
|
+
const kind = errorKind ??
|
|
38
|
+
(error instanceof MaxTurnsExceededError
|
|
39
|
+
? 'maxTurns'
|
|
40
|
+
: error instanceof ModelRefusalError
|
|
41
|
+
? 'modelRefusal'
|
|
42
|
+
: undefined);
|
|
43
|
+
if (!kind) {
|
|
44
|
+
return undefined;
|
|
33
45
|
}
|
|
34
|
-
|
|
46
|
+
const typedError = kind === 'maxTurns' && error instanceof MaxTurnsExceededError
|
|
47
|
+
? error
|
|
48
|
+
: kind === 'modelRefusal' && error instanceof ModelRefusalError
|
|
49
|
+
? error
|
|
50
|
+
: kind === 'invalidFinalOutput' && error instanceof ModelBehaviorError
|
|
51
|
+
? error
|
|
52
|
+
: undefined;
|
|
53
|
+
if (!typedError) {
|
|
35
54
|
return undefined;
|
|
36
55
|
}
|
|
56
|
+
const handler = errorHandlers?.[kind] ?? errorHandlers?.default;
|
|
37
57
|
if (!handler) {
|
|
38
58
|
return undefined;
|
|
39
59
|
}
|
|
40
60
|
const handlerResult = await handler({
|
|
41
|
-
error,
|
|
61
|
+
error: typedError,
|
|
42
62
|
context,
|
|
43
63
|
runData,
|
|
44
64
|
});
|
|
@@ -56,6 +76,7 @@ export const tryHandleRunError = async ({ error, state, errorHandlers, outputGua
|
|
|
56
76
|
}
|
|
57
77
|
const includeInHistory = handlerResult.includeInHistory !== false;
|
|
58
78
|
const outputText = formatFinalOutput(state._currentAgent, handlerResult.finalOutput);
|
|
79
|
+
validateRunErrorFinalOutput(state._currentAgent, outputText);
|
|
59
80
|
state._lastTurnResponse = undefined;
|
|
60
81
|
state._lastProcessedResponse = undefined;
|
|
61
82
|
const item = createFinalOutputItem(state._currentAgent, outputText);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandlers.mjs","sourceRoot":"","sources":["../../src/runner/errorHandlers.ts"],"names":[],"mappings":"OACO,
|
|
1
|
+
{"version":3,"file":"errorHandlers.mjs","sourceRoot":"","sources":["../../src/runner/errorHandlers.ts"],"names":[],"mappings":"OACO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,EACjB,SAAS,GACV;OACM,EAAE,SAAS,EAAE;OACb,EAAW,oBAAoB,EAAE;OAEjC,EAAE,SAAS,EAAqB;OAYhC,EAAE,mBAAmB,EAAE;OACvB,EAAE,YAAY,EAAE;OAChB,EAAE,0BAA0B,EAAE;AA8ErC,MAAM,YAAY,GAAG,CACnB,KAAiC,EACD,EAAE,CAAC,CAAC;IACpC,KAAK,EAAE,KAAK,CAAC,cAAc;IAC3B,QAAQ,EAAE,KAAK,CAAC,eAAe;IAC/B,OAAO,EAAE,YAAY,CACnB,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,eAAe,EACrB,KAAK,CAAC,sBAAsB,CAC7B;IACD,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,sBAAsB,CAAC;IAC7E,YAAY,EAAE,KAAK,CAAC,eAAe;IACnC,SAAS,EAAE,KAAK,CAAC,aAAa;IAC9B,KAAK;CACN,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,CACxB,KAAa,EACb,WAAsD,EAC9C,EAAE;IACV,IAAI,KAAK,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;QAChC,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAC5B,KAAa,EACb,UAAkB,EACI,EAAE,CACxB,IAAI,oBAAoB,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;AAEzD,SAAS,2BAA2B,CAClC,KAAa,EACb,UAAkB;IAElB,IAAI,CAAC;QACH,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,SAAS,CAAC,0CAA0C,OAAO,EAAE,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAC3D,MAAM,CAAC,MAAM,6BAA6B,GAAG,qBAAqB,CAAC;AACnE,MAAM,CAAC,MAAM,kCAAkC,GAAG,2BAA2B,CAAC;AAE9E,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EAGzC,EACA,KAAK,EACL,SAAS,EACT,aAAa,EACb,OAAO,EACP,OAAO,GACsC,EAE7C,EAAE;IACF,MAAM,IAAI,GACR,SAAS;QACT,CAAC,KAAK,YAAY,qBAAqB;YACrC,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,KAAK,YAAY,iBAAiB;gBAClC,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAC,SAAS,CAAC,CAAC;IAEnB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,UAAU,GACd,IAAI,KAAK,UAAU,IAAI,KAAK,YAAY,qBAAqB;QAC3D,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAI,KAAK,cAAc,IAAI,KAAK,YAAY,iBAAiB;YAC7D,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,IAAI,KAAK,oBAAoB,IAAI,KAAK,YAAY,kBAAkB;gBACpE,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,SAAS,CAAC;IAEpB,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,aAAa,EAAE,OAAO,CAAC;IAChE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC;QAClC,KAAK,EAAE,UAAU;QACjB,OAAO;QACP,OAAO;KACR,CAAC,CAAC;IACH,OAAO,aAAa,IAAI,SAAS,CAAC;AACpC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAGpC,EACA,KAAK,EACL,KAAK,EACL,aAAa,EACb,mBAAmB,EACnB,YAAY,EACZ,YAAY,GAC4B,EAExC,EAAE;IACF,MAAM,aAAa,GAAG,MAAM,sBAAsB,CAAC;QACjD,KAAK;QACL,aAAa;QACb,OAAO,EAAE,KAAK,CAAC,QAAQ;QACvB,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;KAC7B,CAAC,CAAC;IACH,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,KAAK,KAAK,CAAC;IAClE,MAAM,UAAU,GAAG,iBAAiB,CAClC,KAAK,CAAC,aAAa,EACnB,aAAa,CAAC,WAAW,CAC1B,CAAC;IACF,2BAA2B,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAC7D,KAAK,CAAC,iBAAiB,GAAG,SAAS,CAAC;IACpC,KAAK,CAAC,sBAAsB,GAAG,SAAS,CAAC;IACzC,MAAM,IAAI,GAAG,qBAAqB,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACpE,IAAI,gBAAgB,EAAE,CAAC;QACrB,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,YAAY,EAAE,CAAC;QACjB,0BAA0B,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACnD,CAAC;IACD,KAAK,CAAC,YAAY,GAAG;QACnB,IAAI,EAAE,wBAAwB;QAC9B,MAAM,EAAE,UAAU;KACnB,CAAC;IACF,KAAK,CAAC,kBAAkB,GAAG,eAAe,CAAC;IAC3C,MAAM,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAClE,KAAK,CAAC,sBAAsB,GAAG,KAAK,CAAC;IACrC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAC9D,OAAO,IAAI,SAAS,CAAmB,KAAK,CAAC,CAAC;AAChD,CAAC,CAAC"}
|
package/dist/runner/items.js
CHANGED
|
@@ -12,12 +12,7 @@ exports.dropOrphanToolCalls = dropOrphanToolCalls;
|
|
|
12
12
|
exports.prepareModelInputItems = prepareModelInputItems;
|
|
13
13
|
exports.getTurnInput = getTurnInput;
|
|
14
14
|
const binary_1 = require("../utils/binary.js");
|
|
15
|
-
const
|
|
16
|
-
function_call: 'function_call_result',
|
|
17
|
-
computer_call: 'computer_call_result',
|
|
18
|
-
shell_call: 'shell_call_output',
|
|
19
|
-
apply_patch_call: 'apply_patch_call_output',
|
|
20
|
-
};
|
|
15
|
+
const toolResultCorrelation_1 = require("./toolResultCorrelation.js");
|
|
21
16
|
// Normalizes user-provided input into the structure the model expects. Strings become user messages,
|
|
22
17
|
// arrays are kept as-is so downstream loops can treat both scenarios uniformly.
|
|
23
18
|
function toAgentInputList(originalInput) {
|
|
@@ -125,7 +120,7 @@ function collectCompletedCallIdsByResultType(items) {
|
|
|
125
120
|
if (typeof type !== 'string' || typeof callId !== 'string') {
|
|
126
121
|
continue;
|
|
127
122
|
}
|
|
128
|
-
if (!
|
|
123
|
+
if (!(0, toolResultCorrelation_1.isSimpleToolResultType)(type)) {
|
|
129
124
|
continue;
|
|
130
125
|
}
|
|
131
126
|
const existing = completed.get(type);
|
|
@@ -161,7 +156,7 @@ function dropOrphanToolCalls(items, options) {
|
|
|
161
156
|
if (typeof type !== 'string' || typeof callId !== 'string') {
|
|
162
157
|
return true;
|
|
163
158
|
}
|
|
164
|
-
const resultType =
|
|
159
|
+
const resultType = (0, toolResultCorrelation_1.getSimpleToolResultTypeForCall)(type);
|
|
165
160
|
if (!resultType) {
|
|
166
161
|
return true;
|
|
167
162
|
}
|
package/dist/runner/items.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"items.js","sourceRoot":"","sources":["../../src/runner/items.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"items.js","sourceRoot":"","sources":["../../src/runner/items.ts"],"names":[],"mappings":";;AAYA,4CAQC;AAED,oDAEC;AAED,kDAcC;AAED,wDAcC;AAED,4DAkBC;AAED,0EAUC;AAUD,sEAgBC;AAGD,wEAaC;AAqDD,kDA2CC;AA8CD,wDAWC;AAoBD,oCAUC;AAvTD,+CAAkD;AAClD,sEAGiC;AAIjC,qGAAqG;AACrG,gFAAgF;AAChF,SAAgB,gBAAgB,CAC9B,aAAwC;IAExC,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;QACtC,OAAO,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,CAAC,GAAG,aAAa,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,oBAAoB,CAAC,IAAoB;IACvD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,+BAA+B,CAAC,CAAC;AAC/D,CAAC;AAED,SAAgB,mBAAmB,CACjC,KAAuB;IAEvB,MAAM,IAAI,GAAuB,IAAI,GAAG,EAAE,CAAC;IAC3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,sBAAsB,CACpC,IAAwB,EACxB,GAAW;IAEX,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;IAC3B,UAAU,CAAC,KAAK,EAAE,CAAC;IACnB,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,wBAAwB,CACtC,IAAwB,EACxB,IAAoB;IAEpB,MAAM,GAAG,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;IACtE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC5B,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,+BAA+B,CAC7C,IAAY,EACZ,KAAc;IAEd,MAAM,UAAU,GAAG,IAAA,wBAAe,EAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAID,SAAS,0BAA0B,CACjC,qBAA6C;IAE7C,OAAO,qBAAqB,KAAK,MAAM,CAAC;AAC1C,CAAC;AAED,SAAgB,6BAA6B,CAC3C,IAAoB,EACpB,qBAA6C;IAE7C,IACE,CAAC,0BAA0B,CAAC,qBAAqB,CAAC;QAClD,CAAC,IAAI;QACL,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,KAAK,WAAW;QACzB,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,EACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,SAAS,EAAE,GAAG,IAA+B,CAAC;IAClE,OAAO,SAA2B,CAAC;AACrC,CAAC;AAED,qFAAqF;AACrF,SAAgB,8BAA8B,CAC5C,KAAgB,EAChB,qBAA6C;IAE7C,OAAO,KAAK;SACT,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,oBAAoB,CAAC;SACpD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAyB,CAAC,CAAC;QAClE,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACnC,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,6BAA6B,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAoB;IAC7C,IACE,CAAC,IAAI;QACL,OAAO,IAAI,KAAK,QAAQ;QACxB,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC;QAClB,IAA6B,CAAC,MAAM,KAAK,IAAI,EAC9C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,EAAE,GAAG,IAA+B,CAAC;IAC9E,OAAO,aAA+B,CAAC;AACzC,CAAC;AAED,SAAS,mCAAmC,CAC1C,KAAuB;IAEvB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAuB,CAAC;IAEjD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtC,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAI,IAA2B,CAAC,IAAI,CAAC;QAC/C,MAAM,MAAM,GAAI,IAA6B,CAAC,MAAM,CAAC;QACrD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC3D,SAAS;QACX,CAAC;QACD,IAAI,CAAC,IAAA,8CAAsB,EAAC,IAAI,CAAC,EAAE,CAAC;YAClC,SAAS;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAoB;IACpD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QACpE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,MAAM,GAAI,IAA6B,CAAC,MAAM,CAAC;IACrD,OAAO,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,aAAa,CAAC;AAC1D,CAAC;AAED,SAAgB,mBAAmB,CACjC,KAAuB,EACvB,OAA0C;IAE1C,MAAM,cAAc,GAAG,OAAO,EAAE,cAAc,CAAC;IAC/C,MAAM,qBAAqB,GAAG,mCAAmC,CAAC,KAAK,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IAEzC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC5C,IAAI,cAAc,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,IAAI,GAAI,IAA2B,CAAC,IAAI,CAAC;QAC/C,MAAM,MAAM,GAAI,IAA6B,CAAC,MAAM,CAAC;QACrD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG,IAAA,sDAA8B,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,wBAAwB,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YAChE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1B,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,IAAI,cAAc,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO,uCAAuC,CAC5C,KAAK,EACL,cAAc,EACd,cAAc,CACf,CAAC;AACJ,CAAC;AAED,SAAS,uCAAuC,CAC9C,KAAuB,EACvB,cAA2B,EAC3B,cAA4B;IAE5B,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAExC,KAAK,IAAI,KAAK,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC1D,IAAI,cAAc,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACjD,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,IACE,CAAC,IAAI;YACL,OAAO,IAAI,KAAK,QAAQ;YACvB,IAA2B,CAAC,IAAI,KAAK,WAAW;YACjD,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EACzB,CAAC;YACD,SAAS;QACX,CAAC;QAED,KAAK,IAAI,SAAS,GAAG,KAAK,GAAG,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,SAAS,IAAI,CAAC,EAAE,CAAC;YACzE,IAAI,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACjC,SAAS;YACX,CAAC;YACD,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;YAClC,IACE,QAAQ;gBACR,OAAO,QAAQ,KAAK,QAAQ;gBAC3B,QAA+B,CAAC,IAAI,KAAK,WAAW,EACrD,CAAC;gBACD,SAAS;YACX,CAAC;YACD,IAAI,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAClC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;YACD,MAAM;QACR,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,cAAc,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC;IAChE,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AAC9D,CAAC;AAED,SAAgB,sBAAsB,CACpC,aAAwC,EACxC,cAAyB,EACzB,qBAA6C;IAE7C,MAAM,WAAW,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,sBAAsB,GAAG,0BAA0B,CACvD,cAAc,EACd,qBAAqB,CACtB,CAAC;IACF,OAAO,CAAC,GAAG,WAAW,EAAE,GAAG,sBAAsB,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,0BAA0B,CACjC,cAAyB,EACzB,qBAA6C;IAE7C,MAAM,oBAAoB,GAAG,8BAA8B,CACzD,cAAc,EACd,qBAAqB,CACtB,CAAC;IACF,OAAO,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;AACnD,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,aAAwC,EACxC,cAAyB,EACzB,qBAA6C;IAE7C,MAAM,WAAW,GAAG,0BAA0B,CAC5C,cAAc,EACd,qBAAqB,CACtB,CAAC;IACF,OAAO,CAAC,GAAG,gBAAgB,CAAC,aAAa,CAAC,EAAE,GAAG,WAAW,CAAC,CAAC;AAC9D,CAAC"}
|
package/dist/runner/items.mjs
CHANGED
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
import { serializeBinary } from "../utils/binary.mjs";
|
|
2
|
-
|
|
3
|
-
function_call: 'function_call_result',
|
|
4
|
-
computer_call: 'computer_call_result',
|
|
5
|
-
shell_call: 'shell_call_output',
|
|
6
|
-
apply_patch_call: 'apply_patch_call_output',
|
|
7
|
-
};
|
|
2
|
+
import { getSimpleToolResultTypeForCall, isSimpleToolResultType, } from "./toolResultCorrelation.mjs";
|
|
8
3
|
// Normalizes user-provided input into the structure the model expects. Strings become user messages,
|
|
9
4
|
// arrays are kept as-is so downstream loops can treat both scenarios uniformly.
|
|
10
5
|
export function toAgentInputList(originalInput) {
|
|
@@ -112,7 +107,7 @@ function collectCompletedCallIdsByResultType(items) {
|
|
|
112
107
|
if (typeof type !== 'string' || typeof callId !== 'string') {
|
|
113
108
|
continue;
|
|
114
109
|
}
|
|
115
|
-
if (!
|
|
110
|
+
if (!isSimpleToolResultType(type)) {
|
|
116
111
|
continue;
|
|
117
112
|
}
|
|
118
113
|
const existing = completed.get(type);
|
|
@@ -148,7 +143,7 @@ export function dropOrphanToolCalls(items, options) {
|
|
|
148
143
|
if (typeof type !== 'string' || typeof callId !== 'string') {
|
|
149
144
|
return true;
|
|
150
145
|
}
|
|
151
|
-
const resultType =
|
|
146
|
+
const resultType = getSimpleToolResultTypeForCall(type);
|
|
152
147
|
if (!resultType) {
|
|
153
148
|
return true;
|
|
154
149
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"items.mjs","sourceRoot":"","sources":["../../src/runner/items.ts"],"names":[],"mappings":"OAEO,EAAE,eAAe,EAAE;
|
|
1
|
+
{"version":3,"file":"items.mjs","sourceRoot":"","sources":["../../src/runner/items.ts"],"names":[],"mappings":"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"}
|