@openai/agents-core 0.3.6 → 0.3.8

package/dist/runner/mcpApprovals.mjs

@@ -0,0 +1,63 @@
+import { RunToolCallItem } from "../items.mjs";
+/**
+ * Normalizes hosted MCP approval flows so streaming and non-streaming loops share identical
+ * behavior. Handles synchronous approvals, previously decided approvals, and pending approvals.
+ */
+export async function handleHostedMcpApprovals({ requests, agent, state, functionResults, appendIfNew, resolveApproval, }) {
+    const pendingApprovals = new Set();
+    const pendingApprovalIds = new Set();
+    for (const approvalRequest of requests) {
+        const rawItem = approvalRequest.requestItem.rawItem;
+        if (rawItem.type !== 'hosted_tool_call') {
+            continue;
+        }
+        const providerData = rawItem.providerData;
+        if (!providerData) {
+            continue;
+        }
+        const toolData = approvalRequest.mcpTool.providerData;
+        const approvalRequestId = rawItem.id ?? providerData.id;
+        if (toolData?.on_approval) {
+            const approvalResult = await toolData.on_approval(state._context, approvalRequest.requestItem);
+            const approvalResponseData = {
+                approve: approvalResult.approve,
+                approval_request_id: approvalRequestId ?? providerData.id,
+                reason: approvalResult.reason,
+            };
+            appendIfNew(new RunToolCallItem({
+                type: 'hosted_tool_call',
+                name: 'mcp_approval_response',
+                providerData: approvalResponseData,
+            }, agent));
+            continue;
+        }
+        const approvalDecision = typeof resolveApproval === 'function'
+            ? resolveApproval(rawItem)
+            : undefined;
+        if (typeof approvalDecision !== 'undefined' && approvalRequestId) {
+            const approvalResponseData = {
+                approve: approvalDecision,
+                approval_request_id: approvalRequestId,
+                reason: undefined,
+            };
+            appendIfNew(new RunToolCallItem({
+                type: 'hosted_tool_call',
+                name: 'mcp_approval_response',
+                providerData: approvalResponseData,
+            }, agent));
+            continue;
+        }
+        functionResults.push({
+            type: 'hosted_mcp_tool_approval',
+            tool: approvalRequest.mcpTool,
+            runItem: approvalRequest.requestItem,
+        });
+        appendIfNew(approvalRequest.requestItem);
+        pendingApprovals.add(approvalRequest.requestItem);
+        if (approvalRequestId) {
+            pendingApprovalIds.add(approvalRequestId);
+        }
+    }
+    return { pendingApprovals, pendingApprovalIds };
+}
+//# sourceMappingURL=mcpApprovals.mjs.map

