@agent-smith/cli 0.0.4 → 0.0.6

package/dist/agent.d.ts

@@ -1,15 +1,8 @@
+import { LmTaskBuilder } from "@agent-smith/lmtask";
 import { marked } from 'marked';
 import { RunMode } from "./interfaces.js";
 declare let brain: import("@agent-smith/brain").AgentBrain;
 declare const modelsForExpert: Record<string, string>;
-declare const taskReader: {
-    init: (taskPath: string) => import("@agent-smith/jobs").AgentTask;
-    read: (taskPath: string) => {
-        found: boolean;
-        task: import("@agent-smith/lmtask").LmTask;
-    };
-    readDir: (dir: string) => Array<string>;
-};
-declare function clearOutput(): void;
+declare const taskBuilder: LmTaskBuilder;
 declare function initAgent(mode: RunMode, isVerbose?: boolean): Promise<boolean>;
-export { brain, initAgent, clearOutput, marked, modelsForExpert, taskReader };
+export { brain, initAgent, marked, modelsForExpert, taskBuilder };

package/dist/agent.js

@@ -1,29 +1,20 @@
 import { useAgentBrain } from "@agent-smith/brain";
-import { useLmTask } from "@agent-smith/lmtask";
-import logUpdate from 'log-update';
+import { LmTaskBuilder } from "@agent-smith/lmtask";
+;
 import { marked } from 'marked';
 import { markedTerminal } from 'marked-terminal';
-import { formatMode } from "./state/state.js";
 marked.use(markedTerminal());
 let brain = useAgentBrain();
 const modelsForExpert = {};
-const taskReader = useLmTask(brain);
+const taskBuilder = new LmTaskBuilder(brain);
 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, taskBuilder };

package/dist/cmd/clicmds/cmds.js

@@ -4,10 +4,11 @@ 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 { clearOutput, initAgent, marked, taskReader } from "../../agent.js";
+import { initAgent, marked, taskBuilder } 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";
+import { readTask } from "../lib/utils.js";
 let cmds = {
     q: {
         cmd: async () => process.exit(0),
@@ -101,12 +102,12 @@ async function _executeTaskCmd(args = [], options) {
     if (!ok) {
         console.warn(error);
     }
-    clearOutput();
     if (formatMode.value == "markdown") {
+        console.log("\n\n------------------\n");
         console.log(marked.parse(data).trim());
     }
     else {
-        console.log(data);
+        console.log();
     }
     return data;
 }
@@ -129,8 +130,12 @@ async function _readTaskCmd(args = [], options) {
         console.warn(`FeatureType ${args[0]} not found`);
         return;
     }
-    const r = taskReader.read(path);
-    console.log(r.task);
+    const res = readTask(path);
+    if (!res.found) {
+        throw new Error(`Task ${args[0]}, ${path} not found`);
+    }
+    const ts = taskBuilder.readFromYaml(path);
+    console.log(ts);
 }
 async function _listTasksCmd(args = [], options) {
     Object.keys(readFeatures().task).forEach((t) => console.log("-", t));

package/dist/cmd/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/lib/execute_job.js

@@ -1,8 +1,10 @@
 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, taskBuilder } from '../../agent.js';
 import { getFeatureSpec } from '../../state/features.js';
+import { formatMode } from '../../state/state.js';
+import { readTask } from './utils.js';
 async function executeJobCmd(name, args = []) {
     const { job, found } = await _dispatchReadJob(name);
     if (!found) {
@@ -16,6 +18,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);
@@ -69,7 +77,11 @@ async function _createJobFromSpec(spec) {
             if (!found) {
                 return { found: false, job: {} };
             }
-            const at = taskReader.init(path);
+            const res = readTask(path);
+            if (!res.found) {
+                throw new Error(`Task ${t.name}, ${path} not found`);
+            }
+            const at = taskBuilder.fromYaml(res.ymlTask);
             tasks[t.name] = at;
         }
     }

package/dist/cmd/lib/execute_task.js

@@ -1,7 +1,7 @@
-import { initAgent, taskReader } from "../../agent.js";
-import logUpdate from "log-update";
+import { initAgent, taskBuilder } from "../../agent.js";
 import { getFeatureSpec } from "../../state/features.js";
 import { runMode } from "../../state/state.js";
+import { readTask } from "./utils.js";
 async function executeTaskCmd(args = [], options = {}) {
     await initAgent(runMode.value);
     const name = args.shift();
@@ -9,7 +9,11 @@ async function executeTaskCmd(args = [], options = {}) {
     if (!found) {
         return { ok: false, data: {}, error: `Task ${name} not found` };
     }
-    const task = taskReader.init(path);
+    const res = readTask(path);
+    if (!res.found) {
+        throw new Error(`Task ${name}, ${path} not found`);
+    }
+    const task = taskBuilder.fromYaml(res.ymlTask);
     const pr = args.shift();
     const vars = {};
     args.forEach((a) => {
@@ -18,7 +22,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.d.ts

@@ -1,4 +1,9 @@
 declare function setOptions(options: Record<string, any>, args?: Array<string>): Promise<Array<string>>;
 declare function readPromptFile(): string;
 declare function processOutput(res: any): Promise<void>;
-export { readPromptFile, processOutput, setOptions, };
+declare function readTask(taskpath: string): {
+    found: boolean;
+    ymlTask: string;
+};
+declare function readTasksDir(dir: string): Array<string>;
+export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, };

package/dist/cmd/lib/utils.js

@@ -1,4 +1,5 @@
 import { default as fs } from "fs";
+import { default as path } from "path";
 import { outputMode, promptfile } from "../../state/state.js";
 import { inputMode, runMode } from "../../state/state.js";
 import { readClipboard, writeToClipboard } from "../sys/clipboard.js";
@@ -39,7 +40,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 {
@@ -49,4 +50,24 @@ async function processOutput(res) {
         await writeToClipboard(data);
     }
 }
-export { readPromptFile, processOutput, setOptions, };
+function readTask(taskpath) {
+    if (!fs.existsSync(taskpath)) {
+        return { ymlTask: "", found: false };
+    }
+    const data = fs.readFileSync(taskpath, 'utf8');
+    return { ymlTask: data, found: true };
+}
+function readTasksDir(dir) {
+    const tasks = new Array();
+    fs.readdirSync(dir).forEach((filename) => {
+        const filepath = path.join(dir, filename);
+        const isDir = fs.statSync(filepath).isDirectory();
+        if (!isDir) {
+            if (filename.endsWith(".yml")) {
+                tasks.push(filename);
+            }
+        }
+    });
+    return tasks;
+}
+export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, };

package/dist/state/state.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: "",

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.4",
+  "version": "0.0.6",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -12,14 +12,14 @@
   "dependencies": {
     "@agent-smith/brain": "^0.0.18",
     "@agent-smith/jobs": "^0.0.8",
-    "@agent-smith/lmtask": "^0.0.12",
+    "@agent-smith/lmtask": "^0.0.13",
     "@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.7",
     "python-shell": "^5.0.0",
@@ -33,8 +33,8 @@
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/better-sqlite3": "^7.6.11",
     "@types/marked-terminal": "^6.1.1",
-    "@types/node": "^22.5.1",
-    "rollup": "^4.21.1",
+    "@types/node": "^22.5.2",
+    "rollup": "^4.21.2",
     "ts-node": "^10.9.2",
     "tslib": "2.7.0",
     "typescript": "^5.5.4"