@agent-smith/cli 0.0.18 → 0.0.19

package/dist/agent.d.ts

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

package/dist/agent.js

@@ -1,36 +1,40 @@
 import { useAgentBrain } from "@agent-smith/brain";
 import { LmTaskBuilder } from "@agent-smith/lmtask";
 import { marked } from 'marked';
-import { markedTerminal } from 'marked-terminal';
+import { markedTerminal } from "marked-terminal";
 marked.use(markedTerminal());
 let brain = useAgentBrain();
-const modelsForExpert = {};
 const taskBuilder = new LmTaskBuilder(brain);
 async function initExperts() {
     brain.experts.forEach((ex) => {
-        ex.backend.setOnStartEmit(() => console.log(""));
         ex.backend.setOnToken((t) => {
             process.stdout.write(t);
         });
     });
 }
-async function initAgent(mode, isVerbose = false) {
+async function initAgent(isVerbose = false) {
     if (!brain.state.get().isOn) {
         brain.resetExperts();
-        await brain.initLocal();
+        await brain.initLocal(true, isVerbose);
         await initExperts();
     }
     const brainUp = brain.state.get().isOn;
     if (isVerbose) {
         if (!brainUp) {
-            console.log("❌ No experts found for inference");
+            console.log("❌ No backends found for inference");
         }
         else {
-            brain.experts.forEach((ex) => {
-                console.log(`✅ Expert ${ex.name} is up`);
+            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);
+                }
             });
         }
     }
     return brainUp;
 }
-export { brain, initAgent, marked, modelsForExpert, taskBuilder };
+export { brain, initAgent, marked, taskBuilder };

package/dist/cli.d.ts

@@ -1,2 +1,2 @@
-declare function query(_default?: string): Promise<void>;
+declare function query(sign?: string): Promise<void>;
 export { query };

package/dist/cli.js

@@ -1,8 +1,8 @@
 import { input } from '@inquirer/prompts';
-import { runCmd } from './cmd/cmds.js';
-import { lastCmd, inputMode } from './state/state.js';
-import { readPromptFile } from './cmd/lib/utils.js';
-import { readClipboard } from './cmd/sys/clipboard.js';
+import { chat, runCmd } from './cmd/cmds.js';
+import { isChatMode } from './state/state.js';
+import { setOptions } from './cmd/lib/utils.js';
+import { modes } from './cmd/clicmds/modes.js';
 function parseParams(params) {
     const regex = /"([^"]*)"|(\S+)/g;
     let match;