package/dist/runner/mcpApprovals.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcpApprovals.mjs","sourceRoot":"","sources":["../../src/runner/mcpApprovals.ts"],"names":[],"mappings":"OACO,EAAgC,eAAe,EAAE;AAyBxD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAW,EACvD,QAAQ,EACR,KAAK,EACL,KAAK,EACL,eAAe,EACf,WAAW,EACX,eAAe,GAC0B;IACzC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAuB,CAAC;IACxD,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE7C,KAAK,MAAM,eAAe,IAAI,QAAQ,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC;QACpD,IAAI,OAAO,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YACxC,SAAS;QACX,CAAC;QAED,MAAM,YAAY,GAAG,OAAO,CAAC,YAEhB,CAAC;QACd,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,YAE5B,CAAC;QACd,MAAM,iBAAiB,GAAG,OAAO,CAAC,EAAE,IAAI,YAAY,CAAC,EAAE,CAAC;QAExD,IAAI,QAAQ,EAAE,WAAW,EAAE,CAAC;YAC1B,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,WAAW,CAC/C,KAAK,CAAC,QAAQ,EACd,eAAe,CAAC,WAAW,CAC5B,CAAC;YACF,MAAM,oBAAoB,GAA2C;gBACnE,OAAO,EAAE,cAAc,CAAC,OAAO;gBAC/B,mBAAmB,EAAE,iBAAiB,IAAI,YAAY,CAAC,EAAE;gBACzD,MAAM,EAAE,cAAc,CAAC,MAAM;aAC9B,CAAC;YACF,WAAW,CACT,IAAI,eAAe,CACjB;gBACE,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,uBAAuB;gBAC7B,YAAY,EAAE,oBAAoB;aACnC,EACD,KAA+B,CAChC,CACF,CAAC;YACF,SAAS;QACX,CAAC;QAED,MAAM,gBAAgB,GACpB,OAAO,eAAe,KAAK,UAAU;YACnC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC;YAC1B,CAAC,CAAC,SAAS,CAAC;QAChB,IAAI,OAAO,gBAAgB,KAAK,WAAW,IAAI,iBAAiB,EAAE,CAAC;YACjE,MAAM,oBAAoB,GAA2C;gBACnE,OAAO,EAAE,gBAAgB;gBACzB,mBAAmB,EAAE,iBAAiB;gBACtC,MAAM,EAAE,SAAS;aAClB,CAAC;YACF,WAAW,CACT,IAAI,eAAe,CACjB;gBACE,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,uBAAuB;gBAC7B,YAAY,EAAE,oBAAoB;aACnC,EACD,KAA+B,CAChC,CACF,CAAC;YACF,SAAS;QACX,CAAC;QAED,eAAe,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,0BAA0B;YAChC,IAAI,EAAE,eAAe,CAAC,OAAO;YAC7B,OAAO,EAAE,eAAe,CAAC,WAAW;SACrC,CAAC,CAAC;QACH,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAEzC,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,iBAAiB,EAAE,CAAC;YACtB,kBAAkB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,CAAC;AAClD,CAAC"}

package/dist/runner/modelOutputs.d.ts

@@ -0,0 +1,10 @@
+import { Agent } from '../agent';
+import { Handoff } from '../handoff';
+import { ModelResponse } from '../model';
+import { Tool } from '../tool';
+import type { ProcessedResponse } from './types';
+/**
+ * Walks a raw model response and classifies each item so the runner can schedule follow-up work.
+ * Returns both the serializable RunItems (for history/streaming) and the actionable tool metadata.
+ */
+export declare function processModelResponse<TContext>(modelResponse: ModelResponse, agent: Agent<any, any>, tools: Tool<TContext>[], handoffs: Handoff<any, any>[]): ProcessedResponse<TContext>;

package/dist/runner/modelOutputs.js

