@agent-smith/cli 0.0.45 → 0.0.46

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

@@ -8,7 +8,7 @@ import { readTask } from "../../sys/read_task.js";
 import { readTool } from "../../../db/read.js";
 import { executeActionCmd, } from "../actions/cmd.js";
 import { executeWorkflowCmd } from "../workflows/cmd.js";
-import { configureTask, parseTaskVars } from "./conf.js";
+import { configureTaskModel, parseTaskVars } from "./conf.js";
 async function executeTaskCmd(args = [], options = {}) {
     await initAgent();
     if (isDebug.value) {
@@ -55,17 +55,17 @@ async function executeTaskCmd(args = [], options = {}) {
         throw new Error(`Task ${name}, ${path} not found`);
     }
     const taskFileSpec = YAML.parse(res.ymlTask);
-    let conf = {};
+    let model;
     let vars = {};
     if (!isWorkflow) {
         const tv = parseTaskVars(args, taskFileSpec?.inferParams ? taskFileSpec.inferParams : {});
         vars = tv.vars;
-        conf = configureTask(tv.conf, taskFileSpec);
+        model = configureTaskModel(tv.conf, taskFileSpec);
     }
     else {
         const tv = parseTaskVars({ name: name, prompt: pr, ...args }, taskFileSpec?.inferParams ? taskFileSpec.inferParams : {});
         vars = tv.vars;
-        conf = configureTask(tv.conf, taskFileSpec);
+        model = configureTaskModel(tv.conf, taskFileSpec);
     }
     const taskSpec = taskFileSpec;
     if (taskSpec.toolsList) {
@@ -100,17 +100,17 @@ async function executeTaskCmd(args = [], options = {}) {
     }
     ;
     const task = taskBuilder.init(taskSpec);
-    if (conf?.inferParams?.tsGrammar) {
-        conf.inferParams.grammar = serializeGrammar(await compile(conf.inferParams.tsGrammar, "Grammar"));
-        delete conf.inferParams.tsGrammar;
+    if (model?.inferParams?.tsGrammar) {
+        model.inferParams.grammar = serializeGrammar(await compile(model.inferParams.tsGrammar, "Grammar"));
+        delete model.inferParams.tsGrammar;
     }
     if (isDebug.value) {
-        console.log("Task conf:", conf);
+        console.log("Task model:", model);
         console.log("Task vars:", vars);
     }
-    const ex = brain.getOrCreateExpertForModel(conf.model.name, conf.model.template);
+    const ex = brain.getOrCreateExpertForModel(model.name, model.template);
     if (!ex) {
-        throw new Error("No expert found for model " + conf.model.name);
+        throw new Error("No expert found for model " + model.name);
     }
     ex.checkStatus();
     let i = 0;
@@ -129,6 +129,11 @@ async function executeTaskCmd(args = [], options = {}) {
             c = !c;
         });
     }
+    const conf = {
+        expert: ex,
+        model: model,
+        debug: isDebug.value,
+    };
     conf.expert = ex;
     if (isDebug.value || isVerbose.value) {
         conf.debug = true;
@@ -141,7 +146,6 @@ async function executeTaskCmd(args = [], options = {}) {
     catch (err) {
         throw new Error(`Error executing task: ${name} ${err}`);
     }
-    conf.prompt = pr;
     if (isChatMode.value) {
         if (brain.ex.name != ex.name) {
             brain.setDefaultExpert(ex);

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

@@ -1,7 +1,7 @@
-import { LmTaskConfig, FinalLmTaskConfig, LmTaskFileSpec } from "../../../interfaces.js";
-declare function configureTask(itConf: LmTaskConfig, taskSpec: LmTaskFileSpec): FinalLmTaskConfig;
+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, configureTask, };
+export { parseTaskVars, configureTaskModel, };

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

@@ -1,6 +1,7 @@
+import { useTemplateForModel } from "@agent-smith/tfm";
 import { readModel } from "../../../db/read.js";
-function configureTask(itConf, taskSpec) {
-    const _conf = {};
+const tfm = useTemplateForModel();
+function configureTaskModel(itConf, taskSpec) {
     let modelName = "";
     let templateName = "";
     let ip = itConf.inferParams;
@@ -60,21 +61,26 @@ function configureTask(itConf, taskSpec) {
             }
         }
     }
-    if (found) {
-        model.inferParams = ip;
-        if (!model?.ctx || !isModelFromTaskFile) {
-            model.ctx = taskSpec.ctx;
-        }
-        _conf.model = model;
-        _conf.model.inferParams = ip;
-        if (templateName.length > 0) {
-            _conf.model.template = templateName;
+    if (!found) {
+        const gt = tfm.guess(modelName);
+        if (gt == "none") {
+            throw new Error(`Unable to guess the template for ${modelName}: please provide a template name: m="modelname/templatename"`);
         }
+        const m = {
+            name: modelName,
+            template: gt
+        };
+        model = m;
     }
-    else {
-        _conf.modelname = modelName;
+    model.inferParams = ip;
+    if (!model?.ctx || !isModelFromTaskFile) {
+        model.ctx = taskSpec.ctx;
+    }
+    model.inferParams = ip;
+    if (templateName.length > 0) {
+        model.template = templateName;
     }
-    return _conf;
+    return model;
 }
 function parseTaskVars(params, inferParams) {
     switch (Array.isArray(params)) {
@@ -141,4 +147,4 @@ function _initTaskVars(args, inferParams) {
     });
     return { conf, vars };
 }
-export { parseTaskVars, configureTask, };
+export { parseTaskVars, configureTaskModel, };

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.45",
+  "version": "0.0.46",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -13,6 +13,7 @@
     "@agent-smith/brain": "^0.0.42",
     "@agent-smith/jobs": "^0.0.14",
     "@agent-smith/lmtask": "^0.0.37",
+    "@agent-smith/tfm": "^0.1.2",
     "@inquirer/prompts": "^7.4.1",
     "@inquirer/select": "^4.1.1",
     "@vue/reactivity": "^3.5.13",