@agent-smith/cli 0.0.92 → 0.0.94

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

@@ -9,7 +9,7 @@ import { usePerfTimer } from "../../../main.js";
 import { isChatMode, runMode, agent } from "../../../state/state.js";
 import { program } from "../../cmds.js";
 import { parseCommandArgs } from "../options_parsers.js";
-import { runtimeDataError, runtimeWarning } from "../user_msgs.js";
+import { runtimeDataError, runtimeError, runtimeWarning } from "../user_msgs.js";
 import { formatStats, processOutput, readPromptFile } from "../utils.js";
 import { readTask } from "./read.js";
 async function executeTask(name, payload, options, quiet) {
@@ -141,7 +141,30 @@ async function executeTask(name, payload, options, quiet) {
         ...conf,
     };
     let out;
-    out = await task.run({ prompt: payload.prompt, ...vars }, tconf);
+    try {
+        out = await task.run({ prompt: payload.prompt, ...vars }, tconf);
+    }
+    catch (e) {
+        const errMsg = `${e}`;
+        if (errMsg.includes("502 Bad Gateway")) {
+            runtimeError("The server answered with a 502 Bad Gateway error. It might be down or misconfigured. Check your inference server.");
+            if (options?.debug) {
+                throw new Error(errMsg);
+            }
+            return;
+        }
+        else if (errMsg.includes("404 Not Found")) {
+            runtimeError("The server answered with a 404 Not Found error. That usually mean that the model you are requesting does not exist on the server.");
+            return;
+        }
+        else if (errMsg.includes("fetch failed")) {
+            runtimeError("The server is not responding. Check if your inference backend is running.");
+            return;
+        }
+        else {
+            throw new Error(errMsg);
+        }
+    }
     if (!out.answer.text.endsWith("\n")) {
         console.log();
     }

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

@@ -17,22 +17,24 @@ 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);
+    if (!foundTemplate) {
+        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;
         }
     }
-    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)) {

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

@@ -18,7 +18,7 @@ async function readTask(name, payload, options, agent) {
     const opts = payload?.inferParams ? { ...options, ...payload.inferParams } : options;
     const conf = parseTaskConfigOptions(opts);
     if (options?.debug) {
-        console.log("conf:", conf);
+        console.log("Task conf:", conf);
         conf.debug = true;
     }
     conf.inferParams = mergeInferParams(conf.inferParams, taskFileSpec.inferParams ?? {});

package/dist/state/backends.d.ts

@@ -1,7 +1,7 @@
 import { Lm } from "@locallm/api";
 declare const backend: import("@vue/reactivity").Ref<Lm | undefined, Lm | undefined>;
 declare const backends: Record<string, Lm>;
-declare function initBackends(isVerbose?: boolean): Promise<void>;
+declare function initBackends(): Promise<void>;
 declare function setBackend(name: string, isVerbose?: boolean): Promise<void>;
 declare function listBackends(): Promise<void>;
 export { backend, backends, initBackends, listBackends, setBackend };

package/dist/state/backends.js

@@ -7,30 +7,38 @@ import { runtimeDataError } from "../utils/user_msgs.js";
 const backend = ref();
 const backends = reactive({});
 const isBackendUp = ref(false);
-async function initBackends(isVerbose = false) {
+async function initBackends() {
     const rmb = readBackends();
     let defaultBackendName = null;
     for (const bk of Object.values(rmb)) {
+        let name = bk.name;
+        let apiKey = "";
+        if (bk?.apiKey) {
+            if (bk.apiKey == "$OPENROUTER_API_KEY") {
+                const apk = process.env.OPENROUTER_API_KEY;
+                if (apk === undefined) {
+                    runtimeDataError("No $OPENROUTER_API_KEY environment variable found, required for ", name);
+                    return;
+                }
+                apiKey = apk;
+            }
+            else {
+                apiKey = bk.apiKey;
+            }
+        }
+        ;
         const lm = new Lm({
             providerType: bk.type,
             serverUrl: bk.url,
+            apiKey: apiKey.length > 0 ? apiKey : undefined,
         });
-        lm.name = bk.name;
-        if (bk?.apiKey) {
-            lm.apiKey = bk.apiKey;
-        }
-        ;
-        backends[bk.name] = lm;
+        backends[name] = lm;
         if (bk.isDefault) {
             defaultBackendName = bk.name;
         }
     }
     if (defaultBackendName !== null) {
         backend.value = backends[defaultBackendName];
-        isBackendUp.value = await probeBackend(backend.value, isVerbose);
-        if (isBackendUp.value && backend.value.providerType == "ollama") {
-            await backend.value.modelsInfo();
-        }
     }
 }
 async function setBackend(name, isVerbose = false) {
@@ -55,8 +63,8 @@ const probeBackend = async (lm, isVerbose) => {
     switch (lm.providerType) {
         case "llamacpp":
             try {
-                const info = await lm.info();
                 if (isVerbose) {
+                    const info = await lm.modelInfo();
                     console.log(`Provider ${lm.name} up`, info);
                 }
                 isUp = true;
@@ -69,9 +77,9 @@ const probeBackend = async (lm, isVerbose) => {
             break;
         case "koboldcpp":
             try {
-                const info = await lm.info();
                 if (lm.model.name.length > 0) {
                     if (isVerbose) {
+                        const info = await lm.modelInfo();
                         console.log(`Provider ${lm.name} up`, info);
                     }
                     isUp = true;

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.92",
+  "version": "0.0.94",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -10,16 +10,16 @@
     "watch": "tsc --noCheck -p . -w"
   },
   "dependencies": {
-    "@agent-smith/agent": "^0.1.3",
-    "@agent-smith/task": "^0.1.4",
+    "@agent-smith/agent": "^0.1.4",
+    "@agent-smith/task": "^0.1.5",
     "@agent-smith/tfm": "^0.2.0",
     "@inquirer/prompts": "^7.10.1",
     "@intrinsicai/gbnfgen": "0.12.0",
-    "@locallm/api": "^0.6.2",
-    "@modelcontextprotocol/sdk": "^1.22.0",
-    "@vue/reactivity": "^3.5.24",
+    "@locallm/api": "^0.7.0",
+    "@modelcontextprotocol/sdk": "^1.23.0",
+    "@vue/reactivity": "^3.5.25",
     "ansi-colors": "^4.1.3",
-    "better-sqlite3": "^12.4.1",
+    "better-sqlite3": "^12.4.6",
     "clipboardy": "^5.0.1",
     "commander": "^14.0.2",
     "marked-terminal": "^7.3.0",
@@ -32,13 +32,13 @@
     "@agent-smith/tmem-jobs": "^0.0.4",
     "@cfworker/json-schema": "^4.1.1",
     "@commander-js/extra-typings": "^14.0.0",
-    "@locallm/types": "^0.5.0",
+    "@locallm/types": "^0.6.2",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
     "@types/better-sqlite3": "^7.6.13",
     "@types/marked-terminal": "^6.1.1",
     "@types/node": "^24.10.1",
-    "restmix": "^0.5.0",
+    "restmix": "^0.6.1",
     "rollup": "^4.53.3",
     "ts-node": "^10.9.2",
     "tslib": "2.8.1",