@openai/agents-core 0.4.4 → 0.4.6

package/dist/runner/modelPreparation.mjs

@@ -1,6 +1,37 @@
-import { serializeHandoff, serializeTool } from "../utils/serialize.mjs";
 import { resolveComputer } from "../tool.mjs";
+import { serializeHandoff, serializeTool } from "../utils/serialize.mjs";
 import { ensureAgentSpan } from "./tracing.mjs";
+const computerInitPromisesByRunState = new WeakMap();
+function getComputerInitMap(state) {
+    let initMap = computerInitPromisesByRunState.get(state);
+    if (!initMap) {
+        initMap = new WeakMap();
+        computerInitPromisesByRunState.set(state, initMap);
+    }
+    return initMap;
+}
+async function initComputerOnce(computer, state) {
+    if (typeof computer.initRun !== 'function') {
+        return;
+    }
+    const initMap = getComputerInitMap(state);
+    const existing = initMap.get(computer);
+    if (existing) {
+        await existing;
+        return;
+    }
+    const initPromise = (async () => {
+        await computer.initRun?.(state._context);
+    })();
+    initMap.set(computer, initPromise);
+    try {
+        await initPromise;
+    }
+    catch (error) {
+        initMap.delete(computer);
+        throw error;
+    }
+}
 /**
  * Collects tools and handoffs for the current agent so model calls and tracing share the same
  * snapshot of enabled capabilities.
@@ -8,6 +39,7 @@ import { ensureAgentSpan } from "./tracing.mjs";
 export async function prepareAgentArtifacts(state) {
     const capabilities = await collectAgentCapabilities(state);
     await warmUpComputerTools(capabilities.tools, state._context);
+    await initializeComputerTools(capabilities.tools, state);
     state.setCurrentAgentSpan(ensureAgentSpan({
         agent: state._currentAgent,
         handoffs: capabilities.handoffs,
@@ -35,4 +67,17 @@ async function warmUpComputerTools(tools, runContext) {
         await resolveComputer({ tool, runContext });
     }));
 }
+async function initializeComputerTools(tools, state) {
+    const computerTools = tools.filter((tool) => tool.type === 'computer');
+    if (computerTools.length === 0) {
+        return;
+    }
+    await Promise.all(computerTools.map(async (tool) => {
+        const computer = await resolveComputer({
+            tool,
+            runContext: state._context,
+        });
+        await initComputerOnce(computer, state);
+    }));
+}
 //# sourceMappingURL=modelPreparation.mjs.map

package/dist/runner/modelPreparation.mjs.map

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

package/dist/runner/runLoop.d.ts

@@ -1,6 +1,6 @@
 import type { Agent, AgentOutputType } from '../agent';
 import type { RunState } from '../runState';
-import type { Runner } from '../run';
+import type { Runner, ToolErrorFormatter } from '../run';
 import type { SingleStepResult } from './steps';
 export type InterruptedTurnOutcome = {
     nextStep: SingleStepResult['nextStep'];
@@ -22,6 +22,7 @@ export declare function applyTurnResult<TContext, TAgent extends Agent<TContext,
 export declare function resumeInterruptedTurn<TContext, TAgent extends Agent<TContext, AgentOutputType>>(options: {
     state: RunState<TContext, TAgent>;
     runner: Runner;
+    toolErrorFormatter?: ToolErrorFormatter;
     onStepItems?: (turnResult: SingleStepResult) => void;
 }): Promise<InterruptedTurnOutcome>;
 export declare function handleInterruptedOutcome<TContext, TAgent extends Agent<TContext, AgentOutputType>>(options: {

package/dist/runner/runLoop.js

@@ -21,8 +21,8 @@ function applyTurnResult(options) {
             : undefined;
 }
 async function resumeInterruptedTurn(options) {
-    const { state, runner, onStepItems } = options;
-    const turnResult = await (0, turnResolution_1.resolveInterruptedTurn)(state._currentAgent, state._originalInput, state._generatedItems, state._lastTurnResponse, state._lastProcessedResponse, runner, state);
+    const { state, runner, toolErrorFormatter, onStepItems } = options;
+    const turnResult = await (0, turnResolution_1.resolveInterruptedTurn)(state._currentAgent, state._originalInput, state._generatedItems, state._lastTurnResponse, state._lastProcessedResponse, runner, state, toolErrorFormatter);
     applyTurnResult({
         state,
         turnResult,

package/dist/runner/runLoop.js.map

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

package/dist/runner/runLoop.mjs

@@ -16,8 +16,8 @@ export function applyTurnResult(options) {
             : undefined;
 }
 export async function resumeInterruptedTurn(options) {
-    const { state, runner, onStepItems } = options;
-    const turnResult = await resolveInterruptedTurn(state._currentAgent, state._originalInput, state._generatedItems, state._lastTurnResponse, state._lastProcessedResponse, runner, state);
+    const { state, runner, toolErrorFormatter, onStepItems } = options;
+    const turnResult = await resolveInterruptedTurn(state._currentAgent, state._originalInput, state._generatedItems, state._lastTurnResponse, state._lastProcessedResponse, runner, state, toolErrorFormatter);
     applyTurnResult({
         state,
         turnResult,

package/dist/runner/runLoop.mjs.map

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

package/dist/runner/toolExecution.d.ts

@@ -4,10 +4,10 @@ import { Logger } from '../logger';
 import { FunctionToolResult } from '../tool';
 import { RunContext } from '../runContext';
 import type { UnknownContext } from '../types';
-import type { Runner } from '../run';
+import type { Runner, ToolErrorFormatter } from '../run';
 import type { ToolRunApplyPatch, ToolRunShell } from './types';
-export declare function executeShellActions(agent: Agent<any, any>, actions: ToolRunShell[], runner: Runner, runContext: RunContext, customLogger?: Logger | undefined): Promise<RunItem[]>;
-export declare function executeApplyPatchOperations(agent: Agent<any, any>, actions: ToolRunApplyPatch[], runner: Runner, runContext: RunContext, customLogger?: Logger | undefined): Promise<RunItem[]>;
+export declare function executeShellActions(agent: Agent<any, any>, actions: ToolRunShell[], runner: Runner, runContext: RunContext, customLogger?: Logger | undefined, toolErrorFormatter?: ToolErrorFormatter): Promise<RunItem[]>;
+export declare function executeApplyPatchOperations(agent: Agent<any, any>, actions: ToolRunApplyPatch[], runner: Runner, runContext: RunContext, customLogger?: Logger | undefined, toolErrorFormatter?: ToolErrorFormatter): Promise<RunItem[]>;
 /**
  * Collects approval interruptions from tool execution results and any additional
  * RunItems (e.g., shell/apply_patch approval placeholders).

package/dist/runner/toolExecution.js

@@ -11,10 +11,11 @@ exports.executeComputerActions = executeComputerActions;
 exports.executeHandoffCalls = executeHandoffCalls;
 exports.collectInterruptions = collectInterruptions;
 exports.checkForFinalOutputFromTools = checkForFinalOutputFromTools;
-const agent_1 = require("../agent.js");
+const agentToolRunResults_1 = require("../agentToolRunResults.js");
 const errors_1 = require("../errors.js");
 const handoff_1 = require("../handoff.js");
 const items_1 = require("../items.js");
+const message_1 = require("../helpers/message.js");
 const logger_1 = __importDefault(require("../logger.js"));
 const tool_1 = require("../tool.js");
 const base64_1 = require("../utils/base64.js");
@@ -24,6 +25,33 @@ const createSpans_1 = require("../tracing/createSpans.js");
 const toolGuardrails_1 = require("../utils/toolGuardrails.js");
 const steps_1 = require("./steps.js");
 const TOOL_APPROVAL_REJECTION_MESSAGE = 'Tool execution was not approved.';
+// 1x1 transparent PNG data URL used for rejected computer actions.
+const TOOL_APPROVAL_REJECTION_SCREENSHOT_DATA_URL = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR4nGP4z8DwHwAFAAH/iZk9HQAAAABJRU5ErkJggg==';
+async function resolveApprovalRejectionMessage({ runContext, toolType, toolName, callId, toolErrorFormatter, }) {
+    if (!toolErrorFormatter) {
+        return TOOL_APPROVAL_REJECTION_MESSAGE;
+    }
+    try {
+        const formattedMessage = await toolErrorFormatter({
+            kind: 'approval_rejected',
+            toolType,
+            toolName,
+            callId,
+            defaultMessage: TOOL_APPROVAL_REJECTION_MESSAGE,
+            runContext,
+        });
+        if (typeof formattedMessage === 'string') {
+            return formattedMessage;
+        }
+        if (typeof formattedMessage !== 'undefined') {
+            logger_1.default.warn('toolErrorFormatter returned a non-string value. Falling back to the default tool approval rejection message.');
+        }
+    }
+    catch (error) {
+        logger_1.default.warn(`toolErrorFormatter threw while formatting approval rejection: ${toErrorMessage(error)}`);
+    }
+    return TOOL_APPROVAL_REJECTION_MESSAGE;
+}
 /**
  * @internal
  * Normalizes tool outputs once so downstream code works with fully structured protocol items.
@@ -57,8 +85,13 @@ function getToolCallOutputItem(toolCall, output) {
  * Runs every function tool call requested by the model and returns their outputs alongside
  * the `RunItem` instances that should be appended to history.
  */
