@openai/agents-core 0.3.0 → 0.3.1

package/dist/items.mjs

@@ -123,16 +123,37 @@ export class RunHandoffOutputItem extends RunItemBase {
 export class RunToolApprovalItem extends RunItemBase {
     rawItem;
     agent;
+    toolName;
     type = 'tool_approval_item';
-    constructor(rawItem, agent) {
+    constructor(rawItem, agent, 
+    /**
+     * Explicit tool name to use for approval tracking when not present on the raw item.
+     */
+    toolName) {
         super();
         this.rawItem = rawItem;
         this.agent = agent;
+        this.toolName = toolName;
+        this.toolName = toolName ?? rawItem.name;
+    }
+    /**
+     * Returns the tool name if available on the raw item or provided explicitly.
+     * Kept for backwards compatibility with code that previously relied on `rawItem.name`.
+     */
+    get name() {
+        return this.toolName ?? this.rawItem.name;
+    }
+    /**
+     * Returns the arguments if the raw item has an arguments property otherwise this will be undefined.
+     */
+    get arguments() {
+        return 'arguments' in this.rawItem ? this.rawItem.arguments : undefined;
     }
     toJSON() {
         return {
             ...super.toJSON(),
             agent: this.agent.toJSON(),
+            toolName: this.toolName,
         };
     }
 }

package/dist/items.mjs.map

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

package/dist/metadata.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.METADATA = void 0;
 exports.METADATA = {
     "name": "@openai/agents-core",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "versions": {
-        "@openai/agents-core": "0.3.0",
+        "@openai/agents-core": "0.3.1",
         "openai": "^6"
     }
 };

package/dist/metadata.mjs

@@ -1,9 +1,9 @@
 // This file is automatically generated
 export const METADATA = {
     "name": "@openai/agents-core",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "versions": {
-        "@openai/agents-core": "0.3.0",
+        "@openai/agents-core": "0.3.1",
         "openai": "^6"
     }
 };

package/dist/model.d.ts

@@ -1,6 +1,6 @@
 import { Usage } from './usage';
 import { StreamEvent } from './types/protocol';
-import { HostedTool, ComputerTool, FunctionTool } from './tool';
+import { HostedTool, ComputerTool, FunctionTool, ShellTool, ApplyPatchTool } from './tool';
 import { Handoff } from './handoff';
 import { AgentInputItem, AgentOutputItem, JsonSchemaDefinition, TextOutput, InputText, InputImage, InputFile } from './types';
 export type ModelSettingsToolChoice = 'auto' | 'required' | 'none' | (string & {});
@@ -127,12 +127,20 @@ export type SerializedComputerTool = {
     environment: ComputerTool['computer']['environment'];
     dimensions: ComputerTool['computer']['dimensions'];
 };
+export type SerializedShellTool = {
+    type: ShellTool['type'];
+    name: ShellTool['name'];
+};
+export type SerializedApplyPatchTool = {
+    type: ApplyPatchTool['type'];
+    name: ApplyPatchTool['name'];
+};
 export type SerializedHostedTool = {
     type: HostedTool['type'];
     name: HostedTool['name'];
     providerData?: HostedTool['providerData'];
 };
-export type SerializedTool = SerializedFunctionTool | SerializedComputerTool | SerializedHostedTool;
+export type SerializedTool = SerializedFunctionTool | SerializedComputerTool | SerializedShellTool | SerializedApplyPatchTool | SerializedHostedTool;
 export type SerializedHandoff = {
     /**
      * The name of the tool that represents the handoff.

package/dist/runContext.js

@@ -81,7 +81,7 @@ class RunContext {
      * @param options - Additional approval behavior options.
      */
     approveTool(approvalItem, { alwaysApprove = false } = {}) {
-        const toolName = approvalItem.rawItem.name;
+        const toolName = approvalItem.toolName ?? approvalItem.rawItem.name;
         if (alwaysApprove) {
             this.#approvals.set(toolName, {
                 approved: true,
@@ -108,7 +108,7 @@ class RunContext {
      * @param approvalItem - The tool approval item to reject.
      */
     rejectTool(approvalItem, { alwaysReject = false } = {}) {
-        const toolName = approvalItem.rawItem.name;
+        const toolName = approvalItem.toolName ?? approvalItem.rawItem.name;
         if (alwaysReject) {
             this.#approvals.set(toolName, {
                 approved: false,

package/dist/runContext.js.map

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

package/dist/runContext.mjs

@@ -75,7 +75,7 @@ export class RunContext {
      * @param options - Additional approval behavior options.
      */
     approveTool(approvalItem, { alwaysApprove = false } = {}) {
-        const toolName = approvalItem.rawItem.name;
+        const toolName = approvalItem.toolName ?? approvalItem.rawItem.name;
         if (alwaysApprove) {
             this.#approvals.set(toolName, {
                 approved: true,
@@ -102,7 +102,7 @@ export class RunContext {
      * @param approvalItem - The tool approval item to reject.
      */
     rejectTool(approvalItem, { alwaysReject = false } = {}) {
-        const toolName = approvalItem.rawItem.name;
+        const toolName = approvalItem.toolName ?? approvalItem.rawItem.name;
         if (alwaysReject) {
             this.#approvals.set(toolName, {
                 approved: false,

package/dist/runContext.mjs.map

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

package/dist/runImplementation.d.ts

@@ -1,9 +1,12 @@
 import { Agent } from './agent';
 import { Handoff } from './handoff';
 import { RunItem, RunToolApprovalItem } from './items';
+import { Logger } from './logger';
 import { ModelResponse } from './model';
-import { ComputerTool, FunctionTool, HostedMCPTool } from './tool';
+import { ComputerTool, FunctionTool, HostedMCPTool, ShellTool, ApplyPatchTool } from './tool';
 import { AgentInputItem, UnknownContext } from './types';
+import { Runner } from './run';
+import { RunContext } from './runContext';
 import { StreamedRunResult } from './result';
 import { z } from 'zod';
 import * as protocol from './types/protocol';
@@ -20,6 +23,14 @@ type ToolRunComputer = {
     toolCall: protocol.ComputerUseCallItem;
     computer: ComputerTool;
 };
+type ToolRunShell = {
+    toolCall: protocol.ShellCallItem;
+    shell: ShellTool;
+};
+type ToolRunApplyPatch = {
+    toolCall: protocol.ApplyPatchCallItem;
+    applyPatch: ApplyPatchTool;
+};
 type ToolRunMCPApprovalRequest = {
     requestItem: RunToolApprovalItem;
     mcpTool: HostedMCPTool;
@@ -29,6 +40,8 @@ export type ProcessedResponse<TContext = UnknownContext> = {
     handoffs: ToolRunHandoff[];
     functions: ToolRunFunction<TContext>[];
     computerActions: ToolRunComputer[];
+    shellActions: ToolRunShell[];
+    applyPatchActions: ToolRunApplyPatch[];
     mcpApprovalRequests: ToolRunMCPApprovalRequest[];
     toolsUsed: string[];
     hasToolsOrApprovalsToRun(): boolean;
@@ -119,6 +132,8 @@ declare class SingleStepResult {
      */
     get generatedItems(): RunItem[];
 }
+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 streamStepItemsToRunResult(result: StreamedRunResult<any, any>, items: RunItem[]): void;
 export declare function addStepToRunResult(result: StreamedRunResult<any, any>, step: SingleStepResult, options?: {
     skipItems?: Set<RunItem>;

package/dist/runImplementation.js

@@ -10,6 +10,8 @@ exports.resolveInterruptedTurn = resolveInterruptedTurn;
 exports.resolveTurnAfterModelResponse = resolveTurnAfterModelResponse;
 exports.getToolCallOutputItem = getToolCallOutputItem;
 exports.executeFunctionToolCalls = executeFunctionToolCalls;
+exports.executeShellActions = executeShellActions;
+exports.executeApplyPatchOperations = executeApplyPatchOperations;
 exports.executeComputerActions = executeComputerActions;
 exports.executeHandoffCalls = executeHandoffCalls;
 exports.checkForFinalOutputFromTools = checkForFinalOutputFromTools;
@@ -89,12 +91,16 @@ function processModelResponse(modelResponse, agent, tools, handoffs) {
     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)
@@ -164,6 +170,40 @@ function processModelResponse(modelResponse, agent, tools, handoffs) {
                 computer: computerTool,
             });
         }
+        else if (output.type === 'shell_call') {
+            items.push(new items_1.RunToolCallItem(output, agent));
+            toolsUsed.push('shell');
+            if (!shellTool) {
+                (0, context_1.addErrorToCurrentSpan)({
+                    message: 'Model produced shell action without a shell tool.',
+                    data: {
+                        agent_name: agent.name,
+                    },
+                });
+                throw new errors_1.ModelBehaviorError('Model produced shell action without a shell tool.');
+            }
+            runShellActions.push({
+                toolCall: output,
+                shell: shellTool,
+            });
+        }
+        else if (output.type === 'apply_patch_call') {
+            items.push(new items_1.RunToolCallItem(output, agent));
+            toolsUsed.push('apply_patch');
+            if (!applyPatchTool) {
+                (0, context_1.addErrorToCurrentSpan)({
+                    message: 'Model produced apply_patch action without an apply_patch tool.',
+                    data: {
+                        agent_name: agent.name,
+                    },
+                });
+                throw new errors_1.ModelBehaviorError('Model produced apply_patch action without an apply_patch tool.');
+            }
+            runApplyPatchActions.push({
+                toolCall: output,
+                applyPatch: applyPatchTool,
+            });
+        }
         if (output.type !== 'function_call') {
             continue;
         }
@@ -200,13 +240,17 @@ function processModelResponse(modelResponse, agent, tools, handoffs) {
         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);
+                runComputerActions.length > 0 ||
+                runShellActions.length > 0 ||
+                runApplyPatchActions.length > 0);
         },
     };
 }
@@ -374,10 +418,14 @@ async function resolveInterruptedTurn(agent, originalInput, originalPreStepItems
     // Keep track of approvals we still need to surface next turn so HITL flows can resume cleanly.
     for (const run of mcpApprovalRuns) {
         // the approval_request_id "mcpr_123..."
-        const approvalRequestId = run.requestItem.rawItem.id;
+        const rawItem = run.requestItem.rawItem;
+        if (rawItem.type !== 'hosted_tool_call') {
+            continue;
+        }
+        const approvalRequestId = rawItem.id;
         const approved = state._context.isToolApproved({
             // Since this item name must be the same with the one sent from Responses API server
-            toolName: run.requestItem.rawItem.name,
+            toolName: rawItem.name,
             callId: approvalRequestId,
         });
         if (typeof approved !== 'undefined') {
@@ -464,9 +512,11 @@ async function resolveTurnAfterModelResponse(agent, originalInput, originalPreSt
         appendIfNew(item);
     }
     // Run function tools and computer actions in parallel; neither depends on the other's side effects.
-    const [functionResults, computerResults] = await Promise.all([
+    const [functionResults, computerResults, shellResults, applyPatchResults] = await Promise.all([
         executeFunctionToolCalls(agent, processedResponse.functions, runner, state),
         executeComputerActions(agent, processedResponse.computerActions, runner, state._context),
+        executeShellActions(agent, processedResponse.shellActions, runner, state._context),
+        executeApplyPatchOperations(agent, processedResponse.applyPatchActions, runner, state._context),
     ]);
     for (const result of functionResults) {
         appendIfNew(result.runItem);
@@ -474,6 +524,12 @@ async function resolveTurnAfterModelResponse(agent, originalInput, originalPreSt
     for (const item of computerResults) {
         appendIfNew(item);
     }
+    for (const item of shellResults) {
+        appendIfNew(item);
+    }
+    for (const item of applyPatchResults) {
+        appendIfNew(item);
+    }
     // run hosted MCP approval requests
     if (processedResponse.mcpApprovalRequests.length > 0) {
         for (const approvalRequest of processedResponse.mcpApprovalRequests) {
@@ -537,6 +593,8 @@ async function resolveTurnAfterModelResponse(agent, originalInput, originalPreSt
     // We should run the loop again so the model can see the tool results and respond.
     const hadToolCallsOrActions = (processedResponse.functions?.length ?? 0) > 0 ||
         (processedResponse.computerActions?.length ?? 0) > 0 ||
+        (processedResponse.shellActions?.length ?? 0) > 0 ||
+        (processedResponse.applyPatchActions?.length ?? 0) > 0 ||
         (processedResponse.mcpApprovalRequests?.length ?? 0) > 0 ||
         (processedResponse.handoffs?.length ?? 0) > 0;
     if (hadToolCallsOrActions) {
@@ -905,6 +963,206 @@ async function _runComputerActionAndScreenshot(computer, toolCall) {
     }
     throw new Error('Computer does not implement screenshot()');
 }
+function toErrorMessage(error) {
+    if (error instanceof Error) {
+        return error.message || error.toString();
+    }
+    try {
+        return JSON.stringify(error);
+    }
+    catch {
+        return String(error);
+    }
+}
+async function executeShellActions(agent, actions, runner, runContext, customLogger = undefined) {
+    const _logger = customLogger ?? logger_1.default;
+    const results = [];
+    for (const action of actions) {
+        const shellTool = action.shell;
+        const toolCall = action.toolCall;
+        const approvalItem = new items_1.RunToolApprovalItem(toolCall, agent, shellTool.name);
+        const requiresApproval = await shellTool.needsApproval(runContext, toolCall.action, toolCall.callId);
+        if (requiresApproval) {
+            if (shellTool.onApproval) {
+                const decision = await shellTool.onApproval(runContext, approvalItem);
+                if (decision.approve === true) {
+                    runContext.approveTool(approvalItem);
+                }
+                else if (decision.approve === false) {
+                    runContext.rejectTool(approvalItem);
+                }
+            }
+            const approval = runContext.isToolApproved({
+                toolName: shellTool.name,
+                callId: toolCall.callId,
+            });
+            if (approval === false) {
+                const response = 'Tool execution was not approved.';
+                const rejectionOutput = {
+                    stdout: '',
+                    stderr: response,
+                    outcome: { type: 'exit', exitCode: null },
+                };
+                results.push(new items_1.RunToolCallOutputItem({
+                    type: 'shell_call_output',
+                    callId: toolCall.callId,
+                    output: [rejectionOutput],
+                }, agent, response));
+                continue;
+            }
+            if (approval !== true) {
+                results.push(approvalItem);
+                continue;
+            }
+        }
+        runner.emit('agent_tool_start', runContext, agent, shellTool, {
+            toolCall,
+        });
+        if (typeof agent.emit === 'function') {
+            agent.emit('agent_tool_start', runContext, shellTool, { toolCall });
+        }
+        let shellOutputs;
+        const providerMeta = {};
+        let maxOutputLength;
+        try {
+            const shellResult = await shellTool.shell.run(toolCall.action);
+            shellOutputs = shellResult.output ?? [];
+            if (shellResult.providerData) {
+                Object.assign(providerMeta, shellResult.providerData);
+            }
+            if (typeof shellResult.maxOutputLength === 'number') {
+                maxOutputLength = shellResult.maxOutputLength;
+            }
+        }
+        catch (err) {
+            const errorText = toErrorMessage(err);
+            shellOutputs = [
+                {
+                    stdout: '',
+                    stderr: errorText,
+                    outcome: { type: 'exit', exitCode: null },
+                },
+            ];
+            _logger.error('Failed to execute shell action:', err);
+        }
+        shellOutputs = shellOutputs ?? [];
+        runner.emit('agent_tool_end', runContext, agent, shellTool, JSON.stringify(shellOutputs), {
+            toolCall,
+        });
+        if (typeof agent.emit === 'function') {
+            agent.emit('agent_tool_end', runContext, shellTool, JSON.stringify(shellOutputs), {
+                toolCall,
+            });
+        }
+        const rawItem = {
+            type: 'shell_call_output',
+            callId: toolCall.callId,
+            output: shellOutputs ?? [],
+        };
+        if (typeof maxOutputLength === 'number') {
+            rawItem.maxOutputLength = maxOutputLength;
+        }
+        if (Object.keys(providerMeta).length > 0) {
+            rawItem.providerData = providerMeta;
+        }
+        results.push(new items_1.RunToolCallOutputItem(rawItem, agent, rawItem.output));
+    }
+    return results;
+}
+async function executeApplyPatchOperations(agent, actions, runner, runContext, customLogger = undefined) {
+    const _logger = customLogger ?? logger_1.default;
+    const results = [];
+    for (const action of actions) {
+        const applyPatchTool = action.applyPatch;
+        const toolCall = action.toolCall;
+        const approvalItem = new items_1.RunToolApprovalItem(toolCall, agent, applyPatchTool.name);
+        const requiresApproval = await applyPatchTool.needsApproval(runContext, toolCall.operation, toolCall.callId);
+        if (requiresApproval) {
+            if (applyPatchTool.onApproval) {
+                const decision = await applyPatchTool.onApproval(runContext, approvalItem);
+                if (decision.approve === true) {
+                    runContext.approveTool(approvalItem);
+                }
+                else if (decision.approve === false) {
+                    runContext.rejectTool(approvalItem);
+                }
+            }
+            const approval = runContext.isToolApproved({
+                toolName: applyPatchTool.name,
+                callId: toolCall.callId,
+            });
+            if (approval === false) {
+                const response = 'Tool execution was not approved.';
+                results.push(new items_1.RunToolCallOutputItem({
+                    type: 'apply_patch_call_output',
+                    callId: toolCall.callId,
+                    status: 'failed',
+                    output: response,
+                }, agent, response));
+                continue;
+            }
+            if (approval !== true) {
+                results.push(approvalItem);
+                continue;
+            }
+        }
+        runner.emit('agent_tool_start', runContext, agent, applyPatchTool, {
+            toolCall,
+        });
+        if (typeof agent.emit === 'function') {
+            agent.emit('agent_tool_start', runContext, applyPatchTool, {
+                toolCall,
+            });
+        }
+        let status = 'completed';
+        let output = '';
+        try {
+            let result;
+            switch (toolCall.operation.type) {
+                case 'create_file':
+                    result = await applyPatchTool.editor.createFile(toolCall.operation);
+                    break;
+                case 'update_file':
+                    result = await applyPatchTool.editor.updateFile(toolCall.operation);
+                    break;
+                case 'delete_file':
+                    result = await applyPatchTool.editor.deleteFile(toolCall.operation);
+                    break;
+                default:
+                    throw new Error('Unsupported apply_patch operation');
+            }
+            if (result && typeof result.status === 'string') {
+                status = result.status;
+            }
+            if (result && typeof result.output === 'string') {
+                output = result.output;
+            }
+        }
+        catch (err) {
+            status = 'failed';
+            output = toErrorMessage(err);
+            _logger.error('Failed to execute apply_patch operation:', err);
+        }
+        runner.emit('agent_tool_end', runContext, agent, applyPatchTool, output, {
+            toolCall,
+        });
+        if (typeof agent.emit === 'function') {
+            agent.emit('agent_tool_end', runContext, applyPatchTool, output, {
+                toolCall,
+            });
+        }
+        const rawItem = {
+            type: 'apply_patch_call_output',
+            callId: toolCall.callId,
+            status,
+        };
+        if (output) {
+            rawItem.output = output;
+        }
+        results.push(new items_1.RunToolCallOutputItem(rawItem, agent, output));
+    }
+    return results;
+}
 /**
  * @internal
  * Executes any computer-use actions emitted by the model and returns the resulting items so the