@agent-smith/cli 0.0.32 → 0.0.34

package/dist/cmd/lib/execute_action.js

@@ -4,7 +4,7 @@ import { readYmlAction } from "../sys/read_yml_action.js";
 import { execute } from "../sys/execute.js";
 import { runPyScript } from "../sys/run_python.js";
 import { pyShell } from "../../state/state.js";
-import { parseInputOptions, processOutput } from "./utils.js";
+import { createJsAction, parseInputOptions, processOutput } from "./utils.js";
 function systemAction(path) {
     const action = useAgentTask({
         id: "system_action",
@@ -43,6 +43,10 @@ async function executeActionCmd(args = [], options = {}, quiet = false) {
             const { action } = await import(path);
             act = action;
             break;
+        case "mjs":
+            const mjsa = await import(path);
+            act = createJsAction(mjsa.action);
+            break;
         case "yml":
             act = systemAction(path);
             break;

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 { initTaskConf, initTaskParams, initTaskVars, readTask } from './utils.js';
+import { createJsAction, 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);
@@ -23,6 +23,7 @@ async function executeJobCmd(name, args = [], options = {}) {
     const finalTaskIndex = Object.keys(job.tasks).length - 1;
     for (const [name, task] of Object.entries(job.tasks)) {
         if (task.type == "task") {
+            const chain = task.properties?.chain;
             const { found, path } = getFeatureSpec(name, "task");
             if (!found) {
                 return { ok: false, data: {}, error: `Task ${name} not found` };
@@ -32,22 +33,48 @@ async function executeJobCmd(name, args = [], options = {}) {
                 throw new Error(`Task ${name}, ${path} not found`);
             }
             const taskSpec = taskBuilder.readFromYaml(tres.ymlTask);
+            if (params.data?.history?.length > 0) {
+                const taskShots = taskSpec?.shots ?? [];
+                taskSpec.shots = [...taskShots, ...params.data.history];
+            }
             let conf = {};
             let vars = {};
             if (i == 0) {
                 const vs = initTaskVars(args, taskSpec?.inferParams ? taskSpec.inferParams : {});
                 conf = vs.conf;
                 vars = vs.vars;
+                const _pr = await parseInputOptions(options);
+                if (_pr) {
+                    vars.prompt = _pr;
+                }
             }
             else {
+                if (!params?.prompt) {
+                    if (params?.text) {
+                        params.prompt = params.text;
+                    }
+                    else {
+                        throw new Error(`No prompt provided for task ${name}.\Params: ${params}`);
+                    }
+                }
                 const vs = initTaskParams(params, taskSpec?.inferParams ? taskSpec.inferParams : {});
                 conf = vs.conf;
                 vars = vs.vars;
             }
+            const nextParams = {};
+            for (const [k, v] of Object.entries(vars)) {
+                if (taskSpec.variables?.required?.includes(k) || taskSpec.variables?.optional?.includes(k) || k == "prompt") {
+                    continue;
+                }
+                ;
+                nextParams[k] = v;
+                delete vars[k];
+            }
             conf = initTaskConf(conf, taskSpec);
             if (isDebug.value) {
                 console.log("Task conf:", conf);
                 console.log("Task vars:", vars);
+                console.log("Next params:", nextParams);
             }
             if (isVerbose.value || isDebug.value) {
                 conf.verbose = true;
@@ -66,7 +93,30 @@ async function executeJobCmd(name, args = [], options = {}) {
                     console.log(i + 1, "Running task", name);
                 }
                 try {
-                    res = await job.runTask(name, { ...params, ...vars }, conf);
+                    const invars = { ...params, ...vars };
+                    try {
+                        res = await job.runTask(name, invars, conf);
+                    }
+                    catch (e) {
+                        throw new Error(`Error running task ${name}: ${e}`);
+                    }
+                    if (chain) {
+                        const turn = {
+                            user: vars["prompt"],
+                            assistant: res.text
+                        };
+                        if (res.data?.history) {
+                            res.data.history.push(turn);
+                        }
+                        else {
+                            res.data.history = [turn];
+                        }
+                    }
+                    else {
+                        if (res.data?.history) {
+                            res.data.history = [];
+                        }
+                    }
                 }
                 catch (e) {
                     throw new Error(`Error running job task ${e}`);
@@ -80,7 +130,7 @@ async function executeJobCmd(name, args = [], options = {}) {
                         console.log(marked.parse(res.text).trim());
                     }
                 }
-                params = res;
+                params = { ...res, ...nextParams };
             }
             catch (err) {
                 return { error: `Error executing job task ${name}: ${err}` };
@@ -88,21 +138,21 @@ async function executeJobCmd(name, args = [], options = {}) {
         }
         else {
             try {
+                const _p = i == 0 ? args : params;
                 if (isDebug.value) {
-                    console.log(i + 1, "Running action", name, args);
+                    console.log(i + 1, "Running action", name, _p);
                 }
                 else if (isVerbose.value) {
                     console.log(i + 1, "Running action", name);
                 }
-                const _p = i == 0 ? args : params;
                 try {
                     res = await job.runTask(name, _p, options);
                 }
                 catch (e) {
                     throw new Error(`Error executing job action ${e}`);
                 }
-                if (res?.error) {
-                    return { ok: false, data: "", conf: {}, error: `Error executing action ${name}: ${res.error}` };
+                if (!res.ok) {
+                    return { ok: false, data: "", conf: {}, error: `Error executing action ${name}: ${res?.error}` };
                 }
                 if (i == finalTaskIndex) {
                     console.log(res.data);
@@ -161,6 +211,12 @@ async function _createJobFromSpec(spec) {
                 at.type = "action";
                 tasks[t.name] = at;
             }
+            else if (ext == "mjs") {
+                const mjsa = await import(path);
+                const act = createJsAction(mjsa.action);
+                act.type = "action";
+                tasks[t.name] = act;
+            }
             else if (ext == "yml") {
                 const _t = systemAction(path);
                 _t.type = "action";
@@ -181,8 +237,10 @@ async function _createJobFromSpec(spec) {
             if (!res.found) {
                 throw new Error(`Task ${t.name}, ${path} not found`);
             }
-            const at = taskBuilder.fromYaml(res.ymlTask);
-            at.type = "task";
+            const at = taskBuilder.fromYaml(res.ymlTask, "task");
+            if (t?.chain) {
+                at.properties = { "chain": true };
+            }
             tasks[t.name] = at;
         }
     }

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

@@ -1,4 +1,6 @@
-import { LmTask } from "@agent-smith/lmtask/dist/interfaces.js";
+import { AgentTask } from "@agent-smith/jobs/dist/jobsinterfaces.js";
+import { LmTask } from "@agent-smith/lmtask";
+import { FeatureType } 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>;
@@ -17,4 +19,5 @@ declare function initTaskVars(args: Array<any>, inferParams: Record<string, any>
     vars: Record<string, any>;
 };
 declare function parseInputOptions(options: any): Promise<string | null>;
-export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, initTaskVars, initTaskConf, initTaskParams, parseInputOptions, };
+declare function createJsAction(action: CallableFunction): AgentTask<FeatureType>;
+export { createJsAction, initTaskConf, initTaskParams, initTaskVars, parseInputOptions, processOutput, readPromptFile, readTask, readTasksDir, setOptions };

package/dist/cmd/lib/utils.js

@@ -1,10 +1,10 @@
+import { useAgentTask } from "@agent-smith/jobs";
+import { useTemplateForModel } from "@agent-smith/tfm";
 import { default as fs } from "fs";
 import { default as path } from "path";
-import { outputMode, promptfile } from "../../state/state.js";
-import { inputMode } from "../../state/state.js";
-import { readClipboard, writeToClipboard } from "../sys/clipboard.js";
+import { inputMode, outputMode, promptfile } from "../../state/state.js";
 import { modes } from "../clicmds/modes.js";
-import { useTemplateForModel } from "@agent-smith/tfm";
+import { readClipboard, writeToClipboard } from "../sys/clipboard.js";
 const tfm = useTemplateForModel();
 async function setOptions(args = [], options) {
     for (const k of Object.keys(options)) {
@@ -184,4 +184,15 @@ async function parseInputOptions(options) {
     }
     return out;
 }
-export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, initTaskVars, initTaskConf, initTaskParams, parseInputOptions, };
+function createJsAction(action) {
+    const task = useAgentTask({
+        id: "",
+        title: "",
+        run: async (args) => {
+            const res = await action(args);
+            return { ok: true, data: res };
+        }
+    });
+    return task;
+}
+export { createJsAction, initTaskConf, initTaskParams, initTaskVars, parseInputOptions, processOutput, readPromptFile, readTask, readTasksDir, setOptions };

package/dist/cmd/sys/read_features.js

@@ -52,7 +52,7 @@ function readFeaturesDir(dir) {
     }
     dirpath = path.join(dir, "actions");
     if (fs.existsSync(dirpath)) {
-        const data = _readDir(dirpath, ["yml", ".js", ".py"]);
+        const data = _readDir(dirpath, ["yml", ".js", "mjs", ".py"]);
         data.forEach((filename) => {
             const parts = filename.split(".");
             const ext = parts.pop();

package/dist/db/schemas.js

@@ -28,7 +28,7 @@ const actions = `CREATE TABLE IF NOT EXISTS action (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     name TEXT UNIQUE NOT NULL,
     path TEXT NOT NULL,
-    ext TEXT NOT NULL CHECK ( ext IN ('yml', 'js', 'py') )
+    ext TEXT NOT NULL CHECK ( ext IN ('yml', 'js', 'py', 'mjs') )
 );`;
 const cmds = `CREATE TABLE IF NOT EXISTS cmd (
     id INTEGER PRIMARY KEY AUTOINCREMENT,

package/dist/interfaces.d.ts

@@ -41,7 +41,7 @@ type OutputMode = "txt" | "clipboard";
 type RunMode = "cli" | "cmd";
 type FormatMode = "text" | "markdown";
 type FeatureType = "task" | "job" | "action" | "cmd";
-type ActionExtension = "js" | "py" | "yml";
+type ActionExtension = "js" | "mjs" | "py" | "yml";
 type TaskExtension = "yml";
 type JobExtension = "yml";
 type CmdExtension = "js";

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.32",
+  "version": "0.0.34",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc --noCheck",
@@ -10,8 +10,8 @@
     "watch": "tsc --noCheck -p . -w"
   },
   "dependencies": {
-    "@agent-smith/brain": "^0.0.36",
-    "@agent-smith/jobs": "^0.0.11",
+    "@agent-smith/brain": "^0.0.37",
+    "@agent-smith/jobs": "^0.0.12",
     "@agent-smith/lmtask": "^0.0.29",
     "@agent-smith/tfm": "^0.1.1",
     "@inquirer/prompts": "^7.3.2",
@@ -21,7 +21,7 @@
     "clipboardy": "^4.0.0",
     "commander": "^13.1.0",
     "marked-terminal": "^7.3.0",
-    "modprompt": "^0.9.5",
+    "modprompt": "^0.10.1",
     "python-shell": "^5.0.0",
     "yaml": "^2.7.0"
   },
@@ -33,12 +33,12 @@
     "@rollup/plugin-typescript": "^12.1.2",
     "@types/better-sqlite3": "^7.6.12",
     "@types/marked-terminal": "^6.1.1",
-    "@types/node": "^22.13.5",
+    "@types/node": "^22.13.9",
     "restmix": "^0.5.0",
-    "rollup": "^4.34.8",
+    "rollup": "^4.34.9",
     "ts-node": "^10.9.2",
     "tslib": "2.8.1",
-    "typescript": "^5.7.3"
+    "typescript": "^5.8.2"
   },
   "type": "module",
   "preferGlobal": true,