@agent-smith/cli 0.0.59 → 0.0.61

package/dist/cmd/clicmds/modes.js

@@ -1,8 +1,8 @@
-import { formatMode, inputMode, isChatMode, isDebug, isShowTokens, isVerbose, outputMode, runMode } from "../../state/state.js";
+import { formatMode, inputMode, isChatMode, isShowTokens, isVerbose, outputMode, runMode, setVerbosity } from "../../state/state.js";
 const modes = {
     "-d": {
         cmd: async () => {
-            isDebug.value = true;
+            setVerbosity("debug");
             if (runMode.value == "cli") {
                 console.log("Debug mode is on");
             }
@@ -20,7 +20,8 @@ const modes = {
     },
     "-v": {
         cmd: async () => {
-            isVerbose.value = !isVerbose.value;
+            setVerbosity("verbose");
+            ;
             if (runMode.value == "cli") {
                 console.log("Verbose mode is", isVerbose.value ? "on" : "off");
             }

package/dist/cmd/lib/actions/cmd.js

@@ -10,12 +10,24 @@ function systemAction(path) {
         id: "system_action",
         title: "",
         run: async (args) => {
+            let runArgs = new Array();
+            if (!Array.isArray(args)) {
+                try {
+                    runArgs = Object.values(args);
+                }
+                catch (e) {
+                    throw new Error(`wrong system action args: ${e}`);
+                }
+            }
+            else {
+                runArgs = args;
+            }
             const actionSpec = readYmlFile(path);
             if (!actionSpec.data?.args) {
                 actionSpec.data.args = [];
             }
-            const out = await execute(actionSpec.data.cmd, [...actionSpec.data.args, ...args]);
-            return { data: out.trim() };
+            const out = await execute(actionSpec.data.cmd, [...actionSpec.data.args, ...runArgs]);
+            return out.trim();
         }
     });
     return action;
@@ -79,12 +91,9 @@ async function executeActionCmd(args = [], options = {}, quiet = false) {
             throw new Error(`Action ext ${ext} not implemented`);
     }
     const res = await act.run(args, options);
-    if (res?.error) {
-        throw res.error;
-    }
     if (!quiet) {
         if (res) {
-            console.log(res);
+            console.log("ARES", res);
         }
     }
     return res;

package/dist/cmd/lib/tasks/cmd.js

@@ -1,12 +1,13 @@
 import { compile, serializeGrammar } from "@intrinsicai/gbnfgen";
+import ora from 'ora';
 import { brain, initAgent, taskBuilder } from "../../../agent.js";
 import { readTool } from "../../../db/read.js";
-import { parseArgs } from "../../../primitives/args.js";
-import { isChatMode, isDebug, isShowTokens, isVerbose } from "../../../state/state.js";
+import { isChatMode, isDebug, isQuiet, isShowTokens, isVerbose } from "../../../state/state.js";
+import { parseArgs } from "../../../utils/args.js";
 import { executeActionCmd, } from "../actions/cmd.js";
 import { formatStats, parseInputOptions } from "../utils.js";
 import { executeWorkflowCmd } from "../workflows/cmd.js";
-import { configureTaskModel, mergeInferParams } from "./conf.js";
+import { configureTaskModel, mergeConfOptions, mergeInferParams } from "./conf.js";
 import { openTaskSpec } from "./utils.js";
 async function executeTaskCmd(args = [], options = {}) {
     await initAgent();
@@ -44,7 +45,8 @@ async function executeTaskCmd(args = [], options = {}) {
         pr = args.prompt;
     }
     const taskFileSpec = openTaskSpec(name);
-    const { conf, vars } = parseArgs(args);
+    let { conf, vars } = parseArgs(args, true);
+    conf = mergeConfOptions(conf, options);
     conf.inferParams = mergeInferParams(conf.inferParams, taskFileSpec.inferParams ?? {});
     const model = configureTaskModel(conf, taskFileSpec);
     const taskSpec = taskFileSpec;
@@ -64,13 +66,14 @@ async function executeTaskCmd(args = [], options = {}) {
                     };
                     switch (type) {
                         case "action":
-                            const res = await executeActionCmd(normalizedArgs, options, true);
+                            const res = await executeActionCmd(normalizedArgs, conf, true);
                             return res;
                         case "task":
-                            const tres = await executeTaskCmd(normalizedArgs, options);
+                            conf.quiet = !isDebug.value;
+                            const tres = await executeTaskCmd(normalizedArgs, conf);
                             return tres.answer.text;
                         case "workflow":
-                            const wres = await executeWorkflowCmd(toolName, normalizedArgs, options);
+                            const wres = await executeWorkflowCmd(toolName, normalizedArgs, conf);
                             return wres;
                         default:
                             throw new Error(`unknown tool execution function type: ${type} for ${toolName}`);
@@ -98,34 +101,89 @@ async function executeTaskCmd(args = [], options = {}) {
     ex.checkStatus();
     let i = 0;
     let c = false;
-    if (options?.onToken) {
-        ex.backend.setOnToken(options.onToken);
-    }
-    else {
-        ex.backend.setOnToken((t) => {
+    const hasThink = ex.template?.tags?.think;
+    const hasTools = ex.template?.tags?.toolCall;
+    const printToken = (t) => {
+        if (isShowTokens.value) {
             let txt = t;
-            if (isShowTokens.value) {
-                txt = c ? t : `\x1b[100m${t}\x1b[0m`;
-            }
+            txt = c ? t : `\x1b[100m${t}\x1b[0m`;
             process.stdout.write(txt);
             ++i;
             c = !c;
-        });
+        }
+        else {
+            process.stdout.write(t);
+        }
+    };
+    let processToken = printToken;
+    if ((hasThink || hasTools) && !isDebug.value) {
+        let continueWrite = true;
+        let skipNextEmptyLinesToken = false;
+        const spinner = ora("Thinking ...");
+        processToken = (t) => {
+            if (isQuiet.value) {
+                if (hasThink) {
+                    if (t == ex.template.tags.think?.start) {
+                        spinner.start();
+                        continueWrite = false;
+                        return;
+                    }
+                    else if (t == ex.template.tags.think?.end) {
+                        continueWrite = true;
+                        skipNextEmptyLinesToken = true;
+                        spinner.stop();
+                        return;
+                    }
+                }
+            }
+            if (hasTools) {
+                if (t == ex.template.tags.toolCall?.start) {
+                    continueWrite = false;
+                    return;
+                }
+                else if (t == ex.template.tags.toolCall?.end) {
+                    if (isVerbose.value) {
+                        skipNextEmptyLinesToken = true;
+                        continueWrite = true;
+                    }
+                    return;
+                }
+            }
+            if (continueWrite) {
+                if (skipNextEmptyLinesToken) {
+                    if (t == "\n\n") {
+                        skipNextEmptyLinesToken = false;
+                        return;
+                    }
+                }
+                printToken(t);
+            }
+            ++i;
+        };
+    }
+    const onToolCall = (tc) => {
+        console.log("⚒️ ", `Executing [${name}]`, tc.name, tc.arguments);
+    };
+    if (options?.onToken) {
+        ex.backend.setOnToken(options.onToken);
+    }
+    else {
+        ex.backend.setOnToken(processToken);
     }
     const tconf = {
         expert: ex,
         model: model,
         debug: isDebug.value,
+        onToolCall: onToolCall,
         ...conf,
     };
     tconf.expert = ex;
-    if (isDebug.value || isVerbose.value) {
-        tconf.debug = true;
-    }
     let out;
     try {
         out = await task.run({ prompt: pr, ...vars }, tconf);
-        console.log();
+        if (!out.answer.text.endsWith("\n")) {
+            console.log();
+        }
     }
     catch (err) {
         throw new Error(`executing task: ${name} (${err})`);

package/dist/cmd/lib/tasks/conf.d.ts

@@ -1,5 +1,6 @@
 import { InferenceParams } from "@locallm/types";
 import { LmTaskConfig, LmTaskFileSpec, ModelSpec } from "../../../interfaces.js";
 declare function configureTaskModel(itConf: LmTaskConfig, taskSpec: LmTaskFileSpec): ModelSpec;
+declare function mergeConfOptions(conf: LmTaskConfig, options: Record<string, any>): LmTaskConfig;
 declare function mergeInferParams(userInferParams: Record<string, any>, taskInferParams: InferenceParams): InferenceParams;
-export { mergeInferParams, configureTaskModel, };
+export { mergeConfOptions, mergeInferParams, configureTaskModel, };

package/dist/cmd/lib/tasks/conf.js

@@ -83,6 +83,16 @@ function configureTaskModel(itConf, taskSpec) {
     }
     return model;
 }
+function mergeConfOptions(conf, options) {
+    const res = conf;
+    for (const [k, v] of Object.entries(options)) {
+        if (k == "inferParams") {
+            continue;
+        }
+        res[k] = v;
+    }
+    return res;
+}
 function mergeInferParams(userInferParams, taskInferParams) {
     const ip = taskInferParams;
     for (const [k, v] of Object.entries(userInferParams)) {
@@ -90,4 +100,4 @@ function mergeInferParams(userInferParams, taskInferParams) {
     }
     return ip;
 }
-export { mergeInferParams, configureTaskModel, };
+export { mergeConfOptions, mergeInferParams, configureTaskModel, };

package/dist/cmd/lib/tasks/utils.js

@@ -11,6 +11,7 @@ function openTaskSpec(name) {
         throw new Error(`Task ${name}, ${path} not found`);
     }
     const taskFileSpec = YAML.parse(res.ymlTask);
+    taskFileSpec.name = name;
     return taskFileSpec;
 }
 export { openTaskSpec, };

package/dist/cmd/lib/utils.js

@@ -3,6 +3,7 @@ import { formatMode, initFilepaths, inputMode, outputMode, promptfilePath } from
 import { modes } from "../clicmds/modes.js";
 import { readClipboard, writeToClipboard } from "../sys/clipboard.js";
 import { readFile } from "../sys/read.js";
+import { splitThinking } from "../../utils/text.js";
 async function setOptions(args = [], options) {
     for (const k of Object.keys(options)) {
         let opt;
@@ -33,7 +34,13 @@ async function processOutput(res) {
     let hasTextData = false;
     if (typeof res == "object") {
         if (res?.answer?.text) {
-            data = res.answer.text;
+            if (res?.template?.tags?.think) {
+                const { finalAnswer } = splitThinking(res.answer.text, res.template.tags.think.start, res.template.tags.think.end);
+                data = finalAnswer;
+            }
+            else {
+                data = res.answer.text;
+            }
             hasTextData = true;
         }
         else {
@@ -46,8 +53,8 @@ async function processOutput(res) {
     if (outputMode.value == "clipboard") {
         await writeToClipboard(data);
     }
-    if (formatMode.value == "markdown") {
-        if (hasTextData) {
+    if (hasTextData) {
+        if (formatMode.value == "markdown") {
             console.log("\n------------------\n");
             console.log(marked.parse(data).trim());
         }

package/dist/db/read.js

@@ -67,9 +67,8 @@ function readTool(name) {
     const q = `SELECT id, name, type, spec FROM tool WHERE name='${name}'`;
     const stmt = db.prepare(q);
     const result = stmt.get();
-    const tool = JSON.parse(result.spec);
-    tool["name"] = name;
     if (result?.id) {
+        const tool = JSON.parse(result.spec);
         return {
             found: true,
             tool: tool,

package/dist/interfaces.d.ts

@@ -86,6 +86,7 @@ interface BaseLmTaskConfig {
 }
 interface LmTaskConfig extends BaseLmTaskConfig {
     modelname?: string;
+    quiet?: boolean;
 }
 interface FinalLmTaskConfig {
     model?: ModelSpec;
@@ -96,6 +97,7 @@ type InputMode = "manual" | "promptfile" | "clipboard";
 type OutputMode = "txt" | "clipboard";
 type RunMode = "cli" | "cmd";
 type FormatMode = "text" | "markdown";
+type VerbosityMode = "quiet" | "verbose" | "debug";
 type FeatureType = "task" | "action" | "cmd" | "workflow" | "adaptater" | "modelfile";
 type ToolType = "task" | "action" | "cmd" | "workflow";
 type ActionExtension = "js" | "mjs" | "py" | "yml";
@@ -106,4 +108,4 @@ type CmdExtension = "js";
 type ModelFileExtension = "yml";
 type FeatureExtension = TaskExtension | CmdExtension | ActionExtension | WorkflowExtension | ModelFileExtension;
 type AliasType = "task" | "action" | "workflow";
-export { Cmd, CmdExecutor, InputMode, OutputMode, RunMode, FormatMode, FeatureType, ActionExtension, TaskExtension, WorkflowExtension, AdaptaterExtension, CmdExtension, ModelFileExtension, FeatureSpec, Features, ConfigFile, FeatureExtension, AliasType, ToolType, Settings, DbModelDef, ModelSpec, ModelfileSpec, ModelPack, LmTaskFileSpec, LmTaskConfig, FinalLmTaskConfig, };
+export { Cmd, CmdExecutor, InputMode, VerbosityMode, OutputMode, RunMode, FormatMode, FeatureType, ActionExtension, TaskExtension, WorkflowExtension, AdaptaterExtension, CmdExtension, ModelFileExtension, FeatureSpec, Features, ConfigFile, FeatureExtension, AliasType, ToolType, Settings, DbModelDef, ModelSpec, ModelfileSpec, ModelPack, LmTaskFileSpec, LmTaskConfig, FinalLmTaskConfig, };

package/dist/main.d.ts

@@ -6,9 +6,10 @@ import { writeToClipboard } from "./cmd/sys/clipboard.js";
 import { pingCmd } from "./cmd/clicmds/cmds.js";
 import { initAgent } from "./agent.js";
 import { initState, pluginDataDir } from "./state/state.js";
-import { usePerfTimer } from "./primitives/perf.js";
-import { parseArgs } from "./primitives/args.js";
+import { usePerfTimer } from "./utils/perf.js";
+import { parseArgs } from "./utils/args.js";
 import { LmTaskConf } from "@agent-smith/lmtask/dist/interfaces.js";
 import { extractToolDoc } from "./cmd/lib/tools.js";
 import { openTaskSpec } from "./cmd/lib/tasks/utils.js";
-export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, initState, pluginDataDir, usePerfTimer, parseArgs, extractToolDoc, LmTaskConf, openTaskSpec, };
+import { extractBetweenTags, splitThinking } from "./utils/text.js";
+export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, initState, pluginDataDir, usePerfTimer, parseArgs, extractToolDoc, LmTaskConf, openTaskSpec, extractBetweenTags, splitThinking, };

package/dist/main.js

@@ -6,8 +6,9 @@ import { writeToClipboard } from "./cmd/sys/clipboard.js";
 import { pingCmd } from "./cmd/clicmds/cmds.js";
 import { initAgent } from "./agent.js";
 import { initState, pluginDataDir } from "./state/state.js";
-import { usePerfTimer } from "./primitives/perf.js";
-import { parseArgs } from "./primitives/args.js";
+import { usePerfTimer } from "./utils/perf.js";
+import { parseArgs } from "./utils/args.js";
 import { extractToolDoc } from "./cmd/lib/tools.js";
 import { openTaskSpec } from "./cmd/lib/tasks/utils.js";
-export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, initState, pluginDataDir, usePerfTimer, parseArgs, extractToolDoc, openTaskSpec, };
+import { extractBetweenTags, splitThinking } from "./utils/text.js";
+export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, initState, pluginDataDir, usePerfTimer, parseArgs, extractToolDoc, openTaskSpec, extractBetweenTags, splitThinking, };

package/dist/state/state.d.ts

@@ -1,13 +1,14 @@
 import { PythonShell } from 'python-shell';
-import { InputMode, RunMode, FormatMode, OutputMode } from "../interfaces.js";
+import { InputMode, RunMode, FormatMode, OutputMode, VerbosityMode } from "../interfaces.js";
 declare let pyShell: PythonShell;
 declare const inputMode: import("@vue/reactivity").Ref<InputMode, InputMode>;
 declare const outputMode: import("@vue/reactivity").Ref<OutputMode, OutputMode>;
 declare const runMode: import("@vue/reactivity").Ref<RunMode, RunMode>;
 declare const formatMode: import("@vue/reactivity").Ref<FormatMode, FormatMode>;
 declare const isChatMode: import("@vue/reactivity").Ref<boolean, boolean>;
-declare const isDebug: import("@vue/reactivity").Ref<boolean, boolean>;
-declare const isVerbose: import("@vue/reactivity").Ref<boolean, boolean>;
+declare const isDebug: import("@vue/reactivity").ComputedRef<boolean>;
+declare const isVerbose: import("@vue/reactivity").ComputedRef<boolean>;
+declare const isQuiet: import("@vue/reactivity").ComputedRef<boolean>;
 declare const isShowTokens: import("@vue/reactivity").Ref<boolean, boolean>;
 declare const promptfilePath: import("@vue/reactivity").Ref<string, string>;
 declare const dataDirPath: import("@vue/reactivity").Ref<string, string>;
@@ -18,4 +19,5 @@ declare const lastCmd: {
 declare function initFilepaths(): void;
 declare function initState(): Promise<void>;
 declare function pluginDataDir(pluginName: string): string;
-export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, dataDirPath, pluginDataDir, initState, initFilepaths, pyShell, };
+declare function setVerbosity(mode: VerbosityMode): void;
+export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, isQuiet, promptfilePath, dataDirPath, pluginDataDir, initState, initFilepaths, setVerbosity, pyShell, };

package/dist/state/state.js

@@ -1,4 +1,4 @@
-import { reactive, ref } from "@vue/reactivity";
+import { computed, reactive, ref } from "@vue/reactivity";
 import { initDb } from "../db/db.js";
 import { readFilePaths } from "../db/read.js";
 import path from "path";
@@ -9,8 +9,10 @@ const outputMode = ref("txt");
 const runMode = ref("cmd");
 const formatMode = ref("text");
 const isChatMode = ref(false);
-const isDebug = ref(false);
-const isVerbose = ref(false);
+const verbosity = ref("quiet");
+const isDebug = computed(() => verbosity.value == "debug");
+const isVerbose = computed(() => verbosity.value == "verbose");
+const isQuiet = computed(() => verbosity.value == "quiet");
 const isShowTokens = ref(false);
 const promptfilePath = ref("");
 const dataDirPath = ref("");
@@ -51,4 +53,7 @@ function pluginDataDir(pluginName) {
     createDirectoryIfNotExists(pluginDatapath);
     return pluginDatapath;
 }
-export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, dataDirPath, pluginDataDir, initState, initFilepaths, pyShell, };
+function setVerbosity(mode) {
+    verbosity.value = mode;
+}
+export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, isQuiet, promptfilePath, dataDirPath, pluginDataDir, initState, initFilepaths, setVerbosity, pyShell, };

package/dist/{primitives → utils}/args.js

@@ -47,7 +47,11 @@ function parseArrayArgs(args) {
     const _nargs = new Array();
     args.forEach((a) => {
         if (a.includes("=")) {
-            const t = a.split("=", 2);
+            const index = a.indexOf('=');
+            const t = [
+                a.slice(0, index),
+                a.slice(index + 1)
+            ];
             const k = t[0];
             const v = t[1];
             switch (k) {

package/dist/utils/text.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/text.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

@@ -2,7 +2,7 @@
   "name": "@agent-smith/cli",
   "description": "Agent Smith: terminal client for language model agents",
   "repository": "https://github.com/synw/agent-smith",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -10,22 +10,23 @@
     "watch": "tsc --noCheck -p . -w"
   },
   "dependencies": {
-    "@agent-smith/brain": "^0.0.42",
+    "@agent-smith/brain": "^0.0.43",
     "@agent-smith/jobs": "^0.0.14",
-    "@agent-smith/lmtask": "^0.0.39",
+    "@agent-smith/lmtask": "^0.0.43",
     "@agent-smith/tfm": "^0.1.2",
     "@inquirer/prompts": "^7.5.0",
     "@inquirer/select": "^4.2.0",
     "@vue/reactivity": "^3.5.13",
     "@wllama/wllama": "^2.3.1",
     "ansi-colors": "^4.1.3",
-    "better-sqlite3": "^11.9.1",
+    "better-sqlite3": "^11.10.0",
     "clipboardy": "^4.0.0",
     "commander": "^13.1.0",
     "marked-terminal": "^7.3.0",
-    "modprompt": "^0.11.2",
+    "modprompt": "^0.11.6",
     "python-shell": "^5.0.0",
-    "yaml": "^2.7.1"
+    "yaml": "^2.7.1",
+    "ora": "^8.2.0"
   },
   "devDependencies": {
     "@agent-smith/tmem-jobs": "^0.0.4",
@@ -35,7 +36,7 @@
     "@rollup/plugin-typescript": "^12.1.2",
     "@types/better-sqlite3": "^7.6.13",
     "@types/marked-terminal": "^6.1.1",
-    "@types/node": "^22.15.12",
+    "@types/node": "^22.15.17",
     "restmix": "^0.5.0",
     "rollup": "^4.40.2",
     "ts-node": "^10.9.2",