@agent-smith/cli 0.0.56 → 0.0.57

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

@@ -3,7 +3,7 @@ import { getFeatureSpec } from '../../../state/features.js';
 import { readYmlAction } from "../../sys/read_yml_action.js";
 import { execute } from "../../sys/execute.js";
 import { runPyScript } from "../../sys/run_python.js";
-import { isStateReady, pyShell } from "../../../state/state.js";
+import { pyShell } from "../../../state/state.js";
 import { createJsAction } from "./read.js";
 function systemAction(path) {
     const action = useAgentTask({
@@ -43,7 +43,6 @@ function pythonAction(path) {
     return action;
 }
 async function executeActionCmd(args = [], options = {}, quiet = false) {
-    while (!isStateReady.value) { }
     const isWorkflow = !Array.isArray(args);
     let name;
     if (!isWorkflow) {

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

@@ -8,7 +8,8 @@ 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, parseTaskVars } from "./conf.js";
+import { configureTaskModel, mergeInferParams } from "./conf.js";
+import { parseArgs } from "../../../primitives/args.js";
 async function executeTaskCmd(args = [], options = {}) {
     await initAgent();
     if (isDebug.value) {
@@ -42,9 +43,7 @@ async function executeTaskCmd(args = [], options = {}) {
             throw new Error("Provide a task prompt param");
         }
         name = args.name;
-        delete args.name;
         pr = args.prompt;
-        delete args.prompt;
     }
     const { found, path } = getFeatureSpec(name, "task");
     if (!found) {
@@ -55,18 +54,9 @@ async function executeTaskCmd(args = [], options = {}) {
         throw new Error(`Task ${name}, ${path} not found`);
     }
     const taskFileSpec = YAML.parse(res.ymlTask);
-    let model;
-    let vars = {};
-    if (!isWorkflow) {
-        const tv = parseTaskVars(args, taskFileSpec?.inferParams ? taskFileSpec.inferParams : {});
-        vars = tv.vars;
-        model = configureTaskModel(tv.conf, taskFileSpec);
-    }
-    else {
-        const tv = parseTaskVars({ name: name, prompt: pr, ...args }, taskFileSpec?.inferParams ? taskFileSpec.inferParams : {});
-        vars = tv.vars;
-        model = configureTaskModel(tv.conf, taskFileSpec);
-    }
+    const { conf, vars } = parseArgs(args);
+    conf.inferParams = mergeInferParams(conf.inferParams, taskFileSpec.inferParams ?? {});
+    const model = configureTaskModel(conf, taskFileSpec);
     const taskSpec = taskFileSpec;
     if (taskSpec.toolsList) {
         taskSpec.tools = [];
@@ -128,18 +118,19 @@ async function executeTaskCmd(args = [], options = {}) {
             c = !c;
         });
     }
-    const conf = {
+    const tconf = {
         expert: ex,
         model: model,
         debug: isDebug.value,
+        ...conf,
     };
-    conf.expert = ex;
+    tconf.expert = ex;
     if (isDebug.value || isVerbose.value) {
-        conf.debug = true;
+        tconf.debug = true;
     }
     let out;
     try {
-        out = await task.run({ prompt: pr, ...vars }, conf);
+        out = await task.run({ prompt: pr, ...vars }, tconf);
         console.log();
     }
     catch (err) {

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

@@ -1,7 +1,5 @@
+import { InferenceParams } from "@locallm/types";
 import { LmTaskConfig, LmTaskFileSpec, ModelSpec } from "../../../interfaces.js";
 declare function configureTaskModel(itConf: LmTaskConfig, taskSpec: LmTaskFileSpec): ModelSpec;
-declare function parseTaskVars(params: Array<any> | Record<string, any>, inferParams?: Record<string, any>): {
-    conf: LmTaskConfig;
-    vars: Record<string, any>;
-};
-export { parseTaskVars, configureTaskModel, };
+declare function mergeInferParams(userInferParams: Record<string, any>, taskInferParams: InferenceParams): InferenceParams;
+export { mergeInferParams, configureTaskModel, };

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

@@ -83,87 +83,11 @@ function configureTaskModel(itConf, taskSpec) {
     }
     return model;
 }
-function parseTaskVars(params, inferParams = {}) {
-    switch (Array.isArray(params)) {
-        case true:
-            return _initTaskVars(params, inferParams);
-        default:
-            return _initTaskParams(params, inferParams);
+function mergeInferParams(userInferParams, taskInferParams) {
+    const ip = taskInferParams;
+    for (const [k, v] of Object.entries(userInferParams)) {
+        ip[k] = v;
     }
+    return ip;
 }
-function _initTaskParams(params, inferParams) {
-    const conf = { inferParams: inferParams, modelname: "", templateName: "" };
-    if (!params?.prompt) {
-        throw new Error(`Error initializing task params: provide a prompt`);
-    }
-    if (params?.images) {
-        conf.inferParams.images = params.images;
-        delete params.images;
-    }
-    if (params?.modelname) {
-        conf.modelname = params.modelname;
-        delete params.modelname;
-    }
-    if (params?.template) {
-        conf.templateName = params.templateName;
-        delete params.templateName;
-    }
-    if (params?.m) {
-        if (params.m.includes("/")) {
-            const _s = params.m.split("/");
-            conf.modelname = _s[0];
-            conf.templateName = _s[1];
-        }
-        else {
-            conf.modelname = params.m;
-        }
-    }
-    const ip = conf.inferParams;
-    if (params?.inferParams) {
-        for (const [k, v] of Object.entries(params.inferParams)) {
-            ip[k] = v;
-        }
-        conf.inferParams = ip;
-        delete params.inferParams;
-    }
-    const res = { conf: conf, vars: params };
-    return res;
-}
-function _initTaskVars(args, inferParams) {
-    const conf = { inferParams: inferParams, modelname: "", templateName: "" };
-    const vars = {};
-    args.forEach((a) => {
-        if (a.includes("=")) {
-            const delimiter = "=";
-            const [k, v] = a.split(delimiter, 2);
-            if (v === undefined) {
-                throw new Error(`invalid parameter ${a}`);
-            }
-            switch (k) {
-                case "m":
-                    if (v.includes("/")) {
-                        const _s = v.split("/");
-                        conf.modelname = _s[0];
-                        conf.templateName = _s[1];
-                    }
-                    else {
-                        conf.modelname = v;
-                    }
-                    break;
-                case "ip":
-                    v.split(",").forEach((p) => {
-                        const s = p.split(":");
-                        const cip = conf.inferParams;
-                        cip[s[0]] = parseFloat(s[1]);
-                        conf.inferParams = cip;
-                    });
-                    break;
-                default:
-                    vars[k] = v;
-                    break;
-            }
-        }
-    });
-    return { conf, vars };
-}
-export { parseTaskVars, configureTaskModel, };
+export { mergeInferParams, configureTaskModel, };

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

@@ -1,7 +1,7 @@
-import { InferenceStats } from "@locallm/types/dist/interfaces.js";
+import { InferenceStats } from "@locallm/types";
 declare function setOptions(args: Array<string> | undefined, options: Record<string, any>): Promise<Array<string>>;
 declare function readPromptFile(): string;
 declare function processOutput(res: any): Promise<void>;
 declare function parseInputOptions(options: any): Promise<string | null>;
 declare function formatStats(stats: InferenceStats): string;
-export { parseInputOptions, processOutput, readPromptFile, setOptions, formatStats, };
+export { formatStats, parseInputOptions, processOutput, readPromptFile, setOptions };

package/dist/cmd/lib/utils.js

@@ -1,8 +1,8 @@
+import { marked } from "../../agent.js";
 import { formatMode, initFilepaths, inputMode, outputMode, promptfilePath } from "../../state/state.js";
 import { modes } from "../clicmds/modes.js";
 import { readClipboard, writeToClipboard } from "../sys/clipboard.js";
 import { readFile } from "../sys/read.js";
-import { marked } from "../../agent.js";
 async function setOptions(args = [], options) {
     for (const k of Object.keys(options)) {
         let opt;
@@ -71,4 +71,4 @@ function formatStats(stats) {
     buf.push(`${stats.inferenceTimeSeconds}s inference)`);
     return buf.join(" ");
 }
-export { parseInputOptions, processOutput, readPromptFile, setOptions, formatStats, };
+export { formatStats, parseInputOptions, processOutput, readPromptFile, setOptions };

package/dist/main.d.ts

@@ -8,7 +8,6 @@ import { initAgent } from "./agent.js";
 import { initState, pluginDataDir } from "./state/state.js";
 import { usePerfTimer } from "./primitives/perf.js";
 import { parseArgs } from "./primitives/args.js";
-import { parseTaskVars } from "./cmd/lib/tasks/conf.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, parseTaskVars, extractToolDoc, LmTaskConf, };
+export { execute, run, pingCmd, executeWorkflowCmd, executeActionCmd, executeTaskCmd, writeToClipboard, initAgent, initState, pluginDataDir, usePerfTimer, parseArgs, extractToolDoc, LmTaskConf, };

package/dist/main.js

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

package/dist/primitives/args.d.ts

@@ -1,4 +1,6 @@
-declare function parseArgs(args: Array<string>): {
+import { LmTaskConfig } from "../interfaces.js";
+declare function parseArgs(params: Record<string, any> | Array<any>): {
+    conf: LmTaskConfig;
     vars: Record<string, any>;
     args: Array<string>;
 };

package/dist/primitives/args.js

@@ -1,36 +1,79 @@
-function parseArgs(args) {
-    const _vars = { "inferParams": {} };
+function parseArgs(params) {
+    switch (Array.isArray(params)) {
+        case true:
+            return parseArrayArgs(params);
+        default:
+            return { ...parseObjectArgs(params), args: [] };
+    }
+}
+function parseObjectArgs(params) {
+    const conf = { inferParams: {}, modelname: "", templateName: "" };
+    if (!params?.prompt) {
+        throw new Error(`Error initializing task params: provide a prompt`);
+    }
+    if (params?.images) {
+        conf.inferParams.images = params.images;
+        delete params.images;
+    }
+    if (params?.modelname) {
+        conf.modelname = params.modelname;
+        delete params.modelname;
+    }
+    if (params?.template) {
+        conf.templateName = params.templateName;
+        delete params.templateName;
+    }
+    if (params?.m) {
+        if (params.m.includes("/")) {
+            const _s = params.m.split("/");
+            conf.modelname = _s[0];
+            conf.templateName = _s[1];
+        }
+        else {
+            conf.modelname = params.m;
+        }
+    }
+    if (params?.ip) {
+        conf.inferParams = params.ip;
+    }
+    const res = { conf: conf, vars: params };
+    return res;
+}
+function parseArrayArgs(args) {
+    const _vars = {};
+    const _conf = { inferParams: {} };
     const _nargs = new Array();
     args.forEach((a) => {
         if (a.includes("=")) {
-            const t = a.split("=");
+            const t = a.split("=", 2);
             const k = t[0];
             const v = t[1];
             switch (k) {
                 case "m":
                     if (v.includes("/")) {
                         const _s = v.split("/");
-                        _vars.modelname = _s[0];
-                        _vars.templateName = _s[1];
+                        _conf.modelname = _s[0];
+                        _conf.templateName = _s[1];
                     }
                     else {
-                        _vars.modelname = v;
+                        _conf.modelname = v;
                     }
                     break;
                 case "ip":
                     v.split(",").forEach((p) => {
                         const s = p.split(":");
-                        _vars["inferParams"][s[0]] = parseFloat(s[1]);
+                        _conf.inferParams[s[0]] = parseFloat(s[1]);
                     });
                     break;
                 default:
                     _vars[k] = v;
+                    break;
             }
         }
         else {
             _nargs.push(a);
         }
     });
-    return { vars: _vars, args: _nargs };
+    return { conf: _conf, vars: _vars, args: _nargs };
 }
 export { parseArgs, };

package/dist/state/state.d.ts

@@ -11,7 +11,6 @@ declare const isVerbose: import("@vue/reactivity").Ref<boolean, boolean>;
 declare const isShowTokens: import("@vue/reactivity").Ref<boolean, boolean>;
 declare const promptfilePath: import("@vue/reactivity").Ref<string, string>;
 declare const dataDirPath: import("@vue/reactivity").Ref<string, string>;
-declare const isStateReady: import("@vue/reactivity").Ref<boolean, boolean>;
 declare const lastCmd: {
     name: string;
     args: Array<string>;
@@ -19,4 +18,4 @@ declare const lastCmd: {
 declare function initFilepaths(): void;
 declare function initState(): Promise<void>;
 declare function pluginDataDir(pluginName: string): string;
-export { inputMode, outputMode, isChatMode, isShowTokens, isStateReady, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, dataDirPath, pluginDataDir, initState, initFilepaths, pyShell, };
+export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, dataDirPath, pluginDataDir, initState, initFilepaths, pyShell, };

package/dist/state/state.js

@@ -51,4 +51,4 @@ function pluginDataDir(pluginName) {
     createDirectoryIfNotExists(pluginDatapath);
     return pluginDatapath;
 }
-export { inputMode, outputMode, isChatMode, isShowTokens, isStateReady, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, dataDirPath, pluginDataDir, initState, initFilepaths, pyShell, };
+export { inputMode, outputMode, isChatMode, isShowTokens, runMode, formatMode, lastCmd, isDebug, isVerbose, promptfilePath, dataDirPath, pluginDataDir, initState, initFilepaths, pyShell, };

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