@agent-smith/cli 0.0.3 → 0.0.5

package/dist/agent.d.ts

@@ -10,6 +10,5 @@ declare const taskReader: {
     };
     readDir: (dir: string) => Array<string>;
 };
-declare function clearOutput(): void;
 declare function initAgent(mode: RunMode, isVerbose?: boolean): Promise<boolean>;
-export { brain, initAgent, clearOutput, marked, modelsForExpert, taskReader };
+export { brain, initAgent, marked, modelsForExpert, taskReader };

package/dist/agent.js

@@ -1,9 +1,8 @@
 import { useAgentBrain } from "@agent-smith/brain";
 import { useLmTask } from "@agent-smith/lmtask";
-import logUpdate from 'log-update';
+;
 import { marked } from 'marked';
 import { markedTerminal } from 'marked-terminal';
-import { formatMode } from "./state/state.js";
 marked.use(markedTerminal());
 let brain = useAgentBrain();
 const modelsForExpert = {};
@@ -12,18 +11,10 @@ async function initExperts() {
     brain.experts.forEach((ex) => {
         ex.setOnStartEmit(() => console.log(""));
         ex.setOnToken((t) => {
-            if (formatMode.value == "markdown") {
-                logUpdate(marked.parse(ex.stream.get() + t).trim());
-            }
-            else {
-                logUpdate((ex.stream.get() + t).trim());
-            }
+            process.stdout.write(t);
         });
     });
 }
-function clearOutput() {
-    logUpdate.clear();
-}
 async function initAgent(mode, isVerbose = false) {
     if (!brain.state.get().isOn) {
         brain.resetExperts();
@@ -44,4 +35,4 @@ async function initAgent(mode, isVerbose = false) {
     }
     return brainUp;
 }
-export { brain, initAgent, clearOutput, marked, modelsForExpert, taskReader };
+export { brain, initAgent, marked, modelsForExpert, taskReader };

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

@@ -0,0 +1,5 @@
+import { Cmd } from "../../interfaces.js";
+declare let cmds: 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 };

package/dist/cmd/clicmds/cmds.js

@@ -0,0 +1,138 @@
+import { formatMode, initFeatures, runMode } from "../../state/state.js";
+import { getFeatureSpec, readFeaturesDirs } from "../../state/features.js";
+import { readFeatures } from "../../db/read.js";
+import { updateFeatures } from "../../db/write.js";
+import { updateConf } from "../../conf.js";
+import { executeActionCmd } from "../lib/execute_action.js";
+import { initAgent, marked, taskReader } from "../../agent.js";
+import { executeJobCmd, readJob } from "../lib/execute_job.js";
+import { executeTaskCmd } from "../lib/execute_task.js";
+import { readCmds } from "../sys/read_cmds.js";
+let cmds = {
+    q: {
+        cmd: async () => process.exit(0),
+        description: "exit the cli"
+    },
+    ping: {
+        cmd: async () => pingCmd(["verbose"], undefined),
+        description: "ping inference servers",
+    },
+    lt: {
+        cmd: _listTasksCmd,
+        description: "list all the tasks"
+    },
+    rt: {
+        cmd: _readTaskCmd,
+        description: "read a task",
+        args: "arguments: \n-task (required): the task name"
+    },
+    rj: {
+        cmd: _readJobCmd,
+        description: "read a job",
+        args: "arguments: \n-job (required): the job name"
+    },
+    t: {
+        cmd: _executeTaskCmd,
+        description: "execute a task",
+        args: "arguments: \n-task (required): the task name\n-args: prompt and other arguments if any for the task"
+    },
+    j: {
+        cmd: _executeJobCmd,
+        description: "execute a job",
+        args: "arguments: \n-job (required): the job name\n-args: arguments if any for the job"
+    },
+    a: {
+        cmd: executeActionCmd,
+        description: "execute an action",
+        args: "arguments: \n-action (required): the task name\n-args: other arguments if any for the action"
+    },
+    conf: {
+        cmd: _updateConfCmd,
+        description: "process config file",
+        args: "arguments: \n-path (required): the path to the config.yml file"
+    },
+    update: {
+        cmd: _updateFeaturesCmd,
+        description: "reparse the features dirs and update the list",
+    }
+};
+async function initCmds() {
+    for (const dirpath of new Set(Object.values(readFeatures().cmd))) {
+        const c = await readCmds(`${dirpath}`);
+        cmds = { ...cmds, ...c };
+    }
+    return cmds;
+}
+async function pingCmd(args = [], options) {
+    let _isVerbose = false;
+    if (args.length > 0) {
+        _isVerbose = args[0] == "verbose";
+    }
+    const isUp = await initAgent(runMode.value, _isVerbose);
+    return isUp;
+}
+async function _updateFeaturesCmd(args = [], options) {
+    await initFeatures();
+    console.log("Features updated");
+}
+async function _updateConfCmd(args = [], options) {
+    if (args.length == 0) {
+        console.warn("Provide a config.yml file path");
+        return;
+    }
+    const allPaths = await updateConf(args[0]);
+    const feats = readFeaturesDirs(allPaths);
+    updateFeatures(feats);
+}
+async function _readJobCmd(args = [], options) {
+    if (args.length == 0) {
+        console.warn("Provide a job name");
+        return;
+    }
+    const t = await readJob(args[0]);
+    console.log(t.data);
+}
+async function _executeTaskCmd(args = [], options) {
+    if (args.length == 0) {
+        console.warn("Provide a task name");
+        return;
+    }
+    const { ok, data, error } = await executeTaskCmd(args);
+    if (!ok) {
+        console.warn(error);
+    }
+    if (formatMode.value == "markdown") {
+        console.log("\n\n------------------\n");
+        console.log(marked.parse(data).trim());
+    }
+    else {
+        console.log();
+    }
+    return data;
+}
+async function _executeJobCmd(args = [], options) {
+    if (args.length == 0) {
+        console.warn("Provide a job name");
+        return;
+    }
+    const name = args.shift();
+    const res = await executeJobCmd(name, args);
+    return res;
+}
+async function _readTaskCmd(args = [], options) {
+    if (args.length == 0) {
+        console.warn("Provide a task name");
+        return;
+    }
+    const { found, path } = getFeatureSpec(args[0], "task");
+    if (!found) {
+        console.warn(`FeatureType ${args[0]} not found`);
+        return;
+    }
+    const r = taskReader.read(path);
+    console.log(r.task);
+}
+async function _listTasksCmd(args = [], options) {
+    Object.keys(readFeatures().task).forEach((t) => console.log("-", t));
+}
+export { cmds, initCmds, pingCmd };