@@ -0,0 +1,206 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processModelResponse = processModelResponse;
+const errors_1 = require("../errors.js");
+const items_1 = require("../items.js");
+const context_1 = require("../tracing/context.js");
+function ensureToolAvailable(tool, message, data) {
+    if (!tool) {
+        (0, context_1.addErrorToCurrentSpan)({
+            message,
+            data,
+        });
+        throw new errors_1.ModelBehaviorError(message);
+    }
+    return tool;
+}
+function handleToolCallAction({ output, tool, agent, errorMessage, errorData, items, toolsUsed, actions, buildAction, }) {
+    const resolvedTool = ensureToolAvailable(tool, errorMessage, errorData);
+    items.push(new items_1.RunToolCallItem(output, agent));
+    toolsUsed.push(resolvedTool.name);
+    actions.push(buildAction(resolvedTool));
+}
+function resolveFunctionOrHandoff(toolCall, handoffMap, functionMap, agent) {
+    const handoff = handoffMap.get(toolCall.name);
+    if (handoff) {
+        return { type: 'handoff', handoff };
+    }
+    const functionTool = functionMap.get(toolCall.name);
+    if (!functionTool) {
+        const message = `Tool ${toolCall.name} not found in agent ${agent.name}.`;
+        (0, context_1.addErrorToCurrentSpan)({
+            message,
+            data: {
+                tool_name: toolCall.name,
+                agent_name: agent.name,
+            },
+        });
+        throw new errors_1.ModelBehaviorError(message);
+    }
+    return { type: 'function', tool: functionTool };
+}
+/**
+ * Walks a raw model response and classifies each item so the runner can schedule follow-up work.
+ * Returns both the serializable RunItems (for history/streaming) and the actionable tool metadata.
+ */
+function processModelResponse(modelResponse, agent, tools, handoffs) {
+    const items = [];
+    const runHandoffs = [];
+    const runFunctions = [];
+    const runComputerActions = [];
+    const runShellActions = [];
+    const runApplyPatchActions = [];
+    const runMCPApprovalRequests = [];
+    const toolsUsed = [];
+    const handoffMap = new Map(handoffs.map((h) => [h.toolName, h]));
+    // Resolve tools upfront so we can look up the concrete handler in O(1) while iterating outputs.
+    const functionMap = new Map(tools
+        .filter((t) => t.type === 'function')
+        .map((t) => [t.name, t]));
+    const computerTool = tools.find((t) => t.type === 'computer');
+    const shellTool = tools.find((t) => t.type === 'shell');
+    const applyPatchTool = tools.find((t) => t.type === 'apply_patch');
+    const mcpToolMap = new Map(tools
+        .filter((t) => t.type === 'hosted_tool' && t.providerData?.type === 'mcp')
+        .map((t) => t)
+        .map((t) => [t.providerData.server_label, t]));
+    for (const output of modelResponse.output) {
+        if (output.type === 'message') {
+            if (output.role === 'assistant') {
+                items.push(new items_1.RunMessageOutputItem(output, agent));
+            }
+        }
+        else if (output.type === 'hosted_tool_call') {
+            items.push(new items_1.RunToolCallItem(output, agent));
+            const toolName = output.name;
+            toolsUsed.push(toolName);
+            if (output.providerData?.type === 'mcp_approval_request' ||
+                output.name === 'mcp_approval_request') {
+                // Hosted remote MCP server's approval process
+                const providerData = output.providerData;
+                const mcpServerLabel = providerData.server_label;
+                const mcpServerTool = mcpToolMap.get(mcpServerLabel);
+                if (typeof mcpServerTool === 'undefined') {
+                    const message = `MCP server (${mcpServerLabel}) not found in Agent (${agent.name})`;
+                    (0, context_1.addErrorToCurrentSpan)({
+                        message,
+                        data: { mcp_server_label: mcpServerLabel },
+                    });
+                    throw new errors_1.ModelBehaviorError(message);
+                }
+                // Do this approval later:
+                // We support both onApproval callback (like the Python SDK does) and HITL patterns.
+                const approvalItem = new items_1.RunToolApprovalItem({
+                    type: 'hosted_tool_call',
+                    // We must use this name to align with the name sent from the servers
+                    name: providerData.name,
+                    id: providerData.id,
+                    status: 'in_progress',
+                    providerData,
+                }, agent);
+                runMCPApprovalRequests.push({
+                    requestItem: approvalItem,
+                    mcpTool: mcpServerTool,
+                });
+                if (!mcpServerTool.providerData.on_approval) {
+                    // When onApproval function exists, it confirms the approval right after this.
+                    // Thus, this approval item must be appended only for the next turn interruption patterns.
+                    items.push(approvalItem);
+                }
+            }
+        }
+        else if (output.type === 'reasoning') {
+            items.push(new items_1.RunReasoningItem(output, agent));
+        }
+        else if (output.type === 'computer_call') {
+            handleToolCallAction({
+                output,
+                tool: computerTool,
+                agent,
+                errorMessage: 'Model produced computer action without a computer tool.',
+                errorData: { agent_name: agent.name },
+                items,
+                toolsUsed,
+                actions: runComputerActions,
+                buildAction: (resolvedTool) => ({
+                    toolCall: output,
+                    computer: resolvedTool,
+                }),
+            });
+        }
+        else if (output.type === 'shell_call') {
+            handleToolCallAction({
+                output,
+                tool: shellTool,
+                agent,
+                errorMessage: 'Model produced shell action without a shell tool.',
+                errorData: { agent_name: agent.name },
+                items,
+                toolsUsed,
+                actions: runShellActions,
+                buildAction: (resolvedTool) => ({
+                    toolCall: output,
+                    shell: resolvedTool,
+                }),
+            });
+        }
+        else if (output.type === 'apply_patch_call') {
+            handleToolCallAction({
+                output,
+                tool: applyPatchTool,
+                agent,
+                errorMessage: 'Model produced apply_patch action without an apply_patch tool.',
+                errorData: { agent_name: agent.name },
+                items,
+                toolsUsed,
+                actions: runApplyPatchActions,
+                buildAction: (resolvedTool) => ({
+                    toolCall: output,
+                    applyPatch: resolvedTool,
+                }),
+            });
+        }
+        /*
+         * Intentionally skip returning here so function_call processing can still
+         * run when output.type matches other tool call types.
+         */
+        if (output.type !== 'function_call') {
+            continue;
+        }
+        toolsUsed.push(output.name);
+        const resolved = resolveFunctionOrHandoff(output, handoffMap, functionMap, agent);
+        if (resolved.type === 'handoff') {
+            items.push(new items_1.RunHandoffCallItem(output, agent));
+            runHandoffs.push({
+                toolCall: output,
+                handoff: resolved.handoff,
+            });
+        }
+        else {
+            items.push(new items_1.RunToolCallItem(output, agent));
+            runFunctions.push({
+                toolCall: output,
+                tool: resolved.tool,
+            });
+        }
+    }
+    return {
+        newItems: items,
+        handoffs: runHandoffs,
+        functions: runFunctions,
+        computerActions: runComputerActions,
+        shellActions: runShellActions,
+        applyPatchActions: runApplyPatchActions,
+        mcpApprovalRequests: runMCPApprovalRequests,
+        toolsUsed: toolsUsed,
+        hasToolsOrApprovalsToRun() {
+            return (runHandoffs.length > 0 ||
+                runFunctions.length > 0 ||
+                runMCPApprovalRequests.length > 0 ||
+                runComputerActions.length > 0 ||
+                runShellActions.length > 0 ||
+                runApplyPatchActions.length > 0);
+        },
+    };
+}
+//# sourceMappingURL=modelOutputs.js.map

