@agentionai/agents 1.6.0 → 1.7.0-beta.0

package/dist/agents/openai-compatible/OpenAICompatibleAgent.js

@@ -7,6 +7,7 @@ exports.OpenAICompatibleAgent = void 0;
 const openai_1 = __importDefault(require("openai"));
 const BaseAgent_1 = require("../BaseAgent");
 const AgentEvent_1 = require("../AgentEvent");
+const cancellation_1 = require("../cancellation");
 const AgentError_1 = require("../errors/AgentError");
 const transformers_1 = require("../../history/transformers");
 const VizReporter_1 = require("../../viz/VizReporter");
@@ -84,7 +85,7 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
     async process(_input) {
         return "";
     }
-    async execute(input) {
+    async execute(input, options) {
         this.emit(AgentEvent_1.AgentEvent.BEFORE_EXECUTE, input);
         this.resetTokenUsage();
         this.currentToolCallCount = 0;
@@ -105,11 +106,19 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
         this.history.setSessionAnchor();
         this.history.beginExecution();
         try {
-            const response = await this.callProvider();
+            const response = await this.callProvider(options);
             this.emit(AgentEvent_1.AgentEvent.AFTER_EXECUTE, response);
-            return await this.handleResponse(response);
+            return await this.handleResponse(response, options);
         }
         catch (error) {
+            if ((0, cancellation_1.isAbortError)(error, options?.signal)) {
+                const abortError = this.abortError(error, options?.signal);
+                if (this.vizEventId) {
+                    VizReporter_1.vizReporter.agentError(this.vizEventId, "AbortError", abortError.message, false);
+                    this.vizEventId = undefined;
+                }
+                throw abortError;
+            }
             if (error instanceof openai_1.default.APIError) {
                 const apiError = new AgentError_1.ApiError(`${this.getVendorName()} API error: ${error.message}`, error.status, error);
                 this.emit(AgentEvent_1.AgentEvent.ERROR, apiError);
@@ -139,7 +148,7 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
             this.history.endExecution();
         }
     }
-    async callProvider() {
+    async callProvider(options) {
         const messages = transformers_1.chatCompletionsTransformer.toProvider(this.history.getEntries());
         const tools = this.tools.size > 0 ? this.getToolDefinitions() : undefined;
         this.startTurnTimer();
@@ -156,9 +165,9 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
             presence_penalty: this.config.presencePenalty,
             frequency_penalty: this.config.frequencyPenalty,
             ...this.buildExtraRequestParams(),
-        });
+        }, { signal: options?.signal });
     }
-    async handleResponse(response) {
+    async handleResponse(response, options) {
         const usage = this.accumulateUsage(this.parseUsage(response));
         const choice = response.choices[0];
         const message = choice.message;
@@ -189,19 +198,24 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
             return textContent;
         }
         const toolCalls = message.tool_calls;
+        // Stop before the assistant turn is written: nothing else would notice a
+        // cancellation until the next provider call, and bailing out here avoids
+        // both running the tools' side effects and leaving a tool call in history
+        // with no tool message to answer it.
+        (0, cancellation_1.throwIfAborted)(options?.signal, `Execution of agent ${this.getName()}`);
         this.emit(AgentEvent_1.AgentEvent.TOOL_USE, toolCalls);
         this.currentToolCallCount += toolCalls.length;
         const assistantEntry = transformers_1.chatCompletionsTransformer.fromProviderMessage(message);
         this.addToHistory(assistantEntry);
-        const toolResults = await this.handleToolCalls(toolCalls);
+        const toolResults = await this.handleToolCalls(toolCalls, options);
         for (const result of toolResults) {
             const resultEntry = transformers_1.chatCompletionsTransformer.toolResultEntry(result.toolCallId, result.content);
             this.addToHistory(resultEntry);
         }
         try {
-            const newResponse = await this.callProvider();
+            const newResponse = await this.callProvider(options);
             this.emit(AgentEvent_1.AgentEvent.AFTER_EXECUTE, newResponse);
-            return this.handleResponse(newResponse);
+            return this.handleResponse(newResponse, options);
         }
         catch (error) {
             const executionError = new AgentError_1.ExecutionError(`${this.getVendorName()} error during tool response: ${error instanceof Error ? error.message : "Unknown error"}`);
@@ -209,7 +223,7 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
             throw executionError;
         }
     }