package/dist/cmd/{options → clicmds}/modes.js

@@ -43,13 +43,13 @@ const modes = {
                 console.log("Markdown output mode");
             }
         },
-        description: "use markdown output (default)"
+        description: "use markdown output"
     },
     "-otxt": {
         cmd: async () => {
             formatMode.value = "text";
             if (runMode.value == "cli") {
-                console.log("Text output mode");
+                console.log("Text output mode (default)");
             }
         },
         description: "use text output "

package/dist/cmd/cmds.d.ts

@@ -1,7 +1,6 @@
 import { Command } from "commander";
-declare function initCmds(): Promise<void>;
+declare function initCliCmds(): Promise<void>;
 declare function runCmd(cmdName: string, args?: Array<string>): Promise<void>;
-declare function pingCmd(args: Array<string> | undefined, options: any): Promise<boolean>;
 declare function buildCmds(): Promise<Command>;
 declare function parseCmd(): Promise<void>;
-export { initCmds, runCmd, buildCmds, parseCmd, pingCmd };
+export { runCmd, buildCmds, parseCmd, initCliCmds };

package/dist/cmd/cmds.js

@@ -1,157 +1,11 @@
 import { Command } from "commander";
-import { formatMode, initFeatures, lastCmd, runMode } from "../state/state.js";
-import { modes } from "./options/modes.js";
-import { executeTaskCmd } from "./lib/execute_task.js";
-import { clearOutput, initAgent, marked, taskReader } from "../agent.js";
-import { executeActionCmd } from "./lib/execute_action.js";
-import { executeJobCmd, readJob } from "./lib/execute_job.js";
-import { readCmds } from "./sys/read_cmds.js";
+import { lastCmd } from "../state/state.js";
+import { modes } from "./clicmds/modes.js";
 import { processOutput, setOptions } from "./lib/utils.js";
-import { getFeatureSpec, readFeaturesDirs } from "../state/features.js";
-import { readFeatures } from "../db/read.js";
-import { insertFeaturesPathIfNotExists, insertPluginIfNotExists, updateFeatures } from "../db/write.js";
-import { readConf } from "./sys/read_conf.js";
-import { buildPluginsPaths } from "../state/plugins.js";
-let cmds = {
-    q: {
-        cmd: async () => process.exit(0),
-        description: "exit the cli"
-    },
-    ping: {
-        cmd: async () => pingCmd(["verbose"], undefined),
-        description: "ping inference servers",
-    },
-    lt: {
-        cmd: _listTasksCmd,
-        description: "list all the tasks"
-    },
-    rt: {
-        cmd: _readTaskCmd,
-        description: "read a task",
-        args: "arguments: \n-task (required): the task name"
-    },
-    rj: {
-        cmd: _readJobCmd,
-        description: "read a job",
-        args: "arguments: \n-job (required): the job name"
-    },
-    t: {
-        cmd: _executeTaskCmd,
-        description: "execute a task",
-        args: "arguments: \n-task (required): the task name\n-args: prompt and other arguments if any for the task"
-    },
-    j: {
-        cmd: _executeJobCmd,
-        description: "execute a job",
-        args: "arguments: \n-job (required): the job name\n-args: arguments if any for the job"
-    },
-    a: {
-        cmd: executeActionCmd,
-        description: "execute an action",
-        args: "arguments: \n-action (required): the task name\n-args: other arguments if any for the action"
-    },
-    conf: {
-        cmd: _updateConfCmd,
-        description: "process config file",
-        args: "arguments: \n-path (required): the path to the config.yml file"
-    },
-    update: {
-        cmd: _updateFeaturesCmd,
-        description: "reparse the features dirs and update the list",
-    }
-};
-let cliCmds = { ...cmds, ...modes };
-async function initCmds() {
-    for (const dirpath of new Set(Object.values(readFeatures().cmd))) {
-        const c = await readCmds(`${dirpath}`);
-        cmds = { ...cmds, ...c };
-    }
-    cliCmds = { ...cmds, ...modes };
-}
-async function _updateFeaturesCmd(args = [], options) {
-    await initFeatures();
-    console.log("Features updated");
-}
-async function _updateConfCmd(args = [], options) {
-    if (args.length == 0) {
-        console.warn("Provide a config.yml file path");
-        return;
-    }
-    const { found, data } = readConf(args[0]);
-    if (!found) {
-        console.warn(`Config file ${args[0]} not found`);
-    }
-    const p = new Array();
-    if ("features" in data) {
-        p.push(...data.features);
-        const fts = new Array();
-        data.features.forEach((f) => {
-            if (!fts.includes(f)) {
-                insertFeaturesPathIfNotExists(f);
-                fts.push(f);
-            }
-        });
-    }
-    if ("plugins" in data) {
-        const plugins = await buildPluginsPaths(data.plugins);
-        plugins.forEach((_pl) => {
-            p.push(_pl.path);
-            insertPluginIfNotExists(_pl.name, _pl.path);
-        });
-    }
-    const feats = readFeaturesDirs(p);
-    updateFeatures(feats);
-}
-async function _readJobCmd(args = [], options) {
-    if (args.length == 0) {
-        console.warn("Provide a job name");
-        return;
-    }
-    const t = await readJob(args[0]);
-    console.log(t.data);
-}
-async function _executeTaskCmd(args = [], options) {
-    if (args.length == 0) {
-        console.warn("Provide a task name");
-        return;
-    }
-    const { ok, data, error } = await executeTaskCmd(args);
-    if (!ok) {
-        console.warn(error);
-    }
-    clearOutput();
-    if (formatMode.value == "markdown") {
-        console.log(marked.parse(data).trim());
-    }
-    else {
-        console.log(data);
-    }
-    return data;
-}
-async function _executeJobCmd(args = [], options) {
-    if (args.length == 0) {
-        console.warn("Provide a job name");
-        return;
-    }
-    const name = args.shift();
-    const res = await executeJobCmd(name, args);
-    return res;
-}
-async function _readTaskCmd(args = [], options) {
-    if (args.length == 0) {
-        console.warn("Provide a task name");
-        return;
-    }
-    const { found, path } = getFeatureSpec(args[0], "task");
-    if (!found) {
-        console.warn(`FeatureType ${args[0]} not found`);
-        return;
-    }
-    const r = taskReader.read(path);
-    console.log(r.task);
-}
-async function _listTasksCmd(args = [], options) {
-    Object.keys(readFeatures().task).forEach((t) => console.log("-", t));
+import { cmds, initCmds } from "./clicmds/cmds.js";
+let cliCmds = {};
+async function initCliCmds() {
+    cliCmds = await initCmds();
 }
 async function runCmd(cmdName, args = []) {
     if (!(cmdName in cliCmds)) {
@@ -163,14 +17,6 @@ async function runCmd(cmdName, args = []) {
     lastCmd.name = cmdName;
     lastCmd.args = args;
 }
-async function pingCmd(args = [], options) {
-    let _isVerbose = false;
-    if (args.length > 0) {
-        _isVerbose = args[0] == "verbose";
-    }
-    const isUp = await initAgent(runMode.value, _isVerbose);
-    return isUp;
-}
 async function buildCmds() {
     const program = new Command();
     for (const [name, spec] of Object.entries(cmds)) {
@@ -203,4 +49,4 @@ async function parseCmd() {
     const program = await buildCmds();
     await program.parseAsync();
 }
-export { initCmds, runCmd, buildCmds, parseCmd, pingCmd };
+export { runCmd, buildCmds, parseCmd, initCliCmds };

package/dist/cmd/lib/execute_job.js

@@ -1,8 +1,9 @@
 import YAML from 'yaml';
 import { default as fs } from "fs";
 import { useAgentJob } from "@agent-smith/jobs";
-import { brain, taskReader } from '../../agent.js';
+import { brain, marked, taskReader } from '../../agent.js';
 import { getFeatureSpec } from '../../state/features.js';
+import { formatMode } from '../../state/state.js';
 async function executeJobCmd(name, args = []) {
     const { job, found } = await _dispatchReadJob(name);
     if (!found) {
@@ -16,6 +17,12 @@ async function executeJobCmd(name, args = []) {
         brain.expertsForModelsInfo();
         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());
+                }
+            }
         }
         catch (err) {
             console.log("ERR", err);

package/dist/cmd/lib/execute_task.js

@@ -1,5 +1,4 @@
 import { initAgent, taskReader } from "../../agent.js";
-import logUpdate from "log-update";
 import { getFeatureSpec } from "../../state/features.js";
 import { runMode } from "../../state/state.js";
 async function executeTaskCmd(args = [], options = {}) {
@@ -18,7 +17,7 @@ async function executeTaskCmd(args = [], options = {}) {
             vars[t[0]] = t[1];
         }
     });
-    logUpdate("Ingesting prompt ...");
+    console.log("Ingesting prompt ...");
     const data = await task.run({ prompt: pr, ...vars });
     if (data?.error) {
         return { ok: false, data: {}, error: `Error executing task: ${data.error}` };

package/dist/cmd/lib/utils.js

@@ -2,7 +2,7 @@ import { default as fs } from "fs";
 import { outputMode, promptfile } from "../../state/state.js";
 import { inputMode, runMode } from "../../state/state.js";
 import { readClipboard, writeToClipboard } from "../sys/clipboard.js";
-import { modes } from "../options/modes.js";
+import { modes } from "../clicmds/modes.js";
 async function setOptions(options, args = []) {
     if (runMode.value == "cli") {
         return args;
@@ -39,7 +39,7 @@ async function processOutput(res) {
             hasOutput = true;
         }
         if (!hasOutput) {
-            throw new Error(`No data in res: ${res}`);
+            throw new Error(`No data in res: ${JSON.stringify(res, null, "  ")}`);
         }
     }
     else {

package/dist/conf.d.ts

@@ -1,4 +1,5 @@
 declare const confDir: string;
 declare const dbPath: string;
 declare function createConfDirIfNotExists(): boolean;
-export { confDir, dbPath, createConfDirIfNotExists, };
+declare function updateConf(confPath: string): Promise<Array<string>>;
+export { confDir, dbPath, createConfDirIfNotExists, updateConf, };

package/dist/conf.js

@@ -1,5 +1,8 @@
 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() {
@@ -9,4 +12,29 @@ function createConfDirIfNotExists() {
     }
     return true;
 }
-export { confDir, dbPath, createConfDirIfNotExists, };
+async function updateConf(confPath) {
+    const { found, data } = readConf(confPath);
+    if (!found) {
+        console.warn(`Config file ${confPath} not found`);
+    }
+    const allPaths = new Array();
+    if ("features" in data) {
+        allPaths.push(...data.features);
+        const fts = new Array();
+        data.features.forEach((f) => {
+            if (!fts.includes(f)) {
+                insertFeaturesPathIfNotExists(f);
+                fts.push(f);
+            }
+        });
+    }
+    if ("plugins" in data) {
+        const plugins = await buildPluginsPaths(data.plugins);
+        plugins.forEach((_pl) => {
+            allPaths.push(_pl.path);
+            insertPluginIfNotExists(_pl.name, _pl.path);
+        });
+    }
+    return allPaths;
+}
+export { confDir, dbPath, createConfDirIfNotExists, updateConf, };

package/dist/db/db.d.ts

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

package/dist/db/db.js

@@ -1,9 +1,9 @@
 import DatabaseConstructor from "better-sqlite3";
 import { schemas } from "./schemas.js";
-import { createConfDirIfNotExists, dbPath } from "../conf.js";
-createConfDirIfNotExists();
-let db = new DatabaseConstructor(dbPath);
+import { dbPath } from "../conf.js";
+let db;
 function initDb(isVerbose = false) {
+    db = new DatabaseConstructor(dbPath);
     schemas.forEach((s) => {
         db.exec(s);
         if (isVerbose) {
@@ -11,6 +11,4 @@ function initDb(isVerbose = false) {
         }
     });
 }
-function dbPopulateDefaults() {
-}
-export { db, initDb, dbPopulateDefaults, };
+export { db, initDb, };

package/dist/index.js

@@ -3,13 +3,13 @@ import { argv } from 'process';
 import { query } from "./cli.js";
 import { initState, runMode } from './state/state.js';
 import { initAgent } from './agent.js';
-import { initCmds, parseCmd } from './cmd/cmds.js';
+import { initCliCmds, parseCmd } from './cmd/cmds.js';
 async function main() {
     if (argv.length == 2) {
         runMode.value = "cli";
     }
     await initState();
-    await initCmds();
+    await initCliCmds();
     await initAgent(runMode.value);
     switch (runMode.value) {
         case "cli":

package/dist/main.d.ts

@@ -1,5 +1,5 @@
 import { execute, run } from "./cmd/sys/execute.js";
 import { executeJobCmd } from "./cmd/lib/execute_job.js";
 import { writeToClipboard } from "./cmd/sys/clipboard.js";
-import { pingCmd } from "./cmd/cmds.js";
+import { pingCmd } from "./cmd/clicmds/cmds.js";
 export { execute, run, pingCmd, executeJobCmd, writeToClipboard, };

package/dist/main.js

@@ -1,5 +1,5 @@
 import { execute, run } from "./cmd/sys/execute.js";
 import { executeJobCmd } from "./cmd/lib/execute_job.js";
 import { writeToClipboard } from "./cmd/sys/clipboard.js";
-import { pingCmd } from "./cmd/cmds.js";
+import { pingCmd } from "./cmd/clicmds/cmds.js";
 export { execute, run, pingCmd, executeJobCmd, writeToClipboard, };

package/dist/state/state.js

@@ -1,6 +1,6 @@
 import { reactive, ref } from "@vue/reactivity";
 import { createConfDirIfNotExists, confDir } from "../conf.js";
-import { initDb, dbPopulateDefaults } from "../db/db.js";
+import { initDb } from "../db/db.js";
 import { readFeaturePaths } from "../db/read.js";
 import { updateFeatures } from "../db/write.js";
 import { readFeaturesDirs } from "./features.js";
@@ -9,7 +9,7 @@ let pyShell;
 const inputMode = ref("manual");
 const outputMode = ref("txt");
 const runMode = ref("cmd");
-const formatMode = ref("markdown");
+const formatMode = ref("text");
 const promptfile = ref("");
 const lastCmd = reactive({
     name: "",
@@ -19,12 +19,8 @@ function initConf() {
     const exists = createConfDirIfNotExists();
     if (!exists) {
         console.log("Created configuration directory", confDir);
-        initDb();
-        dbPopulateDefaults();
-    }
-    else {
-        initDb();
     }
+    initDb();
 }
 async function initFeatures() {
     const fp = readFeaturePaths();

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.3",
+  "version": "0.0.5",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -11,17 +11,17 @@
   },
   "dependencies": {
     "@agent-smith/brain": "^0.0.18",
-    "@agent-smith/jobs": "^0.0.7",
-    "@agent-smith/lmtask": "^0.0.10",
+    "@agent-smith/jobs": "^0.0.8",
+    "@agent-smith/lmtask": "^0.0.12",
     "@inquirer/prompts": "^5.3.8",
     "@inquirer/select": "^2.4.7",
     "@vue/reactivity": "^3.4.38",
     "better-sqlite3": "^11.2.1",
     "clipboardy": "^4.0.0",
     "commander": "^12.1.0",
-    "log-update": "^6.1.0",
+    "draftlog": "^1.0.13",
     "marked-terminal": "^7.1.0",
-    "modprompt": "^0.7.6",
+    "modprompt": "^0.7.7",
     "python-shell": "^5.0.0",
     "yaml": "^2.5.0"
   },
@@ -33,7 +33,7 @@
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/better-sqlite3": "^7.6.11",
     "@types/marked-terminal": "^6.1.1",
-    "@types/node": "^22.5.0",
+    "@types/node": "^22.5.1",
     "rollup": "^4.21.1",
     "ts-node": "^10.9.2",
     "tslib": "2.7.0",