package/dist/runner/modelOutputs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelOutputs.js","sourceRoot":"","sources":["../../src/runner/modelOutputs.ts"],"names":[],"mappings":"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"}

package/dist/runner/modelOutputs.mjs

@@ -0,0 +1,203 @@
+import { ModelBehaviorError } from "../errors.mjs";
+import { RunHandoffCallItem, RunMessageOutputItem, RunReasoningItem, RunToolApprovalItem, RunToolCallItem, } from "../items.mjs";
+import { addErrorToCurrentSpan } from "../tracing/context.mjs";
+function ensureToolAvailable(tool, message, data) {
+    if (!tool) {
+        addErrorToCurrentSpan({
+            message,
+            data,
+        });
+        throw new ModelBehaviorError(message);
+    }
+    return tool;
+}
+function handleToolCallAction({ output, tool, agent, errorMessage, errorData, items, toolsUsed, actions, buildAction, }) {
+    const resolvedTool = ensureToolAvailable(tool, errorMessage, errorData);
+    items.push(new RunToolCallItem(output, agent));
+    toolsUsed.push(resolvedTool.name);
+    actions.push(buildAction(resolvedTool));
+}
+function resolveFunctionOrHandoff(toolCall, handoffMap, functionMap, agent) {
+    const handoff = handoffMap.get(toolCall.name);
+    if (handoff) {
+        return { type: 'handoff', handoff };
+    }
+    const functionTool = functionMap.get(toolCall.name);
+    if (!functionTool) {
+        const message = `Tool ${toolCall.name} not found in agent ${agent.name}.`;
+        addErrorToCurrentSpan({
+            message,
+            data: {
+                tool_name: toolCall.name,
+                agent_name: agent.name,
+            },
+        });
+        throw new ModelBehaviorError(message);
+    }
+    return { type: 'function', tool: functionTool };
+}
+/**
+ * Walks a raw model response and classifies each item so the runner can schedule follow-up work.
+ * Returns both the serializable RunItems (for history/streaming) and the actionable tool metadata.
+ */
+export function processModelResponse(modelResponse, agent, tools, handoffs) {
+    const items = [];
+    const runHandoffs = [];
+    const runFunctions = [];
+    const runComputerActions = [];
+    const runShellActions = [];
+    const runApplyPatchActions = [];
+    const runMCPApprovalRequests = [];
+    const toolsUsed = [];
+    const handoffMap = new Map(handoffs.map((h) => [h.toolName, h]));
+    // Resolve tools upfront so we can look up the concrete handler in O(1) while iterating outputs.
+    const functionMap = new Map(tools
+        .filter((t) => t.type === 'function')
+        .map((t) => [t.name, t]));
+    const computerTool = tools.find((t) => t.type === 'computer');
+    const shellTool = tools.find((t) => t.type === 'shell');
+    const applyPatchTool = tools.find((t) => t.type === 'apply_patch');
+    const mcpToolMap = new Map(tools
+        .filter((t) => t.type === 'hosted_tool' && t.providerData?.type === 'mcp')
+        .map((t) => t)
+        .map((t) => [t.providerData.server_label, t]));
+    for (const output of modelResponse.output) {
+        if (output.type === 'message') {
+            if (output.role === 'assistant') {
+                items.push(new RunMessageOutputItem(output, agent));
+            }
+        }
+        else if (output.type === 'hosted_tool_call') {
+            items.push(new RunToolCallItem(output, agent));
+            const toolName = output.name;
+            toolsUsed.push(toolName);
+            if (output.providerData?.type === 'mcp_approval_request' ||
+                output.name === 'mcp_approval_request') {
+                // Hosted remote MCP server's approval process
+                const providerData = output.providerData;
+                const mcpServerLabel = providerData.server_label;
+                const mcpServerTool = mcpToolMap.get(mcpServerLabel);
+                if (typeof mcpServerTool === 'undefined') {
+                    const message = `MCP server (${mcpServerLabel}) not found in Agent (${agent.name})`;
+                    addErrorToCurrentSpan({
+                        message,
+                        data: { mcp_server_label: mcpServerLabel },
+                    });
+                    throw new ModelBehaviorError(message);
+                }
+                // Do this approval later:
+                // We support both onApproval callback (like the Python SDK does) and HITL patterns.
+                const approvalItem = new RunToolApprovalItem({
+                    type: 'hosted_tool_call',
+                    // We must use this name to align with the name sent from the servers
+                    name: providerData.name,
+                    id: providerData.id,
+                    status: 'in_progress',
+                    providerData,
+                }, agent);
+                runMCPApprovalRequests.push({
+                    requestItem: approvalItem,
+                    mcpTool: mcpServerTool,
+                });
+                if (!mcpServerTool.providerData.on_approval) {
+                    // When onApproval function exists, it confirms the approval right after this.
+                    // Thus, this approval item must be appended only for the next turn interruption patterns.
+                    items.push(approvalItem);
+                }
+            }
+        }
+        else if (output.type === 'reasoning') {
+            items.push(new RunReasoningItem(output, agent));
+        }
+        else if (output.type === 'computer_call') {
+            handleToolCallAction({
+                output,
+                tool: computerTool,
+                agent,
+                errorMessage: 'Model produced computer action without a computer tool.',
+                errorData: { agent_name: agent.name },
+                items,
+                toolsUsed,
+                actions: runComputerActions,
+                buildAction: (resolvedTool) => ({
+                    toolCall: output,
+                    computer: resolvedTool,
+                }),
+            });
+        }
+        else if (output.type === 'shell_call') {
+            handleToolCallAction({
+                output,
+                tool: shellTool,
+                agent,
+                errorMessage: 'Model produced shell action without a shell tool.',
+                errorData: { agent_name: agent.name },
+                items,
+                toolsUsed,
+                actions: runShellActions,
+                buildAction: (resolvedTool) => ({
+                    toolCall: output,
+                    shell: resolvedTool,
+                }),
+            });
+        }
+        else if (output.type === 'apply_patch_call') {
+            handleToolCallAction({
+                output,
+                tool: applyPatchTool,
+                agent,
+                errorMessage: 'Model produced apply_patch action without an apply_patch tool.',
+                errorData: { agent_name: agent.name },
+                items,
+                toolsUsed,
+                actions: runApplyPatchActions,
+                buildAction: (resolvedTool) => ({
+                    toolCall: output,
+                    applyPatch: resolvedTool,
+                }),
+            });
+        }
+        /*
+         * Intentionally skip returning here so function_call processing can still
+         * run when output.type matches other tool call types.
+         */
+        if (output.type !== 'function_call') {
+            continue;
+        }
+        toolsUsed.push(output.name);
+        const resolved = resolveFunctionOrHandoff(output, handoffMap, functionMap, agent);
+        if (resolved.type === 'handoff') {
+            items.push(new RunHandoffCallItem(output, agent));
+            runHandoffs.push({
+                toolCall: output,
+                handoff: resolved.handoff,
+            });
+        }
+        else {
+            items.push(new RunToolCallItem(output, agent));
+            runFunctions.push({
+                toolCall: output,
+                tool: resolved.tool,
+            });
+        }
+    }
+    return {
+        newItems: items,
+        handoffs: runHandoffs,
+        functions: runFunctions,
+        computerActions: runComputerActions,
+        shellActions: runShellActions,
+        applyPatchActions: runApplyPatchActions,
+        mcpApprovalRequests: runMCPApprovalRequests,
+        toolsUsed: toolsUsed,
+        hasToolsOrApprovalsToRun() {
+            return (runHandoffs.length > 0 ||
+                runFunctions.length > 0 ||
+                runMCPApprovalRequests.length > 0 ||
+                runComputerActions.length > 0 ||
+                runShellActions.length > 0 ||
+                runApplyPatchActions.length > 0);
+        },
+    };
+}
+//# sourceMappingURL=modelOutputs.mjs.map

