@agent-smith/cli 0.0.39 → 0.0.40

package/dist/interfaces.d.ts

@@ -14,11 +14,6 @@ interface Features {
         path: string;
         ext: TaskExtension;
     }>;
-    job: Array<{
-        name: string;
-        path: string;
-        ext: JobExtension;
-    }>;
     cmd: Array<{
         name: string;
         path: string;
@@ -34,27 +29,40 @@ interface Features {
         path: string;
         ext: WorkflowExtension;
     }>;
+    adaptater: Array<{
+        name: string;
+        path: string;
+        ext: AdaptaterExtension;
+    }>;
 }
 interface ConfigFile {
     promptfile?: string;
     features?: Array<string>;
     plugins?: Array<string>;
 }
-interface NodeReturnType<T = Record<string, any>> {
-    data: T;
-    error?: Error;
+interface Settings {
+    name: string;
+    inputmode: InputMode;
+    outputmode: OutputMode;
+    runmode: RunMode;
+    formatmode: FormatMode;
+    ischatMode: boolean;
+    isdebug: boolean;
+    isverbose: boolean;
+    promptfile: string;
 }
 type CmdExecutor = (args: Array<string>, options: any) => Promise<any>;
 type InputMode = "manual" | "promptfile" | "clipboard";
 type OutputMode = "txt" | "clipboard";
 type RunMode = "cli" | "cmd";
 type FormatMode = "text" | "markdown";
-type FeatureType = "task" | "job" | "action" | "cmd" | "workflow";
+type FeatureType = "task" | "action" | "cmd" | "workflow" | "adaptater";
+type ToolType = "task" | "action" | "cmd" | "workflow";
 type ActionExtension = "js" | "mjs" | "py" | "yml";
 type TaskExtension = "yml";
+type AdaptaterExtension = "js";
 type WorkflowExtension = "yml";
-type JobExtension = "yml";
 type CmdExtension = "js";
-type FeatureExtension = TaskExtension | JobExtension | CmdExtension | ActionExtension | WorkflowExtension;
-type AliasType = "task" | "action" | "job" | "workflow";
-export { Cmd, CmdExecutor, NodeReturnType, InputMode, OutputMode, RunMode, FormatMode, FeatureType, ActionExtension, TaskExtension, JobExtension, WorkflowExtension, CmdExtension, FeatureSpec, Features, ConfigFile, FeatureExtension, AliasType, };
+type FeatureExtension = TaskExtension | CmdExtension | ActionExtension | WorkflowExtension;
+type AliasType = "task" | "action" | "workflow";
+export { Cmd, CmdExecutor, InputMode, OutputMode, RunMode, FormatMode, FeatureType, ActionExtension, TaskExtension, WorkflowExtension, AdaptaterExtension, CmdExtension, FeatureSpec, Features, ConfigFile, FeatureExtension, AliasType, ToolType, Settings, };

package/dist/main.d.ts

@@ -1,9 +1,8 @@
 import { execute, run } from "./cmd/sys/execute.js";
-import { executeJobCmd } from "./cmd/lib/execute_job.js";
-import { executeActionCmd } from "./cmd/lib/execute_action.js";
-import { executeTaskCmd } from "./cmd/lib/execute_task.js";
+import { executeActionCmd } from "./cmd/lib/actions/cmd.js";
+import { executeTaskCmd } from "./cmd/lib/tasks/cmd.js";
 import { executeWorkflowCmd } from "./cmd/lib/workflows/cmd.js";
 import { writeToClipboard } from "./cmd/sys/clipboard.js";
 import { pingCmd } from "./cmd/clicmds/cmds.js";
 import { initAgent } from "./agent.js";
-export { execute, run, pingCmd, executeJobCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, };
+export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, };

package/dist/main.js

@@ -1,9 +1,8 @@
 import { execute, run } from "./cmd/sys/execute.js";
-import { executeJobCmd } from "./cmd/lib/execute_job.js";
-import { executeActionCmd } from "./cmd/lib/execute_action.js";
-import { executeTaskCmd } from "./cmd/lib/execute_task.js";
+import { executeActionCmd } from "./cmd/lib/actions/cmd.js";
+import { executeTaskCmd } from "./cmd/lib/tasks/cmd.js";
 import { executeWorkflowCmd } from "./cmd/lib/workflows/cmd.js";
 import { writeToClipboard } from "./cmd/sys/clipboard.js";
 import { pingCmd } from "./cmd/clicmds/cmds.js";
 import { initAgent } from "./agent.js";
