@agent-smith/cli 0.0.84 → 0.0.86

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

@@ -1,5 +1,4 @@
 import { Agent } from "@agent-smith/agent";
-import { useTemplateForModel } from "@agent-smith/tfm";
 import { input } from "@inquirer/prompts";
 import { compile, serializeGrammar } from "@intrinsicai/gbnfgen";
 import { default as color, default as colors } from "ansi-colors";
@@ -15,7 +14,6 @@ import { parseCommandArgs } from "../options_parsers.js";
 import { runtimeDataError, runtimeWarning } from "../user_msgs.js";
 import { formatStats, processOutput, readPromptFile } from "../utils.js";
 import { readTask } from "./read.js";
-const tfm = useTemplateForModel();
 async function executeTask(name, payload, options, quiet) {
     const agent = new Agent(backend.value);
     if (options?.debug) {
@@ -35,14 +33,7 @@ async function executeTask(name, payload, options, quiet) {
     let hasThink = false;
     let tpl = null;
     if (useTemplates) {
-        if ((!task.def.model?.template)) {
-            const gt = tfm.guess(task.def.model.name);
-            if (gt == "none") {
-                throw new Error(`Unable to guess the template for ${task.def.model}: please provide a template in the taskDef definition`);
-            }
-            task.def.model.template = gt;
-        }
-        tpl = new PromptTemplate(task.def.model.template);
+        tpl = new PromptTemplate(model.template ?? "none");
         hasThink = tpl.tags?.think ? true : false;
     }
     const printToken = (t) => {
@@ -143,6 +134,9 @@ async function executeTask(name, payload, options, quiet) {
         conf.inferParams = {};
     }
     conf.inferParams.stream = true;
+    if (conf?.model) {
+        delete conf.model;
+    }
     const tconf = {
         model: model,
         onToolCall: onToolCall,

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

@@ -1,5 +1,12 @@
 import { useTemplateForModel } from "@agent-smith/tfm";
 const tfm = useTemplateForModel();
+function guessTemplate(modelname) {
+    const gt = tfm.guess(modelname);
+    if (gt == "none") {
+        throw new Error(`Unable to guess the template for ${modelname}: please provide a template name: --tpl templatename`);
+    }
+    return gt;
+}
 function configureTaskModel(itConf, taskSpec) {
     let ip = itConf.inferParams;
     let isModelFromTaskFile = false;
@@ -10,10 +17,22 @@ function configureTaskModel(itConf, taskSpec) {
         model.template = itConf.templateName;
         foundTemplate = true;
     }
+    if (itConf?.model?.name) {
+        if (itConf?.model?.name != taskSpec.model.name) {
+            const gt = guessTemplate(itConf.model.name);
+            model.template = gt;
+            foundTemplate = true;
+        }
+    }
     else if (taskSpec?.model?.template) {
         model.template = taskSpec.model.template;
         foundTemplate = true;
     }
+    else {
+        const gt = guessTemplate(taskSpec.model.name);
+        model.template = gt;
+        foundTemplate = true;
+    }
     if (itConf?.model?.name) {
         if (taskSpec?.models && Object.keys(taskSpec.models).includes(itConf.model.name)) {
             for (const [k, v] of Object.entries(taskSpec.models)) {
@@ -37,6 +56,10 @@ function configureTaskModel(itConf, taskSpec) {
                 }
             }
         }
+        else {
+            model.name = itConf.model.name;
+            foundModel = true;
+        }
     }
     else {
         model = taskSpec.model;

package/dist/main.d.ts

@@ -3,7 +3,7 @@ import { executeTask } from "./cmd/lib/tasks/cmd.js";
 import { executeAction } from "./cmd/lib/actions/cmd.js";
 import { executeWorkflow } from "./cmd/lib/workflows/cmd.js";
 import { writeToClipboard } from "./cmd/sys/clipboard.js";
-import { initState, pluginDataDir } from "./state/state.js";
+import { initState, pluginDataDir, init } from "./state/state.js";
 import { usePerfTimer } from "./utils/perf.js";
 import { parseCommandArgs } from "./cmd/lib/options_parsers.js";
 import { extractToolDoc } from "./cmd/lib/tools.js";
@@ -13,4 +13,4 @@ import { displayOptions, ioOptions, inferenceOptions, allOptions } from "./cmd/o
 import { McpClient } from "./cmd/lib/mcp.js";
 import { readTask } from "./cmd/lib/tasks/read.js";
 import { FeatureType } from "./interfaces.js";
-export { execute, run, executeTask, executeAction, executeWorkflow, writeToClipboard, initState, pluginDataDir, usePerfTimer, parseCommandArgs, extractToolDoc, openTaskSpec, extractBetweenTags, splitThinking, displayOptions, ioOptions, inferenceOptions, allOptions, McpClient, readTask, FeatureType, };
+export { execute, run, executeTask, executeAction, executeWorkflow, writeToClipboard, initState, init, pluginDataDir, usePerfTimer, parseCommandArgs, extractToolDoc, openTaskSpec, extractBetweenTags, splitThinking, displayOptions, ioOptions, inferenceOptions, allOptions, McpClient, readTask, FeatureType, };

package/dist/main.js

@@ -3,7 +3,7 @@ import { executeTask } from "./cmd/lib/tasks/cmd.js";
 import { executeAction } from "./cmd/lib/actions/cmd.js";
 import { executeWorkflow } from "./cmd/lib/workflows/cmd.js";
 import { writeToClipboard } from "./cmd/sys/clipboard.js";
-import { initState, pluginDataDir } from "./state/state.js";
+import { initState, pluginDataDir, init } from "./state/state.js";
 import { usePerfTimer } from "./utils/perf.js";
 import { parseCommandArgs } from "./cmd/lib/options_parsers.js";
 import { extractToolDoc } from "./cmd/lib/tools.js";
@@ -12,4 +12,4 @@ import { extractBetweenTags, splitThinking } from "./utils/text.js";
 import { displayOptions, ioOptions, inferenceOptions, allOptions } from "./cmd/options.js";
 import { McpClient } from "./cmd/lib/mcp.js";
 import { readTask } from "./cmd/lib/tasks/read.js";
-export { execute, run, executeTask, executeAction, executeWorkflow, writeToClipboard, initState, pluginDataDir, usePerfTimer, parseCommandArgs, extractToolDoc, openTaskSpec, extractBetweenTags, splitThinking, displayOptions, ioOptions, inferenceOptions, allOptions, McpClient, readTask, };
+export { execute, run, executeTask, executeAction, executeWorkflow, writeToClipboard, initState, init, pluginDataDir, usePerfTimer, parseCommandArgs, extractToolDoc, openTaskSpec, extractBetweenTags, splitThinking, displayOptions, ioOptions, inferenceOptions, allOptions, McpClient, readTask, };

package/dist/state/state.d.ts

@@ -14,6 +14,7 @@ declare const lastCmd: {
     args: Array<string>;
 };
 declare function initFilepaths(): void;
+declare function init(): Promise<void>;
 declare function initState(): Promise<void>;
 declare function pluginDataDir(pluginName: string): string;
-export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, promptfilePath, dataDirPath, isStateReady, pluginDataDir, initState, initFilepaths, pyShell, };
+export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, promptfilePath, dataDirPath, isStateReady, pluginDataDir, initState, initFilepaths, init, pyShell, };

package/dist/state/state.js

@@ -3,6 +3,7 @@ import { initDb } from "../db/db.js";
 import { readFilePaths } from "../db/read.js";
 import path from "path";
 import { createDirectoryIfNotExists } from "../cmd/sys/dirs.js";
+import { initBackends } from "./backends.js";
 let pyShell;
 const inputMode = ref("manual");
 const outputMode = ref("txt");
@@ -28,6 +29,10 @@ function initFilepaths() {
         }
     }
 }
+async function init() {
+    await initState();
+    await initBackends();
+}
 async function initState() {
     if (isStateReady.value) {
         return;
@@ -48,4 +53,4 @@ function pluginDataDir(pluginName) {
     createDirectoryIfNotExists(pluginDatapath);
     return pluginDatapath;
 }
-export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, promptfilePath, dataDirPath, isStateReady, pluginDataDir, initState, initFilepaths, pyShell, };
+export { inputMode, outputMode, isChatMode, runMode, formatMode, lastCmd, promptfilePath, dataDirPath, isStateReady, pluginDataDir, initState, initFilepaths, init, 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.84",
+  "version": "0.0.86",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",