@agent-smith/agent 0.2.2 → 0.3.0

package/dist/agent.js

@@ -67,6 +67,9 @@ class Agent {
         }
         let _res = res;
         if (res?.toolCalls) {
+            if (options?.onToolsTurnStart) {
+                options.onToolsTurnStart(res.toolCalls);
+            }
             const toolsResults = new Array();
             const toolNames = Object.keys(this.tools);
             for (const tc of res.toolCalls) {
@@ -88,7 +91,7 @@ class Agent {
                     }
                     toolsResults.push({ call: tc, response: JSON.stringify(toolCallResult) });
                     if (options?.onToolCallEnd) {
-                        options.onToolCallEnd(toolCallResult);
+                        options.onToolCallEnd(tc.id, toolCallResult);
                     }
                 }
                 else {
@@ -97,6 +100,9 @@ class Agent {
                     }
                 }
             }
+            if (options?.onToolsTurnEnd) {
+                options.onToolsTurnEnd(toolsResults);
+            }
             this.history.push({ tools: toolsResults });
             if (options?.isToolsRouter) {
                 const fres = {
@@ -111,10 +117,16 @@ class Agent {
             if (options?.tools) {
                 options.tools = Object.values(this.tools);
             }
+            if (options?.onTurnEnd) {
+                options.onTurnEnd(this.history[this.history.length - 1]);
+            }
             _res = await this.runAgentNoTemplate(nit, "", params, options);
         }
         else {
             this.history.push({ assistant: res.text });
+            if (options?.onTurnEnd) {
+                options.onTurnEnd(this.history[this.history.length - 1]);
+            }
         }
         return _res;
     }
@@ -131,12 +143,20 @@ class Agent {
         if (typeof params?.model == "string") {
             params.model = { name: params.model };
         }
-        const { isToolCall, toolsCall, error } = tpl.processAnswer(res.text);
+        const { isToolCall, toolsCall, assistant, error } = tpl.processAnswer(res.text);
         if (error) {
-            throw new Error(`error processing tool call answer:\n, ${error}`);
+            throw new Error(`error processing model answer:\n, ${error}`);
+        }
+        if (assistant) {
+            if (options?.onAssistant) {
+                options.onAssistant(assistant);
+            }
         }
         const toolResults = new Array();
         if (isToolCall) {
+            if (options?.onToolsTurnStart) {
+                options.onToolsTurnStart(toolsCall);
+            }
             for (const toolCall of toolsCall) {
                 if (!("name" in toolCall)) {
                     throw new Error(`tool call does not includes a name in it's response:\n${toolCall}`);
@@ -144,6 +164,7 @@ class Agent {
                 if (!("arguments" in toolCall)) {
                     toolCall.arguments = {};
                 }
+                toolCall.name = toolCall.name.trim();
                 const tool = toolCall.name in this.tools ? this.tools[toolCall.name] : null;
                 if (!tool) {
                     const buf = new Array(`wrong tool call ${toolCall.name} from the model:`, JSON.stringify(toolCall, null, "  "), `It does not exist in the tools list:. Available tools:`, JSON.stringify(Object.keys(this.tools), null, "  "));
@@ -157,10 +178,14 @@ class Agent {
                     if (options?.debug || options?.verbose) {
                         console.log("[-] Tool", tool.name, "execution refused");
                     }
+                    const toolResp = "tool execution denied";
                     toolResults.push({
                         call: toolCall,
-                        response: "tool execution denied"
+                        response: toolResp,
                     });
+                    if (options?.onToolCallEnd) {
+                        options.onToolCallEnd(toolCall.id, toolResp);
+                    }
                 }
                 else {
                     if (options?.onToolCall) {
@@ -178,22 +203,31 @@ class Agent {
                         response: toolResp
                     });
                     if (options?.onToolCallEnd) {
-                        options.onToolCallEnd(toolResp);
+                        options.onToolCallEnd(toolCall.id, toolResp);
                     }
                 }
             }
+            if (options?.onToolsTurnEnd) {
+                options.onToolsTurnEnd(toolResults);
+            }
             if (it == 1) {
-                this.history.push({
+                const t = {
                     user: prompt,
-                    assistant: res.text,
                     tools: toolResults,
-                });
+                };
+                if (assistant) {
+                    t.assistant = assistant;
+                }
+                this.history.push(t);
             }
             else {
-                this.history.push({
-                    assistant: res.text,
+                const t = {
                     tools: toolResults,
-                });
+                };
+                if (assistant) {
+                    t.assistant = assistant;
+                }
+                this.history.push(t);
             }
             if (options?.isToolsRouter && isToolCall) {
                 const fres = {
@@ -204,6 +238,9 @@ class Agent {
                 };
                 return fres;
             }
+            if (options?.onTurnEnd) {
+                options.onTurnEnd(this.history[this.history.length - 1]);
+            }
             return await this.runAgentWithTemplate(it + 1, prompt, params, options, tpl);
         }
         else {
@@ -231,6 +268,9 @@ class Agent {
                 turn.assistant = final;
                 this.history.push(turn);
             }
+            if (options?.onTurnEnd) {
+                options.onTurnEnd(this.history[this.history.length - 1]);
+            }
             return res;
         }
     }

package/package.json

@@ -5,23 +5,23 @@
     "type": "git",
     "url": "git+https://github.com/synw/agent-smith.git"
   },
-  "version": "0.2.2",
+  "version": "0.3.0",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc"
   },
   "dependencies": {
     "@locallm/api": "^0.7.3",
-    "modprompt": "0.13.1",
+    "modprompt": "^0.14.0",
     "restmix": "^0.6.1"
   },
   "devDependencies": {
-    "@locallm/types": "^0.6.7",
+    "@locallm/types": "^0.7.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@types/node": "^25.0.10",
-    "openai": "^6.16.0",
-    "rollup": "^4.56.0",
+    "@types/node": "^25.3.0",
+    "openai": "^6.22.0",
+    "rollup": "^4.59.0",
     "ts-node": "^10.9.2",
     "tslib": "2.8.1",
     "typescript": "^5.9.3"