@openai/agents-core 0.5.3 → 0.6.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/computer.d.ts +10 -2
- package/dist/events.d.ts +1 -1
- package/dist/events.js.map +1 -1
- package/dist/events.mjs.map +1 -1
- package/dist/extensions/handoffFilters.d.ts +4 -3
- package/dist/extensions/handoffFilters.js +8 -3
- package/dist/extensions/handoffFilters.js.map +1 -1
- package/dist/extensions/handoffFilters.mjs +9 -4
- package/dist/extensions/handoffFilters.mjs.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.js +8 -2
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +2 -2
- package/dist/index.mjs.map +1 -1
- package/dist/items.d.ts +1158 -32
- package/dist/items.js +56 -2
- package/dist/items.js.map +1 -1
- package/dist/items.mjs +53 -1
- package/dist/items.mjs.map +1 -1
- package/dist/metadata.js +3 -3
- package/dist/metadata.mjs +3 -3
- package/dist/model.d.ts +14 -2
- package/dist/run.js +2 -2
- package/dist/run.js.map +1 -1
- package/dist/run.mjs +3 -3
- package/dist/run.mjs.map +1 -1
- package/dist/runContext.d.ts +12 -1
- package/dist/runContext.js +145 -41
- package/dist/runContext.js.map +1 -1
- package/dist/runContext.mjs +145 -41
- package/dist/runContext.mjs.map +1 -1
- package/dist/runState.d.ts +506 -18
- package/dist/runState.js +321 -15
- package/dist/runState.js.map +1 -1
- package/dist/runState.mjs +322 -16
- package/dist/runState.mjs.map +1 -1
- package/dist/runner/approvalRejection.d.ts +13 -0
- package/dist/runner/approvalRejection.js +44 -0
- package/dist/runner/approvalRejection.js.map +1 -0
- package/dist/runner/approvalRejection.mjs +37 -0
- package/dist/runner/approvalRejection.mjs.map +1 -0
- package/dist/runner/mcpApprovals.js +4 -1
- package/dist/runner/mcpApprovals.js.map +1 -1
- package/dist/runner/mcpApprovals.mjs +4 -1
- package/dist/runner/mcpApprovals.mjs.map +1 -1
- package/dist/runner/modelOutputs.d.ts +5 -1
- package/dist/runner/modelOutputs.js +552 -12
- package/dist/runner/modelOutputs.js.map +1 -1
- package/dist/runner/modelOutputs.mjs +552 -13
- package/dist/runner/modelOutputs.mjs.map +1 -1
- package/dist/runner/modelPreparation.js +5 -2
- package/dist/runner/modelPreparation.js.map +1 -1
- package/dist/runner/modelPreparation.mjs +5 -2
- package/dist/runner/modelPreparation.mjs.map +1 -1
- package/dist/runner/sessionPersistence.js +17 -3
- package/dist/runner/sessionPersistence.js.map +1 -1
- package/dist/runner/sessionPersistence.mjs +17 -3
- package/dist/runner/sessionPersistence.mjs.map +1 -1
- package/dist/runner/streaming.js +8 -0
- package/dist/runner/streaming.js.map +1 -1
- package/dist/runner/streaming.mjs +9 -1
- package/dist/runner/streaming.mjs.map +1 -1
- package/dist/runner/toolExecution.js +105 -95
- package/dist/runner/toolExecution.js.map +1 -1
- package/dist/runner/toolExecution.mjs +100 -90
- package/dist/runner/toolExecution.mjs.map +1 -1
- package/dist/runner/toolSearch.d.ts +23 -0
- package/dist/runner/toolSearch.js +426 -0
- package/dist/runner/toolSearch.js.map +1 -0
- package/dist/runner/toolSearch.mjs +416 -0
- package/dist/runner/toolSearch.mjs.map +1 -0
- package/dist/runner/turnResolution.js +2 -1
- package/dist/runner/turnResolution.js.map +1 -1
- package/dist/runner/turnResolution.mjs +2 -1
- package/dist/runner/turnResolution.mjs.map +1 -1
- package/dist/tool.d.ts +50 -0
- package/dist/tool.js +79 -0
- package/dist/tool.js.map +1 -1
- package/dist/tool.mjs +74 -0
- package/dist/tool.mjs.map +1 -1
- package/dist/toolIdentity.d.ts +23 -0
- package/dist/toolIdentity.js +105 -0
- package/dist/toolIdentity.js.map +1 -0
- package/dist/toolIdentity.mjs +89 -0
- package/dist/toolIdentity.mjs.map +1 -0
- package/dist/tooling.d.ts +24 -0
- package/dist/tooling.js +110 -0
- package/dist/tooling.js.map +1 -0
- package/dist/tooling.mjs +97 -0
- package/dist/tooling.mjs.map +1 -0
- package/dist/types/aliases.d.ts +3 -3
- package/dist/types/protocol.d.ts +417 -12
- package/dist/types/protocol.js +59 -4
- package/dist/types/protocol.js.map +1 -1
- package/dist/types/protocol.mjs +57 -2
- package/dist/types/protocol.mjs.map +1 -1
- package/dist/types/providerData.d.ts +2 -0
- package/dist/utils/index.d.ts +2 -0
- package/dist/utils/index.js +15 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/index.mjs +2 -0
- package/dist/utils/index.mjs.map +1 -1
- package/dist/utils/serialize.js +37 -6
- package/dist/utils/serialize.js.map +1 -1
- package/dist/utils/serialize.mjs +37 -6
- package/dist/utils/serialize.mjs.map +1 -1
- package/dist/utils/toolSearch.d.ts +1 -0
- package/dist/utils/toolSearch.js +13 -0
- package/dist/utils/toolSearch.js.map +1 -0
- package/dist/utils/toolSearch.mjs +2 -0
- package/dist/utils/toolSearch.mjs.map +1 -0
- package/package.json +2 -2
|
@@ -0,0 +1,416 @@
|
|
|
1
|
+
import { UserError } from "../errors.mjs";
|
|
2
|
+
import { getClientToolSearchExecutor, getToolSearchRuntimeToolKey, } from "../tool.mjs";
|
|
3
|
+
import { getExplicitFunctionToolNamespace, getFunctionToolNamespaceDescription, getFunctionToolQualifiedName, toolQualifiedName, } from "../toolIdentity.mjs";
|
|
4
|
+
import { serializeTool } from "../utils/serialize.mjs";
|
|
5
|
+
import { resolveToolSearchCallId } from "../utils/toolSearch.mjs";
|
|
6
|
+
function isDeferredFunctionTool(tool) {
|
|
7
|
+
return tool.type === 'function' && tool.deferLoading === true;
|
|
8
|
+
}
|
|
9
|
+
function isTopLevelDeferredFunctionTool(tool) {
|
|
10
|
+
return (isDeferredFunctionTool(tool) && !getExplicitFunctionToolNamespace(tool));
|
|
11
|
+
}
|
|
12
|
+
function isDeferredHostedMcpTool(tool) {
|
|
13
|
+
return (tool.type === 'hosted_tool' &&
|
|
14
|
+
tool.providerData?.type === 'mcp' &&
|
|
15
|
+
tool.providerData.defer_loading === true);
|
|
16
|
+
}
|
|
17
|
+
function getBuiltInClientToolSearchArguments(value) {
|
|
18
|
+
if (!value || typeof value !== 'object') {
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
21
|
+
const paths = value.paths;
|
|
22
|
+
if (!Array.isArray(paths)) {
|
|
23
|
+
return undefined;
|
|
24
|
+
}
|
|
25
|
+
return {
|
|
26
|
+
paths: paths.filter((path) => typeof path === 'string' && path.length > 0),
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
function getDeferredFunctionToolsByName(tools) {
|
|
30
|
+
return new Map(tools
|
|
31
|
+
.filter(isTopLevelDeferredFunctionTool)
|
|
32
|
+
.map((tool) => [tool.name, tool]));
|
|
33
|
+
}
|
|
34
|
+
function getDeferredNamespaceToolsByName(tools) {
|
|
35
|
+
const namespaces = new Map();
|
|
36
|
+
for (const tool of tools) {
|
|
37
|
+
if (!isDeferredFunctionTool(tool)) {
|
|
38
|
+
continue;
|
|
39
|
+
}
|
|
40
|
+
const namespace = getExplicitFunctionToolNamespace(tool);
|
|
41
|
+
if (!namespace) {
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
const description = getFunctionToolNamespaceDescription(tool);
|
|
45
|
+
if (!description) {
|
|
46
|
+
throw new UserError(`Deferred namespace "${namespace}" must provide a description for built-in client tool_search.`);
|
|
47
|
+
}
|
|
48
|
+
const existing = namespaces.get(namespace);
|
|
49
|
+
if (!existing) {
|
|
50
|
+
namespaces.set(namespace, { description, tools: [tool] });
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
existing.tools.push(tool);
|
|
54
|
+
}
|
|
55
|
+
return namespaces;
|
|
56
|
+
}
|
|
57
|
+
function getDeferredHostedMcpToolsByServerLabel(tools) {
|
|
58
|
+
return new Map(tools
|
|
59
|
+
.filter(isDeferredHostedMcpTool)
|
|
60
|
+
.map((tool) => [tool.providerData.server_label, tool]));
|
|
61
|
+
}
|
|
62
|
+
function getDeferredNamespacedFunctionToolsByQualifiedName(tools) {
|
|
63
|
+
const qualifiedTools = new Map();
|
|
64
|
+
for (const tool of tools) {
|
|
65
|
+
if (!isDeferredFunctionTool(tool)) {
|
|
66
|
+
continue;
|
|
67
|
+
}
|
|
68
|
+
const namespace = getExplicitFunctionToolNamespace(tool);
|
|
69
|
+
if (!namespace) {
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
72
|
+
const description = getFunctionToolNamespaceDescription(tool);
|
|
73
|
+
const qualifiedName = getFunctionToolQualifiedName(tool);
|
|
74
|
+
if (!description || !qualifiedName) {
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
77
|
+
qualifiedTools.set(qualifiedName, { namespace, description, tool });
|
|
78
|
+
}
|
|
79
|
+
return qualifiedTools;
|
|
80
|
+
}
|
|
81
|
+
function serializeFunctionToolForToolSearchOutput(tool) {
|
|
82
|
+
const serialized = serializeTool(tool);
|
|
83
|
+
const namespace = getExplicitFunctionToolNamespace(tool);
|
|
84
|
+
if (!namespace) {
|
|
85
|
+
return serialized;
|
|
86
|
+
}
|
|
87
|
+
const { namespace: _namespace, namespaceDescription, ...toolPayload } = serialized;
|
|
88
|
+
void namespaceDescription;
|
|
89
|
+
return toolPayload;
|
|
90
|
+
}
|
|
91
|
+
function serializeHostedMcpToolForToolSearchOutput(tool) {
|
|
92
|
+
const { on_approval: _onApproval, ...providerData } = tool.providerData;
|
|
93
|
+
void _onApproval;
|
|
94
|
+
return providerData;
|
|
95
|
+
}
|
|
96
|
+
function appendNamespaceMemberToolSearchOutput(args) {
|
|
97
|
+
const { namespace, description, tool, namespaceOutputIndexByName, resolvedTools, } = args;
|
|
98
|
+
const existingIndex = namespaceOutputIndexByName.get(namespace);
|
|
99
|
+
const serializedTool = serializeFunctionToolForToolSearchOutput(tool);
|
|
100
|
+
if (typeof existingIndex === 'number') {
|
|
101
|
+
const existingNamespace = resolvedTools[existingIndex];
|
|
102
|
+
if (existingNamespace?.type === 'namespace' &&
|
|
103
|
+
Array.isArray(existingNamespace.tools)) {
|
|
104
|
+
existingNamespace.tools.push(serializedTool);
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
namespaceOutputIndexByName.set(namespace, resolvedTools.length);
|
|
109
|
+
resolvedTools.push({
|
|
110
|
+
type: 'namespace',
|
|
111
|
+
name: namespace,
|
|
112
|
+
description,
|
|
113
|
+
tools: [serializedTool],
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
function isClientToolSearchToolWithCustomParameters(tool) {
|
|
117
|
+
return (tool.type === 'hosted_tool' &&
|
|
118
|
+
tool.providerData?.type === 'tool_search' &&
|
|
119
|
+
tool.providerData.execution === 'client' &&
|
|
120
|
+
tool.providerData.parameters != null);
|
|
121
|
+
}
|
|
122
|
+
function isClientToolSearchTool(tool) {
|
|
123
|
+
return (tool.type === 'hosted_tool' &&
|
|
124
|
+
tool.providerData?.type === 'tool_search' &&
|
|
125
|
+
tool.providerData.execution === 'client');
|
|
126
|
+
}
|
|
127
|
+
function normalizeClientToolSearchExecutorResult(result) {
|
|
128
|
+
if (typeof result === 'undefined' || result === null) {
|
|
129
|
+
return [];
|
|
130
|
+
}
|
|
131
|
+
return Array.isArray(result) ? result : [result];
|
|
132
|
+
}
|
|
133
|
+
function addLoadedToolName(loadedToolNames, name, namespace) {
|
|
134
|
+
if (typeof name !== 'string' || name.length === 0) {
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
const explicitNamespace = typeof namespace === 'string' && namespace.length > 0
|
|
138
|
+
? namespace
|
|
139
|
+
: undefined;
|
|
140
|
+
const qualifiedName = toolQualifiedName(name, explicitNamespace);
|
|
141
|
+
if (qualifiedName) {
|
|
142
|
+
loadedToolNames.add(qualifiedName);
|
|
143
|
+
}
|
|
144
|
+
if (!explicitNamespace || explicitNamespace === name) {
|
|
145
|
+
loadedToolNames.add(name);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
function collectLoadedToolNamesFromSearchResult(searchResult, loadedToolNames, namespace) {
|
|
149
|
+
if (!searchResult || typeof searchResult !== 'object') {
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
const candidate = searchResult;
|
|
153
|
+
if (candidate.type === 'tool_reference') {
|
|
154
|
+
addLoadedToolName(loadedToolNames, candidate.functionName, candidate.namespace ?? namespace);
|
|
155
|
+
return;
|
|
156
|
+
}
|
|
157
|
+
if (candidate.type === 'function') {
|
|
158
|
+
addLoadedToolName(loadedToolNames, candidate.name, candidate.namespace ?? namespace);
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
const mcpProviderData = getHostedMcpProviderDataFromSearchResult(candidate);
|
|
162
|
+
if (mcpProviderData) {
|
|
163
|
+
addLoadedToolName(loadedToolNames, mcpProviderData.server_label);
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
if (candidate.type === 'namespace' && Array.isArray(candidate.tools)) {
|
|
167
|
+
const nestedNamespace = typeof candidate.name === 'string' && candidate.name.length > 0
|
|
168
|
+
? candidate.name
|
|
169
|
+
: namespace;
|
|
170
|
+
for (const nestedTool of candidate.tools) {
|
|
171
|
+
collectLoadedToolNamesFromSearchResult(nestedTool, loadedToolNames, nestedNamespace);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
function normalizeStringRecord(value) {
|
|
176
|
+
if (!value || typeof value !== 'object') {
|
|
177
|
+
return undefined;
|
|
178
|
+
}
|
|
179
|
+
const entries = Object.entries(value).filter(([key, entryValue]) => typeof key === 'string' && typeof entryValue === 'string');
|
|
180
|
+
if (entries.length === 0) {
|
|
181
|
+
return undefined;
|
|
182
|
+
}
|
|
183
|
+
return Object.fromEntries(entries);
|
|
184
|
+
}
|
|
185
|
+
function normalizeHostedMcpProviderData(value) {
|
|
186
|
+
if (!value || typeof value !== 'object') {
|
|
187
|
+
return undefined;
|
|
188
|
+
}
|
|
189
|
+
const candidate = value;
|
|
190
|
+
if (candidate.type !== 'mcp' ||
|
|
191
|
+
typeof candidate.server_label !== 'string' ||
|
|
192
|
+
candidate.server_label.length === 0) {
|
|
193
|
+
return undefined;
|
|
194
|
+
}
|
|
195
|
+
const normalized = {
|
|
196
|
+
type: 'mcp',
|
|
197
|
+
server_label: candidate.server_label,
|
|
198
|
+
require_approval: candidate.require_approval === undefined
|
|
199
|
+
? 'never'
|
|
200
|
+
: candidate.require_approval,
|
|
201
|
+
};
|
|
202
|
+
if (typeof candidate.server_url === 'string') {
|
|
203
|
+
normalized.server_url = candidate.server_url;
|
|
204
|
+
}
|
|
205
|
+
if (typeof candidate.connector_id === 'string') {
|
|
206
|
+
normalized.connector_id = candidate.connector_id;
|
|
207
|
+
}
|
|
208
|
+
if (typeof candidate.authorization === 'string') {
|
|
209
|
+
normalized.authorization = candidate.authorization;
|
|
210
|
+
}
|
|
211
|
+
if (candidate.allowed_tools !== undefined) {
|
|
212
|
+
normalized.allowed_tools =
|
|
213
|
+
candidate.allowed_tools;
|
|
214
|
+
}
|
|
215
|
+
if (candidate.defer_loading === true) {
|
|
216
|
+
normalized.defer_loading = true;
|
|
217
|
+
}
|
|
218
|
+
const headers = normalizeStringRecord(candidate.headers);
|
|
219
|
+
if (headers) {
|
|
220
|
+
normalized.headers = headers;
|
|
221
|
+
}
|
|
222
|
+
if (typeof candidate.server_description === 'string') {
|
|
223
|
+
normalized.server_description = candidate.server_description;
|
|
224
|
+
}
|
|
225
|
+
return normalized;
|
|
226
|
+
}
|
|
227
|
+
function getHostedMcpProviderDataFromSearchResult(searchResult) {
|
|
228
|
+
const directProviderData = normalizeHostedMcpProviderData(searchResult);
|
|
229
|
+
if (directProviderData) {
|
|
230
|
+
return directProviderData;
|
|
231
|
+
}
|
|
232
|
+
if (!searchResult || typeof searchResult !== 'object') {
|
|
233
|
+
return undefined;
|
|
234
|
+
}
|
|
235
|
+
const hostedCandidate = searchResult;
|
|
236
|
+
if (hostedCandidate.type !== 'hosted_tool') {
|
|
237
|
+
return undefined;
|
|
238
|
+
}
|
|
239
|
+
return normalizeHostedMcpProviderData(hostedCandidate.providerData);
|
|
240
|
+
}
|
|
241
|
+
export function addLoadedToolNamesFromToolSearchOutput(toolSearchOutput, loadedToolNames) {
|
|
242
|
+
for (const tool of toolSearchOutput.tools) {
|
|
243
|
+
collectLoadedToolNamesFromSearchResult(tool, loadedToolNames);
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
export function addHostedMcpToolsFromToolSearchOutput(toolSearchOutput, hostedMcpToolsByServerLabel, options) {
|
|
247
|
+
const preserveExistingServerLabels = options?.preserveExistingServerLabels;
|
|
248
|
+
for (const tool of toolSearchOutput.tools) {
|
|
249
|
+
const providerData = getHostedMcpProviderDataFromSearchResult(tool);
|
|
250
|
+
if (!providerData) {
|
|
251
|
+
continue;
|
|
252
|
+
}
|
|
253
|
+
if (preserveExistingServerLabels?.has(providerData.server_label) &&
|
|
254
|
+
hostedMcpToolsByServerLabel.has(providerData.server_label)) {
|
|
255
|
+
continue;
|
|
256
|
+
}
|
|
257
|
+
hostedMcpToolsByServerLabel.set(providerData.server_label, {
|
|
258
|
+
type: 'hosted_tool',
|
|
259
|
+
name: 'hosted_mcp',
|
|
260
|
+
providerData,
|
|
261
|
+
});
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
export function validateClientToolSearchSupport(tools) {
|
|
265
|
+
if (!tools.some((tool) => isClientToolSearchToolWithCustomParameters(tool) &&
|
|
266
|
+
!getClientToolSearchExecutor(tool))) {
|
|
267
|
+
return;
|
|
268
|
+
}
|
|
269
|
+
throw new UserError('Runner.run() and Runner.runStreamed() require toolSearchTool({ execution: "client", execute }) when custom client tool_search parameters are provided. Leave parameters unset to use the default built-in { paths: string[] } loader, or use server execution / a custom model loop instead.');
|
|
270
|
+
}
|
|
271
|
+
export function resolveBuiltInClientToolSearchTools(paths, tools) {
|
|
272
|
+
const deferredToolsByName = getDeferredFunctionToolsByName(tools);
|
|
273
|
+
const deferredNamespaceToolsByName = getDeferredNamespaceToolsByName(tools);
|
|
274
|
+
const deferredNamespacedToolsByQualifiedName = getDeferredNamespacedFunctionToolsByQualifiedName(tools);
|
|
275
|
+
const deferredHostedMcpToolsByServerLabel = getDeferredHostedMcpToolsByServerLabel(tools);
|
|
276
|
+
const ambiguousPath = paths.find((path) => Number(deferredToolsByName.has(path)) +
|
|
277
|
+
Number(deferredNamespaceToolsByName.has(path)) +
|
|
278
|
+
Number(deferredNamespacedToolsByQualifiedName.has(path)) +
|
|
279
|
+
Number(deferredHostedMcpToolsByServerLabel.has(path)) >
|
|
280
|
+
1);
|
|
281
|
+
if (ambiguousPath) {
|
|
282
|
+
throw new UserError(`Runner.run() and Runner.runStreamed() cannot disambiguate built-in client tool_search path "${ambiguousPath}" because it matches multiple deferred tool_search surfaces. Rename one of them or use server tool_search execution.`);
|
|
283
|
+
}
|
|
284
|
+
const requestedNamespacePaths = new Set(paths.filter((path) => deferredNamespaceToolsByName.has(path)));
|
|
285
|
+
const resolvedTools = [];
|
|
286
|
+
const seenPaths = new Set();
|
|
287
|
+
const resolvedQualifiedNames = new Set();
|
|
288
|
+
for (const path of paths) {
|
|
289
|
+
if (seenPaths.has(path)) {
|
|
290
|
+
continue;
|
|
291
|
+
}
|
|
292
|
+
seenPaths.add(path);
|
|
293
|
+
const tool = deferredToolsByName.get(path);
|
|
294
|
+
if (!tool) {
|
|
295
|
+
const namespaceTools = deferredNamespaceToolsByName.get(path);
|
|
296
|
+
if (namespaceTools) {
|
|
297
|
+
const unresolvedTools = namespaceTools.tools.filter((tool) => {
|
|
298
|
+
const qualifiedName = getFunctionToolQualifiedName(tool);
|
|
299
|
+
return !qualifiedName || !resolvedQualifiedNames.has(qualifiedName);
|
|
300
|
+
});
|
|
301
|
+
if (unresolvedTools.length === 0) {
|
|
302
|
+
continue;
|
|
303
|
+
}
|
|
304
|
+
for (const namespaceTool of unresolvedTools) {
|
|
305
|
+
const qualifiedName = getFunctionToolQualifiedName(namespaceTool);
|
|
306
|
+
if (qualifiedName) {
|
|
307
|
+
resolvedQualifiedNames.add(qualifiedName);
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
resolvedTools.push(...unresolvedTools);
|
|
311
|
+
continue;
|
|
312
|
+
}
|
|
313
|
+
const namespacedTool = deferredNamespacedToolsByQualifiedName.get(path);
|
|
314
|
+
if (namespacedTool) {
|
|
315
|
+
if (requestedNamespacePaths.has(namespacedTool.namespace)) {
|
|
316
|
+
continue;
|
|
317
|
+
}
|
|
318
|
+
if (resolvedQualifiedNames.has(path)) {
|
|
319
|
+
continue;
|
|
320
|
+
}
|
|
321
|
+
resolvedQualifiedNames.add(path);
|
|
322
|
+
resolvedTools.push(namespacedTool.tool);
|
|
323
|
+
continue;
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
if (tool) {
|
|
327
|
+
resolvedTools.push(tool);
|
|
328
|
+
continue;
|
|
329
|
+
}
|
|
330
|
+
const hostedMcpTool = deferredHostedMcpToolsByServerLabel.get(path);
|
|
331
|
+
if (hostedMcpTool) {
|
|
332
|
+
resolvedTools.push(hostedMcpTool);
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
return resolvedTools;
|
|
336
|
+
}
|
|
337
|
+
export function createClientToolSearchOutputFromTools(toolSearchCall, tools) {
|
|
338
|
+
const callId = resolveToolSearchCallId(toolSearchCall);
|
|
339
|
+
const resolvedTools = [];
|
|
340
|
+
const namespaceOutputIndexByName = new Map();
|
|
341
|
+
const seenToolKeys = new Set();
|
|
342
|
+
for (const tool of tools) {
|
|
343
|
+
const runtimeToolKey = getToolSearchRuntimeToolKey(tool);
|
|
344
|
+
if (runtimeToolKey && seenToolKeys.has(runtimeToolKey)) {
|
|
345
|
+
continue;
|
|
346
|
+
}
|
|
347
|
+
if (runtimeToolKey) {
|
|
348
|
+
seenToolKeys.add(runtimeToolKey);
|
|
349
|
+
}
|
|
350
|
+
if (tool.type === 'function') {
|
|
351
|
+
const namespace = getExplicitFunctionToolNamespace(tool);
|
|
352
|
+
if (namespace) {
|
|
353
|
+
const description = getFunctionToolNamespaceDescription(tool);
|
|
354
|
+
if (!description) {
|
|
355
|
+
throw new UserError(`Client tool_search execute() returned namespace member "${namespace}.${tool.name}" without a namespace description.`);
|
|
356
|
+
}
|
|
357
|
+
appendNamespaceMemberToolSearchOutput({
|
|
358
|
+
namespace,
|
|
359
|
+
description,
|
|
360
|
+
tool,
|
|
361
|
+
namespaceOutputIndexByName,
|
|
362
|
+
resolvedTools,
|
|
363
|
+
});
|
|
364
|
+
continue;
|
|
365
|
+
}
|
|
366
|
+
resolvedTools.push(serializeFunctionToolForToolSearchOutput(tool));
|
|
367
|
+
continue;
|
|
368
|
+
}
|
|
369
|
+
if (isDeferredHostedMcpTool(tool) || tool.type === 'hosted_tool') {
|
|
370
|
+
if (tool.type === 'hosted_tool' && tool.providerData?.type === 'mcp') {
|
|
371
|
+
resolvedTools.push(serializeHostedMcpToolForToolSearchOutput(tool));
|
|
372
|
+
continue;
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
throw new UserError('Client tool_search execute() may only return function tools or hosted MCP tools.');
|
|
376
|
+
}
|
|
377
|
+
return {
|
|
378
|
+
type: 'tool_search_output',
|
|
379
|
+
status: 'completed',
|
|
380
|
+
tools: resolvedTools,
|
|
381
|
+
providerData: {
|
|
382
|
+
call_id: callId,
|
|
383
|
+
execution: 'client',
|
|
384
|
+
},
|
|
385
|
+
};
|
|
386
|
+
}
|
|
387
|
+
export function createBuiltInClientToolSearchOutput(toolSearchCall, tools) {
|
|
388
|
+
const callId = resolveToolSearchCallId(toolSearchCall);
|
|
389
|
+
const builtInArgs = getBuiltInClientToolSearchArguments(toolSearchCall.arguments);
|
|
390
|
+
if (!builtInArgs) {
|
|
391
|
+
throw new UserError(`Runner.run() and Runner.runStreamed() only auto-execute built-in client tool_search calls with { paths: string[] }. Custom client tool_search schemas require toolSearchTool({ execution: "client", execute }) or a custom model loop before re-processing call ${callId}.`);
|
|
392
|
+
}
|
|
393
|
+
return createClientToolSearchOutputFromTools(toolSearchCall, resolveBuiltInClientToolSearchTools(builtInArgs.paths, tools));
|
|
394
|
+
}
|
|
395
|
+
export async function executeCustomClientToolSearch(args) {
|
|
396
|
+
const { agent, runContext, toolSearchCall, toolSearchTool, tools } = args;
|
|
397
|
+
const executor = getClientToolSearchExecutor(toolSearchTool);
|
|
398
|
+
if (!executor) {
|
|
399
|
+
throw new UserError('Client tool_search execution requires a registered execute callback.');
|
|
400
|
+
}
|
|
401
|
+
const runtimeTools = normalizeClientToolSearchExecutorResult(await executor({
|
|
402
|
+
agent,
|
|
403
|
+
availableTools: [...tools],
|
|
404
|
+
loadDefault: (paths) => resolveBuiltInClientToolSearchTools(paths, tools),
|
|
405
|
+
runContext,
|
|
406
|
+
toolCall: toolSearchCall,
|
|
407
|
+
}));
|
|
408
|
+
return {
|
|
409
|
+
output: createClientToolSearchOutputFromTools(toolSearchCall, runtimeTools),
|
|
410
|
+
runtimeTools,
|
|
411
|
+
};
|
|
412
|
+
}
|
|
413
|
+
export function getClientToolSearchHelper(tools) {
|
|
414
|
+
return tools.find(isClientToolSearchTool);
|
|
415
|
+
}
|
|
416
|
+
//# sourceMappingURL=toolSearch.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"toolSearch.mjs","sourceRoot":"","sources":["../../src/runner/toolSearch.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const steps_1 = require("./steps.js");
|
|
|
14
14
|
Object.defineProperty(exports, "nextStepSchema", { enumerable: true, get: function () { return steps_1.nextStepSchema; } });
|
|
15
15
|
const toolExecution_1 = require("./toolExecution.js");
|
|
16
16
|
const mcpApprovals_1 = require("./mcpApprovals.js");
|
|
17
|
+
const toolIdentity_1 = require("../toolIdentity.js");
|
|
17
18
|
const APPROVAL_ITEM_TYPES = [
|
|
18
19
|
'function_call',
|
|
19
20
|
'computer_call',
|
|
@@ -281,7 +282,7 @@ async function resolveInterruptedTurn(agent, originalInput, originalPreStepItems
|
|
|
281
282
|
return false;
|
|
282
283
|
}
|
|
283
284
|
const isApprovedCall = functionCallIds.includes(callId);
|
|
284
|
-
const isPendingNested = state.hasPendingAgentToolRun(run.tool.name, callId);
|
|
285
|
+
const isPendingNested = state.hasPendingAgentToolRun((0, toolIdentity_1.getFunctionToolQualifiedName)(run.tool) ?? run.tool.name, callId);
|
|
285
286
|
if (!isApprovedCall && !isPendingNested) {
|
|
286
287
|
return false;
|
|
287
288
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turnResolution.js","sourceRoot":"","sources":["../../src/runner/turnResolution.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"turnResolution.js","sourceRoot":"","sources":["../../src/runner/turnResolution.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { addErrorToCurrentSpan } from "../tracing/context.mjs";
|
|
|
8
8
|
import { SingleStepResult, nextStepSchema } from "./steps.mjs";
|
|
9
9
|
import { checkForFinalOutputFromTools, executeApplyPatchOperations, executeComputerActions, executeFunctionToolCalls, executeHandoffCalls, executeShellActions, collectInterruptions, } from "./toolExecution.mjs";
|
|
10
10
|
import { handleHostedMcpApprovals } from "./mcpApprovals.mjs";
|
|
11
|
+
import { getFunctionToolQualifiedName } from "../toolIdentity.mjs";
|
|
11
12
|
const APPROVAL_ITEM_TYPES = [
|
|
12
13
|
'function_call',
|
|
13
14
|
'computer_call',
|
|
@@ -275,7 +276,7 @@ export async function resolveInterruptedTurn(agent, originalInput, originalPreSt
|
|
|
275
276
|
return false;
|
|
276
277
|
}
|
|
277
278
|
const isApprovedCall = functionCallIds.includes(callId);
|
|
278
|
-
const isPendingNested = state.hasPendingAgentToolRun(run.tool.name, callId);
|
|
279
|
+
const isPendingNested = state.hasPendingAgentToolRun(getFunctionToolQualifiedName(run.tool) ?? run.tool.name, callId);
|
|
279
280
|
if (!isApprovedCall && !isPendingNested) {
|
|
280
281
|
return false;
|
|
281
282
|
}
|