-export { execute, run, pingCmd, executeJobCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, };
+export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, };

package/dist/state/chat.d.ts

@@ -2,7 +2,7 @@ declare const chatInferenceParams: {
     stream?: boolean | undefined;
     model?: {
         name: string;
-        ctx: number;
+        ctx?: number | undefined;
         info?: {
             size: string;
             quant: string;

package/dist/state/features.js

@@ -4,18 +4,18 @@ import { readFeature } from "../db/read.js";
 function readFeaturesDirs(featuresPaths) {
     const feats = {
         task: [],
-        job: [],
         action: [],
         cmd: [],
         workflow: [],
+        adaptater: [],
     };
     featuresPaths.forEach((dir) => {
         const _f = readFeaturesDir(dir);
         _f.task.forEach((item) => feats.task.push(item));
-        _f.job.forEach((item) => feats.job.push(item));
         _f.action.forEach((item) => feats.action.push(item));
         _f.cmd.forEach((item) => feats.cmd.push(item));
         _f.workflow.forEach((item) => feats.workflow.push(item));
+        _f.adaptater.forEach((item) => feats.adaptater.push(item));
     });
     return feats;
 }

package/dist/state/state.d.ts

@@ -8,11 +8,12 @@ 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 promptfile: import("@vue/reactivity").Ref<string, string>;
+declare const isShowTokens: import("@vue/reactivity").Ref<boolean, boolean>;
+declare const promptfilePath: import("@vue/reactivity").Ref<string, string>;
 declare const lastCmd: {
     name: string;
     args: Array<string>;
 };
 declare function initFeatures(): Promise<void>;
 declare function initState(): Promise<void>;
-export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfile, initState, initFeatures, pyShell, };
+export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, initState, initFeatures, pyShell, };

package/dist/state/state.js

@@ -1,7 +1,7 @@
 import { reactive, ref } from "@vue/reactivity";
 import { createConfDirIfNotExists, confDir } from "../conf.js";
 import { initDb } from "../db/db.js";
-import { readFeaturePaths, readPromptFile } from "../db/read.js";
+import { readFeaturePaths, readPromptFilePath } from "../db/read.js";
 import { updateAliases, updateFeatures } from "../db/write.js";
 import { readFeaturesDirs } from "./features.js";
 import { readPluginsPaths } from "./plugins.js";
@@ -13,7 +13,8 @@ const formatMode = ref("text");
 const isChatMode = ref(false);
 const isDebug = ref(false);
 const isVerbose = ref(false);
-const promptfile = ref("");
+const isShowTokens = ref(false);
+const promptfilePath = ref("");
 const lastCmd = reactive({
     name: "",
     args: [],
@@ -32,10 +33,10 @@ async function initFeatures() {
     const feats = readFeaturesDirs(p);
     updateFeatures(feats);
     updateAliases(feats);
-    promptfile.value = readPromptFile();
+    promptfilePath.value = readPromptFilePath();
 }
 async function initState() {
     initConf();
     await initFeatures();
 }
-export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfile, initState, initFeatures, pyShell, };
+export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, initState, initFeatures, pyShell, };

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.39",
+  "version": "0.0.40",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc --noCheck",
@@ -10,32 +10,33 @@
     "watch": "tsc --noCheck -p . -w"
   },
   "dependencies": {
-    "@agent-smith/brain": "^0.0.38",
-    "@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",
+    "@agent-smith/brain": "^0.0.41",
+    "@agent-smith/jobs": "^0.0.14",
+    "@agent-smith/lmtask": "^0.0.33",
+    "@agent-smith/tfm": "^0.1.2",
+    "@inquirer/prompts": "^7.4.0",
+    "@inquirer/select": "^4.1.0",
     "@vue/reactivity": "^3.5.13",
-    "better-sqlite3": "^11.9.0",
+    "@wllama/wllama": "^2.3.0",
+    "better-sqlite3": "^11.9.1",
     "clipboardy": "^4.0.0",
     "commander": "^13.1.0",
     "marked-terminal": "^7.3.0",
-    "modprompt": "^0.10.4",
+    "modprompt": "^0.10.8",
     "python-shell": "^5.0.0",
     "yaml": "^2.7.0"
   },
   "devDependencies": {
     "@agent-smith/tmem-jobs": "^0.0.4",
     "@commander-js/extra-typings": "^13.1.0",
-    "@locallm/types": "^0.1.5",
+    "@locallm/types": "^0.1.6",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-typescript": "^12.1.2",
     "@types/better-sqlite3": "^7.6.12",
     "@types/marked-terminal": "^6.1.1",
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.13.11",
     "restmix": "^0.5.0",
-    "rollup": "^4.35.0",
+    "rollup": "^4.36.0",
     "ts-node": "^10.9.2",
     "tslib": "2.8.1",
     "typescript": "^5.8.2"

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

@@ -1,6 +0,0 @@
-declare function executeJobCmd(name: string, args?: Array<any>, options?: any): Promise<Record<string, any>>;
-declare function readJob(name: string): Promise<{
-    found: boolean;
-    data: Record<string, any>;
-}>;
-export { readJob, executeJobCmd };

package/dist/cmd/lib/execute_job.js

@@ -1,273 +0,0 @@
-import YAML from 'yaml';
-import { default as fs } from "fs";
-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, 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);
-    if (isDebug.value || isVerbose.value) {
-        console.log("Running job", name, Object.keys(job.tasks).length, "tasks");
-    }
-    if (!found) {
-        throw new Error(`Job ${name} not found`);
-    }
-    await job.start();
-    let res = {};
-    let params = {};
-    brain.backendsForModelsInfo();
-    let i = 0;
-    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) {
-                throw new 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);
-            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: ${JSON.stringify(params, null, 2)}`);
-                    }
-                }
-                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;
-            }
-            const ex = brain.getOrCreateExpertForModel(conf.model.name, conf.model.template);
-            if (!ex) {
-                throw new Error("No expert found for model " + conf.model.name);
-            }
-            ex.checkStatus();
-            ex.backend.setOnToken((t) => {
-                process.stdout.write(t);
-            });
-            brain.setDefaultExpert(ex);
-            conf["expert"] = ex;
-            try {
-                if (isDebug.value || isVerbose.value) {
-                    console.log(i + 1, "Running task", name);
-                }
-                try {
-                    const invars = { ...params, ...vars };
-                    try {
-                        res = await job.runTask(name, invars, conf);
-                        console.log("");
-                    }
-                    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}`);
-                }
-                if (res?.error) {
-                    return { ok: false, data: "", conf: conf, error: `Error executing job task ${name}: ${res.error}` };
-                }
-                if ("text" in res) {
-                    if (formatMode.value == "markdown") {
-                        console.log("\n\n------------------\n");
-                        console.log(marked.parse(res.text).trim());
-                    }
-                }
-                params = { ...res, ...nextParams };
-            }
-            catch (err) {
-                return { error: `Error executing job task ${name}: ${err}` };
-            }
-        }
-        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);
-                }
-                else if (isVerbose.value) {
-                    console.log(i + 1, "Running action", name);
-                }
-                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}`);
-                }
-                if (!res.ok) {
-                    return { ok: false, data: "", conf: {}, error: `Error executing action ${name}: ${res?.error}` };
-                }
-                if (i == finalTaskIndex) {
-                    console.log(res.data);
-                }
-                else {
-                    params = res.data;
-                }
-                params = { ...res.data, ...nextParams };
-            }
-            catch (err) {
-                throw new Error(`Error executing (${task.type}) task ${name}: ${err}`);
-            }
-        }
-        ++i;
-    }
-    await job.finish(true);
-    return res;
-}
-async function _dispatchReadJob(name) {
-    const { found, path, ext } = getFeatureSpec(name, "job");
-    if (!found) {
-        return { found: false, job: {} };
-    }
-    let jb;
-    switch (ext) {
-        case "js":
-            let { job } = await import(path);
-            jb = job;
-            break;
-        case "yml":
-            const { data } = await readJob(name);
-            const res = await _createJobFromSpec(data);
-            jb = res.job;
-            break;
-        default:
-            throw new Error(`Job extension ${ext} not implemented`);
-    }
-    return { found: true, job: jb };
-}
-async function _createJobFromSpec(spec) {
-    const job = useAgentJob({
-        name: spec.name,
-        title: spec.title,
-        tasks: []
-    });
-    const tasks = {};
-    for (const t of spec.tasks) {
-        if (t.type == "action") {
-            const { found, path, ext } = getFeatureSpec(t.name, "action");
-            if (!found) {
-                return { found: false, job: {} };
-            }
-            if (ext == "js") {
-                const { action } = await import(path);
-                const at = action;
-                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";
-                tasks[t.name] = _t;
-            }
-            else if (ext == "py") {
-                const _t = pythonAction(path);
-                _t.type = "action";
-                tasks[t.name] = _t;
-            }
-        }
-        else {
-            const { found, path } = getFeatureSpec(t.name, "task");
-            if (!found) {
-                return { found: false, job: {} };
-            }
-            const res = readTask(path);
-            if (!res.found) {
-                throw new Error(`Task ${t.name}, ${path} not found`);
-            }
-            const at = taskBuilder.fromYaml(res.ymlTask, "task");
-            if (t?.chain) {
-                at.properties = { "chain": true };
-            }
-            const tsk = at;
-            tasks[t.name] = tsk;
-        }
-    }
-    job.tasks = tasks;
-    return { job: job, found: true };
-}
-async function readJob(name) {
-    const { found, path, ext } = getFeatureSpec(name, "job");
-    if (!found) {
-        return { found: false, data: {} };
-    }
-    if (!fs.existsSync(path)) {
-        return { data: {}, found: false };
-    }
-    const file = fs.readFileSync(path, 'utf8');
-    const data = YAML.parse(file);
-    data.name = name;
-    return { data: data, found: true };
-}
-export { readJob, executeJobCmd };

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

@@ -1,4 +0,0 @@
-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

@@ -1,106 +0,0 @@
-import { brain, initAgent, taskBuilder } from "../../agent.js";
-import { getFeatureSpec } from "../../state/features.js";
-import { isChatMode, isDebug, isVerbose } from "../../state/state.js";
-import { initTaskConf, initTaskParams, initTaskVars, parseInputOptions, readTask } from "./utils.js";
-async function executeTaskCmd(args = [], options = {}) {
-    await initAgent();
-    if (isDebug.value) {
-        console.log("Task args:", args);
-        console.log("Task options:", options);
-    }
-    const isWorkflow = !Array.isArray(args);
-    let name;
-    let pr;
-    if (!isWorkflow) {
-        name = args.shift();
-        const _pr = await parseInputOptions(options);
-        if (!_pr) {
-            const p = args.shift();
-            if (p) {
-                pr = p;
-            }
-            else {
-                throw new Error("Please provide a prompt");
-            }
-        }
-        else {
-            pr = _pr;
-        }
-    }
-    else {
-        if (!args.name) {
-            throw new Error("Provide a task name param");
-        }
-        if (!args.prompt) {
-            throw new Error("Provide a task prompt param");
-        }
-        name = args.name;
-        delete args.name;
-        pr = args.prompt;
-    }
-    const { found, path } = getFeatureSpec(name, "task");
-    if (!found) {
-        return { data: {}, error: new Error(`Task ${name} not found`) };
-    }
-    const res = readTask(path);
-    if (!res.found) {
-        throw new Error(`Task ${name}, ${path} not found`);
-    }
-    const taskSpec = taskBuilder.readFromYaml(res.ymlTask);
-    const task = taskBuilder.fromYaml(res.ymlTask);
-    let conf = {};
-    let vars = {};
-    if (!isWorkflow) {
-        const tv = initTaskVars(args, taskSpec?.inferParams ? taskSpec.inferParams : {});
-        conf = tv.conf;
-        vars = tv.vars;
-    }
-    else {
-        const tv = initTaskParams(args, taskSpec?.inferParams ? taskSpec.inferParams : {});
-        conf = tv.conf;
-        vars = tv.vars;
-    }
-    conf = initTaskConf(conf, taskSpec);
-    if (isDebug.value) {
-        console.log("Task conf:", conf);
-        console.log("Task vars:", vars);
-    }
-    const ex = brain.getOrCreateExpertForModel(conf.model.name, conf.model.template);
-    if (!ex) {
-        throw new Error("No expert found for model " + conf.model.name);
-    }
-    ex.checkStatus();
-    let i = 0;
-    ex.backend.setOnToken((t) => {
-        if (i == 0) {
-            if (t == "\n\n") {
-                return;
-            }
-        }
-        ++i;
-        process.stdout.write(t);
-    });
-    conf.expert = ex;
-    if (isDebug.value || isVerbose.value) {
-        conf.debug = true;
-    }
-    let ir;
-    try {
-        ir = await task.run({ prompt: pr, ...vars }, conf);
-    }
-    catch (err) {
-        throw new Error(`Error executing task: ${name} ${err}`);
-    }
-    conf.prompt = pr;
-    if (isChatMode.value) {
-        if (brain.ex.name != ex.name) {
-            brain.setDefaultExpert(ex);
-        }
-        brain.ex.template.pushToHistory({ user: pr, assistant: ir.text });
-    }
-    if (isDebug.value) {
-        console.log("\n", ir.stats);
-    }
-    return { data: ir };
-}
-export { executeTaskCmd };