@agent-smith/cli 0.0.103 → 0.0.104

package/dist/cmd/clicmds/cache.js

@@ -15,8 +15,8 @@ function createCacheFileContent(cmdFeats) {
         ++i;
     });
     const finalImports = imports.join("\n");
-    const cmds = `const cmds = [ ${cmdNames.join(", ")} ]`;
-    const end = "export { cmds }";
+    const cmds = `const cmds = [ ${cmdNames.join(", ")} ];\nconst isCacheReady = true;`;
+    const end = "export { isCacheReady, cmds }";
     return `${finalImports}\n\n${cmds}\n\n${end}`;
 }
 function ensureUserCmdsCacheFileExists(cacheFilePath) {

package/dist/cmd/clicmds/cmds.js

@@ -1,29 +1,24 @@
 import colors from "ansi-colors";
 import path from "path";
-import { pathToFileURL } from 'url';
 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";
 import { initTaskSettings, isTaskSettingsInitialized, tasksSettings } from '../../state/tasks.js';
-import { cmds } from "../../state/auto/usercmds.js";
 import { deleteFileIfExists } from "../sys/delete_file.js";
 import { readCmd } from "../sys/read_cmds.js";
 import { readTask } from "../sys/read_task.js";
 import { updateUserCmdsCache } from './cache.js';
 async function initUserCmds(cmdFeats) {
     const features = Object.values(cmdFeats);
-    if (features.length == 0) {
-        return [];
-    }
     let endCmds = cmds;
-    if (cmds.length == 0) {
+    if (!isCacheReady) {
         updateUserCmdsCache(cacheFilePath, features);
-        const url = pathToFileURL(cacheFilePath).href;
-        const usrCmds = new Array();
+        const usrCmds = [];
         for (const feat of features) {
             const cmdPath = path.join(feat.path, feat.name + "." + feat.ext);
             const c = await readCmd(feat.name, cmdPath);

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

@@ -257,7 +257,7 @@ async function executeTask(name, payload, options) {
             runtimeWarning("Error formating stats:", `${e}`);
         }
     }
-    if (options?.backend) {
+    if (options?.backend || settings?.backend) {
         agent.lm = backend.value;
     }
     return out;

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

@@ -5,6 +5,9 @@ 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";
 async function executeWorkflow(wname, args, options = {}) {
     const { workflow, found } = await readWorkflow(wname);
     if (!found) {
@@ -27,7 +30,7 @@ async function executeWorkflow(wname, args, options = {}) {
         switch (step.type) {
             case "task":
                 try {
-                    let tdata = {};
+                    let tdata = taskRes;
                     if (i == 0) {
                         tdata.prompt = await getTaskPrompt(step.name, taskRes.cmdArgs, options);
                     }
@@ -37,7 +40,6 @@ async function executeWorkflow(wname, args, options = {}) {
                                 tdata.prompt = taskRes.answer.text;
                             }
                         }
-                        tdata = taskRes;
                     }
                     if (!tdata?.prompt) {
                         throw new Error(`Workflow ${wname} step ${i + 1}: provide a prompt for the task ${step.name}`);
@@ -49,6 +51,31 @@ async function executeWorkflow(wname, args, options = {}) {
                     throw new Error(`workflow task ${i + 1}: ${e}`);
                 }
                 break;
+            case "agent":
+                try {
+                    let tdata = taskRes;
+                    if (i == 0) {
+                        tdata.prompt = await getTaskPrompt(step.name, taskRes.cmdArgs, options);
+                    }
+                    else {
+                        if (prevStepType) {
+                            if (prevStepType == "task") {
+                                tdata.prompt = taskRes.answer.text;
+                            }
+                        }
+                    }
+                    if (!tdata?.prompt) {
+                        throw new Error(`Workflow ${wname} step ${i + 1}: provide a prompt for the task ${step.name}`);
+                    }
+                    options.isAgent = true;
+                    const tr = await executeTask(step.name, tdata, options);
+                    options.isAgent = false;
+                    taskRes = { ...tr, ...taskRes };
+                }
+                catch (e) {
+                    throw new Error(`workflow task ${i + 1}: ${e}`);
+                }
+                break;
             case "action":
                 try {
                     const actArgs = i == 0 ? taskRes.cmdArgs : taskRes;
@@ -75,7 +102,7 @@ async function executeWorkflow(wname, args, options = {}) {
                         taskRes.args = adres;
                     }
                     else {
-                        taskRes = { ...adres, ...taskRes };
+                        taskRes = { ...adres };
                     }
                     if (i == finalTaskIndex) {
                         console.log(taskRes);
@@ -85,8 +112,32 @@ async function executeWorkflow(wname, args, options = {}) {
                     throw new Error(`workflow adaptater ${i + 1}: ${e}`);
                 }
                 break;
+            case "cmd":
+                try {
+                    const { found, path } = getFeatureSpec(step.name, "cmd");
+                    if (!found) {
+                        throw new Error(`Command ${step.name} not found`);
+                    }
+                    const url = pathToFileURL(path).href;
+                    const jsa = await import(url);
+                    if (!jsa?.runCmd) {
+                        runtimeError(`workflow ${wname}: can not import the runCmd function from step ${i} for command ${step.name}: please add a runCmd function export`);
+                        return;
+                    }
+                    const cres = await jsa.runCmd(args, options);
+                    if (typeof cres == "string" || Array.isArray(cres)) {
+                        taskRes.args = cres;
+                    }
+                    else {
+                        taskRes = { ...cres, ...taskRes };
+                    }
+                }
+                catch (e) {
+                    throw new Error(`workflow command ${i + 1}: ${e}`);
+                }
+                break;
             default:
-                throw new Error(`unknown task type ${step.type} in workflow ${name}`);
+                throw new Error(`unknown workflow step type ${step.type} in workflow ${wname}`);
         }
         prevStepType = step.type;
         ++i;

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

@@ -1,104 +1,17 @@
-import { Agent } from '@agent-smith/agent';
-import { Task } from '@agent-smith/task';
 import { default as fs } from "fs";
 import YAML from 'yaml';
-import { backend } from '../../../state/backends.js';
 import { getFeatureSpec } from '../../../state/features.js';
-import { readTask } from "../../sys/read_task.js";
-import { pythonAction, systemAction } from '../actions/cmd.js';
-import { createJsAction } from '../actions/read.js';
-import { pathToFileURL } from 'url';
 async function _createWorkflowFromSpec(spec) {
     const steps = [];
-    let i = 1;
     for (const step of spec.steps) {
         const type = Object.keys(step)[0];
         const sval = step[type];
         const name = sval;
-        if (type == "action") {
-            const { found, path, ext } = getFeatureSpec(name, "action");
-            if (!found) {
-                throw new Error(`Action ${name} not found`);
-            }
-            switch (ext) {
-                case "js":
-                    const url = pathToFileURL(path).href;
-                    const { action } = await import(url);
-                    const at = action;
-                    const wf = {
-                        name: name,
-                        type: "action",
-                        run: at,
-                    };
-                    steps.push(wf);
-                    break;
-                case "mjs":
-                    const url2 = pathToFileURL(path).href;
-                    const mjsa = await import(url2);
-                    const act = createJsAction(mjsa.action);
-                    const wf2 = {
-                        name: name,
-                        type: "action",
-                        run: act,
-                    };
-                    steps.push(wf2);
-                    break;
-                case "yml":
-                    const _t1 = systemAction(path);
-                    const wf3 = {
-                        name: name,
-                        type: "action",
-                        run: _t1,
-                    };
-                    steps.push(wf3);
-                    break;
-                case "py":
-                    const _t = pythonAction(path);
-                    const wf4 = {
-                        name: name,
-                        type: "action",
-                        run: _t,
-                    };
-                    steps.push(wf4);
-                    break;
-                default:
-                    throw new Error(`Unknown feature extension ${ext}`);
-            }
-        }
-        else if (type == "adaptater") {
-            const { found, path } = getFeatureSpec(name, "adaptater");
-            if (!found) {
-                throw new Error(`Adaptater ${name} not found`);
-            }
-            const url = pathToFileURL(path).href;
-            const jsa = await import(url);
-            const act = createJsAction(jsa.action);
-            const wf = {
-                name: name,
-                type: "adaptater",
-                run: act,
-            };
-            steps.push(wf);
-        }
-        else {
-            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(`Unable to read task ${name} ${path}`);
-            }
-            const agent = new Agent(backend.value);
-            const tsk = Task.fromYaml(agent, res.ymlTask);
-            const wf = {
-                name: name,
-                type: "task",
-                run: tsk.run,
-            };
-            steps.push(wf);
-        }
-        ++i;
+        const wf = {
+            name: name,
+            type: type == "command" ? "cmd" : type,
+        };
+        steps.push(wf);
     }
     return steps;
 }

package/dist/interfaces.d.ts

@@ -105,7 +105,6 @@ interface FinalLmTaskConfig {
 interface WorkflowStep {
     name: string;
     type: string;
-    run: FeatureExecutor;
 }
 interface McpServerSpec {
     command: string;

package/dist/state/auto/usercmds.d.ts

@@ -1 +1,4 @@
-export const cmds: any[];
+import { Command } from "commander";
+declare const cmds: Command[];
+declare const isCacheReady = false;
+export { cmds, isCacheReady, };

package/dist/state/auto/usercmds.js

@@ -1,9 +1,3 @@
-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();
+const isCacheReady = false;
+export { cmds, isCacheReady, };

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