@agent-smith/cli 0.0.64 → 0.0.65

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

@@ -13,6 +13,7 @@ import { formatStats, readPromptFile } from "../utils.js";
 import { executeWorkflow } from "../workflows/cmd.js";
 import { configureTaskModel, mergeInferParams } from "./conf.js";
 import { openTaskSpec } from "./utils.js";
+import { McpServer } from "./mcp.js";
 async function executeTask(name, payload, options, quiet = false) {
     await initAgent();
     if (options.debug) {
@@ -41,8 +42,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) {
@@ -117,7 +131,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 +149,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,6 +208,7 @@ 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);

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.65",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",