@openai/agents-core 0.4.11 → 0.4.13
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 +2 -2
- package/dist/agent.js.map +1 -1
- package/dist/agent.mjs.map +1 -1
- package/dist/config.js +58 -3
- package/dist/config.js.map +1 -1
- package/dist/config.mjs +24 -2
- package/dist/config.mjs.map +1 -1
- package/dist/editor.d.ts +13 -3
- package/dist/guardrail.d.ts +9 -9
- package/dist/guardrail.js.map +1 -1
- package/dist/guardrail.mjs.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js.map +1 -1
- package/dist/index.mjs.map +1 -1
- package/dist/logger.js +6 -12
- package/dist/logger.js.map +1 -1
- package/dist/logger.mjs +6 -12
- package/dist/logger.mjs.map +1 -1
- package/dist/metadata.js +2 -2
- package/dist/metadata.mjs +2 -2
- package/dist/result.js +2 -2
- package/dist/result.js.map +1 -1
- package/dist/result.mjs +2 -2
- package/dist/result.mjs.map +1 -1
- package/dist/run.d.ts +7 -0
- package/dist/run.js +14 -1
- package/dist/run.js.map +1 -1
- package/dist/run.mjs +14 -1
- package/dist/run.mjs.map +1 -1
- package/dist/runState.d.ts +18 -2
- package/dist/runState.js +79 -3
- package/dist/runState.js.map +1 -1
- package/dist/runState.mjs +79 -3
- package/dist/runState.mjs.map +1 -1
- package/dist/runner/conversation.d.ts +7 -1
- package/dist/runner/conversation.js +45 -5
- package/dist/runner/conversation.js.map +1 -1
- package/dist/runner/conversation.mjs +46 -6
- package/dist/runner/conversation.mjs.map +1 -1
- package/dist/runner/errorHandlers.js +2 -2
- package/dist/runner/errorHandlers.js.map +1 -1
- package/dist/runner/errorHandlers.mjs +2 -2
- package/dist/runner/errorHandlers.mjs.map +1 -1
- package/dist/runner/guardrails.js +4 -2
- package/dist/runner/guardrails.js.map +1 -1
- package/dist/runner/guardrails.mjs +4 -2
- package/dist/runner/guardrails.mjs.map +1 -1
- package/dist/runner/items.d.ts +3 -2
- package/dist/runner/items.js +18 -4
- package/dist/runner/items.js.map +1 -1
- package/dist/runner/items.mjs +18 -4
- package/dist/runner/items.mjs.map +1 -1
- package/dist/runner/modelSettings.js +3 -1
- package/dist/runner/modelSettings.js.map +1 -1
- package/dist/runner/modelSettings.mjs +3 -1
- package/dist/runner/modelSettings.mjs.map +1 -1
- package/dist/runner/sessionPersistence.js +1 -1
- package/dist/runner/sessionPersistence.js.map +1 -1
- package/dist/runner/sessionPersistence.mjs +1 -1
- package/dist/runner/sessionPersistence.mjs.map +1 -1
- package/dist/runner/toolExecution.js +4 -3
- package/dist/runner/toolExecution.js.map +1 -1
- package/dist/runner/toolExecution.mjs +4 -3
- package/dist/runner/toolExecution.mjs.map +1 -1
- package/dist/runner/turnPreparation.js +1 -1
- package/dist/runner/turnPreparation.js.map +1 -1
- package/dist/runner/turnPreparation.mjs +1 -1
- package/dist/runner/turnPreparation.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -121,17 +121,21 @@ async function applyCallModelInputFilter(agent, callModelInputFilter, context, i
|
|
|
121
121
|
class ServerConversationTracker {
|
|
122
122
|
conversationId;
|
|
123
123
|
previousResponseId;
|
|
124
|
+
reasoningItemIdPolicy;
|
|
124
125
|
// Using this flag because WeakSet does not provide a way to check its size.
|
|
125
126
|
sentInitialInput = false;
|
|
126
127
|
// The items already sent to the model; using WeakSet for memory efficiency.
|
|
127
128
|
sentItems = new WeakSet();
|
|
128
129
|
// The items received from the server; using WeakSet for memory efficiency.
|
|
129
130
|
serverItems = new WeakSet();
|
|
131
|
+
// Tracks which prepared turn-input item originated from which source object.
|
|
132
|
+
preparedItemSources = new WeakMap();
|
|
130
133
|
// Track initial input items that have not yet been sent so they can be retried on later turns.
|
|
131
134
|
remainingInitialInput = null;
|
|
132
|
-
constructor({ conversationId, previousResponseId, }) {
|
|
135
|
+
constructor({ conversationId, previousResponseId, reasoningItemIdPolicy, }) {
|
|
133
136
|
this.conversationId = conversationId ?? undefined;
|
|
134
137
|
this.previousResponseId = previousResponseId ?? undefined;
|
|
138
|
+
this.reasoningItemIdPolicy = reasoningItemIdPolicy;
|
|
135
139
|
}
|
|
136
140
|
/**
|
|
137
141
|
* Pre-populates tracker caches from an existing RunState when resuming server-managed runs.
|
|
@@ -201,10 +205,14 @@ class ServerConversationTracker {
|
|
|
201
205
|
*/
|
|
202
206
|
prepareInput(originalInput, generatedItems) {
|
|
203
207
|
const inputItems = [];
|
|
208
|
+
const generatedItemsForInput = [];
|
|
204
209
|
if (!this.sentInitialInput) {
|
|
205
210
|
const initialItems = (0, items_1.toAgentInputList)(originalInput);
|
|
206
211
|
// Preserve the full initial payload so a filter can drop items without losing their originals.
|
|
207
212
|
inputItems.push(...initialItems);
|
|
213
|
+
for (const item of initialItems) {
|
|
214
|
+
this.registerPreparedItemSource(item);
|
|
215
|
+
}
|
|
208
216
|
this.remainingInitialInput = initialItems.filter((item) => Boolean(item) && typeof item === 'object');
|
|
209
217
|
this.sentInitialInput = true;
|
|
210
218
|
}
|
|
@@ -212,6 +220,9 @@ class ServerConversationTracker {
|
|
|
212
220
|
this.remainingInitialInput.length > 0) {
|
|
213
221
|
// Re-queue prior initial items until the tracker confirms they were delivered to the API.
|
|
214
222
|
inputItems.push(...this.remainingInitialInput);
|
|
223
|
+
for (const item of this.remainingInitialInput) {
|
|
224
|
+
this.registerPreparedItemSource(item);
|
|
225
|
+
}
|
|
215
226
|
}
|
|
216
227
|
for (const item of generatedItems) {
|
|
217
228
|
if (item.type === 'tool_approval_item') {
|
|
@@ -224,8 +235,14 @@ class ServerConversationTracker {
|
|
|
224
235
|
if (this.sentItems.has(rawItem) || this.serverItems.has(rawItem)) {
|
|
225
236
|
continue;
|
|
226
237
|
}
|
|
227
|
-
|
|
238
|
+
generatedItemsForInput.push(item);
|
|
228
239
|
}
|
|
240
|
+
const preparedGeneratedItems = (0, items_1.extractOutputItemsFromRunItems)(generatedItemsForInput, this.reasoningItemIdPolicy);
|
|
241
|
+
for (const [index, preparedItem] of preparedGeneratedItems.entries()) {
|
|
242
|
+
const sourceItem = generatedItemsForInput[index]?.rawItem;
|
|
243
|
+
this.registerPreparedItemSource(preparedItem, sourceItem);
|
|
244
|
+
}
|
|
245
|
+
inputItems.push(...preparedGeneratedItems);
|
|
229
246
|
return inputItems;
|
|
230
247
|
}
|
|
231
248
|
/**
|
|
@@ -245,13 +262,36 @@ class ServerConversationTracker {
|
|
|
245
262
|
}
|
|
246
263
|
addDeliveredItems(delivered, items) {
|
|
247
264
|
for (const item of items) {
|
|
248
|
-
if (!item || typeof item !== 'object'
|
|
265
|
+
if (!item || typeof item !== 'object') {
|
|
266
|
+
continue;
|
|
267
|
+
}
|
|
268
|
+
const sourceItem = this.resolvePreparedItemSource(item);
|
|
269
|
+
if (!sourceItem || typeof sourceItem !== 'object') {
|
|
270
|
+
continue;
|
|
271
|
+
}
|
|
272
|
+
if (delivered.has(sourceItem)) {
|
|
249
273
|
continue;
|
|
250
274
|
}
|
|
251
275
|
// Some inputs may be repeated in the filtered list; only mark unique originals once.
|
|
252
|
-
delivered.add(
|
|
253
|
-
this.sentItems.add(
|
|
276
|
+
delivered.add(sourceItem);
|
|
277
|
+
this.sentItems.add(sourceItem);
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
registerPreparedItemSource(preparedItem, sourceItem) {
|
|
281
|
+
if (!preparedItem || typeof preparedItem !== 'object') {
|
|
282
|
+
return;
|
|
283
|
+
}
|
|
284
|
+
if (!sourceItem || typeof sourceItem !== 'object') {
|
|
285
|
+
this.preparedItemSources.set(preparedItem, preparedItem);
|
|
286
|
+
return;
|
|
287
|
+
}
|
|
288
|
+
this.preparedItemSources.set(preparedItem, sourceItem);
|
|
289
|
+
}
|
|
290
|
+
resolvePreparedItemSource(item) {
|
|
291
|
+
if (!item || typeof item !== 'object') {
|
|
292
|
+
return item;
|
|
254
293
|
}
|
|
294
|
+
return this.preparedItemSources.get(item) ?? item;
|
|
255
295
|
}
|
|
256
296
|
updateRemainingInitialInput(delivered, dropRemainingInitialInput) {
|
|
257
297
|
if (!this.remainingInitialInput ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.js","sourceRoot":"","sources":["../../src/runner/conversation.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"conversation.js","sourceRoot":"","sources":["../../src/runner/conversation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { UserError } from "../errors.mjs";
|
|
2
2
|
import { addErrorToCurrentSpan } from "../tracing/context.mjs";
|
|
3
|
-
import { buildAgentInputPool, getAgentInputItemKey, removeAgentInputFromPool, takeAgentInputFromPool, toAgentInputList, } from "./items.mjs";
|
|
3
|
+
import { buildAgentInputPool, extractOutputItemsFromRunItems, getAgentInputItemKey, removeAgentInputFromPool, takeAgentInputFromPool, toAgentInputList, } from "./items.mjs";
|
|
4
4
|
export { getTurnInput } from "./items.mjs";
|
|
5
5
|
/**
|
|
6
6
|
* Applies the optional callModelInputFilter and returns the filtered input alongside the original
|
|
@@ -116,17 +116,21 @@ export async function applyCallModelInputFilter(agent, callModelInputFilter, con
|
|
|
116
116
|
export class ServerConversationTracker {
|
|
117
117
|
conversationId;
|
|
118
118
|
previousResponseId;
|
|
119
|
+
reasoningItemIdPolicy;
|
|
119
120
|
// Using this flag because WeakSet does not provide a way to check its size.
|
|
120
121
|
sentInitialInput = false;
|
|
121
122
|
// The items already sent to the model; using WeakSet for memory efficiency.
|
|
122
123
|
sentItems = new WeakSet();
|
|
123
124
|
// The items received from the server; using WeakSet for memory efficiency.
|
|
124
125
|
serverItems = new WeakSet();
|
|
126
|
+
// Tracks which prepared turn-input item originated from which source object.
|
|
127
|
+
preparedItemSources = new WeakMap();
|
|
125
128
|
// Track initial input items that have not yet been sent so they can be retried on later turns.
|
|
126
129
|
remainingInitialInput = null;
|
|
127
|
-
constructor({ conversationId, previousResponseId, }) {
|
|
130
|
+
constructor({ conversationId, previousResponseId, reasoningItemIdPolicy, }) {
|
|
128
131
|
this.conversationId = conversationId ?? undefined;
|
|
129
132
|
this.previousResponseId = previousResponseId ?? undefined;
|
|
133
|
+
this.reasoningItemIdPolicy = reasoningItemIdPolicy;
|
|
130
134
|
}
|
|
131
135
|
/**
|
|
132
136
|
* Pre-populates tracker caches from an existing RunState when resuming server-managed runs.
|
|
@@ -196,10 +200,14 @@ export class ServerConversationTracker {
|
|
|
196
200
|
*/
|
|
197
201
|
prepareInput(originalInput, generatedItems) {
|
|
198
202
|
const inputItems = [];
|
|
203
|
+
const generatedItemsForInput = [];
|
|
199
204
|
if (!this.sentInitialInput) {
|
|
200
205
|
const initialItems = toAgentInputList(originalInput);
|
|
201
206
|
// Preserve the full initial payload so a filter can drop items without losing their originals.
|
|
202
207
|
inputItems.push(...initialItems);
|
|
208
|
+
for (const item of initialItems) {
|
|
209
|
+
this.registerPreparedItemSource(item);
|
|
210
|
+
}
|
|
203
211
|
this.remainingInitialInput = initialItems.filter((item) => Boolean(item) && typeof item === 'object');
|
|
204
212
|
this.sentInitialInput = true;
|
|
205
213
|
}
|
|
@@ -207,6 +215,9 @@ export class ServerConversationTracker {
|
|
|
207
215
|
this.remainingInitialInput.length > 0) {
|
|
208
216
|
// Re-queue prior initial items until the tracker confirms they were delivered to the API.
|
|
209
217
|
inputItems.push(...this.remainingInitialInput);
|
|
218
|
+
for (const item of this.remainingInitialInput) {
|
|
219
|
+
this.registerPreparedItemSource(item);
|
|
220
|
+
}
|
|
210
221
|
}
|
|
211
222
|
for (const item of generatedItems) {
|
|
212
223
|
if (item.type === 'tool_approval_item') {
|
|
@@ -219,8 +230,14 @@ export class ServerConversationTracker {
|
|
|
219
230
|
if (this.sentItems.has(rawItem) || this.serverItems.has(rawItem)) {
|
|
220
231
|
continue;
|
|
221
232
|
}
|
|
222
|
-
|
|
233
|
+
generatedItemsForInput.push(item);
|
|
223
234
|
}
|
|
235
|
+
const preparedGeneratedItems = extractOutputItemsFromRunItems(generatedItemsForInput, this.reasoningItemIdPolicy);
|
|
236
|
+
for (const [index, preparedItem] of preparedGeneratedItems.entries()) {
|
|
237
|
+
const sourceItem = generatedItemsForInput[index]?.rawItem;
|
|
238
|
+
this.registerPreparedItemSource(preparedItem, sourceItem);
|
|
239
|
+
}
|
|
240
|
+
inputItems.push(...preparedGeneratedItems);
|
|
224
241
|
return inputItems;
|
|
225
242
|
}
|
|
226
243
|
/**
|
|
@@ -240,13 +257,36 @@ export class ServerConversationTracker {
|
|
|
240
257
|
}
|
|
241
258
|
addDeliveredItems(delivered, items) {
|
|
242
259
|
for (const item of items) {
|
|
243
|
-
if (!item || typeof item !== 'object'
|
|
260
|
+
if (!item || typeof item !== 'object') {
|
|
261
|
+
continue;
|
|
262
|
+
}
|
|
263
|
+
const sourceItem = this.resolvePreparedItemSource(item);
|
|
264
|
+
if (!sourceItem || typeof sourceItem !== 'object') {
|
|
265
|
+
continue;
|
|
266
|
+
}
|
|
267
|
+
if (delivered.has(sourceItem)) {
|
|
244
268
|
continue;
|
|
245
269
|
}
|
|
246
270
|
// Some inputs may be repeated in the filtered list; only mark unique originals once.
|
|
247
|
-
delivered.add(
|
|
248
|
-
this.sentItems.add(
|
|
271
|
+
delivered.add(sourceItem);
|
|
272
|
+
this.sentItems.add(sourceItem);
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
registerPreparedItemSource(preparedItem, sourceItem) {
|
|
276
|
+
if (!preparedItem || typeof preparedItem !== 'object') {
|
|
277
|
+
return;
|
|
278
|
+
}
|
|
279
|
+
if (!sourceItem || typeof sourceItem !== 'object') {
|
|
280
|
+
this.preparedItemSources.set(preparedItem, preparedItem);
|
|
281
|
+
return;
|
|
282
|
+
}
|
|
283
|
+
this.preparedItemSources.set(preparedItem, sourceItem);
|
|
284
|
+
}
|
|
285
|
+
resolvePreparedItemSource(item) {
|
|
286
|
+
if (!item || typeof item !== 'object') {
|
|
287
|
+
return item;
|
|
249
288
|
}
|
|
289
|
+
return this.preparedItemSources.get(item) ?? item;
|
|
250
290
|
}
|
|
251
291
|
updateRemainingInitialInput(delivered, dropRemainingInitialInput) {
|
|
252
292
|
if (!this.remainingInitialInput ||
|
|
@@ -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,oBAAoB,EACpB,wBAAwB,EACxB,sBAAsB,EACtB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"conversation.mjs","sourceRoot":"","sources":["../../src/runner/conversation.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,8 @@ const streaming_1 = require("./streaming.js");
|
|
|
11
11
|
const buildRunData = (state) => ({
|
|
12
12
|
input: state._originalInput,
|
|
13
13
|
newItems: state._generatedItems,
|
|
14
|
-
history: (0, items_2.getTurnInput)(state._originalInput, state._generatedItems),
|
|
15
|
-
output: (0, items_2.getTurnInput)([], state._generatedItems),
|
|
14
|
+
history: (0, items_2.getTurnInput)(state._originalInput, state._generatedItems, state._reasoningItemIdPolicy),
|
|
15
|
+
output: (0, items_2.getTurnInput)([], state._generatedItems, state._reasoningItemIdPolicy),
|
|
16
16
|
rawResponses: state._modelResponses,
|
|
17
17
|
lastAgent: state._currentAgent,
|
|
18
18
|
state,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandlers.js","sourceRoot":"","sources":["../../src/runner/errorHandlers.ts"],"names":[],"mappings":";;;AACA,yCAAkD;AAClD,mDAA+C;AAC/C,uCAAyD;AAEzD,yCAAyD;AAYzD,gDAAmD;AACnD,sCAAuC;AACvC,8CAAyD;AAsEzD,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,
|
|
1
|
+
{"version":3,"file":"errorHandlers.js","sourceRoot":"","sources":["../../src/runner/errorHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,8 @@ import { streamStepItemsToRunResult } from "./streaming.mjs";
|
|
|
8
8
|
const buildRunData = (state) => ({
|
|
9
9
|
input: state._originalInput,
|
|
10
10
|
newItems: state._generatedItems,
|
|
11
|
-
history: getTurnInput(state._originalInput, state._generatedItems),
|
|
12
|
-
output: getTurnInput([], state._generatedItems),
|
|
11
|
+
history: getTurnInput(state._originalInput, state._generatedItems, state._reasoningItemIdPolicy),
|
|
12
|
+
output: getTurnInput([], state._generatedItems, state._reasoningItemIdPolicy),
|
|
13
13
|
rawResponses: state._modelResponses,
|
|
14
14
|
lastAgent: state._currentAgent,
|
|
15
15
|
state,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandlers.mjs","sourceRoot":"","sources":["../../src/runner/errorHandlers.ts"],"names":[],"mappings":"OACO,EAAE,qBAAqB,EAAE;OACzB,EAAE,SAAS,EAAE;OACb,EAAW,oBAAoB,EAAE;OAEjC,EAAE,SAAS,EAAqB;OAYhC,EAAE,mBAAmB,EAAE;OACvB,EAAE,YAAY,EAAE;OAChB,EAAE,0BAA0B,EAAE;AAsErC,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,
|
|
1
|
+
{"version":3,"file":"errorHandlers.mjs","sourceRoot":"","sources":["../../src/runner/errorHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -142,12 +142,14 @@ async function runInputGuardrails(state, guardrails) {
|
|
|
142
142
|
});
|
|
143
143
|
}
|
|
144
144
|
async function runOutputGuardrails(state, runnerOutputGuardrails, output) {
|
|
145
|
-
|
|
145
|
+
// Runner-level output guardrails are context-agnostic, so align them with the active run context type.
|
|
146
|
+
const runnerGuardrails = runnerOutputGuardrails;
|
|
147
|
+
const guardrails = runnerGuardrails.concat(state._currentAgent.outputGuardrails.map(guardrail_1.defineOutputGuardrail));
|
|
146
148
|
if (guardrails.length === 0) {
|
|
147
149
|
return;
|
|
148
150
|
}
|
|
149
151
|
const agentOutput = state._currentAgent.processFinalOutput(output);
|
|
150
|
-
const runOutput = (0, items_1.getTurnInput)([], state._generatedItems);
|
|
152
|
+
const runOutput = (0, items_1.getTurnInput)([], state._generatedItems, state._reasoningItemIdPolicy);
|
|
151
153
|
const guardrailArgs = {
|
|
152
154
|
agent: state._currentAgent,
|
|
153
155
|
agentOutput,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guardrails.js","sourceRoot":"","sources":["../../src/runner/guardrails.ts"],"names":[],"mappings":";;;AAgKA,wEAUC;AAED,oDAgBC;AAED,gDAuCC;AAED,
|
|
1
|
+
{"version":3,"file":"guardrails.js","sourceRoot":"","sources":["../../src/runner/guardrails.ts"],"names":[],"mappings":"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"}
|
|
@@ -134,12 +134,14 @@ export async function runInputGuardrails(state, guardrails) {
|
|
|
134
134
|
});
|
|
135
135
|
}
|
|
136
136
|
export async function runOutputGuardrails(state, runnerOutputGuardrails, output) {
|
|
137
|
-
|
|
137
|
+
// Runner-level output guardrails are context-agnostic, so align them with the active run context type.
|
|
138
|
+
const runnerGuardrails = runnerOutputGuardrails;
|
|
139
|
+
const guardrails = runnerGuardrails.concat(state._currentAgent.outputGuardrails.map(defineOutputGuardrail));
|
|
138
140
|
if (guardrails.length === 0) {
|
|
139
141
|
return;
|
|
140
142
|
}
|
|
141
143
|
const agentOutput = state._currentAgent.processFinalOutput(output);
|
|
142
|
-
const runOutput = getTurnInput([], state._generatedItems);
|
|
144
|
+
const runOutput = getTurnInput([], state._generatedItems, state._reasoningItemIdPolicy);
|
|
143
145
|
const guardrailArgs = {
|
|
144
146
|
agent: state._currentAgent,
|
|
145
147
|
agentOutput,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guardrails.mjs","sourceRoot":"","sources":["../../src/runner/guardrails.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"guardrails.mjs","sourceRoot":"","sources":["../../src/runner/guardrails.ts"],"names":[],"mappings":"OACO,EACL,uBAAuB,EACvB,+BAA+B,EAC/B,gCAAgC,GACjC;OACM,EACL,oBAAoB,EACpB,qBAAqB,GAMtB;OAEM,EAAE,YAAY,EAAE;OAChB,EAAE,iBAAiB,EAAE;AAc5B,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAqB,EAAE;IAC3D,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,KAAK,GAAY,SAAS,CAAC;IAC/B,IAAI,OAAoD,CAAC;IAEzD,MAAM,QAAQ,GAAG,CAAC,GAAY,EAAE,EAAE;QAChC,MAAM,GAAG,IAAI,CAAC;QACd,KAAK,GAAG,GAAG,CAAC;QACZ,OAAO,GAAG,KAAK,CAAC;IAClB,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,CAAC,QAA0C,EAAE,EAAE;QAChE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QACD,OAAO,GAAG,IAAI,CAAC;QACf,OAAO,GAAG,QAAQ;aACf,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC;aAC1B,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,QAAQ,CAAC,GAAG,CAAC,CAAC;YACd,gFAAgF;YAChF,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE;YACZ,OAAO,GAAG,KAAK,CAAC;QAClB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,KAAK,EAAE,OAAsC,EAAE,EAAE;QACvE,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,OAAO,CAAC;QAChB,CAAC;QACD,IAAI,KAAK,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;YACtC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IAEF,OAAO;QACL,IAAI,OAAO;YACT,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,IAAI,MAAM;YACR,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,KAAK;YACP,OAAO,KAAK,CAAC;QACf,CAAC;QACD,WAAW,EAAE,GAAG,EAAE;YAChB,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,UAAU;QACV,QAAQ;QACR,YAAY;QACZ,eAAe;KAChB,CAAC;AACJ,CAAC,CAAC;AAOF,KAAK,UAAU,yBAAyB,CAKtC,OAQD;IACC,MAAM,EACJ,KAAK,EACL,UAAU,EACV,aAAa,EACb,aAAa,EACb,UAAU,EACV,eAAe,EACf,OAAO,GACR,GAAG,OAAO,CAAC;IAEZ,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;YACjC,OAAO,iBAAiB,CACtB,KAAK,EAAE,IAAI,EAAE,EAAE;gBACb,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBAClD,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC;gBAC1D,OAAO,MAAM,CAAC;YAChB,CAAC,EACD,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAClC,KAAK,CAAC,iBAAiB,CACxB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QACF,aAAa,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;QAC/B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;gBACpC,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;oBAC5B,KAAK,CAAC,iBAAiB,CAAC,QAAQ,CAAC;wBAC/B,OAAO,EAAE,8BAA8B;wBACvC,IAAI,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE;qBAC3C,CAAC,CAAC;gBACL,CAAC;gBACD,UAAU,CAAC,MAAM,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,KAAK,CAAC;QACd,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,CAAC;QACf,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,8BAA8B,CAI5C,KAAiC,EACjC,gBAA4C;IAE5C,OAAO,gBAAgB,CAAC,MAAM,CAC5B,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAC9D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,UAAsC;IAIzE,MAAM,QAAQ,GAA+B,EAAE,CAAC;IAChD,MAAM,QAAQ,GAA+B,EAAE,CAAC;IAEhD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,SAAS,CAAC,aAAa,KAAK,KAAK,EAAE,CAAC;YACtC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AAChC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAItC,KAAiC,EACjC,UAAsC;IAEtC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,aAAa,GAAG;QACpB,KAAK,EAAE,KAAK,CAAC,aAAa;QAC1B,KAAK,EAAE,KAAK,CAAC,cAAc;QAC3B,OAAO,EAAE,KAAK,CAAC,QAAQ;KACxB,CAAC;IACF,OAAO,MAAM,yBAAyB,CAAC;QACrC,KAAK;QACL,UAAU;QACV,aAAa;QACb,aAAa,EAAE,KAAK,CAAC,sBAAsB;QAC3C,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;YACrB,MAAM,IAAI,+BAA+B,CACvC,8BAA8B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,EACxE,MAAM,EACN,KAAK,CACN,CAAC;QACJ,CAAC;QACD,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE,CACzB,KAAK,YAAY,+BAA+B;QAClD,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,8CAA8C;YAC9C,KAAK,CAAC,YAAY,EAAE,CAAC;YACrB,MAAM,IAAI,uBAAuB,CAC/B,uCAAuC,KAAK,EAAE,EAC9C,KAAc,EACd,KAAK,CACN,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAKvC,KAAiC,EACjC,sBAGG,EACH,MAAc;IAEd,uGAAuG;IACvG,MAAM,gBAAgB,GAAG,sBAItB,CAAC;IACJ,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CACxC,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAChE,CAAC;IACF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IACD,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACnE,MAAM,SAAS,GAAG,YAAY,CAC5B,EAAE,EACF,KAAK,CAAC,eAAe,EACrB,KAAK,CAAC,sBAAsB,CAC7B,CAAC;IACF,MAAM,aAAa,GAAmD;QACpE,KAAK,EAAE,KAAK,CAAC,aAAa;QAC1B,WAAW;QACX,OAAO,EAAE,KAAK,CAAC,QAAQ;QACvB,OAAO,EAAE;YACP,aAAa,EAAE,KAAK,CAAC,iBAAiB;YACtC,MAAM,EAAE,SAAS;SAClB;KACF,CAAC;IACF,MAAM,yBAAyB,CAAC;QAC9B,KAAK;QACL,UAAU;QACV,aAAa;QACb,aAAa,EAAE,KAAK,CAAC,uBAAuB;QAC5C,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;YACrB,MAAM,IAAI,gCAAgC,CACxC,+BAA+B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,EACzE,MAAM,EACN,KAAK,CACN,CAAC;QACJ,CAAC;QACD,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE,CACzB,KAAK,YAAY,gCAAgC;QACnD,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACjB,MAAM,IAAI,uBAAuB,CAC/B,wCAAwC,KAAK,EAAE,EAC/C,KAAc,EACd,KAAK,CACN,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
package/dist/runner/items.d.ts
CHANGED
|
@@ -7,7 +7,8 @@ export declare function buildAgentInputPool(items: AgentInputItem[]): AgentInput
|
|
|
7
7
|
export declare function takeAgentInputFromPool(pool: AgentInputItemPool, key: string): AgentInputItem | undefined;
|
|
8
8
|
export declare function removeAgentInputFromPool(pool: AgentInputItemPool, item: AgentInputItem): boolean;
|
|
9
9
|
export declare function agentInputSerializationReplacer(_key: string, value: unknown): unknown;
|
|
10
|
-
export
|
|
10
|
+
export type ReasoningItemIdPolicy = 'preserve' | 'omit';
|
|
11
|
+
export declare function extractOutputItemsFromRunItems(items: RunItem[], reasoningItemIdPolicy?: ReasoningItemIdPolicy): AgentInputItem[];
|
|
11
12
|
/**
|
|
12
13
|
* Constructs the model input array for the current turn by combining the original turn input with
|
|
13
14
|
* any new run items (excluding tool approval placeholders). This helps ensure that repeated calls
|
|
@@ -15,4 +16,4 @@ export declare function extractOutputItemsFromRunItems(items: RunItem[]): AgentI
|
|
|
15
16
|
*
|
|
16
17
|
* See: https://platform.openai.com/docs/guides/conversation-state?api-mode=responses.
|
|
17
18
|
*/
|
|
18
|
-
export declare function getTurnInput(originalInput: string | AgentInputItem[], generatedItems: RunItem[]): AgentInputItem[];
|
|
19
|
+
export declare function getTurnInput(originalInput: string | AgentInputItem[], generatedItems: RunItem[], reasoningItemIdPolicy?: ReasoningItemIdPolicy): AgentInputItem[];
|
package/dist/runner/items.js
CHANGED
|
@@ -69,11 +69,25 @@ function agentInputSerializationReplacer(_key, value) {
|
|
|
69
69
|
}
|
|
70
70
|
return value;
|
|
71
71
|
}
|
|
72
|
+
function shouldOmitReasoningItemIds(reasoningItemIdPolicy) {
|
|
73
|
+
return reasoningItemIdPolicy === 'omit';
|
|
74
|
+
}
|
|
72
75
|
// Extracts model-ready output items from run items, excluding approval placeholders.
|
|
73
|
-
function extractOutputItemsFromRunItems(items) {
|
|
76
|
+
function extractOutputItemsFromRunItems(items, reasoningItemIdPolicy) {
|
|
77
|
+
const omitReasoningItemIds = shouldOmitReasoningItemIds(reasoningItemIdPolicy);
|
|
74
78
|
return items
|
|
75
79
|
.filter((item) => item.type !== 'tool_approval_item')
|
|
76
|
-
.map((item) =>
|
|
80
|
+
.map((item) => {
|
|
81
|
+
const rawItem = item.rawItem;
|
|
82
|
+
if (!omitReasoningItemIds || item.type !== 'reasoning_item') {
|
|
83
|
+
return rawItem;
|
|
84
|
+
}
|
|
85
|
+
if (!rawItem || typeof rawItem !== 'object' || !('id' in rawItem)) {
|
|
86
|
+
return rawItem;
|
|
87
|
+
}
|
|
88
|
+
const { id: _id, ...withoutId } = rawItem;
|
|
89
|
+
return withoutId;
|
|
90
|
+
});
|
|
77
91
|
}
|
|
78
92
|
/**
|
|
79
93
|
* Constructs the model input array for the current turn by combining the original turn input with
|
|
@@ -82,8 +96,8 @@ function extractOutputItemsFromRunItems(items) {
|
|
|
82
96
|
*
|
|
83
97
|
* See: https://platform.openai.com/docs/guides/conversation-state?api-mode=responses.
|
|
84
98
|
*/
|
|
85
|
-
function getTurnInput(originalInput, generatedItems) {
|
|
86
|
-
const outputItems = extractOutputItemsFromRunItems(generatedItems);
|
|
99
|
+
function getTurnInput(originalInput, generatedItems, reasoningItemIdPolicy) {
|
|
100
|
+
const outputItems = extractOutputItemsFromRunItems(generatedItems, reasoningItemIdPolicy);
|
|
87
101
|
return [...toAgentInputList(originalInput), ...outputItems];
|
|
88
102
|
}
|
|
89
103
|
//# sourceMappingURL=items.js.map
|
package/dist/runner/items.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"items.js","sourceRoot":"","sources":["../../src/runner/items.ts"],"names":[],"mappings":";;AAQA,4CAQC;AAED,oDAEC;AAED,kDAcC;AAED,wDAcC;AAED,4DAkBC;AAED,0EAUC;
|
|
1
|
+
{"version":3,"file":"items.js","sourceRoot":"","sources":["../../src/runner/items.ts"],"names":[],"mappings":"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"}
|
package/dist/runner/items.mjs
CHANGED
|
@@ -59,11 +59,25 @@ export function agentInputSerializationReplacer(_key, value) {
|
|
|
59
59
|
}
|
|
60
60
|
return value;
|
|
61
61
|
}
|
|
62
|
+
function shouldOmitReasoningItemIds(reasoningItemIdPolicy) {
|
|
63
|
+
return reasoningItemIdPolicy === 'omit';
|
|
64
|
+
}
|
|
62
65
|
// Extracts model-ready output items from run items, excluding approval placeholders.
|
|
63
|
-
export function extractOutputItemsFromRunItems(items) {
|
|
66
|
+
export function extractOutputItemsFromRunItems(items, reasoningItemIdPolicy) {
|
|
67
|
+
const omitReasoningItemIds = shouldOmitReasoningItemIds(reasoningItemIdPolicy);
|
|
64
68
|
return items
|
|
65
69
|
.filter((item) => item.type !== 'tool_approval_item')
|
|
66
|
-
.map((item) =>
|
|
70
|
+
.map((item) => {
|
|
71
|
+
const rawItem = item.rawItem;
|
|
72
|
+
if (!omitReasoningItemIds || item.type !== 'reasoning_item') {
|
|
73
|
+
return rawItem;
|
|
74
|
+
}
|
|
75
|
+
if (!rawItem || typeof rawItem !== 'object' || !('id' in rawItem)) {
|
|
76
|
+
return rawItem;
|
|
77
|
+
}
|
|
78
|
+
const { id: _id, ...withoutId } = rawItem;
|
|
79
|
+
return withoutId;
|
|
80
|
+
});
|
|
67
81
|
}
|
|
68
82
|
/**
|
|
69
83
|
* Constructs the model input array for the current turn by combining the original turn input with
|
|
@@ -72,8 +86,8 @@ export function extractOutputItemsFromRunItems(items) {
|
|
|
72
86
|
*
|
|
73
87
|
* See: https://platform.openai.com/docs/guides/conversation-state?api-mode=responses.
|
|
74
88
|
*/
|
|
75
|
-
export function getTurnInput(originalInput, generatedItems) {
|
|
76
|
-
const outputItems = extractOutputItemsFromRunItems(generatedItems);
|
|
89
|
+
export function getTurnInput(originalInput, generatedItems, reasoningItemIdPolicy) {
|
|
90
|
+
const outputItems = extractOutputItemsFromRunItems(generatedItems, reasoningItemIdPolicy);
|
|
77
91
|
return [...toAgentInputList(originalInput), ...outputItems];
|
|
78
92
|
}
|
|
79
93
|
//# sourceMappingURL=items.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"items.mjs","sourceRoot":"","sources":["../../src/runner/items.ts"],"names":[],"mappings":"OAEO,EAAE,eAAe,EAAE;AAI1B,qGAAqG;AACrG,gFAAgF;AAChF,MAAM,UAAU,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,MAAM,UAAU,oBAAoB,CAAC,IAAoB;IACvD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,+BAA+B,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,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,MAAM,UAAU,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,MAAM,UAAU,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,MAAM,UAAU,+BAA+B,CAC7C,IAAY,EACZ,KAAc;IAEd,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,8BAA8B,CAC5C,KAAgB;
|
|
1
|
+
{"version":3,"file":"items.mjs","sourceRoot":"","sources":["../../src/runner/items.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,9 @@ function selectModel(agentModel, runConfigModel) {
|
|
|
29
29
|
* any tool usage. This prevents the provider from reusing stale tool hints across turns.
|
|
30
30
|
*/
|
|
31
31
|
function maybeResetToolChoice(agent, toolUseTracker, modelSettings) {
|
|
32
|
-
if (agent.resetToolChoice &&
|
|
32
|
+
if (agent.resetToolChoice &&
|
|
33
|
+
toolUseTracker.hasUsedTools(agent) &&
|
|
34
|
+
modelSettings.toolChoice !== 'none') {
|
|
33
35
|
return { ...modelSettings, toolChoice: undefined };
|
|
34
36
|
}
|
|
35
37
|
return modelSettings;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelSettings.js","sourceRoot":"","sources":["../../src/runner/modelSettings.ts"],"names":[],"mappings":";;AAyBA,kCAYC;AAMD,
|
|
1
|
+
{"version":3,"file":"modelSettings.js","sourceRoot":"","sources":["../../src/runner/modelSettings.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,9 @@ export function selectModel(agentModel, runConfigModel) {
|
|
|
24
24
|
* any tool usage. This prevents the provider from reusing stale tool hints across turns.
|
|
25
25
|
*/
|
|
26
26
|
export function maybeResetToolChoice(agent, toolUseTracker, modelSettings) {
|
|
27
|
-
if (agent.resetToolChoice &&
|
|
27
|
+
if (agent.resetToolChoice &&
|
|
28
|
+
toolUseTracker.hasUsedTools(agent) &&
|
|
29
|
+
modelSettings.toolChoice !== 'none') {
|
|
28
30
|
return { ...modelSettings, toolChoice: undefined };
|
|
29
31
|
}
|
|
30
32
|
return modelSettings;
|