@@ -18,27 +18,38 @@ function parseParams(params) {
     return result;
 }
 async function dispatch(input) {
-    let buf = new Array();
-    buf = parseParams(input);
-    const cmd = buf.shift();
-    if (inputMode.value == "promptfile") {
-        const p = readPromptFile();
-        buf.push(p);
-    }
-    else if (inputMode.value == "clipboard") {
-        const p = await readClipboard();
-        buf.push(p);
+    if (input.startsWith("-")) {
+        try {
+            const _cmd = modes[input].cmd;
+            await _cmd([], {});
+            return;
+        }
+        catch (e) {
+            throw new Error(`Option error ${e}`);
+        }
     }
-    await runCmd(cmd, buf);
+    const buf = new Array();
+    let params = parseParams(input);
+    const cmd = params.shift();
+    const opts = {};
+    params.forEach((p) => {
+        if (p.startsWith("-")) {
+            opts[p.substring(1)] = true;
+        }
+        else {
+            buf.push(p);
+        }
+    });
+    const args = await setOptions(buf, opts);
+    await runCmd(cmd, args);
 }
-async function query(_default) {
-    const data = { message: '>', default: "" };
-    if (_default) {
-        data.default = _default;
+async function query(sign = "$") {
+    const data = { message: sign, default: "" };
+    const q = await input(data);
+    await dispatch(q);
+    if (isChatMode.value) {
+        await chat();
     }
-    const answer = await input(data);
-    await dispatch(answer);
-    const lc = lastCmd.name + " " + lastCmd.args.join(" ");
-    await query(lc);
+    await query(sign);
 }
 export { query };

package/dist/cmd/clicmds/cmds.js

@@ -1,4 +1,4 @@
-import { formatMode, runMode } from "../../state/state.js";
+import { formatMode, isChatMode } from "../../state/state.js";
 import { getFeatureSpec, readFeaturesDirs } from "../../state/features.js";
 import { readAliases, readFeatures } from "../../db/read.js";
 import { cleanupFeaturePaths, updateAliases, updateFeatures } from "../../db/write.js";
@@ -86,11 +86,7 @@ async function initCmds() {
     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);
+    const isUp = await initAgent(true);
     return isUp;
 }
 async function _updateConfCmd(args = [], options) {
@@ -120,7 +116,7 @@ async function _executeTaskCmd(args = [], options) {
         console.warn("Provide a task name");
         return;
     }
-    const { ok, data, error } = await executeTaskCmd(args, options);
+    const { ok, data, conf, error } = await executeTaskCmd(args, options);
     if (!ok) {
         console.warn(error);
     }
@@ -131,6 +127,8 @@ async function _executeTaskCmd(args = [], options) {
     else {
         console.log();
     }
+    if (isChatMode.value) {
+    }
     return data;
 }
 async function _executeJobCmd(args = [], options) {
@@ -156,8 +154,8 @@ async function _readTaskCmd(args = [], options) {
     if (!res.found) {
         throw new Error(`Task ${args[0]}, ${path} not found`);
     }
-    const ts = taskBuilder.readFromYaml(path);
-    console.log(ts);
+    const ts = taskBuilder.readFromYaml(res.ymlTask);
+    console.log(JSON.stringify(ts, null, "  "));
 }
 async function _listTasksCmd(args = [], options) {
     Object.keys(readFeatures().task).forEach((t) => console.log("-", t));

package/dist/cmd/clicmds/modes.js

@@ -1,11 +1,23 @@
-import { formatMode, inputMode, isDebug, outputMode, runMode } from "../../state/state.js";
+import { formatMode, inputMode, isChatMode, isDebug, outputMode, runMode } from "../../state/state.js";
 const modes = {
     "-d": {
         cmd: async () => {
             isDebug.value = true;
+            if (runMode.value == "cli") {
+                console.log("Debug mode is on");
+            }
         },
         description: "use debug mode",
     },
+    "-c": {
+        cmd: async () => {
+            isChatMode.value = true;
+            if (runMode.value == "cli") {
+                console.log("Chat mode is on");
+            }
+        },
+        description: "use chat mode for tasks",
+    },
     "-if": {
         cmd: async () => {
             inputMode.value = "promptfile";

package/dist/cmd/cmds.d.ts

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

package/dist/cmd/cmds.js

@@ -1,11 +1,32 @@
+import { input } from "@inquirer/prompts";
 import { Command } from "commander";
-import { lastCmd } from "../state/state.js";
+import { brain } from "../agent.js";
+import { isChatMode, lastCmd, runMode } from "../state/state.js";
+import { cmds, initAliases, initCmds } from "./clicmds/cmds.js";
 import { modes } from "./clicmds/modes.js";
 import { processOutput, setOptions } from "./lib/utils.js";
-import { cmds, initAliases, initCmds } from "./clicmds/cmds.js";
+import { query } from "../cli.js";
 let cliCmds = {};
+async function chat() {
+    const data = { message: '>', default: "" };
+    const prompt = await input(data);
+    if (prompt == "/q") {
+        isChatMode.value = false;
+        if (runMode.value == "cmd") {
+            process.exit(0);
+        }
+        else {
+            await query();
+        }
+    }
+    await brain.ex.think(prompt);
+    console.log();
+    await chat();
+}
 async function initCliCmds() {
-    cliCmds = await initCmds();
+    const _cmds = await initCmds();
+    const _alias = initAliases();
+    cliCmds = { ..._cmds, ..._alias };
 }
 async function runCmd(cmdName, args = []) {
     if (!(cmdName in cliCmds)) {
@@ -23,7 +44,7 @@ async function buildCmds() {
     for (const [name, spec] of Object.entries({ ...cmds, ...aliases })) {
         const cmd = program.command(name);
         const _cmd = async (args = [], options = {}) => {
-            const _args = await setOptions(options, args);
+            const _args = await setOptions(args, options);
             const res = await spec.cmd(_args, options);
             await processOutput(res);
             return res;
@@ -49,5 +70,9 @@ async function buildCmds() {
 async function parseCmd() {
     const program = await buildCmds();
     await program.parseAsync();
+    if (isChatMode.value) {
+        await chat();
+    }
 }
-export { runCmd, buildCmds, parseCmd, initCliCmds };
+export { buildCmds, initCliCmds, parseCmd, runCmd, chat };
+;

package/dist/cmd/lib/execute_action.js

@@ -4,6 +4,7 @@ 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";
 function _systemAction(path) {
     const action = useAgentTask({
         id: "system_action",
@@ -47,12 +48,12 @@ async function executeActionCmd(args = [], options = {}, quiet = false) {
             break;
         default:
             throw new Error(`Action ext ${ext} not implemented`);
-            break;
     }
     const res = await act.run(args, options);
     if (!quiet) {
         console.log(res.data);
     }
+    await processOutput(res);
     return { ok: true, data: res.data, error: "" };
 }
 export { executeActionCmd };

package/dist/cmd/lib/execute_task.js

@@ -1,10 +1,10 @@
 import { brain, initAgent, taskBuilder } from "../../agent.js";
 import { getFeatureSpec } from "../../state/features.js";
-import { inputMode, isDebug, runMode } from "../../state/state.js";
+import { inputMode, isChatMode, isDebug } from "../../state/state.js";
 import { initTaskVars, readPromptFile, readTask } from "./utils.js";
 import { readClipboard } from "../sys/clipboard.js";
 async function executeTaskCmd(args = [], options = {}) {
-    await initAgent(runMode.value);
+    await initAgent();
     if (isDebug.value) {
         console.log("Task args:", args);
         console.log("Task options:", options);
@@ -26,7 +26,7 @@ async function executeTaskCmd(args = [], options = {}) {
     }
     const { found, path } = getFeatureSpec(name, "task");
     if (!found) {
-        return { ok: false, data: {}, error: `Task ${name} not found` };
+        return { ok: false, data: "", conf: {}, error: `Task ${name} not found` };
     }
     const res = readTask(path);
     if (!res.found) {
@@ -64,8 +64,15 @@ async function executeTaskCmd(args = [], options = {}) {
     }
     const data = await task.run({ prompt: pr, ...vars }, conf);
     if (data?.error) {
-        return { ok: false, data: {}, error: `Error executing task: ${data.error}` };
+        return { ok: false, data: "", conf: conf, error: `Error executing task: ${data.error}` };
     }
-    return { ok: true, data: data.text, error: "" };
+    conf.prompt = pr;
+    if (isChatMode.value) {
+        if (brain.ex.name != ex.name) {
+            brain.setDefaultExpert(ex);
+        }
+        brain.ex.template.pushToHistory({ user: pr, assistant: data.text });
+    }
+    return { ok: true, data: data.text, conf: conf, error: "" };
 }
 export { executeTaskCmd };

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

@@ -1,4 +1,4 @@
-declare function setOptions(options: Record<string, any>, args?: Array<string>): Promise<Array<string>>;
+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 readTask(taskpath: string): {

package/dist/cmd/lib/utils.js

@@ -1,14 +1,10 @@
 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 { inputMode } from "../../state/state.js";
 import { readClipboard, writeToClipboard } from "../sys/clipboard.js";
 import { modes } from "../clicmds/modes.js";
-async function setOptions(options, args = []) {
-    if (runMode.value == "cli") {
-        return args;
-    }
-    ;
+async function setOptions(args = [], options) {
     for (const k of Object.keys(options)) {
         const opt = modes["-" + k.toLowerCase()];
         await opt.cmd([], undefined);
@@ -28,6 +24,9 @@ function readPromptFile() {
     return res;
 }
 async function processOutput(res) {
+    if (!(outputMode.value == "clipboard")) {
+        return;
+    }
     let data = "";
     if (typeof res == "object") {
         let hasOutput = false;

package/dist/index.js

@@ -9,10 +9,10 @@ async function main() {
         runMode.value = "cli";
     }
     await initState();
-    await initCliCmds();
-    await initAgent(runMode.value);
+    await initAgent();
     switch (runMode.value) {
         case "cli":
+            await initCliCmds();
             await query();
             break;
         default:

package/dist/state/state.d.ts

@@ -5,6 +5,7 @@ declare const inputMode: import("@vue/reactivity").Ref<InputMode, InputMode>;
 declare const outputMode: import("@vue/reactivity").Ref<OutputMode, OutputMode>;
 declare const runMode: import("@vue/reactivity").Ref<RunMode, RunMode>;
 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 promptfile: import("@vue/reactivity").Ref<string, string>;
 declare const lastCmd: {
@@ -13,4 +14,4 @@ declare const lastCmd: {
 };
 declare function initFeatures(): Promise<void>;
 declare function initState(): Promise<void>;
-export { inputMode, outputMode, runMode, formatMode, lastCmd, isDebug, promptfile, initState, initFeatures, pyShell, };
+export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, isDebug, promptfile, initState, initFeatures, pyShell, };

package/dist/state/state.js

@@ -10,6 +10,7 @@ const inputMode = ref("manual");
 const outputMode = ref("txt");
 const runMode = ref("cmd");
 const formatMode = ref("text");
+const isChatMode = ref(false);
 const isDebug = ref(false);
 const promptfile = ref("");
 const lastCmd = reactive({
@@ -35,4 +36,4 @@ async function initState() {
     initConf();
     await initFeatures();
 }
-export { inputMode, outputMode, runMode, formatMode, lastCmd, isDebug, promptfile, initState, initFeatures, pyShell, };
+export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, isDebug, promptfile, 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.18",
+  "version": "0.0.19",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -10,18 +10,18 @@
     "watch": "tsc -p . -w"
   },
   "dependencies": {
-    "@agent-smith/brain": "^0.0.32",
+    "@agent-smith/brain": "^0.0.33",
     "@agent-smith/jobs": "^0.0.11",
-    "@agent-smith/lmtask": "^0.0.23",
-    "@inquirer/prompts": "^7.0.0",
-    "@inquirer/select": "^4.0.0",
+    "@agent-smith/lmtask": "^0.0.24",
+    "@inquirer/prompts": "^7.0.1",
+    "@inquirer/select": "^4.0.1",
     "@vue/reactivity": "^3.5.12",
     "better-sqlite3": "^11.5.0",
     "clipboardy": "^4.0.0",
     "commander": "^12.1.0",
     "draftlog": "^1.0.13",
-    "marked-terminal": "^7.1.0",
-    "modprompt": "^0.9.0",
+    "marked-terminal": "^7.2.1",
+    "modprompt": "^0.9.1",
     "python-shell": "^5.0.0",
     "yaml": "^2.6.0"
   },
@@ -33,9 +33,9 @@
     "@rollup/plugin-typescript": "^12.1.1",
     "@types/better-sqlite3": "^7.6.11",
     "@types/marked-terminal": "^6.1.1",
-    "@types/node": "^22.7.9",
+    "@types/node": "^22.8.5",
     "restmix": "^0.5.0",
-    "rollup": "^4.24.0",
+    "rollup": "^4.24.3",
     "ts-node": "^10.9.2",
     "tslib": "2.8.0",
     "typescript": "^5.6.3"