@agent-smith/cli 0.0.104 → 0.0.106

package/dist/cli.js

@@ -1,13 +1,16 @@
 import { input } from '@inquirer/prompts';
 import { chat } from './cmd/cmds.js';
 import { isChatMode } from './state/state.js';
+import { Agent } from '@agent-smith/agent';
+import { backend } from './state/backends.js';
 async function query(program) {
     const data = { message: "$", default: "" };
     const q = await input(data);
     const args = q.split(" ");
     await program.parseAsync(args, { from: "user" });
     if (isChatMode.value) {
-        await chat(program, {});
+        const agent = new Agent(backend.value, "chat");
+        await chat(program, {}, agent, []);
     }
     await query(program);
 }

package/dist/cmd/clicmds/cmds.js

@@ -4,7 +4,6 @@ import YAML from 'yaml';
 import { cacheFilePath, dbPath } from "../../conf.js";
 import { readFeaturePaths, readFeaturesType, readTaskSetting } from "../../db/read.js";
 import { cleanupFeaturePaths, deleteTaskSetting, updateAliases, updateFeatures, upsertTaskSettings } from "../../db/write.js";
-import { isCacheReady, cmds } from "../../state/auto/usercmds.js";
 import { getFeatureSpec, readFeaturesDirs } from "../../state/features.js";
 import { readPluginsPaths } from "../../state/plugins.js";
 import { runMode } from "../../state/state.js";