package/dist/runner/modelOutputs.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelOutputs.mjs","sourceRoot":"","sources":["../../src/runner/modelOutputs.ts"],"names":[],"mappings":"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"}

package/dist/runner/modelPreparation.d.ts

@@ -0,0 +1,8 @@
+import { Agent, AgentOutputType } from '../agent';
+import { RunState } from '../runState';
+import { AgentArtifacts } from './types';
+/**
+ * Collects tools and handoffs for the current agent so model calls and tracing share the same
+ * snapshot of enabled capabilities.
+ */
+export declare function prepareAgentArtifacts<TContext, TAgent extends Agent<TContext, AgentOutputType>>(state: RunState<TContext, TAgent>): Promise<AgentArtifacts<TContext>>;

package/dist/runner/modelPreparation.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareAgentArtifacts = prepareAgentArtifacts;
+const serialize_1 = require("../utils/serialize.js");
+const tool_1 = require("../tool.js");
+const tracing_1 = require("./tracing.js");
+/**
+ * Collects tools and handoffs for the current agent so model calls and tracing share the same
+ * snapshot of enabled capabilities.
+ */
+async function prepareAgentArtifacts(state) {
+    const capabilities = await collectAgentCapabilities(state);
+    await warmUpComputerTools(capabilities.tools, state._context);
+    state.setCurrentAgentSpan((0, tracing_1.ensureAgentSpan)({
+        agent: state._currentAgent,
+        handoffs: capabilities.handoffs,
+        tools: capabilities.tools,
+        currentSpan: state._currentAgentSpan,
+    }));
+    return {
+        ...capabilities,
+        serializedHandoffs: capabilities.handoffs.map((handoff) => (0, serialize_1.serializeHandoff)(handoff)),
+        serializedTools: capabilities.tools.map((tool) => (0, serialize_1.serializeTool)(tool)),
+        toolsExplicitlyProvided: state._currentAgent.hasExplicitToolConfig(),
+    };
+}
+async function collectAgentCapabilities(state) {
+    const handoffs = await state._currentAgent.getEnabledHandoffs(state._context);
+    const tools = (await state._currentAgent.getAllTools(state._context));
+    return { handoffs, tools };
+}
+async function warmUpComputerTools(tools, runContext) {
+    const computerTools = tools.filter((tool) => tool.type === 'computer');
+    if (computerTools.length === 0) {
+        return;
+    }
+    await Promise.all(computerTools.map(async (tool) => {
+        await (0, tool_1.resolveComputer)({ tool, runContext });
+    }));
+}
+//# sourceMappingURL=modelPreparation.js.map

