@agent-smith/cli 0.0.35 → 0.0.37

package/dist/cmd/clicmds/cmds.js

@@ -1,4 +1,4 @@
-import { formatMode, isChatMode, promptfile } from "../../state/state.js";
+import { formatMode, isChatMode, isDebug, promptfile } from "../../state/state.js";
 import { getFeatureSpec, readFeaturesDirs } from "../../state/features.js";
 import { readAliases, readFeatures } from "../../db/read.js";
 import { cleanupFeaturePaths, updateAliases, updateFeatures, updatePromptfilePath } from "../../db/write.js";
@@ -86,7 +86,7 @@ async function initCmds() {
     return cmds;
 }
 async function pingCmd(args = [], options) {
-    const isUp = await initAgent(true);
+    const isUp = await initAgent(isDebug.value);
     return isUp;
 }
 async function _updateConfCmd(args = [], options) {
@@ -120,13 +120,13 @@ async function _executeTaskCmd(args = [], options) {
         console.warn("Provide a task name");
         return;
     }
-    const { ok, data, conf, error } = await executeTaskCmd(args, options);
-    if (!ok) {
+    const { data, error } = await executeTaskCmd(args, options);
+    if (error) {
         console.warn(error);
     }
     if (formatMode.value == "markdown") {
         console.log("\n------------------\n");
-        console.log(marked.parse(data).trim());
+        console.log(marked.parse(data.text).trim());
     }
     else {
         console.log();

package/dist/cmd/lib/execute_action.d.ts

@@ -1,6 +1,6 @@
 import { AgentTask } from "@agent-smith/jobs";
-import { FeatureType } from "../../interfaces.js";
-declare function systemAction(path: string): AgentTask<FeatureType>;
-declare function pythonAction(path: string): AgentTask<FeatureType>;
-declare function executeActionCmd(args?: Array<string>, options?: any, quiet?: boolean): Promise<any>;
+import { FeatureType, NodeReturnType } from "../../interfaces.js";
+declare function systemAction(path: string): AgentTask<FeatureType, Array<string>, NodeReturnType<string>>;
+declare function pythonAction(path: string): AgentTask<FeatureType, any, NodeReturnType<string | Record<string, any> | Array<any>>>;
+declare function executeActionCmd(args?: Array<string>, options?: any, quiet?: boolean): Promise<NodeReturnType<any>>;
 export { executeActionCmd, systemAction, pythonAction };

package/dist/cmd/lib/execute_action.js

@@ -15,7 +15,7 @@ function systemAction(path) {
                 actionSpec.data.args = [];
             }
             const out = await execute(actionSpec.data.cmd, [...actionSpec.data.args, ...args]);
-            return { data: out.trim(), error: "", ok: true };
+            return { data: out.trim() };
         }
     });
     return action;
@@ -25,8 +25,17 @@ function pythonAction(path) {
         id: "python_action",
         title: "",
         run: async (args) => {
-            const out = await runPyScript(pyShell, "python3", path, args);
-            return { data: out.join("\n"), error: "", ok: true };
+            const { data, error } = await runPyScript(pyShell, "python3", path, args);
+            if (error) {
+                return { data: {}, error: error };
+            }
+            const txt = data.join("\n");
+            let final = txt;
+            if (txt.startsWith("{") || txt.startsWith("[")) {
+                final = JSON.parse(final);
+            }
+            const res = { data: final };
+            return res;
         }
     });
     return action;
