@agent-smith/cli 0.0.64 → 0.0.66

package/dist/cmd/cmds.d.ts

@@ -1,5 +1,6 @@
 import { Command } from "commander";
+declare const program: Command;
 declare function chat(program: Command): Promise<void>;
 declare function buildCmds(): Promise<Command>;
 declare function parseCmd(program: Command): Promise<void>;
-export { buildCmds, chat, parseCmd, };
+export { program, buildCmds, chat, parseCmd, };

package/dist/cmd/cmds.js

@@ -9,6 +9,7 @@ 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) {
     const data = { message: '>', default: "" };
     const prompt = await input(data);
@@ -26,7 +27,6 @@ async function chat(program) {
     await chat(program);
 }
 async function buildCmds() {
-    const program = new Command();
     initBaseCommands(program);
     const aliases = readAliases();
     const feats = readFeatures();
@@ -39,8 +39,5 @@ async function buildCmds() {
 }
 async function parseCmd(program) {
     await program.parseAsync();
-    if (isChatMode.value) {
-        await chat(program);
-    }
 }
-export { buildCmds, chat, parseCmd, };
+export { program, buildCmds, chat, parseCmd, };

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

@@ -1,4 +1,5 @@
 import { LmTaskOutput } from "@agent-smith/lmtask";
-declare function executeTask(name: string, payload: Record<string, any>, options: Record<string, any>, quiet?: boolean): Promise<LmTaskOutput>;
+import { LmExpert } from "@agent-smith/brain";
+declare function executeTask(name: string, payload: Record<string, any>, options: Record<string, any>, quiet?: boolean, expert?: LmExpert): Promise<LmTaskOutput>;
 declare function executeTaskCmd(name: string, targs?: Array<any>): Promise<LmTaskOutput>;
 export { executeTask, executeTaskCmd };

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

@@ -1,19 +1,23 @@
+import { input } from "@inquirer/prompts";
 import { compile, serializeGrammar } from "@intrinsicai/gbnfgen";
 import color from "ansi-colors";
 import ora from 'ora';
 import { brain, initAgent, taskBuilder } from "../../../agent.js";
+import { query } from "../../../cli.js";
 import { readClipboard } from "../../../cmd/sys/clipboard.js";
 import { readTool } from "../../../db/read.js";
 import { usePerfTimer } from "../../../main.js";
-import { isChatMode } from "../../../state/state.js";
+import { isChatMode, runMode } from "../../../state/state.js";
+import { program } from "../../cmds.js";
 import { executeAction } from "../actions/cmd.js";
 import { parseCommandArgs, parseTaskConfigOptions } from "../options_parsers.js";
 import { runtimeDataError } from "../user_msgs.js";
 import { formatStats, readPromptFile } from "../utils.js";
 import { executeWorkflow } from "../workflows/cmd.js";
 import { configureTaskModel, mergeInferParams } from "./conf.js";
+import { McpServer } from "./mcp.js";
 import { openTaskSpec } from "./utils.js";
-async function executeTask(name, payload, options, quiet = false) {
+async function executeTask(name, payload, options, quiet, expert) {
     await initAgent();
     if (options.debug) {
         console.log("Payload:", payload);
@@ -41,8 +45,21 @@ async function executeTask(name, payload, options, quiet = false) {
             vars[k] = options[k];
         }
     });
-    if (taskSpec.toolsList) {
+    const mcpServers = new Array();
+    if (taskFileSpec?.mcp) {
         taskSpec.tools = [];
+        for (const tool of Object.values(taskFileSpec.mcp)) {
+            const mcp = new McpServer(tool.command, tool.arguments, tool?.tools ?? null);
+            mcpServers.push(mcp);
+            await mcp.start();
+            const tools = await mcp.extractTools();
+            tools.forEach(t => taskSpec.tools?.push(t));
+        }
+    }
+    if (taskSpec.toolsList) {
+        if (!taskSpec?.tools) {
+            taskSpec.tools = [];
+        }
         for (const toolName of taskSpec.toolsList) {
             const { found, tool, type } = readTool(toolName);
             if (!found) {
@@ -80,7 +97,7 @@ async function executeTask(name, payload, options, quiet = false) {
     if (options.debug) {
         console.log("Task model:", model);
     }
-    const ex = brain.getOrCreateExpertForModel(model.name, model.template);
+    const ex = expert ?? brain.getOrCreateExpertForModel(model.name, model.template);
     if (!ex) {
         throw new Error("No expert found for model " + model.name);
     }
@@ -117,7 +134,6 @@ async function executeTask(name, payload, options, quiet = false) {
             if (i == 0) {
                 perfTimer.start();
             }
-            ++i;
             spinner.text = formatTokenCount(i);
             if (!options?.verbose) {
                 if (hasThink) {
@@ -136,6 +152,13 @@ async function executeTask(name, payload, options, quiet = false) {
                     }
                 }
             }
+            else {
+                if (t == ex.template.tags.think?.end) {
+                    let msg = color.dim("Thinking:") + ` ${i} ${color.dim("tokens")}`;
+                    msg = msg + " " + color.dim(perfTimer.time());
+                    console.log(msg);
+                }
+            }
             if (hasTools) {
                 if (t == ex.template.tags.toolCall?.start) {
                     continueWrite = false;
@@ -188,11 +211,22 @@ async function executeTask(name, payload, options, quiet = false) {
     catch (err) {
         throw new Error(`executing task: ${name} (${err})`);
     }
+    mcpServers.forEach(async (s) => await s.stop());
     if (isChatMode.value) {
-        if (brain.ex.name != ex.name) {
-            brain.setDefaultExpert(ex);
+        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(program);
+            }
+        }
+        else {
+            await executeTask(name, { ...vars, prompt: prompt }, options, quiet, ex);
         }
-        brain.ex.template.pushToHistory({ user: payload.prompt, assistant: out.answer.text });
     }
     if (options?.debug === true || options?.verbose === true) {
         console.log("\n", formatStats(out.answer.stats));

package/dist/cmd/lib/tasks/mcp.d.ts

@@ -0,0 +1,13 @@
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { LmTaskToolSpec } from "@agent-smith/lmtask/dist/interfaces.js";
+declare class McpServer {
+    transport: StdioClientTransport;
+    client: Client;
+    authorizedTools: Array<string> | null;
+    constructor(command: string, args: Array<string>, authorizedTools?: string[]);
+    start(): Promise<void>;
+    stop(): Promise<void>;
+    extractTools(): Promise<Array<LmTaskToolSpec>>;
+}
+export { McpServer, };

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

@@ -0,0 +1,57 @@
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+class McpServer {
+    transport;
+    client;
+    authorizedTools = null;
+    constructor(command, args, authorizedTools = new Array) {
+        this.transport = new StdioClientTransport({
+            command: command,
+            args: args
+        });
+        this.client = new Client({ name: "AgentSmith", version: "1.0.0" });
+        if (authorizedTools) {
+            this.authorizedTools = authorizedTools;
+        }
+    }
+    async start() {
+        await this.client.connect(this.transport);
+    }
+    async stop() {
+        await this.client.close();
+    }
+    async extractTools() {
+        const toolSpecs = new Array();
+        const serverToolsList = await this.client.listTools();
+        for (const tool of serverToolsList.tools) {
+            if (this.authorizedTools) {
+                if (!this.authorizedTools.includes(tool.name)) {
+                    continue;
+                }
+            }
+            const args = {};
+            if (tool.inputSchema.properties) {
+                for (const [k, v] of Object.entries(tool.inputSchema.properties)) {
+                    const vv = v;
+                    args[k] = { description: vv.description + " (" + vv.type + ")" };
+                }
+            }
+            const exec = async (args) => {
+                const res = await this.client.callTool({
+                    name: tool.name,
+                    arguments: args,
+                });
+                return res;
+            };
+            const t = {
+                name: tool.name,
+                description: tool.description ?? "",
+                arguments: args,
+                execute: exec
+            };
+            toolSpecs.push(t);
+        }
+        return toolSpecs;
+    }
+}
+export { McpServer, };

package/dist/db/db.js

@@ -5,7 +5,7 @@ import { createDirectoryIfNotExists } from "../cmd/sys/dirs.js";
 const confDir = path.join(process.env.HOME ?? "~/", ".config/agent-smith/cli");
 const dbPath = path.join(confDir, "config.db");
 let db;
-const debugDb = true;
+const debugDb = false;
 function initDb(isVerbose, execSchema) {
     if (execSchema) {
         createDirectoryIfNotExists(confDir, true);

package/dist/interfaces.d.ts

@@ -79,6 +79,7 @@ interface LmTaskFileSpec extends BaseLmTask {
     ctx: number;
     model?: ModelSpec;
     modelpack?: ModelPack;
+    mcp?: McpServerSpec;
 }
 interface BaseLmTaskConfig {
     templateName: string;
@@ -92,6 +93,23 @@ interface FinalLmTaskConfig {
     model?: ModelSpec;
     modelname?: string;
 }
+interface McpServerSpec {
+    command: string;
+    arguments: string[];
+    tools: string[];
+}
+interface McpServerTool {
+    name: string;
+    description: string;
+    inputSchema: {
+        type: string;
+        properties: Record<string, {
+            type: string;
+            description: string;
+        }>;
+        required: string[];
+    };
+}
 type InputMode = "manual" | "promptfile" | "clipboard";
 type OutputMode = "txt" | "clipboard";
 type RunMode = "cli" | "cmd";
@@ -107,4 +125,4 @@ type CmdExtension = "js";
 type ModelFileExtension = "yml";
 type FeatureExtension = TaskExtension | CmdExtension | ActionExtension | WorkflowExtension | ModelFileExtension;
 type AliasType = "task" | "action" | "workflow";
-export { InputMode, VerbosityMode, OutputMode, RunMode, FormatMode, FeatureType, ActionExtension, TaskExtension, WorkflowExtension, AdaptaterExtension, CmdExtension, ModelFileExtension, FeatureSpec, Features, ConfigFile, FeatureExtension, AliasType, ToolType, Settings, DbModelDef, ModelSpec, ModelfileSpec, ModelPack, LmTaskFileSpec, LmTaskConfig, FinalLmTaskConfig, };
+export { InputMode, VerbosityMode, OutputMode, RunMode, FormatMode, FeatureType, ActionExtension, TaskExtension, WorkflowExtension, AdaptaterExtension, CmdExtension, ModelFileExtension, FeatureSpec, Features, ConfigFile, FeatureExtension, AliasType, ToolType, Settings, DbModelDef, ModelSpec, ModelfileSpec, ModelPack, LmTaskFileSpec, LmTaskConfig, FinalLmTaskConfig, McpServerSpec, McpServerTool, };

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.64",
+  "version": "0.0.66",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -12,18 +12,18 @@
   "dependencies": {
     "@agent-smith/brain": "^0.0.43",
     "@agent-smith/jobs": "^0.0.14",
-    "@agent-smith/lmtask": "^0.0.44",
+    "@agent-smith/lmtask": "^0.0.45",
     "@agent-smith/tfm": "^0.1.2",
     "@inquirer/prompts": "^7.5.3",
     "@inquirer/select": "^4.2.3",
-    "@vue/reactivity": "^3.5.15",
+    "@vue/reactivity": "^3.5.16",
     "ansi-colors": "^4.1.3",
     "better-sqlite3": "^11.10.0",
     "chalk": "^5.4.1",
     "clipboardy": "^4.0.0",
     "commander": "^14.0.0",
     "marked-terminal": "^7.3.0",
-    "modprompt": "^0.11.7",
+    "modprompt": "^0.11.8",
     "ora": "^8.2.0",
     "python-shell": "^5.0.0",
     "yaml": "^2.8.0"
@@ -36,7 +36,7 @@
     "@rollup/plugin-typescript": "^12.1.2",
     "@types/better-sqlite3": "^7.6.13",
     "@types/marked-terminal": "^6.1.1",
-    "@types/node": "^22.15.21",
+    "@types/node": "^22.15.27",
     "restmix": "^0.5.0",
     "rollup": "^4.41.1",
     "ts-node": "^10.9.2",