package/dist/runner/modelPreparation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelPreparation.js","sourceRoot":"","sources":["../../src/runner/modelPreparation.ts"],"names":[],"mappings":";;AAYA,sDAuBC;AAlCD,qDAAqE;AAErE,qCAA8D;AAG9D,0CAA4C;AAE5C;;;GAGG;AACI,KAAK,UAAU,qBAAqB,CAGzC,KAAiC;IACjC,MAAM,YAAY,GAAG,MAAM,wBAAwB,CAAC,KAAK,CAAC,CAAC;IAC3D,MAAM,mBAAmB,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9D,KAAK,CAAC,mBAAmB,CACvB,IAAA,yBAAe,EAAC;QACd,KAAK,EAAE,KAAK,CAAC,aAAa;QAC1B,QAAQ,EAAE,YAAY,CAAC,QAAQ;QAC/B,KAAK,EAAE,YAAY,CAAC,KAAK;QACzB,WAAW,EAAE,KAAK,CAAC,iBAAiB;KACrC,CAAC,CACH,CAAC;IAEF,OAAO;QACL,GAAG,YAAY;QACf,kBAAkB,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACxD,IAAA,4BAAgB,EAAC,OAAO,CAAC,CAC1B;QACD,eAAe,EAAE,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,yBAAa,EAAC,IAAI,CAAC,CAAC;QACtE,uBAAuB,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE;KACrE,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,KAA2D;IAK3D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,CAAC,MAAM,KAAK,CAAC,aAAa,CAAC,WAAW,CAClD,KAAK,CAAC,QAAQ,CACf,CAAqB,CAAC;IACvB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,KAAuB,EACvB,UAA4E;IAE5E,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAChC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CACF,CAAC;IAEnC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC/B,MAAM,IAAA,sBAAe,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}

