@arki-moe/agent-ts 2.0.0 → 2.1.0

package/README.md

@@ -20,7 +20,10 @@ const agent = new Agent("openai", {
   apiKey: "sk-...",
   model: "gpt-5-nano",
   system: "You are a helpful assistant. Reply concisely.",
-  onToolCall: (msg) => console.log("tool call:", msg),
+  onToolCall: (message, args) => {
+    console.log("tool call:", message);
+    console.log("tool args:", args);
+  },
   onToolResult: (msg) => console.log("tool result:", msg),
 });
 agent.registerTool(getTimeTool);
@@ -58,11 +61,13 @@ When `apiKey` is not provided in config, adapters read from the corresponding en
 | `model` | `string` | Model name |
 | `system` | `string` | Optional system prompt |
 | `endCondition` | `(context, last) => boolean` | Stop condition for `run`. Defaults to `last.role === Role.Ai` |
-| `onToolCall` | `(message) => void \| Promise<void>` | Called before each tool execution |
+| `onToolCall` | `(message, args) => boolean \| void \| Promise<boolean \| void>` | Called before each tool execution; return `false` to skip tool execution and `onToolResult` |
 | `onToolResult` | `(message) => void \| Promise<void>` | Called after each tool execution |
 
 `agent.run` always appends new messages to `agent.context`. Multiple tool calls in a single model response are executed in parallel.
 
+`onToolCall` receives parsed JSON args and can mutate them before execution. Returning `false` skips the tool call and does not emit a `ToolResult` message.
+
 `agent.fork()` shallow-copies the context array, but message objects are shared. This means:
 - Shallow copy: `forked.context !== agent.context`, so pushing new messages does not affect the other agent.
 - Shared messages: modifying a message object in one context will be visible in the other.

package/dist/index.js

@@ -45,12 +45,29 @@ class Agent {
                 const tool = this.tools.find((t) => t.name === m.toolName);
                 if (!tool)
                     throw new Error(`Tool "${m.toolName}" is not registered`);
-                if (this.onToolCall)
-                    await Promise.resolve(this.onToolCall(m));
+                let args;
+                try {
+                    args = JSON.parse(m.argsText || "{}");
+                }
+                catch (err) {
+                    const result = {
+                        role: types_1.Role.ToolResult,
+                        callId: m.callId,
+                        content: err instanceof Error ? err.message : String(err),
+                        isError: true,
+                    };
+                    if (this.onToolResult)
+                        await Promise.resolve(this.onToolResult(result));
+                    return result;
+                }
+                if (this.onToolCall) {
+                    const shouldRun = await Promise.resolve(this.onToolCall(m, args));
+                    if (shouldRun === false)
+                        return null;
+                }
                 let content;
                 let isError = false;
                 try {
-                    const args = JSON.parse(m.argsText || "{}");
                     const out = await Promise.resolve(tool.execute(args));
                     content = typeof out === "string" ? out : JSON.stringify(out);
                 }
@@ -63,8 +80,9 @@ class Agent {
                     await Promise.resolve(this.onToolResult(result));
                 return result;
             }));
-            this.context.push(...results);
-            all.push(...results);
+            const filteredResults = results.filter((result) => result !== null);
+            this.context.push(...filteredResults);
+            all.push(...filteredResults);
             msgs = await this.adapter(this.config, this.context, this.tools);
             this.context.push(...msgs);
             all.push(...msgs);

package/dist/types.d.ts

@@ -34,7 +34,9 @@ export type Tool = {
 };
 export type AgentConfig = {
     endCondition?: (context: Message[], last: Message) => boolean;
-    onToolCall?: (message: Message) => void | Promise<void>;
+    onToolCall?: (message: Extract<Message, {
+        role: Role.ToolCall;
+    }>, args: unknown) => boolean | void | Promise<boolean | void>;
     onToolResult?: (message: Message) => void | Promise<void>;
     [key: string]: unknown;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arki-moe/agent-ts",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Minimal Agent library, zero dependencies",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",