@agent-smith/cli 0.0.46 → 0.0.47

package/README.md

@@ -0,0 +1,82 @@
+# Agent Smith terminal client
+
+A terminal client to use language models
+
+:books: Read the [documentation](https://synw.github.io/agent-smith/terminal_client/install)
+
+## Install
+
+Install the Agent Smith terminal client globally:
+
+```bash
+npm i -g @agent-smith/cli
+```
+
+A global `lm` command is available once installed.
+
+## Quickstart
+
+Install the inference and the vision plugin:
+
+```bash
+npm i -g @agent-smith/feat-inference @agent-smith/feat-vision
+```
+
+Create a `config.yml` file with this content:
+
+```yml
+plugins:
+  - "@agent-smith/feat-inference"
+  - "@agent-smith/feat-vision"
+  - "@agent-smith/feat-models"
+```
+
+Run the conf command to initialize:
+
+```bash
+lm conf ~/path/to/config.yml
+```
+
+### Inference
+
+Run an inference query with the <kbd>q</kbd> command, using an Ollama model that you already have:
+
+```bash
+lm q list the planets of the solar system m="llama3.1:latest"
+```
+
+### Vision
+
+Run a vision query: pull `minicpm-v:8b-2.6-q8_0` from Ollama and run:
+
+```bash
+lm vision imgs/img1.jpeg imgs/img2.jpeg "Compare the images"
+```
+
+### Tasks
+
+List the available tasks:
+
+```bash
+lm tasks
+```
+
+Show a task:
+
+```bash
+lm task think
+```
+
+### Models
+
+Show available models:
+
+```bash
+lm models
+```
+
+Search for a model:
+
+```bash
+lm model qwen
+```

package/dist/cmd/clicmds/cmds.d.ts

@@ -3,4 +3,5 @@ declare let cmds: Record<string, Cmd>;
 declare function initAliases(): Record<string, Cmd>;
 declare function initCmds(): Promise<Record<string, Cmd>>;
 declare function pingCmd(args: Array<string> | undefined, options: any): Promise<boolean>;
-export { cmds, initCmds, pingCmd, initAliases };
+declare function updateConfCmd(args: Array<string> | undefined, options: any): Promise<any>;
+export { cmds, initCmds, pingCmd, initAliases, updateConfCmd };

package/dist/cmd/clicmds/cmds.js

@@ -1,17 +1,19 @@
 import YAML from 'yaml';
-import { dataDirPath, formatMode, isChatMode, promptfilePath, runMode } from "../../state/state.js";
+import { dataDirPath, isChatMode, isDebug, promptfilePath, runMode } from "../../state/state.js";
 import { getFeatureSpec, readFeaturesDirs } from "../../state/features.js";
-import { readAliases, readFeatures } from "../../db/read.js";
+import { readAliases, readFeaturePaths, readFeatures } from "../../db/read.js";
 import { cleanupFeaturePaths, updateAliases, updateDataDirPath, updateFeatures, updatePromptfilePath } from "../../db/write.js";
 import { processConfPath } from "../../conf.js";
 import { executeActionCmd } from "../lib/actions/cmd.js";
-import { initAgent, marked, taskBuilder } from "../../agent.js";
+import { initAgent, taskBuilder } from "../../agent.js";
 import { executeTaskCmd } from "../lib/tasks/cmd.js";
 import { readCmds } from "../sys/read_cmds.js";
 import { executeWorkflowCmd } from "../lib/workflows/cmd.js";
 import { readTask } from "../sys/read_task.js";
 import { deleteFileIfExists } from "../sys/delete_file.js";
-import { dbPath } from "../../db/db.js";
+import { dbPath, initDb } from "../../db/db.js";
+import { showModelsCmd, updateModels } from '../lib/models.js';
+import { readPluginsPaths } from '../../state/plugins.js';
 let cmds = {
     exit: {
         cmd: async () => process.exit(0),
@@ -30,8 +32,16 @@ let cmds = {
         description: "read a task",
         args: "arguments: \n-task (required): the task name"
     },
+    models: {
+        cmd: showModelsCmd,
+        description: "list the available models",
+    },
+    update: {
+        cmd: _updateFeatures,
+        description: "update the available features: run this after adding a new feature",
+    },
     conf: {
-        cmd: _updateConfCmd,
+        cmd: updateConfCmd,
         description: "process config file",
         args: "arguments: \n-path (required): the path to the config.yml file"
     },
@@ -77,11 +87,25 @@ async function pingCmd(args = [], options) {
     const isUp = await initAgent();
     return isUp;
 }
-async function _updateConfCmd(args = [], options) {
+async function _updateFeatures(args = [], options) {
+    const fp = readFeaturePaths();
+    const pp = await readPluginsPaths();
+    const paths = [...fp, ...pp];
+    const feats = readFeaturesDirs(paths);
+    updateFeatures(feats);
+    updateAliases(feats);
+    updateModels();
+    const deleted = cleanupFeaturePaths(paths);
+    for (const el of deleted) {
+        console.log("- [feature path]", el);
+    }
+}
+async function updateConfCmd(args = [], options) {
     if (args.length == 0) {
         console.warn("Provide a config.yml file path");
         return;
     }
+    initDb(isDebug.value, true);
     const { paths, pf, dd } = await processConfPath(args[0]);
     if (pf.length > 0) {
         updatePromptfilePath(pf);
@@ -94,6 +118,7 @@ async function _updateConfCmd(args = [], options) {
     const feats = readFeaturesDirs(paths);
     updateFeatures(feats);
     updateAliases(feats);
+    updateModels();
     const deleted = cleanupFeaturePaths(paths);
     for (const el of deleted) {
         console.log("- [feature path]", el);
@@ -113,13 +138,6 @@ async function _executeTaskCmd(args = [], options) {
         return;
     }
     const res = await executeTaskCmd(args, options);
-    if (formatMode.value == "markdown") {
-        console.log("\n------------------\n");
-        console.log(marked.parse(res.answer.text).trim());
-    }
-    else {
-        console.log();
-    }
     if (isChatMode.value) {
     }
     return res;
@@ -154,4 +172,4 @@ async function _listTasksCmd(args = [], options) {
     const ts = Object.keys(readFeatures().task).sort();
     console.table(ts);
 }
-export { cmds, initCmds, pingCmd, initAliases };
+export { cmds, initCmds, pingCmd, initAliases, updateConfCmd };

package/dist/cmd/lib/actions/cmd.js

@@ -4,7 +4,6 @@ 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 { processOutput } from "../utils.js";
 import { createJsAction } from "./read.js";
 function systemAction(path) {
     const action = useAgentTask({
@@ -84,7 +83,6 @@ async function executeActionCmd(args = [], options = {}, quiet = false) {
             console.log(res);
         }
     }
-    await processOutput(res);
     return res;
 }
 export { executeActionCmd, systemAction, pythonAction };

package/dist/cmd/lib/adaptaters/cmd.js

@@ -1,5 +1,4 @@
 import { getFeatureSpec } from "../../../state/features.js";
-import { processOutput } from "../utils.js";
 import { createJsAction } from "../actions/read.js";
 async function executeAdaptaterCmd(args = [], options = {}) {
     const isWorkflow = !Array.isArray(args);
@@ -31,7 +30,6 @@ async function executeAdaptaterCmd(args = [], options = {}) {
     if (res?.error) {
         throw res.error;
     }
-    await processOutput(res);
     return res;
 }
 export { executeAdaptaterCmd, };

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

@@ -1,2 +1,3 @@
+declare function showModelsCmd(args: Array<string>, options: any): Promise<void>;
 declare function updateModels(): void;
-export { updateModels, };
+export { updateModels, showModelsCmd, };

package/dist/cmd/lib/models.js

@@ -1,7 +1,28 @@
 import path from "path";
-import { readModelfiles } from "../../db/read.js";
+import { readModelfiles, readModels } from "../../db/read.js";
 import { readModelsFile } from "../sys/read_modelfile.js";
 import { upsertModels } from "../../db/write.js";
+import color from "ansi-colors";
+async function showModelsCmd(args, options) {
+    let models = readModels();
+    models.sort((a, b) => a.name.localeCompare(b.name));
+    if (args.length > 0) {
+        args.forEach((a) => {
+            models = models.filter((m) => m.shortname.includes(a) || m.name.includes(a));
+        });
+    }
+    models.forEach((model) => {
+        const ips = model.data.inferParams;
+        if (!ips?.max_tokens) {
+            throw new Error(`no max tokens in ${model.shortname}`);
+        }
+        const mt = ips.max_tokens;
+        delete ips.max_tokens;
+        const vip = Object.keys(ips).length > 0 ? JSON.stringify(ips) : "";
+        const m = `- ${color.yellow(model.shortname)}: ${color.bold(model.data.name)} - ${model.data.ctx} ctx / ${mt} max tokens ${vip}`;
+        console.log(m);
+    });
+}
 function updateModels() {
     const mfs = readModelfiles();
     const modelNames = new Array();
@@ -32,4 +53,4 @@ function updateModels() {
         upsertModels(modelDefs);
     });
 }
-export { updateModels, };
+export { updateModels, showModelsCmd, };

package/dist/cmd/lib/utils.js

@@ -1,9 +1,8 @@
-import { useTemplateForModel } from "@agent-smith/tfm";
-import { inputMode, outputMode, promptfilePath } from "../../state/state.js";
+import { formatMode, initFilepaths, inputMode, outputMode, promptfilePath } from "../../state/state.js";
 import { modes } from "../clicmds/modes.js";
 import { readClipboard, writeToClipboard } from "../sys/clipboard.js";
 import { readFile } from "../sys/read.js";
-const tfm = useTemplateForModel();
+import { marked } from "../../agent.js";
 async function setOptions(args = [], options) {
     for (const k of Object.keys(options)) {
         let opt;
@@ -26,16 +25,16 @@ async function setOptions(args = [], options) {
     return args;
 }
 function readPromptFile() {
+    initFilepaths();
     return readFile(promptfilePath.value);
 }
 async function processOutput(res) {
-    if (!(outputMode.value == "clipboard")) {
-        return;
-    }
     let data = "";
+    let hasTextData = false;
     if (typeof res == "object") {
         if (res?.answer?.text) {
             data = res.answer.text;
+            hasTextData = true;
         }
         else {
             data = JSON.stringify(res);
@@ -45,11 +44,14 @@ async function processOutput(res) {
         data = res;
     }
     if (outputMode.value == "clipboard") {
-        if (typeof data == "object") {
-            data = JSON.stringify(data);
-        }
         await writeToClipboard(data);
     }
+    if (formatMode.value == "markdown") {
+        if (hasTextData) {
+            console.log("\n------------------\n");
+            console.log(marked.parse(data).trim());
+        }
+    }
 }
 async function parseInputOptions(options) {
     let out = null;

package/dist/conf.d.ts

@@ -1,9 +1,8 @@
 declare const confDir: string;
 declare const dbPath: string;
-declare function createConfDirIfNotExists(): boolean;
 declare function processConfPath(confPath: string): Promise<{
     paths: Array<string>;
     pf: string;
     dd: string;
 }>;
-export { confDir, dbPath, createConfDirIfNotExists, processConfPath, };
+export { confDir, dbPath, processConfPath, };

package/dist/conf.js

@@ -1,17 +1,9 @@
 import path from "path";
-import { default as fs } from "fs";
 import { readConf } from "./cmd/sys/read_conf.js";
 import { insertFeaturesPathIfNotExists, insertPluginIfNotExists } from "./db/write.js";
 import { buildPluginsPaths } from "./state/plugins.js";
 const confDir = path.join(process.env.HOME, ".config/agent-smith/cli");
 const dbPath = path.join(confDir, "config.db");
-function createConfDirIfNotExists() {
-    if (!fs.existsSync(confDir)) {
-        fs.mkdirSync(confDir, { recursive: true });
-        return false;
-    }
-    return true;
-}
 async function processConfPath(confPath) {
     const { found, data } = readConf(confPath);
     if (!found) {
@@ -45,4 +37,4 @@ async function processConfPath(confPath) {
     }
     return { paths: allPaths, pf: pf, dd: dd };
 }
-export { confDir, dbPath, createConfDirIfNotExists, processConfPath, };
+export { confDir, dbPath, processConfPath, };

package/dist/db/db.d.ts

@@ -1,5 +1,5 @@
 import { Database } from "better-sqlite3";
 declare const dbPath: string;
 declare let db: Database;
-declare function initDb(isVerbose?: boolean): void;
+declare function initDb(isVerbose: boolean, execSchema?: boolean): void;
 export { db, dbPath, initDb, };

package/dist/db/db.js

@@ -1,16 +1,21 @@
 import DatabaseConstructor from "better-sqlite3";
 import { schemas } from "./schemas.js";
 import path from "path";
-const confDir = path.join(process.env.HOME, ".config/agent-smith/cli");
+const confDir = path.join(process.env.HOME ?? "~/", ".config/agent-smith/cli");
 const dbPath = path.join(confDir, "config.db");
 let db;
-function initDb(isVerbose = false) {
-    db = new DatabaseConstructor(dbPath, { fileMustExist: false });
-    schemas.forEach((s) => {
-        db.exec(s);
-        if (isVerbose) {
-            console.log(`Schema executed: ${s}`);
-        }
-    });
+function initDb(isVerbose, execSchema = false) {
+    if (execSchema) {
+        db = new DatabaseConstructor(dbPath, { fileMustExist: false });
+        schemas.forEach((s) => {
+            db.exec(s);
+            if (isVerbose) {
+                console.log(`Schema executed: ${s}`);
+            }
+        });
+    }
+    else {
+        db = new DatabaseConstructor(dbPath);
+    }
 }
 export { db, dbPath, initDb, };

package/dist/db/read.js

@@ -101,7 +101,13 @@ function readModels() {
     const data = stmt.all();
     let f = new Array();
     data.forEach((row) => {
-        f.push(row);
+        const ips = JSON.parse(row.data);
+        const mod = {
+            name: row.name,
+            shortname: row.shortname,
+            data: ips,
+        };
+        f.push(mod);
     });
     return f;
 }

package/dist/index.js

@@ -4,10 +4,18 @@ import { query } from "./cli.js";
 import { initState, runMode } from './state/state.js';
 import { initAgent } from './agent.js';
 import { initCliCmds, parseCmd } from './cmd/cmds.js';
+import { updateConfCmd } from './cmd/clicmds/cmds.js';
 async function main() {
-    if (argv.length == 2) {
+    const nargs = argv.length;
+    if (nargs == 2) {
         runMode.value = "cli";
     }
+    else if (nargs >= 3) {
+        if (argv[2] == "conf") {
+            await updateConfCmd(argv.slice(-1), {});
+            return;
+        }
+    }
     await initState();
     await initAgent();
     switch (runMode.value) {

package/dist/state/state.d.ts

@@ -15,7 +15,7 @@ declare const lastCmd: {
     name: string;
     args: Array<string>;
 };
-declare function initFeatures(): Promise<void>;
+declare function initFilepaths(): void;
 declare function initState(): Promise<void>;
 declare function pluginDataDir(pluginName: string): string;
-export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, dataDirPath, pluginDataDir, initState, initFeatures, pyShell, };
+export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, dataDirPath, pluginDataDir, initState, initFilepaths, pyShell, };

package/dist/state/state.js

@@ -1,13 +1,8 @@
 import { reactive, ref } from "@vue/reactivity";
-import { createConfDirIfNotExists, confDir } from "../conf.js";
 import { initDb } from "../db/db.js";
-import { readFeaturePaths, readFilePaths } from "../db/read.js";
-import { updateAliases, updateFeatures } from "../db/write.js";
-import { readFeaturesDirs } from "./features.js";
-import { readPluginsPaths } from "./plugins.js";
+import { readFilePaths } from "../db/read.js";
 import path from "path";
 import { createDirectoryIfNotExists } from "../cmd/sys/dirs.js";
-import { updateModels } from "../cmd/lib/models.js";
 let pyShell;
 const inputMode = ref("manual");
 const outputMode = ref("txt");
@@ -24,21 +19,7 @@ const lastCmd = reactive({
     name: "",
     args: [],
 });
-function initConf() {
-    const exists = createConfDirIfNotExists();
-    if (!exists) {
-        console.log("Created configuration directory", confDir);
-    }
-    initDb();
-}
-async function initFeatures() {
-    const fp = readFeaturePaths();
-    const pp = await readPluginsPaths();
-    const p = [...fp, ...pp];
-    const feats = readFeaturesDirs(p);
-    updateFeatures(feats);
-    updateAliases(feats);
-    updateModels();
+function initFilepaths() {
     const filePaths = readFilePaths();
     for (const fp of filePaths) {
         switch (fp.name) {
@@ -54,8 +35,7 @@ async function initState() {
     if (isStateReady.value) {
         return;
     }
-    initConf();
-    await initFeatures();
+    initDb(isDebug.value);
     isStateReady.value = true;
 }
 function _getDataDirPath() {
@@ -70,4 +50,4 @@ function pluginDataDir(pluginName) {
     createDirectoryIfNotExists(pluginDatapath);
     return pluginDatapath;
 }
-export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, dataDirPath, pluginDataDir, initState, initFeatures, pyShell, };
+export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, dataDirPath, pluginDataDir, initState, initFilepaths, 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.46",
+  "version": "0.0.47",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -18,6 +18,7 @@
     "@inquirer/select": "^4.1.1",
     "@vue/reactivity": "^3.5.13",
     "@wllama/wllama": "^2.3.0",
+    "ansi-colors": "^4.1.3",
     "better-sqlite3": "^11.9.1",
     "clipboardy": "^4.0.0",
     "commander": "^13.1.0",
@@ -60,4 +61,4 @@
     "registry": "https://registry.npmjs.org/"
   },
   "license": "MIT"
-}
+}