@agent-smith/agent 0.3.3 → 0.4.1

package/dist/agent.d.ts

@@ -8,7 +8,7 @@ declare class Agent {
     history: Array<HistoryTurn>;
     constructor(lm: Lm, name?: string);
     run(prompt: string, params: InferenceParams, options?: InferenceOptions, template?: PromptTemplate | string): Promise<InferenceResult>;
-    runAgentNoTemplate(it: number, prompt: string, params: InferenceParams, options?: InferenceOptions): Promise<InferenceResult>;
+    runAgentNoTemplate(it: number, prompt: string, params: InferenceParams, options: InferenceOptions | undefined, tpl: PromptTemplate): Promise<InferenceResult>;
     runAgentWithTemplate(it: number, prompt: string, params: InferenceParams, options: InferenceOptions | undefined, tpl: PromptTemplate): Promise<InferenceResult>;
     abort(): Promise<void>;
 }

package/dist/agent.js

@@ -21,6 +21,22 @@ class Agent {
             this.history = options.history;
             options.history = undefined;
         }
+        if (!template) {
+            if (params?.template) {
+                tpl = new PromptTemplate(params.template);
+            }
+            else {
+                throw new Error(`A template is required for provider ${this.lm.provider.name}`);
+            }
+        }
+        else {
+            if (typeof template == "string") {
+                tpl = new PromptTemplate(template);
+            }
+            else {
+                tpl = template;
+            }
+        }
         if (this.lm.providerType == "openai") {
             this.tools = {};
             if (options?.tools) {
@@ -28,26 +44,10 @@ class Agent {
                     this.tools[t.name] = t;
                 });
             }
-            const res = await this.runAgentNoTemplate(1, prompt, params, options);
+            const res = await this.runAgentNoTemplate(1, prompt, params, options, tpl);
             return res;
         }
         else {
-            if (!template) {
-                if (params?.template) {
-                    tpl = new PromptTemplate(params.template);
-                }
-                else {
-                    throw new Error(`A template is required for provider ${this.lm.provider.name}`);
-                }
-            }
-            else {
-                if (typeof template == "string") {
-                    tpl = new PromptTemplate(template);
-                }
-                else {
-                    tpl = template;
-                }
-            }
             this.tools = {};
             if (options?.tools) {
                 options.tools.forEach(t => {
@@ -59,13 +59,33 @@ class Agent {
             return res;
         }
     }
-    async runAgentNoTemplate(it, prompt, params, options = {}) {
+    async runAgentNoTemplate(it, prompt, params, options = {}, tpl) {
         options.history = this.history;
         const res = await this.lm.infer(prompt, params, options);
         if (it == 1) {
             this.history.push({ user: prompt });
         }
         let _res = res;
+        if (_res.text) {
+            if (tpl.tags?.think?.start) {
+                const { think, finalAnswer } = splitThinking(res.text, tpl.tags.think.start, tpl.tags.think.end);
+                if (think.length > 0) {
+                    if (options?.onThink) {
+                        options.onThink(think);
+                    }
+                }
+                if (finalAnswer) {
+                    if (options?.onAssistant) {
+                        options.onAssistant(finalAnswer);
+                    }
+                }
+            }
+            else {
+                if (options?.onAssistant) {
+                    options.onAssistant(res.text);
+                }
+            }
+        }
         if (res?.toolCalls) {
             if (options?.onToolsTurnStart) {
                 options.onToolsTurnStart(res.toolCalls);
@@ -120,7 +140,7 @@ class Agent {
             if (options?.onTurnEnd) {
                 options.onTurnEnd(this.history[this.history.length - 1]);
             }
-            _res = await this.runAgentNoTemplate(nit, "", params, options);
+            _res = await this.runAgentNoTemplate(nit, "", params, options, tpl);
         }
         else {
             this.history.push({ assistant: res.text });

package/dist/utils.js

@@ -24,13 +24,14 @@ function extractBetweenTags(text, startTag, endTag) {
 function splitThinking(text, startTag, endTag) {
     let think = "";
     let answer = "";
-    const st = text.split(endTag);
-    if (st.length > 1) {
-        think = extractBetweenTags(text, startTag, endTag).trim();
-        answer = st[1].trim();
+    text = text.trim();
+    if (!text.includes(startTag)) {
+        return { think: "", finalAnswer: text };
     }
-    else {
-        answer = text;
+    think = extractBetweenTags(text, startTag, endTag).trim();
+    if (!text.endsWith(endTag)) {
+        const st = text.split(endTag);
+        answer = st[1].trim();
     }
     return { think: think, finalAnswer: answer };
 }

package/package.json

@@ -5,26 +5,26 @@
     "type": "git",
     "url": "git+https://github.com/synw/agent-smith.git"
   },
-  "version": "0.3.3",
+  "version": "0.4.1",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc"
   },
   "dependencies": {
-    "@locallm/api": "^0.7.3",
-    "modprompt": "^0.14.2",
+    "@locallm/api": "^0.8.0",
+    "modprompt": "^0.14.3",
     "restmix": "^0.6.1"
   },
   "devDependencies": {
     "@locallm/types": "^0.7.1",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@types/node": "^25.3.0",
-    "openai": "^6.24.0",
-    "rollup": "^4.59.0",
+    "@types/node": "^25.5.2",
+    "openai": "^6.33.0",
+    "rollup": "^4.60.1",
     "ts-node": "^10.9.2",
     "tslib": "2.8.1",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   },
   "type": "module",
   "main": "./dist/main.js",