package/dist/runner/modelPreparation.mjs

@@ -0,0 +1,38 @@
+import { serializeHandoff, serializeTool } from "../utils/serialize.mjs";
+import { resolveComputer } from "../tool.mjs";
+import { ensureAgentSpan } from "./tracing.mjs";
+/**
+ * Collects tools and handoffs for the current agent so model calls and tracing share the same
+ * snapshot of enabled capabilities.
+ */
+export async function prepareAgentArtifacts(state) {
+    const capabilities = await collectAgentCapabilities(state);
+    await warmUpComputerTools(capabilities.tools, state._context);
+    state.setCurrentAgentSpan(ensureAgentSpan({
+        agent: state._currentAgent,
+        handoffs: capabilities.handoffs,
+        tools: capabilities.tools,
+        currentSpan: state._currentAgentSpan,
+    }));
+    return {
+        ...capabilities,
+        serializedHandoffs: capabilities.handoffs.map((handoff) => serializeHandoff(handoff)),
+        serializedTools: capabilities.tools.map((tool) => serializeTool(tool)),
+        toolsExplicitlyProvided: state._currentAgent.hasExplicitToolConfig(),
+    };
+}
+async function collectAgentCapabilities(state) {
+    const handoffs = await state._currentAgent.getEnabledHandoffs(state._context);
+    const tools = (await state._currentAgent.getAllTools(state._context));
+    return { handoffs, tools };
+}
+async function warmUpComputerTools(tools, runContext) {
+    const computerTools = tools.filter((tool) => tool.type === 'computer');
+    if (computerTools.length === 0) {
+        return;
+    }
+    await Promise.all(computerTools.map(async (tool) => {
+        await resolveComputer({ tool, runContext });
+    }));
+}
+//# sourceMappingURL=modelPreparation.mjs.map