@@ -35,7 +44,7 @@ async function executeActionCmd(args = [], options = {}, quiet = false) {
     const name = args.shift();
     const { found, path, ext } = getFeatureSpec(name, "action");
     if (!found) {
-        return { ok: false, data: {}, error: "Action not found" };
+        throw new Error("Action not found");
     }
     let act;
     switch (ext) {
@@ -61,10 +70,13 @@ async function executeActionCmd(args = [], options = {}, quiet = false) {
         args.push(input);
     }
     const res = await act.run(args, {});
+    if (res?.error) {
+        throw res.error;
+    }
     if (!quiet) {
         console.log(res.data);
     }
     await processOutput(res);
-    return { ok: true, data: res.data, error: "" };
+    return { data: res.data };
 }
 export { executeActionCmd, systemAction, pythonAction };

package/dist/cmd/lib/execute_job.js

@@ -4,7 +4,7 @@ import { useAgentJob } from "@agent-smith/jobs";
 import { brain, marked, taskBuilder } from '../../agent.js';
 import { getFeatureSpec } from '../../state/features.js';
 import { formatMode, isDebug, isVerbose } from '../../state/state.js';
-import { createJsAction, initTaskConf, initTaskParams, initTaskVars, parseInputOptions, readTask } from './utils.js';
+import { createJsAction, initActionVars, initTaskConf, initTaskParams, initTaskVars, parseInputOptions, readTask } from './utils.js';
 import { pythonAction, systemAction } from './execute_action.js';
 async function executeJobCmd(name, args = [], options = {}) {
     const { job, found } = await _dispatchReadJob(name);
@@ -12,8 +12,7 @@ async function executeJobCmd(name, args = [], options = {}) {
         console.log("Running job", name, Object.keys(job.tasks).length, "tasks");
     }
     if (!found) {
-        console.log(`Job ${name} not found`);
-        return { error: `Job ${name} not found` };
+        throw new Error(`Job ${name} not found`);
     }
     await job.start();
     let res = {};
@@ -26,7 +25,7 @@ async function executeJobCmd(name, args = [], options = {}) {
             const chain = task.properties?.chain;
             const { found, path } = getFeatureSpec(name, "task");
             if (!found) {
-                return { ok: false, data: {}, error: `Task ${name} not found` };
+                throw new Error(`Task ${name} not found`);
             }
             const tres = readTask(path);
             if (!tres.found) {
@@ -54,7 +53,7 @@ async function executeJobCmd(name, args = [], options = {}) {
                         params.prompt = params.text;
                     }
                     else {
-                        throw new Error(`No prompt provided for task ${name}.\Params: ${params}`);
+                        throw new Error(`No prompt provided for task ${name}.\Params: ${JSON.stringify(params, null, 2)}`);
                     }
                 }
                 const vs = initTaskParams(params, taskSpec?.inferParams ? taskSpec.inferParams : {});
@@ -87,6 +86,7 @@ async function executeJobCmd(name, args = [], options = {}) {
             ex.backend.setOnToken((t) => {
                 process.stdout.write(t);
             });
+            brain.setDefaultExpert(ex);
             conf["expert"] = ex;
             try {
                 if (isDebug.value || isVerbose.value) {
@@ -96,6 +96,7 @@ async function executeJobCmd(name, args = [], options = {}) {
                     const invars = { ...params, ...vars };
                     try {
                         res = await job.runTask(name, invars, conf);
+                        console.log("");
                     }
                     catch (e) {
                         throw new Error(`Error running task ${name}: ${e}`);
@@ -139,6 +140,11 @@ async function executeJobCmd(name, args = [], options = {}) {
         else {
             try {
                 const _p = i == 0 ? args : params;
+                let nextParams = {};
+                if (i == 0) {
+                    const { vars } = initActionVars(args);
+                    nextParams = vars;
+                }
                 if (isDebug.value) {
                     console.log(i + 1, "Running action", name, _p);
                 }
@@ -147,6 +153,9 @@ async function executeJobCmd(name, args = [], options = {}) {
                 }
                 try {
                     res = await job.runTask(name, _p, options);
+                    if (res?.error) {
+                        throw new Error(`Error executing job action ${res.error}`);
+                    }
                 }
                 catch (e) {
                     throw new Error(`Error executing job action ${e}`);
@@ -160,10 +169,10 @@ async function executeJobCmd(name, args = [], options = {}) {
                 else {
                     params = res.data;
                 }
-                params = res.data;
+                params = { ...res.data, ...nextParams };
             }
             catch (err) {
-                return { error: `Error executing (${task.type}) task ${name}: ${err}` };
+                throw new Error(`Error executing (${task.type}) task ${name}: ${err}`);
             }
         }
         ++i;
@@ -241,7 +250,8 @@ async function _createJobFromSpec(spec) {
             if (t?.chain) {
                 at.properties = { "chain": true };
             }
-            tasks[t.name] = at;
+            const tsk = at;
+            tasks[t.name] = tsk;
         }
     }
     job.tasks = tasks;

package/dist/cmd/lib/execute_task.d.ts

@@ -1,2 +1,4 @@
-declare function executeTaskCmd(args?: Array<string> | Record<string, any>, options?: any): Promise<any>;
+import { NodeReturnType } from "../../interfaces.js";
+import { InferenceResult } from "@locallm/types/dist/interfaces.js";
+declare function executeTaskCmd(args?: Array<string> | Record<string, any>, options?: any): Promise<NodeReturnType<InferenceResult>>;
 export { executeTaskCmd };

package/dist/cmd/lib/execute_task.js

@@ -37,11 +37,10 @@ async function executeTaskCmd(args = [], options = {}) {
         name = args.name;
         delete args.name;
         pr = args.prompt;
-        delete args.prompt;
     }
     const { found, path } = getFeatureSpec(name, "task");
     if (!found) {
-        return { ok: false, data: "", conf: {}, error: `Task ${name} not found` };
+        return { data: {}, error: new Error(`Task ${name} not found`) };
     }
     const res = readTask(path);
     if (!res.found) {
@@ -85,17 +84,21 @@ async function executeTaskCmd(args = [], options = {}) {
     if (isDebug.value) {
         conf.debug = true;
     }
-    const data = await task.run({ prompt: pr, ...vars }, conf);
-    if (data?.error) {
-        return { ok: false, data: "", conf: conf, error: `Error executing task: ${name} ${data.error}` };
+    const fres = await task.run({ prompt: pr, ...vars }, conf);
+    if (fres.error) {
+        throw new Error(`Error executing task: ${name} ${fres.data.error}`);
     }
     conf.prompt = pr;
     if (isChatMode.value) {
         if (brain.ex.name != ex.name) {
             brain.setDefaultExpert(ex);
         }
-        brain.ex.template.pushToHistory({ user: pr, assistant: data.text });
+        brain.ex.template.pushToHistory({ user: pr, assistant: fres.text });
     }
-    return { ok: true, data: data.text, conf: conf, error: "" };
+    const ir = fres;
+    if (isDebug.value) {
+        console.log("\n", ir.stats);
+    }
+    return { data: ir };
 }
 export { executeTaskCmd };

package/dist/cmd/lib/utils.d.ts

@@ -1,6 +1,6 @@
-import { AgentTask } from "@agent-smith/jobs/dist/jobsinterfaces.js";
+import { AgentTask } from "@agent-smith/jobs";
 import { LmTask } from "@agent-smith/lmtask";
-import { FeatureType } from "../../interfaces.js";
+import { FeatureType, NodeReturnType } from "../../interfaces.js";
 declare function setOptions(args: Array<string> | undefined, options: Record<string, any>): Promise<Array<string>>;
 declare function readPromptFile(): string;
 declare function processOutput(res: any): Promise<void>;
@@ -14,10 +14,11 @@ declare function initTaskParams(params: Record<string, any>, inferParams: Record
     conf: Record<string, any>;
     vars: Record<string, any>;
 };
+declare function initActionVars(args: Array<any>): Record<string, any>;
 declare function initTaskVars(args: Array<any>, inferParams: Record<string, any>): {
     conf: Record<string, any>;
     vars: Record<string, any>;
 };
 declare function parseInputOptions(options: any): Promise<string | null>;
-declare function createJsAction(action: CallableFunction): AgentTask<FeatureType>;
-export { createJsAction, initTaskConf, initTaskParams, initTaskVars, parseInputOptions, processOutput, readPromptFile, readTask, readTasksDir, setOptions };
+declare function createJsAction(action: CallableFunction): AgentTask<FeatureType, any, NodeReturnType<any>>;
+export { createJsAction, initTaskConf, initTaskParams, initTaskVars, initActionVars, parseInputOptions, processOutput, readPromptFile, readTask, readTasksDir, setOptions };

package/dist/cmd/lib/utils.js

@@ -44,7 +44,6 @@ async function processOutput(res) {
         let hasOutput = false;
         if (res?.data) {
             data = res.data;
-            0;
             hasOutput = true;
         }
         if (res?.text) {
@@ -129,15 +128,62 @@ function initTaskConf(conf, taskSpec) {
 function initTaskParams(params, inferParams) {
     const conf = { inferParams: inferParams };
     if (!params?.prompt) {
-        throw new Error(`Error initializing task variable: provide a prompt`);
+        throw new Error(`Error initializing task params: provide a prompt`);
     }
     if (params?.images) {
         conf.inferParams.images = params.images;
         delete params.images;
     }
+    if (params?.size) {
+        conf.size = params.size;
+        delete params.size;
+    }
+    if (params?.model) {
+        conf.model = params.model;
+        delete params.model;
+    }
+    if (params?.template) {
+        conf.template = params.template;
+        delete params.template;
+    }
     const res = { conf: conf, vars: params };
     return res;
 }
+function initActionVars(args) {
+    const vars = {};
+    args.forEach((a) => {
+        if (a.includes("=")) {
+            const t = a.split("=");
+            const k = t[0];
+            const v = t[1];
+            switch (k) {
+                case "m":
+                    if (v.includes("/")) {
+                        const _s = v.split("/");
+                        vars.model = _s[0];
+                        vars.template = _s[1];
+                    }
+                    else {
+                        vars.model = v;
+                    }
+                    break;
+                case "ip":
+                    v.split(",").forEach((p) => {
+                        const s = p.split(":");
+                        vars["inferParams"][s[0]] = parseFloat(s[1]);
+                    });
+                    break;
+                case "s":
+                    vars.size = v;
+                    break;
+                default:
+                    vars[k] = v;
+                    break;
+            }
+        }
+    });
+    return { vars };
+}
 function initTaskVars(args, inferParams) {
     const conf = { inferParams: inferParams };
     const vars = {};
@@ -189,10 +235,16 @@ function createJsAction(action) {
         id: "",
         title: "",
         run: async (args) => {
-            const res = await action(args);
-            return { ok: true, data: res };
+            try {
+                const res = await action(args);
+                return { ok: true, data: res };
+            }
+            catch (e) {
+                const err = new Error(`Error executing action ${e}`);
+                return { ok: false, data: {}, error: err };
+            }
         }
     });
     return task;
 }
-export { createJsAction, initTaskConf, initTaskParams, initTaskVars, parseInputOptions, processOutput, readPromptFile, readTask, readTasksDir, setOptions };
+export { createJsAction, initTaskConf, initTaskParams, initTaskVars, initActionVars, parseInputOptions, processOutput, readPromptFile, readTask, readTasksDir, setOptions };

package/dist/cmd/sys/run_python.d.ts

@@ -1,3 +1,4 @@
+import { NodeReturnType } from '../../interfaces.js';
 import { PythonShell } from 'python-shell';
-declare function runPyScript(rsShell: PythonShell, pythonPath: string, scriptPath: string, scriptArgs: Array<string>, handleOutputFrom?: "msg" | "stderr", onEmitLine?: CallableFunction): Promise<string[]>;
+declare function runPyScript(rsShell: PythonShell, pythonPath: string, scriptPath: string, scriptArgs: Array<string>, onEmitLine?: CallableFunction): Promise<NodeReturnType<Array<string>>>;
 export { runPyScript };

package/dist/cmd/sys/run_python.js

@@ -1,5 +1,5 @@
 import { PythonShell } from 'python-shell';
-async function runPyScript(rsShell, pythonPath, scriptPath, scriptArgs, handleOutputFrom = "msg", onEmitLine) {
+async function runPyScript(rsShell, pythonPath, scriptPath, scriptArgs, onEmitLine) {
     const _options = {
         mode: "text",
         pythonPath: pythonPath,
@@ -9,35 +9,24 @@ async function runPyScript(rsShell, pythonPath, scriptPath, scriptArgs, handleOu
     let promiseResolve;
     let promise = new Promise((resolve) => promiseResolve = resolve);
     rsShell = new PythonShell(scriptPath, _options);
-    const msgs = new Array();
+    const res = { data: new Array() };
     function handleLine(msg) {
         if (onEmitLine) {
             onEmitLine(msg);
         }
-        msgs.push(msg);
+        res.data.push(msg);
     }
     rsShell.on('message', function (message) {
-        if (handleOutputFrom == "msg") {
-            handleLine(message);
-        }
-    });
-    rsShell.on('stderr', function (err) {
-        console.log("STDERR", err);
-        if (handleOutputFrom == "stderr") {
-            handleLine(err);
-        }
-        else {
-            promiseResolve(true);
-        }
+        handleLine(message);
     });
     rsShell.on('pythonError', function (err) {
         console.log("PYERR", `${err.message}, ${err.traceback}`);
-        promiseResolve(true);
+        res.error = new Error(err.traceback.toString());
     });
     rsShell.end(function (err, code, signal) {
         promiseResolve(true);
     });
     await promise;
-    return msgs;
+    return res;
 }
 export { runPyScript };

package/dist/interfaces.d.ts

@@ -35,6 +35,10 @@ interface ConfigFile {
     features?: Array<string>;
     plugins?: Array<string>;
 }
+interface NodeReturnType<T = Record<string, any>> {
+    data: T;
+    error?: Error;
+}
 type CmdExecutor = (args: Array<string>, options: any) => Promise<any>;
 type InputMode = "manual" | "promptfile" | "clipboard";
 type OutputMode = "txt" | "clipboard";
@@ -47,4 +51,4 @@ type JobExtension = "yml";
 type CmdExtension = "js";
 type FeatureExtension = TaskExtension | JobExtension | CmdExtension | ActionExtension;
 type AliasType = "task" | "action" | "job";
-export { Cmd, CmdExecutor, InputMode, OutputMode, RunMode, FormatMode, FeatureType, ActionExtension, TaskExtension, JobExtension, CmdExtension, FeatureSpec, Features, ConfigFile, FeatureExtension, AliasType, };
+export { Cmd, CmdExecutor, NodeReturnType, InputMode, OutputMode, RunMode, FormatMode, FeatureType, ActionExtension, TaskExtension, JobExtension, CmdExtension, FeatureSpec, Features, ConfigFile, FeatureExtension, AliasType, };

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.35",
+  "version": "0.0.37",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc --noCheck",
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@agent-smith/brain": "^0.0.38",
-    "@agent-smith/jobs": "^0.0.12",
-    "@agent-smith/lmtask": "^0.0.30",
+    "@agent-smith/jobs": "^0.0.13",
+    "@agent-smith/lmtask": "^0.0.31",
     "@agent-smith/tfm": "^0.1.1",
     "@inquirer/prompts": "^7.3.3",
     "@inquirer/select": "^4.0.10",
@@ -21,7 +21,7 @@
     "clipboardy": "^4.0.0",
     "commander": "^13.1.0",
     "marked-terminal": "^7.3.0",
-    "modprompt": "^0.10.3",
+    "modprompt": "^0.10.4",
     "python-shell": "^5.0.0",
     "yaml": "^2.7.0"
   },