@agent-smith/cli 0.0.41 → 0.0.43

package/dist/agent.d.ts

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

package/dist/agent.js

@@ -12,28 +12,15 @@ async function initExperts() {
         });
     });
 }
-async function initAgent(isVerbose = false) {
+async function initAgent() {
     if (!brain.state.get().isOn) {
         brain.resetExperts();
-        await brain.initLocal(true, isVerbose);
+        await brain.initLocal(true);
         await initExperts();
     }
     const brainUp = brain.state.get().isOn;
-    if (isVerbose) {
-        if (!brainUp) {
-            console.log("❌ No backends found for inference");
-        }
-        else {
-            brain.backends.forEach((b) => {
-                console.log(`✅ Backend ${b.name} is up`);
-                if (b.lm.providerType == "ollama") {
-                    console.log("   Models:", b.lm.models.map(x => x.name));
-                }
-                else {
-                    console.log("   Model:", b.lm.model.name);
-                }
-            });
-        }
+    if (!brainUp) {
+        console.log("❌ No backends found for inference");
     }
     return brainUp;
 }

package/dist/cmd/clicmds/cmds.js

@@ -1,4 +1,5 @@
-import { formatMode, isChatMode, isDebug, promptfilePath, runMode } from "../../state/state.js";
+import YAML from 'yaml';
+import { formatMode, isChatMode, promptfilePath, runMode } 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";
@@ -87,7 +88,7 @@ async function initCmds() {
     return cmds;
 }
 async function pingCmd(args = [], options) {
-    const isUp = await initAgent(isDebug.value);
+    const isUp = await initAgent();
     return isUp;
 }
 async function _updateConfCmd(args = [], options) {
@@ -157,7 +158,7 @@ async function _readTaskCmd(args = [], options) {
         throw new Error(`Task ${args[0]}, ${path} not found`);
     }
     const ts = taskBuilder.readFromYaml(res.ymlTask);
-    console.log(JSON.stringify(ts, null, "  "));
+    console.log(YAML.stringify(ts));
 }
 async function _listTasksCmd(args = [], options) {
     Object.keys(readFeatures().task).forEach((t) => console.log("-", t));

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

@@ -1,3 +1,3 @@
-import { LmTaskOutput } from "@agent-smith/lmtask";
+import { LmTaskOutput } from "../../../../../lmtask/dist/main.js";
 declare function executeTaskCmd(args?: Array<string> | Record<string, any>, options?: any): Promise<LmTaskOutput>;
 export { executeTaskCmd };

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

@@ -1,11 +1,13 @@
 import { brain, initAgent, taskBuilder } from "../../../agent.js";
 import { getFeatureSpec } from "../../../state/features.js";
 import { isChatMode, isDebug, isShowTokens, isVerbose } from "../../../state/state.js";
-import { initTaskConf, initTaskParams, initTaskVars, parseInputOptions } from "../utils.js";
+import { formatStats, initTaskConf, initTaskParams, initTaskVars, parseInputOptions } from "../utils.js";
 import { readTask } from "../../sys/read_task.js";
-import { readTool } from "../../../db/read.js";
+import { readFeature, readTool } from "../../../db/read.js";
+import { LmTaskBuilder } from "../../../../../lmtask/dist/main.js";
 import { executeActionCmd, } from "../actions/cmd.js";
 import { executeWorkflowCmd } from "../workflows/cmd.js";
+import { readModelsFile } from "../../../cmd/sys/read_models.js";
 async function executeTaskCmd(args = [], options = {}) {
     await initAgent();
     if (isDebug.value) {
@@ -51,7 +53,48 @@ async function executeTaskCmd(args = [], options = {}) {
     if (!res.found) {
         throw new Error(`Task ${name}, ${path} not found`);
     }
-    const taskSpec = taskBuilder.readFromYaml(res.ymlTask);
+    const taskRawSpec = taskBuilder.readSpecFromYaml(res.ymlTask);
+    let taskSpec;
+    let defaultCtx;
+    if (taskRawSpec?.modelset) {
+        const modelsFeat = readFeature(taskRawSpec.modelset.name, "modelset");
+        if (!modelsFeat.found) {
+            throw new Error(`modelset feature ${taskRawSpec.modelset.name} not found in conf db`);
+        }
+        const { found, ctx, max_tokens, models } = readModelsFile(modelsFeat.feature.path + "/" + modelsFeat.feature.name + "." + modelsFeat.feature.ext);
+        if (!found) {
+            throw new Error(`modelset ${taskRawSpec.modelset.name} not found`);
+        }
+        defaultCtx = ctx;
+        for (const [k, v] of Object.entries(models)) {
+            if (!v?.ctx) {
+                v.ctx = ctx;
+                models[k] = v;
+            }
+        }
+        taskRawSpec.model = models[taskRawSpec.modelset.default];
+        if (!taskRawSpec.model) {
+            throw new Error(`model ${taskRawSpec.modelset.default} not found`);
+        }
+        if (!taskRawSpec.model?.ctx) {
+            taskRawSpec.model.ctx = ctx;
+        }
+        if (!taskRawSpec?.inferParams?.max_tokens) {
+            if (!taskRawSpec?.inferParams) {
+                taskRawSpec.inferParams = {};
+            }
+            taskRawSpec.inferParams.max_tokens = max_tokens;
+        }
+        taskRawSpec.models = models;
+        taskSpec = LmTaskBuilder.fromRawSpec(taskRawSpec);
+    }
+    else {
+        taskSpec = taskRawSpec;
+        if (!taskSpec.model?.ctx) {
+            throw new Error(`provide a ctx parameter in the task default model`);
+        }
+        defaultCtx = taskSpec.model.ctx;
+    }
     if (taskSpec.toolsList) {
         taskSpec.tools = [];
         for (const toolName of taskSpec.toolsList) {
@@ -96,7 +139,7 @@ async function executeTaskCmd(args = [], options = {}) {
         conf = tv.conf;
         vars = tv.vars;
     }
-    conf = initTaskConf(conf, taskSpec);
+    conf = initTaskConf(conf, taskSpec, defaultCtx);
     if (isDebug.value) {
         console.log("Task conf:", conf);
         console.log("Task vars:", vars);
@@ -136,8 +179,8 @@ async function executeTaskCmd(args = [], options = {}) {
         }
         brain.ex.template.pushToHistory({ user: pr, assistant: out.answer.text });
     }
-    if (isDebug.value) {
-        console.log("\n", out.answer.stats);
+    if (isDebug.value || isVerbose.value) {
+        console.log("\n", formatStats(out.answer.stats));
     }
     return out;
 }

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

@@ -1,8 +1,9 @@
-import { LmTask } from "../../../../lmtask/dist/interfaces.js";
+import { LmTask } from "@agent-smith/lmtask";
+import { InferenceStats } from "@locallm/types/dist/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>;
-declare function initTaskConf(conf: Record<string, any>, taskSpec: LmTask): Record<string, any>;
+declare function initTaskConf(conf: Record<string, any>, taskSpec: LmTask, defaultCtx: number): Record<string, any>;
 declare function initTaskParams(params: Record<string, any>, inferParams: Record<string, any>): {
     conf: Record<string, any>;
     vars: Record<string, any>;
@@ -13,4 +14,5 @@ declare function initTaskVars(args: Array<any>, inferParams: Record<string, any>
     vars: Record<string, any>;
 };
 declare function parseInputOptions(options: any): Promise<string | null>;
-export { initTaskConf, initTaskParams, initTaskVars, initActionVars, parseInputOptions, processOutput, readPromptFile, setOptions };
+declare function formatStats(stats: InferenceStats): string;
+export { initTaskConf, initTaskParams, initTaskVars, initActionVars, parseInputOptions, processOutput, readPromptFile, setOptions, formatStats, };

package/dist/cmd/lib/utils.js

@@ -48,11 +48,14 @@ async function processOutput(res) {
         await writeToClipboard(data);
     }
 }
-function initTaskConf(conf, taskSpec) {
+function initTaskConf(conf, taskSpec, defaultCtx) {
     const _conf = conf;
     let m = taskSpec.model.name;
     let t = taskSpec.model.template;
-    let c = taskSpec.model.ctx;
+    let c = taskSpec.model?.ctx ?? defaultCtx;
+    let ip = conf.inferParams;
+    let system = taskSpec.model?.system;
+    let assistant = taskSpec.model?.assistant;
     if (conf?.model) {
         m = conf.model;
         if (conf?.template) {
@@ -76,7 +79,15 @@ function initTaskConf(conf, taskSpec) {
             }
             m = taskSpec.models[conf.size].name;
             t = taskSpec.models[conf.size].template;
-            c = taskSpec.models[conf.size].ctx;
+            c = taskSpec.models[conf.size]?.ctx ?? defaultCtx;
+            if (taskSpec.models[conf.size]?.inferParams) {
+                const tip = taskSpec.models[conf.size].inferParams;
+                for (const [k, v] of Object.entries(tip)) {
+                    ip[k] = v;
+                }
+            }
+            system = taskSpec.models[conf.size]?.system;
+            assistant = taskSpec.models[conf.size]?.assistant;
         }
     }
     _conf.model = {
@@ -84,6 +95,13 @@ function initTaskConf(conf, taskSpec) {
         template: t,
         ctx: c,
     };
+    if (system) {
+        _conf.model.system = system;
+    }
+    if (assistant) {
+        _conf.model.assistant = assistant;
+    }
+    _conf.inferParams = ip;
     if (_conf?.template) {
         delete conf.template;
     }
@@ -205,4 +223,12 @@ async function parseInputOptions(options) {
     }
     return out;
 }
-export { initTaskConf, initTaskParams, initTaskVars, initActionVars, parseInputOptions, processOutput, readPromptFile, setOptions };
+function formatStats(stats) {
+    const buf = new Array();
+    buf.push(`${stats.tokensPerSecond} tps`);
+    buf.push(`- ${stats.totalTimeSeconds}s`);
+    buf.push(`(${stats.ingestionTimeSeconds}s ingestion /`);
+    buf.push(`${stats.inferenceTimeSeconds}s inference)`);
+    return buf.join(" ");
+}
+export { initTaskConf, initTaskParams, initTaskVars, initActionVars, parseInputOptions, processOutput, readPromptFile, setOptions, formatStats, };

package/dist/cmd/sys/read_features.js

@@ -22,6 +22,7 @@ function readFeaturesDir(dir) {
         cmd: [],
         workflow: [],
         adaptater: [],
+        modelset: []
     };
     let dirpath = path.join(dir, "tasks");
     if (fs.existsSync(dirpath)) {
@@ -93,6 +94,20 @@ function readFeaturesDir(dir) {
             });
         });
     }
+    dirpath = path.join(dir, "models");
+    if (fs.existsSync(dirpath)) {
+        const data = _readDir(dirpath, [".yml"]);
+        data.forEach((filename) => {
+            const parts = filename.split(".");
+            const ext = parts.pop();
+            const name = parts.join("");
+            feats.modelset.push({
+                name: name,
+                path: path.join(dirpath),
+                ext: ext,
+            });
+        });
+    }
     return feats;
 }
 export { readFeaturesDir };

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

@@ -0,0 +1,7 @@
+declare function readModelsFile(dir: string): {
+    found: boolean;
+    ctx: number;
+    max_tokens: number;
+    models: Record<string, any>;
+};
+export { readModelsFile, };

package/dist/cmd/sys/read_models.js

@@ -0,0 +1,21 @@
+import { default as fs } from "fs";
+import YAML from 'yaml';
+function readModelsFile(dir) {
+    if (!fs.existsSync(dir)) {
+        return { models: {}, ctx: 0, max_tokens: 0, found: false };
+    }
+    const data = fs.readFileSync(dir, 'utf8');
+    const m = YAML.parse(data);
+    if (!m?.ctx) {
+        throw new Error(`provide a ctx param in models file`);
+    }
+    if (!m?.max_tokens) {
+        throw new Error(`provide a max_tokens param in models file`);
+    }
+    const ctx = m.ctx;
+    const max_tokens = m.max_tokens;
+    delete m.ctx;
+    delete m.max_tokens;
+    return { models: m, ctx: ctx, max_tokens: max_tokens, found: true };
+}
+export { readModelsFile, };

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

@@ -1,4 +1,6 @@
-import { NodeReturnType } from '../../interfaces.js';
 import { PythonShell } from 'python-shell';
-declare function runPyScript(rsShell: PythonShell, pythonPath: string, scriptPath: string, scriptArgs: Array<string>, onEmitLine?: CallableFunction): Promise<NodeReturnType<Array<string>>>;
+declare function runPyScript(rsShell: PythonShell, pythonPath: string, scriptPath: string, scriptArgs: Array<string>, onEmitLine?: CallableFunction): Promise<{
+    data: any;
+    error?: Error;
+}>;
 export { runPyScript };

package/dist/db/read.js

@@ -27,12 +27,13 @@ function _readFeaturesType(type) {
     return f;
 }
 function readFeatures() {
-    const feats = { task: {}, action: {}, cmd: {}, workflow: {}, adaptater: {} };
+    const feats = { task: {}, action: {}, cmd: {}, workflow: {}, adaptater: {}, modelset: {} };
     feats.task = _readFeaturesType("task");
     feats.action = _readFeaturesType("action");
     feats.cmd = _readFeaturesType("cmd");
     feats.workflow = _readFeaturesType("workflow");
     feats.adaptater = _readFeaturesType("adaptater");
+    feats.modelset = _readFeaturesType("modelset");
     return feats;
 }
 function readAliases() {

package/dist/db/schemas.js

@@ -53,11 +53,11 @@ const alias = `CREATE TABLE IF NOT EXISTS aliases (
     name TEXT UNIQUE NOT NULL,
     type TEXT NOT NULL CHECK ( type IN ('task', 'action', 'workflow') )
 );`;
-const model = `CREATE TABLE IF NOT EXISTS model (
+const model = `CREATE TABLE IF NOT EXISTS modelset (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     name TEXT UNIQUE NOT NULL,
-    ctx INTEGER NOT NULL,
-    template TEXT NOT NULL
+    path TEXT NOT NULL,
+    ext TEXT NOT NULL CHECK ( ext IN ('yml') )
 );`;
 const schemas = [
     filepath,

package/dist/db/write.js

@@ -118,5 +118,6 @@ function updateFeatures(feats) {
     upsertAndCleanFeatures(feats.cmd, "cmd");
     upsertAndCleanFeatures(feats.workflow, "workflow");
     upsertAndCleanFeatures(feats.adaptater, "adaptater");
+    upsertAndCleanFeatures(feats.modelset, "modelset");
 }
 export { updatePromptfilePath, insertFeaturesPathIfNotExists, insertPluginIfNotExists, updateFeatures, updateAliases, cleanupFeaturePaths, };

package/dist/interfaces.d.ts

@@ -34,6 +34,11 @@ interface Features {
         path: string;
         ext: AdaptaterExtension;
     }>;
+    modelset: Array<{
+        name: string;
+        path: string;
+        ext: ModelsetExtension;
+    }>;
 }
 interface ConfigFile {
     promptfile?: string;
@@ -56,13 +61,14 @@ type InputMode = "manual" | "promptfile" | "clipboard";
 type OutputMode = "txt" | "clipboard";
 type RunMode = "cli" | "cmd";
 type FormatMode = "text" | "markdown";
-type FeatureType = "task" | "action" | "cmd" | "workflow" | "adaptater";
+type FeatureType = "task" | "action" | "cmd" | "workflow" | "adaptater" | "modelset";
 type ToolType = "task" | "action" | "cmd" | "workflow";
 type ActionExtension = "js" | "mjs" | "py" | "yml";
 type TaskExtension = "yml";
 type AdaptaterExtension = "js";
 type WorkflowExtension = "yml";
 type CmdExtension = "js";
+type ModelsetExtension = "yml";
 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, };
+export { Cmd, CmdExecutor, InputMode, OutputMode, RunMode, FormatMode, FeatureType, ActionExtension, TaskExtension, WorkflowExtension, AdaptaterExtension, CmdExtension, ModelsetExtension, FeatureSpec, Features, ConfigFile, FeatureExtension, AliasType, ToolType, Settings, };

package/dist/main.d.ts

@@ -5,4 +5,5 @@ 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, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, };
+import { initState } from "./state/state.js";
+export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, initState, };

package/dist/main.js

@@ -5,4 +5,5 @@ 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, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, };
+import { initState } from "./state/state.js";
+export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, initState, };

package/dist/state/features.js

@@ -8,6 +8,7 @@ function readFeaturesDirs(featuresPaths) {
         cmd: [],
         workflow: [],
         adaptater: [],
+        modelset: [],
     };
     featuresPaths.forEach((dir) => {
         const _f = readFeaturesDir(dir);
@@ -16,6 +17,7 @@ function readFeaturesDirs(featuresPaths) {
         _f.cmd.forEach((item) => feats.cmd.push(item));
         _f.workflow.forEach((item) => feats.workflow.push(item));
         _f.adaptater.forEach((item) => feats.adaptater.push(item));
+        _f.modelset.forEach((item) => feats.modelset.push(item));
     });
     return feats;
 }

package/dist/state/state.js

@@ -15,6 +15,7 @@ const isDebug = ref(false);
 const isVerbose = ref(false);
 const isShowTokens = ref(false);
 const promptfilePath = ref("");
+const isStateReady = ref(false);
 const lastCmd = reactive({
     name: "",
     args: [],
@@ -36,7 +37,11 @@ async function initFeatures() {
     promptfilePath.value = readPromptFilePath();
 }
 async function initState() {
+    if (isStateReady.value) {
+        return;
+    }
     initConf();
     await initFeatures();
+    isStateReady.value = true;
 }
 export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, initState, initFeatures, pyShell, };

package/package.json

@@ -2,17 +2,17 @@
   "name": "@agent-smith/cli",
   "description": "Agent Smith: terminal client for language model agents",
   "repository": "https://github.com/synw/agent-smith",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
-    "build": "rm -rf dist/* && tsc --noCheck",
+    "build": "rm -rf dist/* && tsc",
     "cli": "node --loader ts-node/esm bin/index.ts",
     "watch": "tsc --noCheck -p . -w"
   },
   "dependencies": {
     "@agent-smith/brain": "^0.0.41",
     "@agent-smith/jobs": "^0.0.14",
-    "@agent-smith/lmtask": "^0.0.33",
+    "@agent-smith/lmtask": "^0.0.35",
     "@agent-smith/tfm": "^0.1.2",
     "@inquirer/prompts": "^7.4.0",
     "@inquirer/select": "^4.1.0",
@@ -22,9 +22,9 @@
     "clipboardy": "^4.0.0",
     "commander": "^13.1.0",
     "marked-terminal": "^7.3.0",
-    "modprompt": "^0.10.8",
+    "modprompt": "^0.10.9",
     "python-shell": "^5.0.0",
-    "yaml": "^2.7.0"
+    "yaml": "^2.7.1"
   },
   "devDependencies": {
     "@agent-smith/tmem-jobs": "^0.0.4",
@@ -34,9 +34,9 @@
     "@rollup/plugin-typescript": "^12.1.2",
     "@types/better-sqlite3": "^7.6.12",
     "@types/marked-terminal": "^6.1.1",
-    "@types/node": "^22.13.11",
+    "@types/node": "^22.13.14",
     "restmix": "^0.5.0",
-    "rollup": "^4.36.0",
+    "rollup": "^4.38.0",
     "ts-node": "^10.9.2",
     "tslib": "2.8.1",
     "typescript": "^5.8.2"