-async function executeFunctionToolCalls(agent, toolRuns, runner, state) {
-    const deps = { agent, runner, state };
+async function executeFunctionToolCalls(agent, toolRuns, runner, state, toolErrorFormatter) {
+    const deps = {
+        agent,
+        runner,
+        state,
+        toolErrorFormatter,
+    };
     try {
         const results = await Promise.all(toolRuns.map(async (toolRun) => {
             const parseResult = parseToolArguments(toolRun);
@@ -113,17 +146,28 @@ function buildParseErrorResult(deps, toolRun, error) {
     };
 }
 async function buildApprovalRejectionResult(deps, toolRun) {
-    const { agent } = deps;
+    const { agent, runner, state, toolErrorFormatter } = deps;
     return (0, createSpans_1.withFunctionSpan)(async (span) => {
-        const response = 'Tool execution was not approved.';
+        const response = await resolveApprovalRejectionMessage({
+            runContext: state._context,
+            toolType: 'function',
+            toolName: toolRun.tool.name,
+            callId: toolRun.toolCall.callId,
+            toolErrorFormatter,
+        });
+        const traceErrorMessage = runner.config.traceIncludeSensitiveData
+            ? response
+            : TOOL_APPROVAL_REJECTION_MESSAGE;
         span.setError({
-            message: response,
+            message: traceErrorMessage,
             data: {
                 tool_name: toolRun.tool.name,
                 error: `Tool execution for ${toolRun.toolCall.callId} was manually rejected by user.`,
             },
         });
-        span.spanData.output = response;
+        if (runner.config.traceIncludeSensitiveData) {
+            span.spanData.output = response;
+        }
         return {
             type: 'function_output',
             tool: toolRun.tool,
@@ -201,7 +245,7 @@ async function runApprovedFunctionTool(deps, toolRun) {
                 output: toolOutput,
                 runItem: new items_1.RunToolCallOutputItem(getToolCallOutputItem(toolRun.toolCall, toolOutput), agent, toolOutput),
             };
-            const nestedRunResult = (0, agent_1.consumeAgentToolRunResult)(toolRun.toolCall);
+            const nestedRunResult = (0, agentToolRunResults_1.consumeAgentToolRunResult)(toolRun.toolCall);
             if (nestedRunResult) {
                 functionResult.agentRunResult = nestedRunResult;
                 const nestedInterruptions = nestedRunResult.interruptions;
@@ -237,37 +281,37 @@ async function runApprovedFunctionTool(deps, toolRun) {
  * @internal
  */
 // Internal helper: dispatch a computer action and return a screenshot (sync/async)
-async function _runComputerActionAndScreenshot(computer, toolCall) {
+async function _runComputerActionAndScreenshot(computer, toolCall, runContext) {
     const action = toolCall.action;
     let screenshot;
     // Dispatch based on action type string (assume action.type exists)
     switch (action.type) {
         case 'click':
-            await computer.click(action.x, action.y, action.button);
+            await computer.click(action.x, action.y, action.button, runContext);
             break;
         case 'double_click':
-            await computer.doubleClick(action.x, action.y);
+            await computer.doubleClick(action.x, action.y, runContext);
             break;
         case 'drag':
-            await computer.drag(action.path.map((p) => [p.x, p.y]));
+            await computer.drag(action.path.map((p) => [p.x, p.y]), runContext);
             break;
         case 'keypress':
-            await computer.keypress(action.keys);
+            await computer.keypress(action.keys, runContext);
             break;
         case 'move':
-            await computer.move(action.x, action.y);
+            await computer.move(action.x, action.y, runContext);
             break;
         case 'screenshot':
-            screenshot = await computer.screenshot();
+            screenshot = await computer.screenshot(runContext);
             break;
         case 'scroll':
-            await computer.scroll(action.x, action.y, action.scroll_x, action.scroll_y);
+            await computer.scroll(action.x, action.y, action.scroll_x, action.scroll_y, runContext);
             break;
         case 'type':
-            await computer.type(action.text);
+            await computer.type(action.text, runContext);
             break;
         case 'wait':
-            await computer.wait();
+            await computer.wait(runContext);
             break;
         default:
             action; // ensures that we handle every action we know of
@@ -279,7 +323,7 @@ async function _runComputerActionAndScreenshot(computer, toolCall) {
     }
     // Always return screenshot as base64 string
     if (typeof computer.screenshot === 'function') {
-        screenshot = await computer.screenshot();
+        screenshot = await computer.screenshot(runContext);
         if (typeof screenshot !== 'undefined') {
             return screenshot;
         }
@@ -334,7 +378,7 @@ async function handleToolApprovalDecision(options) {
         onApproval,
     });
     if (approvalState === 'rejected') {
-        return { status: 'rejected', item: buildRejectionItem() };
+        return { status: 'rejected', item: await buildRejectionItem() };
     }
     if (approvalState === 'pending') {
         return { status: 'pending', item: approvalItem };
@@ -353,7 +397,7 @@ function emitToolEnd(runner, runContext, agent, tool, output, toolCall) {
         agent.emit('agent_tool_end', runContext, tool, output, { toolCall });
     }
 }
-async function executeShellActions(agent, actions, runner, runContext, customLogger = undefined) {
+async function executeShellActions(agent, actions, runner, runContext, customLogger = undefined, toolErrorFormatter) {
     const _logger = customLogger ?? logger_1.default;
     const results = [];
     for (const action of actions) {
@@ -367,8 +411,14 @@ async function executeShellActions(agent, actions, runner, runContext, customLog
             approvalItem,
             needsApproval: await shellTool.needsApproval(runContext, toolCall.action, toolCall.callId),
             onApproval: shellTool.onApproval,
-            buildRejectionItem: () => {
-                const response = TOOL_APPROVAL_REJECTION_MESSAGE;
+            buildRejectionItem: async () => {
+                const response = await resolveApprovalRejectionMessage({
+                    runContext,
+                    toolType: 'shell',
+                    toolName: shellTool.name,
+                    callId: toolCall.callId,
+                    toolErrorFormatter,
+                });
                 const rejectionOutput = {
                     stdout: '',
                     stderr: response,
@@ -427,7 +477,7 @@ async function executeShellActions(agent, actions, runner, runContext, customLog
     }
     return results;
 }
-async function executeApplyPatchOperations(agent, actions, runner, runContext, customLogger = undefined) {
+async function executeApplyPatchOperations(agent, actions, runner, runContext, customLogger = undefined, toolErrorFormatter) {
     const _logger = customLogger ?? logger_1.default;
     const results = [];
     for (const action of actions) {
@@ -441,8 +491,14 @@ async function executeApplyPatchOperations(agent, actions, runner, runContext, c
             approvalItem,
             needsApproval: await applyPatchTool.needsApproval(runContext, toolCall.operation, toolCall.callId),
             onApproval: applyPatchTool.onApproval,
-            buildRejectionItem: () => {
-                const response = TOOL_APPROVAL_REJECTION_MESSAGE;
+            buildRejectionItem: async () => {
+                const response = await resolveApprovalRejectionMessage({
+                    runContext,
+                    toolType: 'apply_patch',
+                    toolName: applyPatchTool.name,
+                    callId: toolCall.callId,
+                    toolErrorFormatter,
+                });
                 return new items_1.RunToolCallOutputItem({
                     type: 'apply_patch_call_output',
                     callId: toolCall.callId,
@@ -503,28 +559,94 @@ async function executeApplyPatchOperations(agent, actions, runner, runContext, c
  * Executes any computer-use actions emitted by the model and returns the resulting items so
  * the run history reflects the computer session.
  */
-async function executeComputerActions(agent, actions, runner, runContext, customLogger = undefined) {
+async function executeComputerActions(agent, actions, runner, runContext, customLogger = undefined, toolErrorFormatter) {
     const _logger = customLogger ?? logger_1.default;
     const results = [];
     for (const action of actions) {
         const toolCall = action.toolCall;
+        const computerTool = action.computer;
+        let cachedRejectionMessage;
+        const getRejectionMessage = async () => {
+            if (typeof cachedRejectionMessage === 'string') {
+                return cachedRejectionMessage;
+            }
+            cachedRejectionMessage = await resolveApprovalRejectionMessage({
+                runContext,
+                toolType: 'computer',
+                toolName: computerTool.name,
+                callId: toolCall.callId,
+                toolErrorFormatter,
+            });
+            return cachedRejectionMessage;
+        };
+        const pendingSafetyChecks = getPendingSafetyChecks(toolCall);
+        const approvalItem = new items_1.RunToolApprovalItem(toolCall, agent, computerTool.name);
+        const needsApprovalCandidate = computerTool
+            .needsApproval;
+        const needsApproval = typeof needsApprovalCandidate === 'function'
+            ? await needsApprovalCandidate(runContext, toolCall.action, toolCall.callId)
+            : typeof needsApprovalCandidate === 'boolean'
+                ? needsApprovalCandidate
+                : false;
+        const approvalDecision = await handleToolApprovalDecision({
+            runContext,
+            toolName: computerTool.name,
+            callId: toolCall.callId,
+            approvalItem,
+            needsApproval,
+            buildRejectionItem: async () => {
+                const rejectionMessage = await getRejectionMessage();
+                const rejectionOutput = {
+                    type: 'computer_screenshot',
+                    data: TOOL_APPROVAL_REJECTION_SCREENSHOT_DATA_URL,
+                    providerData: {
+                        approvalStatus: 'rejected',
+                        message: rejectionMessage,
+                    },
+                };
+                const rawItem = {
+                    type: 'computer_call_result',
+                    callId: toolCall.callId,
+                    output: rejectionOutput,
+                };
+                return new items_1.RunToolCallOutputItem(rawItem, agent, TOOL_APPROVAL_REJECTION_SCREENSHOT_DATA_URL);
+            },
+        });
+        if (approvalDecision.status === 'rejected') {
+            const rejectionMessage = await getRejectionMessage();
+            results.push(approvalDecision.item);
+            results.push(new items_1.RunMessageOutputItem((0, message_1.assistant)(rejectionMessage), agent));
+            continue;
+        }
+        if (approvalDecision.status === 'pending') {
+            results.push(approvalDecision.item);
+            continue;
+        }
         // Hooks: on_tool_start (global + agent)
-        emitToolStart(runner, runContext, agent, action.computer, toolCall);
+        emitToolStart(runner, runContext, agent, computerTool, toolCall);
+        const acknowledgedSafetyChecks = pendingSafetyChecks && pendingSafetyChecks.length > 0
+            ? await resolveSafetyCheckAcknowledgements({
+                runContext,
+                toolCall,
+                pendingSafetyChecks,
+                onSafetyCheck: computerTool.onSafetyCheck,
+            })
+            : undefined;
         // Run the action and get screenshot
         let output;
         try {
             const computer = await (0, tool_1.resolveComputer)({
-                tool: action.computer,
+                tool: computerTool,
                 runContext,
             });
-            output = await _runComputerActionAndScreenshot(computer, toolCall);
+            output = await _runComputerActionAndScreenshot(computer, toolCall, runContext);
         }
         catch (err) {
             _logger.error('Failed to execute computer action:', err);
             output = '';
         }
         // Hooks: on_tool_end (global + agent)
-        emitToolEnd(runner, runContext, agent, action.computer, output, toolCall);
+        emitToolEnd(runner, runContext, agent, computerTool, output, toolCall);
         // Return the screenshot as a data URL when available; fall back to an empty string on failures.
         const imageUrl = output ? `data:image/png;base64,${output}` : '';
         const rawItem = {
@@ -532,6 +654,11 @@ async function executeComputerActions(agent, actions, runner, runContext, custom
             callId: toolCall.callId,
             output: { type: 'computer_screenshot', data: imageUrl },
         };
+        if (acknowledgedSafetyChecks && acknowledgedSafetyChecks.length > 0) {
+            rawItem.providerData = {
+                acknowledgedSafetyChecks,
+            };
+        }
         results.push(new items_1.RunToolCallOutputItem(rawItem, agent, imageUrl));
     }
     return results;
@@ -1000,6 +1127,77 @@ function normalizeLegacyFileValue(value) {
     }
     return null;
 }
+function normalizeSafetyChecks(checks) {
+    if (!Array.isArray(checks)) {
+        return undefined;
+    }
+    const normalized = [];
+    for (const entry of checks) {
+        if (!isRecord(entry)) {
+            continue;
+        }
+        const id = entry.id;
+        const code = entry.code;
+        if (!isNonEmptyString(id) || !isNonEmptyString(code)) {
+            continue;
+        }
+        const message = 'message' in entry && isNonEmptyString(entry.message)
+            ? entry.message
+            : undefined;
+        const normalizedEntry = { ...entry, id, code };
+        if (message) {
+            normalizedEntry.message = message;
+        }
+        normalized.push(normalizedEntry);
+    }
+    return normalized.length > 0 ? normalized : undefined;
+}
+function normalizeSafetyCheckResult(result) {
+    if (!result) {
+        return undefined;
+    }
+    if (!isRecord(result)) {
+        return undefined;
+    }
+    if ('acknowledgedSafetyChecks' in result) {
+        return normalizeSafetyChecks(result.acknowledgedSafetyChecks);
+    }
+    if ('acknowledged_safety_checks' in result) {
+        return normalizeSafetyChecks(result.acknowledged_safety_checks);
+    }
+    return undefined;
+}
+async function resolveSafetyCheckAcknowledgements(options) {
+    const { runContext, toolCall, pendingSafetyChecks, onSafetyCheck } = options;
+    if (!onSafetyCheck) {
+        return undefined;
+    }
+    const result = await onSafetyCheck({
+        runContext,
+        pendingSafetyChecks,
+        toolCall,
+    });
+    if (result === true) {
+        return pendingSafetyChecks;
+    }
+    if (result === false) {
+        return undefined;
+    }
+    return normalizeSafetyCheckResult(result);
+}
+function getPendingSafetyChecks(toolCall) {
+    const providerData = toolCall.providerData;
+    if (!isRecord(providerData)) {
+        return undefined;
+    }
+    if ('pending_safety_checks' in providerData) {
+        return normalizeSafetyChecks(providerData.pending_safety_checks);
+    }
+    if ('pendingSafetyChecks' in providerData) {
+        return normalizeSafetyChecks(providerData.pendingSafetyChecks);
+    }
+    return undefined;
+}
 function isRecord(value) {
     return typeof value === 'object' && value !== null;
 }