@agent-smith/cli 0.0.57 → 0.0.58

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

@@ -1,6 +1,6 @@
 import { useAgentTask } from "@agent-smith/jobs";
 import { getFeatureSpec } from '../../../state/features.js';
-import { readYmlAction } from "../../sys/read_yml_action.js";
+import { readYmlFile } from "../../sys/read_yml_file.js";
 import { execute } from "../../sys/execute.js";
 import { runPyScript } from "../../sys/run_python.js";
 import { pyShell } from "../../../state/state.js";
@@ -10,7 +10,7 @@ function systemAction(path) {
         id: "system_action",
         title: "",
         run: async (args) => {
-            const actionSpec = readYmlAction(path);
+            const actionSpec = readYmlFile(path);
             if (!actionSpec.data?.args) {
                 actionSpec.data.args = [];
             }
@@ -29,13 +29,17 @@ function pythonAction(path) {
             if (error) {
                 throw new Error(`python error: ${error}`);
             }
-            const txt = data.join("\n");
+            let txt = data[0];
+            if (data.length > 1) {
+                txt = data.join("\n");
+            }
             let final = txt;
             if (txt.startsWith("{") || txt.startsWith("[")) {
                 try {
                     final = JSON.parse(txt);
                 }
-                catch (e) { }
+                catch (e) {
+                }
             }
             return final;
         }

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

@@ -1,15 +1,13 @@
 import { compile, serializeGrammar } from "@intrinsicai/gbnfgen";
-import YAML from 'yaml';
 import { brain, initAgent, taskBuilder } from "../../../agent.js";
 import { readTool } from "../../../db/read.js";
-import { getFeatureSpec } from "../../../state/features.js";
+import { parseArgs } from "../../../primitives/args.js";
 import { isChatMode, isDebug, isShowTokens, isVerbose } from "../../../state/state.js";
-import { readTask } from "../../sys/read_task.js";
 import { executeActionCmd, } from "../actions/cmd.js";
 import { formatStats, parseInputOptions } from "../utils.js";
 import { executeWorkflowCmd } from "../workflows/cmd.js";
 import { configureTaskModel, mergeInferParams } from "./conf.js";
-import { parseArgs } from "../../../primitives/args.js";
+import { openTaskSpec } from "./utils.js";
 async function executeTaskCmd(args = [], options = {}) {
     await initAgent();
     if (isDebug.value) {
@@ -45,15 +43,7 @@ async function executeTaskCmd(args = [], options = {}) {
         name = args.name;
         pr = args.prompt;
     }
-    const { found, path } = getFeatureSpec(name, "task");
-    if (!found) {
-        throw new Error(`Task ${name} not found`);
-    }
-    const res = readTask(path);
-    if (!res.found) {
-        throw new Error(`Task ${name}, ${path} not found`);
-    }
-    const taskFileSpec = YAML.parse(res.ymlTask);
+    const taskFileSpec = openTaskSpec(name);
     const { conf, vars } = parseArgs(args);
     conf.inferParams = mergeInferParams(conf.inferParams, taskFileSpec.inferParams ?? {});
     const model = configureTaskModel(conf, taskFileSpec);
@@ -68,15 +58,19 @@ async function executeTaskCmd(args = [], options = {}) {
             const lmTool = {
                 ...tool,
                 execute: async (args) => {
+                    const normalizedArgs = Array.isArray(args) ? [toolName, ...args] : {
+                        name: toolName,
+                        ...args,
+                    };
                     switch (type) {
                         case "action":
-                            const res = await executeActionCmd([toolName, ...Object.values(args)], options, true);
+                            const res = await executeActionCmd(normalizedArgs, options, true);
                             return res;
                         case "task":
-                            const tres = await executeTaskCmd([toolName, args], options);
-                            return tres;
+                            const tres = await executeTaskCmd(normalizedArgs, options);
+                            return tres.answer.text;
                         case "workflow":
-                            const wres = await executeWorkflowCmd(toolName, ...Object.values(args), options);
+                            const wres = await executeWorkflowCmd(toolName, normalizedArgs, options);
                             return wres;
                         default:
                             throw new Error(`unknown tool execution function type: ${type} for ${toolName}`);

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

@@ -18,8 +18,8 @@ function configureTaskModel(itConf, taskSpec) {
             found = true;
         }
         else {
-            if (!taskSpec?.modelpack) {
-                throw new Error("provide a default model or a use a modelpack in the task definition");
+            if (!taskSpec?.modelpack?.default) {
+                throw new Error(`provide a default model or a use a modelpack in the ${taskSpec.name} task yaml file`);
             }
             modelName = taskSpec.modelpack.default;
         }

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

@@ -0,0 +1,3 @@
+import { LmTaskFileSpec } from "../../../interfaces.js";
+declare function openTaskSpec(name: string): LmTaskFileSpec;
+export { openTaskSpec, };

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

@@ -0,0 +1,16 @@
+import YAML from 'yaml';
+import { readTask } from "../../../cmd/sys/read_task.js";
+import { getFeatureSpec } from "../../../state/features.js";
+function openTaskSpec(name) {
+    const { found, path } = getFeatureSpec(name, "task");
+    if (!found) {
+        throw new Error(`Task ${name} not found`);
+    }
+    const res = readTask(path);
+    if (!res.found) {
+        throw new Error(`Task ${name}, ${path} not found`);
+    }
+    const taskFileSpec = YAML.parse(res.ymlTask);
+    return taskFileSpec;
+}
+export { openTaskSpec, };

package/dist/cmd/lib/tools.js

@@ -1,5 +1,6 @@
 import YAML from 'yaml';
 import * as fs from 'fs';
+import { readYmlFile } from '../sys/read_yml_file.js';
 function _extractToolDoc(filePath, startComment, endComment) {
     try {
         const fileContent = fs.readFileSync(filePath, 'utf-8');
@@ -36,6 +37,17 @@ function _extractPyToolDoc(filePath) {
 function _extractJsToolDoc(filePath) {
     return _extractToolDoc(filePath, '/*', '*/');
 }
+function _extractYamlToolDoc(filePath, name) {
+    const { data, found } = readYmlFile(filePath);
+    if (!found) {
+        return { found: false, tspec: {} };
+    }
+    if (!data.tool) {
+        return { found: false, tspec: {} };
+    }
+    data.tool.name = name;
+    return { found: true, tspec: data.tool };
+}
 function _parseToolDoc(rawTxt, name) {
     try {
         const res = YAML.parse(rawTxt);
@@ -49,7 +61,8 @@ function _parseToolDoc(rawTxt, name) {
 function extractToolDoc(name, ext, dirPath) {
     let spec;
     let found = false;
-    let doc;
+    let doc = "";
+    let docts = null;
     switch (ext) {
         case "py":
             let res = _extractPyToolDoc(dirPath + "/" + name + "." + ext);
@@ -61,11 +74,22 @@ function extractToolDoc(name, ext, dirPath) {
             found = res2.found;
             doc = res2.doc;
             break;
+        case "yml":
+            let res3 = _extractYamlToolDoc(dirPath + "/" + name + "." + ext, name);
+            found = res3.found;
+            docts = res3.tspec;
+            break;
         default:
             return { found: false, toolDoc: "" };
     }
     if (found) {
-        const ts = _parseToolDoc(doc, name);
+        let ts;
+        if (docts) {
+            ts = docts;
+        }
+        else {
+            ts = _parseToolDoc(doc, name);
+        }
         spec = JSON.stringify(ts, null, "  ");
     }
     else {

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

@@ -20,11 +20,22 @@ async function executeWorkflowCmd(name, args = [], options = {}) {
         if (isDebug.value || isVerbose.value) {
             console.log(`${i + 1}: ${step.type} ${name}`);
         }
-        const p = i == 0 ? [name, ...args] : { name: name, ...params };
+        let pval = new Array();
+        if (i == 0) {
+            pval = [name, ...args];
+        }
+        else {
+            if (Array.isArray(params)) {
+                pval = [name, ...params];
+            }
+            else {
+                pval = { name: name, ...params };
+            }
+        }
         switch (step.type) {
             case "task":
                 try {
-                    const tr = await executeTaskCmd(p, options);
+                    const tr = await executeTaskCmd(pval, options);
                     taskRes = tr;
                 }
                 catch (e) {
@@ -33,8 +44,13 @@ async function executeWorkflowCmd(name, args = [], options = {}) {
                 break;
             case "action":
                 try {
-                    const ares = await executeActionCmd(p, options, true);
-                    taskRes = ares;
+                    const ares = await executeActionCmd(pval, options, true);
+                    if (typeof ares == "string") {
+                        taskRes = [ares];
+                    }
+                    else {
+                        taskRes = ares;
+                    }
                     if (i == finalTaskIndex) {
                         console.log(taskRes);
                     }
@@ -45,8 +61,13 @@ async function executeWorkflowCmd(name, args = [], options = {}) {
                 break;
             case "adaptater":
                 try {
-                    const ares = await executeAdaptaterCmd(p, options);
-                    taskRes = ares;
+                    const ares = await executeAdaptaterCmd(pval, options);
+                    if (typeof ares == "string") {
+                        taskRes = [ares];
+                    }
+                    else {
+                        taskRes = ares;
+                    }
                 }
                 catch (e) {
                     throw new Error(`workflow adaptater ${i + 1}: ${e}`);

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

@@ -0,0 +1,5 @@
+declare function readYmlFile(path: string): {
+    found: boolean;
+    data: Record<string, any>;
+};
+export { readYmlFile };

package/dist/cmd/sys/{read_yml_action.js → read_yml_file.js}

@@ -1,6 +1,6 @@
 import { default as fs } from "fs";
 import YAML from 'yaml';
-function readYmlAction(path) {
+function readYmlFile(path) {
     if (!fs.existsSync(path)) {
         return { data: {}, found: false };
     }
@@ -8,4 +8,4 @@ function readYmlAction(path) {
     const data = YAML.parse(file);
     return { data: data, found: true };
 }
-export { readYmlAction };
+export { readYmlFile };

package/dist/db/write.js

@@ -134,19 +134,29 @@ function upsertModels(models) {
     })();
 }
 function updateFeatures(feats) {
-    upsertAndCleanFeatures(feats.task, "task");
+    const newTasks = upsertAndCleanFeatures(feats.task, "task");
+    newTasks.forEach((feat) => {
+        const { found, toolDoc } = extractToolDoc(feat.name, feat.ext, feat.path);
+        if (found) {
+            upsertTool(feat.name, "task", toolDoc);
+        }
+    });
     const newActions = upsertAndCleanFeatures(feats.action, "action");
-    if (newActions.length > 0) {
-        newActions.forEach((feat) => {
-            const { found, toolDoc } = extractToolDoc(feat.name, feat.ext, feat.path);
-            if (found) {
-                upsertTool(feat.name, "action", toolDoc);
-            }
-        });
-    }
-    upsertAndCleanFeatures(feats.cmd, "cmd");
-    upsertAndCleanFeatures(feats.workflow, "workflow");
+    newActions.forEach((feat) => {
+        const { found, toolDoc } = extractToolDoc(feat.name, feat.ext, feat.path);
+        if (found) {
+            upsertTool(feat.name, "action", toolDoc);
+        }
+    });
+    const newWorkflows = upsertAndCleanFeatures(feats.workflow, "workflow");
+    newWorkflows.forEach((feat) => {
+        const { found, toolDoc } = extractToolDoc(feat.name, feat.ext, feat.path);
+        if (found) {
+            upsertTool(feat.name, "workflow", toolDoc);
+        }
+    });
     upsertAndCleanFeatures(feats.adaptater, "adaptater");
+    upsertAndCleanFeatures(feats.cmd, "cmd");
     upsertAndCleanFeatures(feats.modelfile, "modelfile");
 }
 export { updatePromptfilePath, updateDataDirPath, insertFeaturesPathIfNotExists, insertPluginIfNotExists, updateFeatures, updateAliases, cleanupFeaturePaths, upsertModels, };

package/dist/main.d.ts

@@ -10,4 +10,5 @@ import { usePerfTimer } from "./primitives/perf.js";
 import { parseArgs } from "./primitives/args.js";
 import { LmTaskConf } from "@agent-smith/lmtask/dist/interfaces.js";
 import { extractToolDoc } from "./cmd/lib/tools.js";
-export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, initState, pluginDataDir, usePerfTimer, parseArgs, extractToolDoc, LmTaskConf, };
+import { openTaskSpec } from "./cmd/lib/tasks/utils.js";
+export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, initState, pluginDataDir, usePerfTimer, parseArgs, extractToolDoc, LmTaskConf, openTaskSpec, };

package/dist/main.js

@@ -9,4 +9,5 @@ import { initState, pluginDataDir } from "./state/state.js";
 import { usePerfTimer } from "./primitives/perf.js";
 import { parseArgs } from "./primitives/args.js";
 import { extractToolDoc } from "./cmd/lib/tools.js";
-export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, initState, pluginDataDir, usePerfTimer, parseArgs, extractToolDoc, };
+import { openTaskSpec } from "./cmd/lib/tasks/utils.js";
+export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, initState, pluginDataDir, usePerfTimer, parseArgs, extractToolDoc, openTaskSpec, };

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

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

@@ -1,5 +0,0 @@
-declare function readYmlAction(path: string): {
-    found: boolean;
-    data: Record<string, any>;
-};
-export { readYmlAction };