@agent-smith/cli 0.0.9 → 0.0.10

package/dist/agent.d.ts

@@ -1,8 +1,8 @@
 import { LmTaskBuilder } from "@agent-smith/lmtask";
 import { marked } from 'marked';
-import { RunMode } from "./interfaces.js";
+import { FeatureType, RunMode } from "./interfaces.js";
 declare let brain: import("@agent-smith/brain").AgentBrain;
 declare const modelsForExpert: Record<string, string>;
-declare const taskBuilder: LmTaskBuilder;
+declare const taskBuilder: LmTaskBuilder<FeatureType>;
 declare function initAgent(mode: RunMode, isVerbose?: boolean): Promise<boolean>;
 export { brain, initAgent, marked, modelsForExpert, taskBuilder };

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

@@ -1,4 +1,4 @@
-declare function executeJobCmd(name: string, args?: Array<any>): Promise<"" | Record<string, any>>;
+declare function executeJobCmd(name: string, args?: Array<any>): Promise<Record<string, any>>;
 declare function readJob(name: string): Promise<{
     found: boolean;
     data: Record<string, any>;

package/dist/cmd/lib/execute_job.js

@@ -4,32 +4,61 @@ import { useAgentJob } from "@agent-smith/jobs";
 import { brain, marked, taskBuilder } from '../../agent.js';
 import { getFeatureSpec } from '../../state/features.js';
 import { formatMode } from '../../state/state.js';
-import { readTask } from './utils.js';
+import { initTaskVars, readTask } from './utils.js';
 async function executeJobCmd(name, args = []) {
     const { job, found } = await _dispatchReadJob(name);
     if (!found) {
         console.log(`Job ${name} not found`);
-        return "";
+        return { error: `Job ${name} not found` };
     }
     await job.start();
     let params = args;
     let res = {};
     brain.backendsForModelsInfo();
-    for (const name of Object.keys(job.tasks)) {
-        try {
-            res = await job.runTask(name, params);
-            if ("text" in res) {
-                if (formatMode.value == "markdown") {
-                    console.log("\n\n------------------\n");
-                    console.log(marked.parse(res.text).trim());
+    for (const [name, task] of Object.entries(job.tasks)) {
+        if (task.type == "task") {
+            const pr = args.shift();
+            const { conf, vars } = initTaskVars(args);
+            const { found, path } = getFeatureSpec(name, "task");
+            if (!found) {
+                return { ok: false, data: {}, error: `Task ${name} not found` };
+            }
+            const tres = readTask(path);
+            if (!tres.found) {
+                throw new Error(`Task ${name}, ${path} not found`);
+            }
+            const taskSpec = taskBuilder.readFromYaml(tres.ymlTask);
+            const ex = brain.getOrCreateExpertForModel(taskSpec.model.name, taskSpec.template.name);
+            if (!ex) {
+                throw new Error("No expert found for model " + taskSpec.model.name);
+            }
+            ex.checkStatus();
+            ex.backend.setOnToken((t) => {
+                process.stdout.write(t);
+            });
+            conf["expert"] = ex;
+            vars["prompt"] = pr;
+            try {
+                res = await job.runTask(name, vars, conf);
+                if ("text" in res) {
+                    if (formatMode.value == "markdown") {
+                        console.log("\n\n------------------\n");
+                        console.log(marked.parse(res.text).trim());
+                    }
                 }
             }
+            catch (err) {
+                return { error: `Error executing task ${name}: ${err}` };
+            }
         }
-        catch (err) {
-            console.log("ERR", err);
-            throw new Error(`Error executing task ${name}: ${err}`);
+        else {
+            try {
+                res = await job.runTask(name, args);
+            }
+            catch (err) {
+                return { error: `Error executing task ${name}: ${err}` };
+            }
         }
-        params = res.data;
     }
     await job.finish(true);
     return res;
@@ -52,7 +81,6 @@ async function _dispatchReadJob(name) {
             break;
         default:
             throw new Error(`Job extension ${ext} not implemented`);
-            break;
     }
     return { found: true, job: jb };
 }
@@ -70,7 +98,9 @@ async function _createJobFromSpec(spec) {
                 return { found: false, job: {} };
             }
             const { action } = await import(path);
-            tasks[t.name] = action;
+            const at = action;
+            at.type = "action";
+            tasks[t.name] = at;
         }
         else {
             const { found, path } = getFeatureSpec(t.name, "task");
@@ -82,6 +112,7 @@ async function _createJobFromSpec(spec) {
                 throw new Error(`Task ${t.name}, ${path} not found`);
             }
             const at = taskBuilder.fromYaml(res.ymlTask);
+            at.type = "task";
             tasks[t.name] = at;
         }
     }

package/dist/cmd/lib/execute_task.js

@@ -1,7 +1,7 @@
 import { brain, initAgent, taskBuilder } from "../../agent.js";
 import { getFeatureSpec } from "../../state/features.js";
 import { runMode } from "../../state/state.js";
-import { readTask } from "./utils.js";
+import { initTaskVars, readTask } from "./utils.js";
 async function executeTaskCmd(args = [], options = {}) {
     await initAgent(runMode.value);
     const name = args.shift();
@@ -16,13 +16,7 @@ async function executeTaskCmd(args = [], options = {}) {
     const taskSpec = taskBuilder.readFromYaml(res.ymlTask);
     const task = taskBuilder.fromYaml(res.ymlTask);
     const pr = args.shift();
-    const vars = {};
-    args.forEach((a) => {
-        if (a.includes("=")) {
-            const t = a.split("=");
-            vars[t[0]] = t[1];
-        }
-    });
+    const { conf, vars } = initTaskVars(args);
     const ex = brain.getOrCreateExpertForModel(taskSpec.model.name, taskSpec.template.name);
     if (!ex) {
         throw new Error("No expert found for model " + taskSpec.model.name);
@@ -31,9 +25,9 @@ async function executeTaskCmd(args = [], options = {}) {
     ex.backend.setOnToken((t) => {
         process.stdout.write(t);
     });
-    vars["expert"] = ex;
+    conf.expert = ex;
     console.log("Ingesting prompt ...");
-    const data = await task.run({ prompt: pr, ...vars });
+    const data = await task.run({ prompt: pr, ...vars }, conf);
     if (data?.error) {
         return { ok: false, data: {}, error: `Error executing task: ${data.error}` };
     }

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

@@ -6,4 +6,8 @@ declare function readTask(taskpath: string): {
     ymlTask: string;
 };
 declare function readTasksDir(dir: string): Array<string>;
-export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, };
+declare function initTaskVars(args: Array<any>): {
+    conf: Record<string, any>;
+    vars: Record<string, any>;
+};
+export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, initTaskVars, };

package/dist/cmd/lib/utils.js

@@ -70,4 +70,29 @@ function readTasksDir(dir) {
     });
     return tasks;
 }
-export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, };
+function initTaskVars(args) {
+    const conf = {};
+    const vars = {};
+    args.forEach((a) => {
+        if (a.includes("=")) {
+            const t = a.split("=");
+            const k = t[0];
+            const v = t[1];
+            if (k == "m") {
+                if (v.includes("/")) {
+                    const _s = v.split("/");
+                    conf.model = _s[0];
+                    conf.template = _s[1];
+                }
+                else {
+                    conf.model = v;
+                }
+            }
+            else {
+                vars[k] = v;
+            }
+        }
+    });
+    return { conf, vars };
+}
+export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, initTaskVars, };

package/dist/db/db.js

@@ -1,9 +1,10 @@
 import DatabaseConstructor from "better-sqlite3";
 import { schemas } from "./schemas.js";
-import { dbPath } from "../conf.js";
-let db;
+import path from "path";
+const confDir = path.join(process.env.HOME, ".config/agent-smith/cli");
+const dbPath = path.join(confDir, "config.db");
+let db = new DatabaseConstructor(dbPath, { fileMustExist: false });
 function initDb(isVerbose = false) {
-    db = new DatabaseConstructor(dbPath, { fileMustExist: false });
     schemas.forEach((s) => {
         db.exec(s);
         if (isVerbose) {

package/dist/db/read.js

@@ -44,7 +44,7 @@ function readAliases() {
     return f;
 }
 function readFeature(name, type) {
-    const q = `SELECT id, path, ext FROM ${type} WHERE name='${name}'`;
+    const q = `SELECT id, name, path, ext FROM ${type} WHERE name='${name}'`;
     const stmt = db.prepare(q);
     const result = stmt.get();
     if (result?.id) {

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.9",
+  "version": "0.0.10",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -10,9 +10,9 @@
     "watch": "tsc -p . -w"
   },
   "dependencies": {
-    "@agent-smith/brain": "^0.0.24",
-    "@agent-smith/jobs": "^0.0.8",
-    "@agent-smith/lmtask": "^0.0.17",
+    "@agent-smith/brain": "^0.0.26",
+    "@agent-smith/jobs": "^0.0.11",
+    "@agent-smith/lmtask": "^0.0.20",
     "@inquirer/prompts": "^6.0.1",
     "@inquirer/select": "^3.0.1",
     "@vue/reactivity": "^3.5.6",
@@ -26,7 +26,7 @@
     "yaml": "^2.5.1"
   },
   "devDependencies": {
-    "@agent-smith/tmem-jobs": "^0.0.3",
+    "@agent-smith/tmem-jobs": "^0.0.4",
     "@commander-js/extra-typings": "^12.1.0",
     "@locallm/types": "^0.1.5",
     "@rollup/plugin-node-resolve": "^15.2.3",
@@ -35,7 +35,7 @@
     "@types/marked-terminal": "^6.1.1",
     "@types/node": "^22.5.5",
     "restmix": "^0.5.0",
-    "rollup": "^4.21.3",
+    "rollup": "^4.22.2",
     "ts-node": "^10.9.2",
     "tslib": "2.7.0",
     "typescript": "^5.6.2"