-    async handleToolCalls(toolCalls) {
+    async handleToolCalls(toolCalls, options) {
         return Promise.all(toolCalls.map(async (toolCall) => {
             const toolName = toolCall.type === "function" ? toolCall.function.name : "";
             const tool = this.tools.get(toolName);
@@ -224,7 +238,7 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
             }
             try {
                 const args = JSON.parse(toolCall.function.arguments || "{}");
-                const result = await tool.execute(this.getId(), this.getName(), args, toolCallId, this.config.model, this.vendor);
+                const result = await tool.execute(this.getId(), this.getName(), args, toolCallId, this.config.model, this.vendor, { signal: options?.signal });
                 return { toolCallId, content: JSON.stringify(result) };
             }
             catch (error) {
@@ -253,7 +267,7 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
      * }
      * ```
      */
-    async *executeStream(input) {
+    async *executeStream(input, options) {
         this.emit(AgentEvent_1.AgentEvent.BEFORE_EXECUTE, input);
         this.resetTokenUsage();
         this.currentToolCallCount = 0;
@@ -274,9 +288,17 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
         this.history.setSessionAnchor();
         this.history.beginExecution();
         try {
-            yield* this.streamTurn();
+            yield* this.streamTurn(options);
         }
         catch (error) {
+            if ((0, cancellation_1.isAbortError)(error, options?.signal)) {
+                const abortError = this.abortError(error, options?.signal);
+                if (this.vizEventId) {
+                    VizReporter_1.vizReporter.agentError(this.vizEventId, "AbortError", abortError.message, false);
+                    this.vizEventId = undefined;
+                }
+                throw abortError;
+            }
             if (error instanceof openai_1.default.APIError) {
                 const apiError = new AgentError_1.ApiError(`${this.getVendorName()} API error: ${error.message}`, error.status, error);
                 this.emit(AgentEvent_1.AgentEvent.ERROR, apiError);
@@ -306,7 +328,7 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
             this.history.endExecution();
         }
     }
-    async *streamTurn() {
+    async *streamTurn(options) {
         const messages = transformers_1.chatCompletionsTransformer.toProvider(this.history.getEntries());
         const tools = this.tools.size > 0 ? this.getToolDefinitions() : undefined;
         this.startTurnTimer();
@@ -324,7 +346,7 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
             presence_penalty: this.config.presencePenalty,
             frequency_penalty: this.config.frequencyPenalty,
             ...this.buildExtraRequestParams(),
-        });
+        }, { signal: options?.signal });
         let textContent = "";
         let reasoningContent = "";
         const toolCallAcc = new Map();
@@ -383,6 +405,10 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
         // continues into a tool call still reports what it spent.
         if (streamUsage)
             this.accumulateStreamUsage(streamUsage);
+        // The SDK's stream iterator swallows the abort and simply stops yielding,
+        // so without this an interrupted stream would look like a short but
+        // complete turn — writing partial text to history and emitting DONE.
+        (0, cancellation_1.throwIfAborted)(options?.signal, `Execution of agent ${this.getName()}`);
         if (finishReason === "length") {
             const error = new AgentError_1.MaxTokensExceededError("Response exceeded maximum token limit", this.config.maxTokens || 1024);
             this.emit(AgentEvent_1.AgentEvent.MAX_TOKENS_EXCEEDED, error);
@@ -394,6 +420,9 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
             throw error;
         }
         if (finishReason === "tool_calls" && toolCallAcc.size > 0) {
+            // As in handleResponse(): bail out before the assistant turn is written,
+            // so a cancelled run leaves no unanswered tool call in history.
+            (0, cancellation_1.throwIfAborted)(options?.signal, `Execution of agent ${this.getName()}`);
             const toolCalls = Array.from(toolCallAcc.entries())
                 .sort(([a], [b]) => a - b)
                 .map(([, tc]) => ({
@@ -410,11 +439,11 @@ class OpenAICompatibleAgent extends BaseAgent_1.BaseAgent {
                 reasoning_content: reasoningContent || null,
             });
             this.addToHistory(assistantEntry);
-            const toolResults = await this.handleToolCalls(toolCalls);
+            const toolResults = await this.handleToolCalls(toolCalls, options);
             for (const result of toolResults) {
                 this.addToHistory(transformers_1.chatCompletionsTransformer.toolResultEntry(result.toolCallId, result.content));
             }
-            yield* this.streamTurn();
+            yield* this.streamTurn(options);
         }
         else {
             const assistantEntry = transformers_1.chatCompletionsTransformer.fromProviderMessage({

package/dist/core.d.ts

@@ -3,6 +3,7 @@ export * from "./agents/model-types";
 export * from "./agents/AgentConfig";
 export * from "./agents/AgentEvent";
 export * from "./agents/errors/AgentError";
+export * from "./agents/cancellation";
 export * from "./history/History";
 export * from "./history/types";
 export * from "./graph/AgentGraph";

package/dist/core.js

@@ -22,6 +22,7 @@ __exportStar(require("./agents/model-types"), exports);
 __exportStar(require("./agents/AgentConfig"), exports);
 __exportStar(require("./agents/AgentEvent"), exports);
 __exportStar(require("./agents/errors/AgentError"), exports);
+__exportStar(require("./agents/cancellation"), exports);
 // History
 __exportStar(require("./history/History"), exports);
 __exportStar(require("./history/types"), exports);

package/dist/index.d.ts

@@ -15,6 +15,7 @@ export * from "./agents/model-types";
 export * from "./agents/AgentConfig";
 export * from "./agents/AgentEvent";
 export * from "./agents/errors/AgentError";
+export * from "./agents/cancellation";
 export * from "./history/History";
 export * from "./history/types";
 export { anthropicTransformer, openAiTransformer, mistralTransformer, geminiTransformer, ollamaTransformer, chatCompletionsTransformer, } from "./history/transformers";

package/dist/index.js

@@ -43,6 +43,7 @@ __exportStar(require("./agents/model-types"), exports);
 __exportStar(require("./agents/AgentConfig"), exports);
 __exportStar(require("./agents/AgentEvent"), exports);
 __exportStar(require("./agents/errors/AgentError"), exports);
+__exportStar(require("./agents/cancellation"), exports);
 // History
 __exportStar(require("./history/History"), exports);
 __exportStar(require("./history/types"), exports);

package/dist/mcp/MCPClient.js

@@ -634,8 +634,10 @@ class MCPClient extends events_1.default {
             name: mcpTool.name,
             description: mcpTool.description ?? mcpTool.name,
             inputSchema,
-            execute: async (input) => {
-                const result = await this.invokeTool(mcpTool.name, input ?? {});
+            execute: async (input, _context, options) => {
+                // The agent run's signal, when it supplied one, overrides the client's
+                // default `callOptions.signal` for this call.
+                const result = await this.invokeTool(mcpTool.name, input ?? {}, options?.signal ? { signal: options.signal } : undefined);
                 const context = { toolName: mcpTool.name, input: input ?? {} };
                 if (result?.isError && this.throwOnToolError) {
                     const rendered = (0, content_1.renderToolResult)(result);

package/dist/tools/Tool.d.ts

@@ -1,5 +1,6 @@
 import EventEmitter from "events";
 import { BaseAgent, AgentVendor } from "../agents/BaseAgent";
+import { ToolExecuteOptions } from "../agents/cancellation";
 export interface ToolInputSchema {
     type: "object";
     properties: Record<string, any>;
@@ -18,7 +19,11 @@ export interface ToolConfig<T> {
     name: string;
     description: string;
     inputSchema: ToolInputSchema;
-    execute: (input: any, context?: Record<string, any> | null) => Promise<T>;
+    /**
+     * @param options Carries the `AbortSignal` of the agent run this call belongs
+     *                to, so a long-running tool can be cancelled with the run.
+     */
+    execute: (input: any, context?: Record<string, any> | null, options?: ToolExecuteOptions) => Promise<T>;
     context?: Record<string, any>;
 }
 export declare class ToolEvent {
@@ -52,7 +57,7 @@ export declare class ToolResultEvent extends ToolEvent {
 
  */
 export declare class Tool<T> extends EventEmitter {
-    protected executeFn: (input: unknown, context: Record<string, any> | null) => Promise<T>;
+    protected executeFn: (input: unknown, context: Record<string, any> | null, options?: ToolExecuteOptions) => Promise<T>;
     name: string;
     protected description: string;
     protected context: Record<string, any> | null;
@@ -65,7 +70,12 @@ export declare class Tool<T> extends EventEmitter {
      */
     static fromAgent(agent: BaseAgent, description: string): Tool<string>;
     constructor(config: ToolConfig<T>);
-    execute(agentId: string, agentName: string, input: Record<string, any>, id: string, agentModel?: string, agentVendor?: AgentVendor): Promise<T>;
+    /**
+     * @param options Per-call options. `options.signal` is the agent run's
+     *                `AbortSignal`, forwarded to the tool's own `execute` so it
+     *                can cancel whatever work it started.
+     */
+    execute(agentId: string, agentName: string, input: Record<string, any>, id: string, agentModel?: string, agentVendor?: AgentVendor, options?: ToolExecuteOptions): Promise<T>;
     getPrompt(_vendor?: string): {
         name: string;
         description: string;

package/dist/tools/Tool.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tool = exports.ToolResultEvent = exports.ToolEvent = void 0;
 const events_1 = __importDefault(require("events"));
+const cancellation_1 = require("../agents/cancellation");
 const VizReporter_1 = require("../viz/VizReporter");
 const VizConfig_1 = require("../viz/VizConfig");
 class ToolEvent {
@@ -67,11 +68,19 @@ class Tool extends events_1.default {
                 },
                 required: ["instructions"],
             },
-            execute: async (input) => {
+            execute: async (input, _context, options) => {
                 try {
-                    return (await agent.execute(input.instructions));
+                    return (await agent.execute(input.instructions, {
+                        signal: options?.signal,
+                    }));
                 }
                 catch (error) {
+                    // A cancelled run is not a tool failure: reporting it as a tool
+                    // result would have the calling agent carry on with the very run
+                    // that was just cancelled.
+                    if ((0, cancellation_1.isAbortError)(error, options?.signal)) {
+                        throw error;
+                    }
                     return JSON.stringify({
                         error: "Failed to execute instructions: " + error.message,
                     });
@@ -87,7 +96,12 @@ class Tool extends events_1.default {
         this.description = config.description;
         this.schema = config.inputSchema;
     }
-    async execute(agentId, agentName, input, id, agentModel, agentVendor) {
+    /**
+     * @param options Per-call options. `options.signal` is the agent run's
+     *                `AbortSignal`, forwarded to the tool's own `execute` so it
+     *                can cancel whatever work it started.
+     */
+    async execute(agentId, agentName, input, id, agentModel, agentVendor, options) {
         const event = new ToolEvent(this, input, id, agentId, agentName);
         this.emit(ToolEvent.EXECUTE, event);
         if (event.isDefaultPrevented) {
@@ -105,7 +119,7 @@ class Tool extends events_1.default {
             vizEventId = VizReporter_1.vizReporter.toolStart(this.name, id, input, vizSource);
         }
         try {
-            const result = await this.executeFn(input, this.context);
+            const result = await this.executeFn(input, this.context, options);
             const resultEvent = new ToolResultEvent(this, input, id, result, agentId, agentName);
             this.emit(ToolResultEvent.RESULT, resultEvent);
             if (resultEvent.isDefaultPrevented) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agentionai/agents",
   "author": "Laurent Zuijdwijk",
-  "version": "1.6.0",
+  "version": "1.7.0-beta.0",
   "description": "Agent Library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",