package/dist/runner/modelPreparation.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"modelPreparation.mjs","sourceRoot":"","sources":["../../src/runner/modelPreparation.ts"],"names":[],"mappings":"OACO,EAAE,gBAAgB,EAAE,aAAa,EAAE;OAEnC,EAAsB,eAAe,EAAE;OAGvC,EAAE,eAAe,EAAE;AAE1B;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAGzC,KAAiC;IACjC,MAAM,YAAY,GAAG,MAAM,wBAAwB,CAAC,KAAK,CAAC,CAAC;IAC3D,MAAM,mBAAmB,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9D,KAAK,CAAC,mBAAmB,CACvB,eAAe,CAAC;QACd,KAAK,EAAE,KAAK,CAAC,aAAa;QAC1B,QAAQ,EAAE,YAAY,CAAC,QAAQ;QAC/B,KAAK,EAAE,YAAY,CAAC,KAAK;QACzB,WAAW,EAAE,KAAK,CAAC,iBAAiB;KACrC,CAAC,CACH,CAAC;IAEF,OAAO;QACL,GAAG,YAAY;QACf,kBAAkB,EAAE,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACxD,gBAAgB,CAAC,OAAO,CAAC,CAC1B;QACD,eAAe,EAAE,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACtE,uBAAuB,EAAE,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE;KACrE,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,KAA2D;IAK3D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,CAAC,MAAM,KAAK,CAAC,aAAa,CAAC,WAAW,CAClD,KAAK,CAAC,QAAQ,CACf,CAAqB,CAAC;IACvB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,KAAuB,EACvB,UAA4E;IAE5E,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAChC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CACF,CAAC;IAEnC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC/B,MAAM,eAAe,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}

package/dist/runner/modelSettings.d.ts

@@ -0,0 +1,20 @@
+import { Agent } from '../agent';
+import { Model, ModelSettings } from '../model';
+import { AgentToolUseTracker } from './toolUseTracker';
+/**
+ * Resolves the effective model for the next turn by giving precedence to the agent-specific
+ * configuration when present, otherwise falling back to the runner-level default.
+ */
+export declare function selectModel(agentModel: string | Model, runConfigModel: string | Model | undefined): string | Model;
+/**
+ * Resets the tool choice when the agent is configured to prefer a fresh tool selection after
+ * any tool usage. This prevents the provider from reusing stale tool hints across turns.
+ */
+export declare function maybeResetToolChoice(agent: Agent<any, any>, toolUseTracker: AgentToolUseTracker, modelSettings: ModelSettings): ModelSettings;
+/**
+ * When the default model is a GPT-5 variant, agents may carry GPT-5-specific providerData
+ * (e.g., reasoning effort, text verbosity). If a run resolves to a non-GPT-5 model and the
+ * agent relied on the default model (i.e., no explicit model set), these GPT-5-only settings
+ * are incompatible and should be stripped to avoid runtime errors.
+ */
+export declare function adjustModelSettingsForNonGPT5RunnerModel(explictlyModelSet: boolean, agentModelSettings: ModelSettings, runnerModel: string | Model, modelSettings: ModelSettings, resolvedModelName?: string): ModelSettings;