@agent-smith/cli 0.0.100 → 0.0.102

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

@@ -6,8 +6,9 @@ declare class McpClient {
     transport: StdioClientTransport;
     client: Client;
     authorizedTools: Array<string> | null;
+    askUserTools: Array<string> | null;
     tools: Record<string, ToolSpec>;
-    constructor(servername: string, command: string, args: Array<string>, authorizedTools?: Array<string> | null);
+    constructor(servername: string, command: string, args: Array<string>, authorizedTools?: Array<string> | null, askUserTools?: Array<string> | null);
     start(): Promise<void>;
     stop(): Promise<void>;
     extractTools(): Promise<Array<ToolSpec>>;

package/dist/cmd/lib/mcp.js

@@ -1,12 +1,14 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { confirmToolUsage } from "./tools.js";
 class McpClient {
     name;
     transport;
     client;
     authorizedTools = null;
+    askUserTools = null;
     tools = {};
-    constructor(servername, command, args, authorizedTools = null) {
+    constructor(servername, command, args, authorizedTools = null, askUserTools = null) {
         this.name = servername;
         const okargs = new Array();
         for (const arg of args) {
@@ -29,6 +31,9 @@ class McpClient {
         if (authorizedTools) {
             this.authorizedTools = authorizedTools;
         }
+        if (askUserTools) {
+            this.askUserTools = askUserTools;
+        }
     }
     async start() {
         await this.client.connect(this.transport);
@@ -66,6 +71,11 @@ class McpClient {
                 arguments: args,
                 execute: exec
             };
+            if (this.askUserTools) {
+                if (this.askUserTools.includes(tool.name)) {
+                    t.canRun = confirmToolUsage;
+                }
+            }
             this.tools[tool.name] = t;
             toolSpecs.push(t);
         }

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

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

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

@@ -13,7 +13,7 @@ import { runtimeDataError, runtimeError, runtimeWarning } from "../user_msgs.js"
 import { formatStats, processOutput } from "../utils.js";
 import { readTask } from "./read.js";
 import { getTaskPrompt } from "./utils.js";
-async function executeTask(name, payload, options, quiet) {
+async function executeTask(name, payload, options) {
     if (!isTaskSettingsInitialized.value) {
         initTaskSettings();
     }
@@ -37,7 +37,7 @@ async function executeTask(name, payload, options, quiet) {
     if (options?.debug || options?.backend) {
         console.log("Agent:", colors.bold(agent.lm.name), "( " + agent.lm.providerType + " backend type)");
     }
-    const { task, model, conf, vars, mcpServers } = await readTask(name, payload, options, agent);
+    const { task, model, conf, vars, mcpServers, taskDir } = await readTask(name, payload, options, agent);
     if (hasSettings) {
         if (!model?.inferParams) {
             model.inferParams = {};
@@ -167,7 +167,7 @@ async function executeTask(name, payload, options, quiet) {
         }
         ++i;
     };
-    const spinnerInit = (name) => ora(`Executing ${name} tool ...`);
+    const spinnerInit = (name) => ora(`Executing ${name} tool ...\n`);
     let tcspinner;
     const onToolCall = (tc) => {
         console.log("⚒️ ", color.bold(name), "=>", `${color.yellowBright(tc.name)}`, tc.arguments);
@@ -191,6 +191,7 @@ async function executeTask(name, payload, options, quiet) {
         delete conf.model;
     }
     const tconf = {
+        baseDir: taskDir,
         model: model,
         onToolCall: onToolCall,
         onToolCallEnd: onToolCallEnd,
@@ -228,7 +229,7 @@ async function executeTask(name, payload, options, quiet) {
     }
     mcpServers.forEach(async (s) => await s.stop());
     await processOutput(out);
-    if (isChatMode.value) {
+    if (!options?.isToolCall && isChatMode.value) {
         if (tpl) {
             setChatTemplate(tpl);
         }

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

@@ -1,11 +1,14 @@
 import { Agent } from "@agent-smith/agent";
-import { ModelSpec, Task, TaskConf } from "@agent-smith/task";
+import { ModelSpec } from "@agent-smith/task";
+import { NodeTask } from "@agent-smith/nodetask";
 import { McpClient } from "../mcp.js";
+import type { LmTaskConfig } from "../../../interfaces.js";
 declare function readTask(name: string, payload: Record<string, any>, options: Record<string, any>, agent: Agent): Promise<{
-    task: Task;
+    task: NodeTask;
     model: ModelSpec;
-    conf: TaskConf;
+    conf: LmTaskConfig;
     vars: Record<string, any>;
     mcpServers: Array<McpClient>;
+    taskDir: string;
 }>;
 export { readTask };

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

@@ -1,4 +1,5 @@
-import { Task } from "@agent-smith/task";
+import path from "path";
+import { NodeTask } from "@agent-smith/nodetask";
 import { compile, serializeGrammar } from "@intrinsicai/gbnfgen";
 import { readTool } from "../../../db/read.js";
 import { executeAction } from "../actions/cmd.js";
@@ -8,13 +9,15 @@ import { executeWorkflow } from "../workflows/cmd.js";
 import { executeTask } from "./cmd.js";
 import { configureTaskModel, mergeInferParams } from "./conf.js";
 import { openTaskSpec } from "./utils.js";
+import { confirmToolUsage } from "../tools.js";
 async function readTask(name, payload, options, agent) {
     if (options?.debug) {
         console.log("Task", name);
         console.log("Payload:", payload);
         console.log("Task options:", options);
     }
-    const taskFileSpec = openTaskSpec(name);
+    const { taskFileSpec, taskPath } = openTaskSpec(name);
+    const taskDir = path.dirname(taskPath);
     const opts = payload?.inferParams ? { ...options, ...payload.inferParams } : options;
     const conf = parseTaskConfigOptions(opts);
     if (options?.debug) {
@@ -54,7 +57,19 @@ async function readTask(name, payload, options, agent) {
     }
     if (taskFileSpec?.mcp) {
         for (const [servername, tool] of Object.entries(taskFileSpec.mcp)) {
-            const mcp = new McpClient(servername, tool.command, tool.arguments, tool?.tools ?? null);
+            const authorizedTools = new Array();
+            const askUserTools = new Array();
+            if (tool?.tools) {
+                tool.tools.forEach(t => {
+                    let tn = t;
+                    if (t.endsWith("?")) {
+                        tn = t.slice(0, -1);
+                        askUserTools.push(tn);
+                    }
+                    authorizedTools.push(tn);
+                });
+            }
+            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();
@@ -62,21 +77,29 @@ async function readTask(name, payload, options, agent) {
         }
     }
     if (taskSpec.toolsList) {
-        for (const toolName of taskSpec.toolsList) {
+        for (const rawToolName of taskSpec.toolsList) {
+            let toolName = rawToolName;
+            let autoRunTool = true;
+            if (rawToolName.endsWith("?")) {
+                autoRunTool = false;
+                toolName = rawToolName.slice(0, -1);
+            }
             const { found, tool, type } = readTool(toolName);
             if (!found) {
                 throw new Error(`tool ${toolName} not found for task ${taskSpec.name}`);
             }
+            const quiet = !options?.debug;
             const lmTool = {
                 ...tool,
                 execute: async (params) => {
                     switch (type) {
                         case "action":
-                            const res = await executeAction(toolName, params, options, true);
+                            const res = await executeAction(toolName, params, options, quiet);
                             return res;
                         case "task":
-                            conf.quiet = !options?.debug;
-                            const tres = await executeTask(name, params, options, true);
+                            options.isToolCall = true;
+                            const tres = await executeTask(toolName, params, options);
+                            options.isToolCall = false;
                             return tres.answer.text;
                         case "workflow":
                             const wres = await executeWorkflow(toolName, params, options);
@@ -86,17 +109,19 @@ async function readTask(name, payload, options, agent) {
                     }
                 }
             };
+            if (!autoRunTool) {
+                lmTool.canRun = confirmToolUsage;
+            }
             taskSpec.tools.push(lmTool);
         }
         delete taskSpec.toolsList;
     }
     ;
-    const task = new Task(agent, taskSpec);
-    task.addTools(taskSpec.tools);
+    const task = new NodeTask(agent, taskSpec);
     if (model?.inferParams?.tsGrammar) {
         model.inferParams.grammar = serializeGrammar(await compile(model.inferParams.tsGrammar, "Grammar"));
         delete model.inferParams.tsGrammar;
     }
-    return { task, model, conf, vars, mcpServers };
+    return { task, model, conf, vars, mcpServers, taskDir };
 }
 export { readTask };

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

@@ -1,4 +1,7 @@
 import { LmTaskFileSpec } from "../../../interfaces.js";
-declare function openTaskSpec(name: string): LmTaskFileSpec;
+declare function openTaskSpec(name: string): {
+    taskFileSpec: LmTaskFileSpec;
+    taskPath: string;
+};
 declare function getTaskPrompt(name: string, args: Array<string>, options: Record<string, any>): Promise<string>;
-export { openTaskSpec, getTaskPrompt, };
+export { getTaskPrompt, openTaskSpec };

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

@@ -1,9 +1,9 @@
 import YAML from 'yaml';
+import { readClipboard } from '../../../cmd/sys/clipboard.js';
 import { readTask } from "../../../cmd/sys/read_task.js";
 import { getFeatureSpec } from "../../../state/features.js";
-import { readClipboard } from '../../../cmd/sys/clipboard.js';
-import { readPromptFile } from '../utils.js';
 import { runtimeDataError } from '../user_msgs.js';
+import { readPromptFile } from '../utils.js';
 function openTaskSpec(name) {
     const { found, path } = getFeatureSpec(name, "task");
     if (!found) {
@@ -15,7 +15,7 @@ function openTaskSpec(name) {
     }
     const taskFileSpec = YAML.parse(res.ymlTask);
     taskFileSpec.name = name;
-    return taskFileSpec;
+    return { taskFileSpec: taskFileSpec, taskPath: path };
 }
 async function getTaskPrompt(name, args, options) {
     let pr;
@@ -36,4 +36,4 @@ async function getTaskPrompt(name, args, options) {
     }
     return pr;
 }
-export { openTaskSpec, getTaskPrompt, };
+export { getTaskPrompt, openTaskSpec };

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

@@ -1,4 +1,6 @@
 import { FeatureExtension } from '../../interfaces.js';
+import { type ToolCallSpec } from '@locallm/types';
+declare function confirmToolUsage(toolCall: ToolCallSpec): Promise<boolean>;
 declare function extractTaskToolDocAndVariables(name: string, ext: FeatureExtension, dirPath: string): {
     toolDoc: string;
     variables: {
@@ -10,4 +12,4 @@ declare function extractToolDoc(name: string, ext: FeatureExtension, dirPath: st
     found: boolean;
     toolDoc: string;
 };
-export { extractToolDoc, extractTaskToolDocAndVariables, };
+export { extractToolDoc, extractTaskToolDocAndVariables, confirmToolUsage, };

package/dist/cmd/lib/tools.js

@@ -1,6 +1,17 @@
 import YAML from 'yaml';
 import * as fs from 'fs';
 import { readYmlFile } from '../sys/read_yml_file.js';
+import { confirm } from '@inquirer/prompts';
+async function confirmToolUsage(toolCall) {
+    let args;
+    if (toolCall?.arguments) {
+        args = `with arguments ${JSON.stringify(toolCall.arguments)}`;
+    }
+    else {
+        args = "with no arguments";
+    }
+    return await confirm({ message: `Execute tool ${toolCall.name} ${args}?` });
+}
 function _extractToolDoc(filePath, startComment, endComment) {
     try {
         const fileContent = fs.readFileSync(filePath, 'utf-8');
@@ -55,7 +66,7 @@ function _parseToolDoc(rawTxt, name) {
         return res;
     }
     catch (e) {
-        throw new Error(`Error parsing tool ${name}: data:\n${rawTxt}\n`);
+        throw new Error(`Error parsing tool ${name}: ${e} \nData:\n${rawTxt}\n`);
     }
 }
 function _parseTaskVariables(data) {
@@ -127,4 +138,4 @@ function extractToolDoc(name, ext, dirPath) {
     }
     return { found: true, toolDoc: spec };
 }
-export { extractToolDoc, extractTaskToolDocAndVariables, };
+export { extractToolDoc, extractTaskToolDocAndVariables, confirmToolUsage, };

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

@@ -46,7 +46,7 @@ async function executeWorkflow(wname, args, options = {}) {
                     if (!pr) {
                         throw new Error(`Workflow ${wname} step ${i + 1}: provide a prompt for the task ${step.name}`);
                     }
-                    const tr = await executeTask(step.name, { prompt: pr }, options, true);
+                    const tr = await executeTask(step.name, { prompt: pr }, options);
                     taskRes = { ...tr, ...taskRes };
                 }
                 catch (e) {

package/dist/state/auto/usercmds.js

@@ -1,9 +1,2 @@
-import { cmd as c1 } from "file:///home/ggg/dev/js/agent-smith-plugins/system/fs/dist/cmds/lsdir.js";
-import { cmd as c2 } from "file:///home/ggg/dev/js/agent-smith-plugins/code/git/dist/cmds/commit.js";
-import { cmd as c3 } from "file:///home/ggg/dev/js/agent-smith-plugins/code/git/dist/cmds/commita.js";
-import { cmd as c4 } from "file:///home/ggg/dev/js/snowind-astro/features/cmds/design-component.js";
-import { cmd as c5 } from "file:///home/ggg/dev/js/docdundee/package/features/dist/cmds/tsdoccmd.js";
-
-const cmds = [ c1, c2, c3, c4, c5 ]
-
-export { cmds }
+const cmds = new Array();
+export { cmds };

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.100",
+  "version": "0.0.102",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -10,8 +10,9 @@
     "watch": "tsc --noCheck -p . -w"
   },
   "dependencies": {
-    "@agent-smith/agent": "^0.1.8",
-    "@agent-smith/task": "^0.1.9",
+    "@agent-smith/agent": "^0.2.0",
+    "@agent-smith/task": "^0.2.1",
+    "@agent-smith/nodetask": "^0.1.0",
     "@agent-smith/tfm": "^0.2.0",
     "@inquirer/prompts": "^8.1.0",
     "@intrinsicai/gbnfgen": "0.12.0",
@@ -31,7 +32,7 @@
     "@agent-smith/tmem-jobs": "^0.0.4",
     "@cfworker/json-schema": "^4.1.1",
     "@commander-js/extra-typings": "^14.0.0",
-    "@locallm/types": "^0.6.5",
+    "@locallm/types": "^0.6.7",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/better-sqlite3": "^7.6.13",