@agent-smith/agent 0.1.1 → 0.1.2

package/dist/agent.d.ts

@@ -6,10 +6,13 @@ declare class Agent {
     tools: Record<string, ToolSpec>;
     history: Array<HistoryTurn>;
     constructor(lm: Lm);
-    run(prompt: string, params: InferenceParams, options?: InferenceOptions, template?: PromptTemplate | string): Promise<InferenceResult>;
+    run(prompt: string, params: InferenceParams, options?: InferenceOptions, template?: PromptTemplate | string): Promise<{
+        result: InferenceResult;
+        template: PromptTemplate;
+    }>;
     runAgentNoTemplate(it: number, prompt: string, params: InferenceParams, options?: InferenceOptions): Promise<InferenceResult>;
     runAgentWithTemplate(it: number, prompt: string, params: InferenceParams, options: InferenceOptions | undefined, tpl: PromptTemplate): Promise<{
-        inferenceResult: InferenceResult;
+        result: InferenceResult;
         template: PromptTemplate;
     }>;
     abort(): Promise<void>;

package/dist/agent.js

@@ -1,4 +1,5 @@
 import { PromptTemplate } from 'modprompt';
+import { splitThinking } from "./utils.js";
 class Agent {
     lm;
     tools = {};
@@ -19,7 +20,8 @@ class Agent {
                     this.tools[t.name] = t;
                 });
             }
-            return await this.runAgentNoTemplate(1, prompt, params, options);
+            const res = await this.runAgentNoTemplate(1, prompt, params, options);
+            return { result: res, template: new PromptTemplate("none") };
         }
         else {
             if (!template) {
@@ -45,7 +47,7 @@ class Agent {
                     tpl = tpl.addTool(t);
                 });
             }
-            return (await this.runAgentWithTemplate(1, prompt, params, options, tpl)).inferenceResult;
+            return (await this.runAgentWithTemplate(1, prompt, params, options, tpl));
         }
     }
     async runAgentNoTemplate(it, prompt, params, options = {}) {
@@ -87,7 +89,6 @@ class Agent {
                 options.verbose = true;
             }
             options.history = this.history;
-            console.dir(options.history, { depth: 8 });
             _res = await this.runAgentNoTemplate(nit, " ", params, options);
         }
         else {
@@ -152,18 +153,32 @@ class Agent {
             return await this.runAgentWithTemplate(it + 1, prompt, params, options, tpl);
         }
         else {
+            let thinking = "";
+            let final = res.text;
+            if (tpl?.tags?.think) {
+                const { think, finalAnswer } = splitThinking(res.text, tpl.tags.think.start, tpl.tags.think.end);
+                thinking = think;
+                final = finalAnswer;
+            }
             if (it == 1) {
+                if (thinking.length > 0) {
+                    tpl.pushToHistory({ think: thinking });
+                }
                 tpl.pushToHistory({
                     user: prompt.replace("{prompt}", prompt),
-                    assistant: res.text,
+                    assistant: final,
                 });
             }
             else {
+                if (thinking.length > 0) {
+                    tpl.pushToHistory({ think: thinking });
+                }
                 tpl.pushToHistory({
-                    assistant: res.text,
+                    assistant: final,
                 });
             }
-            return { inferenceResult: res, template: tpl };
+            this.history = tpl.history;
+            return { result: res, template: tpl };
         }
     }
     async abort() {

package/dist/main.d.ts

@@ -1,2 +1,3 @@
 import { Agent } from "./agent.js";
-export { Agent, };
+import { extractBetweenTags, splitThinking } from "./utils.js";
+export { Agent, extractBetweenTags, splitThinking, };

package/dist/main.js

@@ -1,2 +1,3 @@
 import { Agent } from "./agent.js";
-export { Agent, };
+import { extractBetweenTags, splitThinking } from "./utils.js";
+export { Agent, extractBetweenTags, splitThinking, };

package/dist/utils.d.ts

@@ -0,0 +1,6 @@
+declare function extractBetweenTags(text: string, startTag: string, endTag: string): string;
+declare function splitThinking(text: string, startTag: string, endTag: string): {
+    think: string;
+    finalAnswer: string;
+};
+export { extractBetweenTags, splitThinking, };

package/dist/utils.js

@@ -0,0 +1,37 @@
+function extractBetweenTags(text, startTag, endTag) {
+    try {
+        const startIndex = text.indexOf(startTag);
+        if (startIndex === -1)
+            return text;
+        let contentStart = startIndex + startTag.length;
+        let contentEnd;
+        if (endTag) {
+            contentEnd = text.indexOf(endTag, contentStart);
+            if (contentEnd === -1)
+                return text;
+        }
+        else {
+            contentEnd = text.indexOf('\n', contentStart);
+            if (contentEnd === -1)
+                contentEnd = text.length;
+        }
+        return text.substring(contentStart, contentEnd).trim();
+    }
+    catch (error) {
+        throw new Error(`Error parsing content between tags ${startTag} ${endTag}: ${error}`);
+    }
+}
+function splitThinking(text, startTag, endTag) {
+    let think = "";
+    let answer = "";
+    const st = text.split(endTag);
+    if (st.length > 1) {
+        think = extractBetweenTags(text, startTag, endTag);
+        answer = st[1].trim();
+    }
+    else {
+        answer = text;
+    }
+    return { think: think, finalAnswer: answer };
+}
+export { extractBetweenTags, splitThinking, };

package/package.json

@@ -5,21 +5,21 @@
     "type": "git",
     "url": "git+https://github.com/synw/agent-smith.git"
   },
-  "version": "0.1.1",
+  "version": "0.1.2",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc"
   },
   "dependencies": {
     "@locallm/api": "^0.6.2",
-    "modprompt": "^0.12.3",
+    "modprompt": "^0.12.5",
     "restmix": "^0.5.0"
   },
   "devDependencies": {
-    "@locallm/types": "^0.4.2",
+    "@locallm/types": "^0.5.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@types/node": "^24.10.0",
+    "@types/node": "^24.10.1",
     "rollup": "^4.53.2",
     "ts-node": "^10.9.2",
     "tslib": "2.8.1",