@@ -15,18 +14,15 @@ import { readTask } from "../sys/read_task.js";
 import { updateUserCmdsCache } from './cache.js';
 async function initUserCmds(cmdFeats) {
     const features = Object.values(cmdFeats);
-    let endCmds = cmds;
-    if (!isCacheReady) {
-        updateUserCmdsCache(cacheFilePath, features);
-        const usrCmds = [];
-        for (const feat of features) {
-            const cmdPath = path.join(feat.path, feat.name + "." + feat.ext);
-            const c = await readCmd(feat.name, cmdPath);
+    const usrCmds = [];
+    for (const feat of features) {
+        const cmdPath = path.join(feat.path, feat.name + "." + feat.ext);
+        const c = await readCmd(feat.name, cmdPath);
+        if (c) {
             usrCmds.push(c);
         }
-        endCmds = usrCmds;
     }
-    return endCmds;
+    return usrCmds;
 }
 async function resetDbCmd() {
     if (runMode.value == "cli") {

package/dist/cmd/cmds.d.ts

@@ -1,7 +1,9 @@
 import { InferenceOptions } from "@locallm/types/dist/inference.js";
 import { Command } from "commander";
+import type { McpClient } from "../main.js";
+import type { Agent } from "@agent-smith/agent";
 declare const program: Command;
-declare function chat(program: Command, options: InferenceOptions): Promise<void>;
+declare function chat(program: Command, options: InferenceOptions, agent: Agent, mcpServers: Array<McpClient>): Promise<void>;
 declare function buildCmds(): Promise<Command>;
 declare function parseCmd(program: Command): Promise<void>;
 export { buildCmds, chat, parseCmd, program };

package/dist/cmd/cmds.js

@@ -3,12 +3,12 @@ import { Command } from "commander";
 import { query } from "../cli.js";
 import { readAliases, readFeatures } from "../db/read.js";
 import { chatInferenceParams, chatTemplate } from "../state/chat.js";
-import { agent, isChatMode, runMode } from "../state/state.js";
+import { isChatMode, runMode } from "../state/state.js";
 import { initCommandsFromAliases } from "./clicmds/aliases.js";
 import { initBaseCommands } from "./clicmds/base.js";
 import { initUserCmds } from "./clicmds/cmds.js";
 const program = new Command();
-async function chat(program, options) {
+async function chat(program, options, agent, mcpServers) {
     const data = { message: '>', default: "" };
     const prompt = await input(data);
     if (prompt == "/q") {
@@ -17,12 +17,13 @@ async function chat(program, options) {
             process.exit(0);
         }
         else {
+            mcpServers.forEach(async (s) => await s.stop());
             await query(program);
         }
     }
     await agent.run(prompt, chatInferenceParams, options, chatTemplate ? chatTemplate : undefined);
     console.log();
-    await chat(program, options);
+    await chat(program, options, agent, mcpServers);
 }
 async function buildCmds() {
     initBaseCommands(program);

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

@@ -117,6 +117,7 @@ function pythonAction(path) {
                 final = JSON.parse(txt);
             }
             catch (e) {
+                console.warn("Can not parse json from python action", path, e);
             }
         }
         return final;

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

@@ -5,7 +5,7 @@ import ora from 'ora';
 import { usePerfTimer } from "../../../main.js";
 import { backend, backends, listBackends } from "../../../state/backends.js";
 import { setChatInferenceParams, setChatTemplate } from "../../../state/chat.js";
-import { agent, isChatMode } from "../../../state/state.js";
+import { isChatMode } from "../../../state/state.js";
 import { initTaskSettings, isTaskSettingsInitialized, tasksSettings } from "../../../state/tasks.js";
 import { chat, program } from "../../cmds.js";
 import { parseCommandArgs } from "../options_parsers.js";
@@ -13,10 +13,12 @@ import { runtimeDataError, runtimeError, runtimeWarning } from "../user_msgs.js"
 import { processOutput } from "../utils.js";
 import { readTask } from "./read.js";
 import { getTaskPrompt } from "./utils.js";
+import { Agent } from "@agent-smith/agent";
 async function executeTask(name, payload, options) {
     if (!isTaskSettingsInitialized.value) {
         initTaskSettings();
     }
+    const agent = new Agent(backend.value, name);
     const hasSettings = Object.keys(tasksSettings).includes(name);
     let settings = {};
     if (hasSettings) {
@@ -35,9 +37,20 @@ async function executeTask(name, payload, options) {
         agent.lm = backends[settings.backend];
     }
     if (options?.debug || options?.backend) {
-        console.log("Agent:", colors.bold(agent.lm.name), "( " + agent.lm.providerType + " backend type)");
+        console.log("Agent:", colors.bold(agent.name), "( " + agent.lm.providerType + " backend type)");
     }
     const { task, model, conf, vars, mcpServers, taskDir } = await readTask(name, payload, options, agent);
+    if (options?.debug && mcpServers.length > 0) {
+        console.log("Starting", mcpServers.length, "mcp servers");
+    }
+    for (const mcp of mcpServers) {
+        await mcp.start();
+        const tools = await mcp.extractTools();
+        tools.forEach(t => task.def.tools?.push(t));
+        if (options?.debug) {
+            console.log("MCP start", mcp.name);
+        }
+    }
     if (hasSettings) {
         if (!model?.inferParams) {
             model.inferParams = {};
@@ -163,7 +176,9 @@ async function executeTask(name, payload, options) {
                     return;
                 }
             }
-            printToken(t);
+            if (!options?.quiet) {
+                printToken(t);
+            }
         }
         ++emittedTokens;
     };
@@ -222,10 +237,22 @@ async function executeTask(name, payload, options) {
             throw new Error(errMsg);
         }
     }
-    if (!out.answer.text.endsWith("\n")) {
-        console.log();
+    if (!options?.isToolCall) {
+        if (!out.answer.text.endsWith("\n")) {
+            console.log();
+        }
+    }
+    if (!isChatMode.value || options?.isToolCall) {
+        if (options?.debug && mcpServers.length > 0) {
+            console.log("Closing", mcpServers.length, "mcp server(s)");
+        }
+        mcpServers.forEach((s) => {
+            s.stop();
+            if (options?.debug) {
+                console.log("MCP stop", s.name);
+            }
+        });
     }
-    mcpServers.forEach(async (s) => await s.stop());
     await processOutput(out);
     if (!options?.isToolCall && isChatMode.value) {
         if (tpl) {
@@ -244,7 +271,7 @@ async function executeTask(name, payload, options) {
             options.assistant = task.def.template.assistant;
         }
         setChatInferenceParams(initialInferParams);
-        await chat(program, options);
+        await chat(program, options, agent, mcpServers);
     }
     if (options?.debug === true || options?.verbose === true) {
         try {

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

@@ -55,6 +55,22 @@ async function readTask(name, payload, options, agent) {
     if (!taskSpec?.tools) {
         taskSpec.tools = [];
     }
+    const mcpServersArgs = {};
+    if (options?.mcp) {
+        options.mcp.forEach(v => {
+            const s = v.split(":");
+            if (s.length < 2) {
+                throw new Error(`Malformed mcp option ${v}: use --mcp servername:arg1,arg2`);
+            }
+            const sn = s[0];
+            const sa = s[1];
+            const _margs = sa.split(",");
+            mcpServersArgs[sn] = _margs;
+        });
+        if (options?.debug) {
+            console.log("Opening", options.mcp.length, "server(s)");
+        }
+    }
     if (taskFileSpec?.mcp) {
         for (const [servername, tool] of Object.entries(taskFileSpec.mcp)) {
             const authorizedTools = new Array();
@@ -69,11 +85,12 @@ async function readTask(name, payload, options, agent) {
                     authorizedTools.push(tn);
                 });
             }
+            const margs = tool.arguments;
+            if (servername in mcpServersArgs) {
+                margs.push(...mcpServersArgs[servername]);
+            }
             const mcp = new McpClient(servername, tool.command, tool.arguments, authorizedTools.length > 0 ? authorizedTools : null, askUserTools.length > 0 ? askUserTools : null);
             mcpServers.push(mcp);
-            await mcp.start();
-            const tools = await mcp.extractTools();
-            tools.forEach(t => taskSpec.tools?.push(t));
         }
     }
     if (taskSpec.toolsList) {

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

@@ -1,3 +1,3 @@
 declare function executeWorkflow(wname: string, args: any, options?: Record<string, any>): Promise<any>;
 declare function executeWorkflowCmd(name: string, wargs: Array<any>): Promise<any>;
-export { executeWorkflow, executeWorkflowCmd, };
+export { executeWorkflow, executeWorkflowCmd };

package/dist/cmd/lib/workflows/cmd.js

@@ -1,13 +1,13 @@
+import colors from "ansi-colors";
+import { pathToFileURL } from "node:url";
+import { getFeatureSpec } from "../../../state/features.js";
 import { executeAction } from "../actions/cmd.js";
 import { executeAdaptater } from "../adaptaters/cmd.js";
 import { parseCommandArgs } from "../options_parsers.js";
 import { executeTask } from "../tasks/cmd.js";
 import { getTaskPrompt } from "../tasks/utils.js";
-import { readWorkflow } from "./read.js";
-import colors from "ansi-colors";
-import { getFeatureSpec } from "../../../state/features.js";
-import { pathToFileURL } from "node:url";
 import { runtimeError } from "../user_msgs.js";
+import { readWorkflow } from "./read.js";
 async function executeWorkflow(wname, args, options = {}) {
     const { workflow, found } = await readWorkflow(wname);
     if (!found) {
@@ -39,6 +39,13 @@ async function executeWorkflow(wname, args, options = {}) {
                             if (prevStepType == "task") {
                                 tdata.prompt = taskRes.answer.text;
                             }
+                            else if (prevStepType == "action") {
+                                if (taskRes?.args) {
+                                    if (typeof taskRes.args == "string") {
+                                        tdata.prompt = taskRes.args;
+                                    }
+                                }
+                            }
                         }
                     }
                     if (!tdata?.prompt) {
@@ -62,6 +69,13 @@ async function executeWorkflow(wname, args, options = {}) {
                             if (prevStepType == "task") {
                                 tdata.prompt = taskRes.answer.text;
                             }
+                            else if (prevStepType == "action") {
+                                if (taskRes?.args) {
+                                    if (typeof taskRes.args == "string") {
+                                        tdata.prompt = taskRes.args;
+                                    }
+                                }
+                            }
                         }
                     }
                     if (!tdata?.prompt) {
@@ -148,4 +162,4 @@ async function executeWorkflowCmd(name, wargs) {
     const { args, options } = parseCommandArgs(wargs);
     return await executeWorkflow(name, args, options);
 }
-export { executeWorkflow, executeWorkflowCmd, };
+export { executeWorkflow, executeWorkflowCmd };

package/dist/cmd/options.js

@@ -14,6 +14,7 @@ const inferenceOptions = [
     new Option("-t, --temperature <number>", "adjusts randomness in sampling; higher values mean more randomness").argParser(parseFloatValue),
     new Option("-r, --repeat_penalty <number>", "adjusts penalty for repeated tokens").argParser(parseFloatValue),
     new Option("-b, --backend <name>", "use a given backend. It must be registered in config").argParser(parseString),
+    new Option("--mcp [args...]", "extra arguments for mcp server arguments: --mcp servername:arg1,arg2"),
 ];
 const ioOptions = [
     new Option("--if, --input-file", "use promptfile input mode"),

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

@@ -1,3 +1,3 @@
 import { Command } from "commander";
-declare function readCmd(name: string, cmdPath: string): Promise<Command>;
+declare function readCmd(name: string, cmdPath: string): Promise<Command | null>;
 export { readCmd };

package/dist/cmd/sys/read_cmds.js

@@ -1,12 +1,19 @@
 import { pathToFileURL } from 'url';
+import { runtimeWarning } from "../lib/user_msgs.js";
 async function readCmd(name, cmdPath) {
-    const cmds = new Array();
     const url = pathToFileURL(cmdPath).href;
-    const { cmd } = await import(url);
-    if (!cmd) {
-        throw new Error(`command ${name} not found at ${cmdPath}`);
+    let _cmd = null;
+    try {
+        const mod = await import(url);
+        _cmd = mod.cmd;
     }
-    cmds.push(cmd);
-    return cmd;
+    catch (e) {
+        runtimeWarning(`command ${name} not found at ${cmdPath}, ${e}`);
+        return null;
+    }
+    if (!_cmd) {
+        throw new Error("no cmd");
+    }
+    return _cmd;
 }
 export { readCmd };

package/dist/cmd/sys/read_features.js

@@ -66,7 +66,7 @@ function readFeaturesDir(dir) {
     }
     dirpath = path.join(dir, "actions");
     if (fs.existsSync(dirpath)) {
-        const data = _readDir(dirpath, ["yml", ".js", "mjs", ".py"]);
+        const data = _readDir(dirpath, [".yml", ".js", ".py"]);
         data.forEach((filename) => {
             const parts = filename.split(".");
             const ext = parts.pop();

package/dist/index.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { argv } from 'process';
 import { query } from "./cli.js";
+import { resetDbCmd } from './cmd/clicmds/cmds.js';
+import { updateConfCmd } from './cmd/clicmds/updateconf.js';
 import { buildCmds, parseCmd } from './cmd/cmds.js';
 import { formatMode, init, inputMode, isChatMode, outputMode, runMode } from './state/state.js';
-import { updateConfCmd } from './cmd/clicmds/updateconf.js';
-import { resetDbCmd } from './cmd/clicmds/cmds.js';
 async function main() {
     const nargs = argv.length;
     if (nargs == 2) {

package/dist/state/state.d.ts

@@ -1,6 +1,5 @@
 import { PythonShell } from 'python-shell';
 import { InputMode, RunMode, FormatMode, OutputMode } from "../interfaces.js";
-import { Agent } from "@agent-smith/agent";
 declare let pyShell: PythonShell;
 declare const inputMode: import("@vue/reactivity").Ref<InputMode, InputMode>;
 declare const outputMode: import("@vue/reactivity").Ref<OutputMode, OutputMode>;
@@ -10,7 +9,6 @@ declare const isChatMode: import("@vue/reactivity").Ref<boolean, boolean>;
 declare const promptfilePath: import("@vue/reactivity").Ref<string, string>;
 declare const dataDirPath: import("@vue/reactivity").Ref<string, string>;
 declare const isStateReady: import("@vue/reactivity").Ref<boolean, boolean>;
-declare let agent: Agent;
 declare const lastCmd: {
     name: string;
     args: Array<string>;
@@ -19,4 +17,4 @@ declare function initFilepaths(): void;
 declare function init(): Promise<void>;
 declare function initState(): Promise<void>;
 declare function pluginDataDir(pluginName: string): string;
-export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, promptfilePath, dataDirPath, isStateReady, pluginDataDir, initState, initFilepaths, init, pyShell, agent, };
+export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, promptfilePath, dataDirPath, isStateReady, pluginDataDir, initState, initFilepaths, init, pyShell, };

package/dist/state/state.js

@@ -4,7 +4,6 @@ import { readFilePaths } from "../db/read.js";
 import path from "path";
 import { createDirectoryIfNotExists } from "../cmd/sys/dirs.js";
 import { backend, initBackends } from "./backends.js";
-import { Agent } from "@agent-smith/agent";
 import { runtimeDataError } from "../utils/user_msgs.js";
 let pyShell;
 const inputMode = ref("manual");
@@ -15,7 +14,6 @@ const isChatMode = ref(false);
 const promptfilePath = ref("");
 const dataDirPath = ref("");
 const isStateReady = ref(false);
-let agent;
 const lastCmd = reactive({
     name: "",
     args: [],
@@ -39,7 +37,6 @@ async function init() {
         runtimeDataError("No backend found, can not initialize agent");
         return;
     }
-    agent = new Agent(backend.value);
 }
 async function initState() {
     if (isStateReady.value) {
@@ -61,4 +58,4 @@ function pluginDataDir(pluginName) {
     createDirectoryIfNotExists(pluginDatapath);
     return pluginDatapath;
 }
-export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, promptfilePath, dataDirPath, isStateReady, pluginDataDir, initState, initFilepaths, init, pyShell, agent, };
+export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, promptfilePath, dataDirPath, isStateReady, pluginDataDir, initState, initFilepaths, init, 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.104",
+  "version": "0.0.106",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -10,17 +10,17 @@
     "watch": "tsc --noCheck -p . -w"
   },
   "dependencies": {
-    "@agent-smith/agent": "^0.2.0",
-    "@agent-smith/task": "^0.2.1",
+    "@agent-smith/agent": "^0.2.1",
     "@agent-smith/nodetask": "^0.1.0",
+    "@agent-smith/task": "^0.2.2",
     "@agent-smith/tfm": "^0.2.0",
-    "@inquirer/prompts": "^8.1.0",
+    "@inquirer/prompts": "^8.2.0",
     "@intrinsicai/gbnfgen": "0.12.0",
     "@locallm/api": "^0.7.3",
     "@modelcontextprotocol/sdk": "^1.25.2",
-    "@vue/reactivity": "^3.5.26",
+    "@vue/reactivity": "^3.5.27",
     "ansi-colors": "^4.1.3",
-    "better-sqlite3": "^12.5.0",
+    "better-sqlite3": "^12.6.2",
     "clipboardy": "^5.0.2",
     "commander": "^14.0.2",
     "marked-terminal": "^7.3.0",
@@ -29,7 +29,6 @@
     "yaml": "^2.8.2"
   },
   "devDependencies": {
-    "@agent-smith/tmem-jobs": "^0.0.4",
     "@cfworker/json-schema": "^4.1.1",
     "@commander-js/extra-typings": "^14.0.0",
     "@locallm/types": "^0.6.7",
@@ -37,11 +36,11 @@
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/better-sqlite3": "^7.6.13",
     "@types/marked-terminal": "^6.1.1",
-    "@types/node": "^25.0.3",
-    "openai": "^6.15.0",
+    "@types/node": "^25.0.9",
+    "openai": "^6.16.0",
     "restmix": "^0.6.1",
-    "rollup": "^4.55.1",
-    "ts-node": "^10.9.2",
+    "rollup": "^4.55.2",
+    "ts-node": "^1.7.1",
     "tslib": "2.8.1",
     "typescript": "^5.9.3"
   },