@agent-smith/cli 0.0.61 → 0.0.62

package/dist/cmd/clicmds/cmds.js

@@ -1,8 +1,8 @@
 import YAML from 'yaml';
 import { dataDirPath, isChatMode, isDebug, promptfilePath, runMode } from "../../state/state.js";
 import { getFeatureSpec, readFeaturesDirs } from "../../state/features.js";
-import { readAliases, readFeaturePaths, readFeatures } from "../../db/read.js";
-import { cleanupFeaturePaths, updateAliases, updateDataDirPath, updateFeatures, updatePromptfilePath } from "../../db/write.js";
+import { readAliases, readFeaturePaths, readFeatures, readFilePath } from "../../db/read.js";
+import { cleanupFeaturePaths, updateAliases, updateDataDirPath, updateFeatures, upsertFilePath, updatePromptfilePath } from "../../db/write.js";
 import { processConfPath } from "../../conf.js";
 import { executeActionCmd } from "../lib/actions/cmd.js";
 import { initAgent, taskBuilder } from "../../agent.js";
@@ -12,8 +12,9 @@ import { executeWorkflowCmd } from "../lib/workflows/cmd.js";
 import { readTask } from "../sys/read_task.js";
 import { deleteFileIfExists } from "../sys/delete_file.js";
 import { dbPath, initDb } from "../../db/db.js";
-import { showModelsCmd, updateModels } from '../lib/models.js';
+import { showModelsCmd, updateAllModels } from '../lib/models.js';
 import { readPluginsPaths } from '../../state/plugins.js';
+import { runtimeDataError, runtimeInfo } from '../lib/user_msgs.js';
 let cmds = {
     exit: {
         cmd: async () => process.exit(0),
@@ -94,19 +95,31 @@ async function _updateFeatures(args = [], options) {
     const feats = readFeaturesDirs(paths);
     updateFeatures(feats);
     updateAliases(feats);
-    updateModels();
     const deleted = cleanupFeaturePaths(paths);
     for (const el of deleted) {
         console.log("- [feature path]", el);
     }
 }
 async function updateConfCmd(args = [], options) {
-    if (args.length == 0) {
-        console.warn("Provide a config.yml file path");
-        return;
-    }
     initDb(isDebug.value, true);
-    const { paths, pf, dd } = await processConfPath(args[0]);
+    const { found, path } = readFilePath("conf");
+    const userProvidedConfPath = (args[0] != "conf") ? args[0] : null;
+    if (!found && !userProvidedConfPath) {
+        runtimeDataError("conf file path not found in db: please provide a conf path parameter to the command");
+    }
+    let confPath;
+    if (userProvidedConfPath) {
+        confPath = userProvidedConfPath;
+        const isu = upsertFilePath("conf", confPath);
+        if (isu) {
+            runtimeInfo("Config path", confPath, "updated");
+        }
+    }
+    else {
+        confPath = path;
+    }
+    console.log("Using", confPath, "to update features");
+    const { paths, pf, dd } = await processConfPath(confPath);
     if (pf.length > 0) {
         updatePromptfilePath(pf);
         promptfilePath.value = pf;
@@ -118,7 +131,7 @@ async function updateConfCmd(args = [], options) {
     const feats = readFeaturesDirs(paths);
     updateFeatures(feats);
     updateAliases(feats);
-    updateModels();
+    updateAllModels();
     const deleted = cleanupFeaturePaths(paths);
     for (const el of deleted) {
         console.log("- [feature path]", el);

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

@@ -1,3 +1,3 @@
 declare function showModelsCmd(args: Array<string>, options: any): Promise<void>;
-declare function updateModels(): void;
-export { updateModels, showModelsCmd, };
+declare function updateAllModels(): void;
+export { updateAllModels, showModelsCmd, };

package/dist/cmd/lib/models.js

@@ -1,7 +1,7 @@
 import path from "path";
 import { readModelfiles, readModels } from "../../db/read.js";
 import { readModelsFile } from "../sys/read_modelfile.js";
-import { upsertModels } from "../../db/write.js";
+import { updateModels as dbUpdateModels } from "../../db/write.js";
 import color from "ansi-colors";
 async function showModelsCmd(args, options) {
     let models = readModels();
@@ -23,9 +23,8 @@ async function showModelsCmd(args, options) {
         console.log(m);
     });
 }
-function updateModels() {
+function updateAllModels() {
     const mfs = readModelfiles();
-    const modelNames = new Array();
     const modelDefs = new Array();
     mfs.forEach((mf) => {
         const filePath = path.join(mf.path + "/" + mf.name + "." + mf.ext);
@@ -34,10 +33,6 @@ function updateModels() {
             throw new Error(`model file ${filePath} not found`);
         }
         for (const [name, m] of (Object.entries(models))) {
-            if (modelNames.includes(m.name)) {
-                console.log("🔴 [models] error: duplicate model name", m.name, "found in", filePath);
-                continue;
-            }
             if (!m?.ctx) {
                 m.ctx = ctx;
             }
@@ -50,7 +45,7 @@ function updateModels() {
             const md = { name: m.name, shortname: name, data: m };
             modelDefs.push(md);
         }
-        upsertModels(modelDefs);
     });
+    dbUpdateModels(modelDefs);
 }
-export { updateModels, showModelsCmd, };
+export { updateAllModels, showModelsCmd, };

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

@@ -0,0 +1,5 @@
+declare function runtimeError(...msg: string[]): void;
+declare function runtimeWarning(...msg: string[]): void;
+declare function runtimeDataError(...msg: string[]): void;
+declare function runtimeInfo(...msg: string[]): void;
+export { runtimeError, runtimeWarning, runtimeDataError, runtimeInfo, };

package/dist/cmd/lib/user_msgs.js

@@ -0,0 +1,17 @@
+import { exit } from "process";
+import chalk from 'chalk';
+function runtimeError(...msg) {
+    console.warn("💥", chalk.dim("Runtime error:"), ...msg);
+    exit(1);
+}
+function runtimeWarning(...msg) {
+    console.warn("⚠️", chalk.dim("Runtime warning:"), ...msg);
+}
+function runtimeDataError(...msg) {
+    console.warn("❌", chalk.dim("Runtime data error:"), ...msg);
+    exit(1);
+}
+function runtimeInfo(...msg) {
+    console.log("📫", chalk.dim("Info:"), ...msg);
+}
+export { runtimeError, runtimeWarning, runtimeDataError, runtimeInfo, };

package/dist/conf.js

@@ -2,12 +2,13 @@ import path from "path";
 import { readConf } from "./cmd/sys/read_conf.js";
 import { insertFeaturesPathIfNotExists, insertPluginIfNotExists } from "./db/write.js";
 import { buildPluginsPaths } from "./state/plugins.js";
+import { runtimeError } from "./cmd/lib/user_msgs.js";
 const confDir = path.join(process.env.HOME, ".config/agent-smith/cli");
 const dbPath = path.join(confDir, "config.db");
 async function processConfPath(confPath) {
     const { found, data } = readConf(confPath);
     if (!found) {
-        console.warn(`Config file ${confPath} not found`);
+        runtimeError(`Config file ${confPath} not found`);
     }
     const allPaths = new Array();
     if (data?.features) {

package/dist/db/read.d.ts

@@ -20,10 +20,14 @@ declare function readFilePaths(): Array<{
     name: string;
     path: string;
 }>;
+declare function readFilePath(name: string): {
+    found: boolean;
+    path: string;
+};
 declare function readModelfiles(): Array<Record<string, string>>;
 declare function readModels(): Array<DbModelDef>;
 declare function readModel(shortname: string): {
     found: boolean;
     modelData: Record<string, any>;
 };
-export { readFeatures, readFeaturePaths, readFeature, readPlugins, readAliases, readFilePaths, readTool, readModels, readModelfiles, readModel, };
+export { readFeatures, readFeaturePaths, readFeature, readPlugins, readAliases, readFilePath, readFilePaths, readTool, readModels, readModelfiles, readModel, };

package/dist/db/read.js

@@ -86,6 +86,15 @@ function readFilePaths() {
     });
     return f;
 }
+function readFilePath(name) {
+    const q = `SELECT id, path FROM filepath WHERE name= ?`;
+    const stmt = db.prepare(q);
+    const result = stmt.get(name);
+    if (result?.id) {
+        return { found: true, path: result.path };
+    }
+    return { found: false, path: "" };
+}
 function readModelfiles() {
     const stmt = db.prepare("SELECT name, path, ext FROM modelfile");
     const data = stmt.all();
@@ -120,4 +129,4 @@ function readModel(shortname) {
     }
     return { found: false, modelData: {} };
 }
-export { readFeatures, readFeaturePaths, readFeature, readPlugins, readAliases, readFilePaths, readTool, readModels, readModelfiles, readModel, };
+export { readFeatures, readFeaturePaths, readFeature, readPlugins, readAliases, readFilePath, readFilePaths, readTool, readModels, readModelfiles, readModel, };

package/dist/db/write.d.ts

@@ -5,6 +5,7 @@ declare function insertFeaturesPathIfNotExists(path: string): boolean;
 declare function insertPluginIfNotExists(n: string, p: string): boolean;
 declare function cleanupFeaturePaths(paths: Array<string>): Array<string>;
 declare function updateAliases(feats: Features): void;
-declare function upsertModels(models: Array<DbModelDef>): void;
+declare function updateModels(models: Array<DbModelDef>): void;
 declare function updateFeatures(feats: Features): void;
-export { updatePromptfilePath, updateDataDirPath, insertFeaturesPathIfNotExists, insertPluginIfNotExists, updateFeatures, updateAliases, cleanupFeaturePaths, upsertModels, };
+declare function upsertFilePath(name: string, newPath: string): boolean;
+export { updatePromptfilePath, updateDataDirPath, insertFeaturesPathIfNotExists, insertPluginIfNotExists, updateFeatures, updateAliases, cleanupFeaturePaths, updateModels, upsertFilePath, };

package/dist/db/write.js

@@ -1,5 +1,6 @@
 import { extractToolDoc } from "../cmd/lib/tools.js";
 import { db } from "./db.js";
+import { readModels } from "./read.js";
 function updatePromptfilePath(pf) {
     const deleteStmt = db.prepare("DELETE FROM filepath WHERE name = ?");
     deleteStmt.run("promptfile");
@@ -110,26 +111,28 @@ function upsertTool(name, type, toolDoc) {
     stmt.run(name, toolDoc, type);
     console.log("+", "[tool] from", type, ":", name);
 }
-function upsertModels(models) {
-    const stmt1 = db.prepare("SELECT shortname FROM model");
-    const rows = stmt1.all();
-    const existingModelShortNames = rows.map(row => row.shortname);
-    const stmt = db.prepare(`INSERT INTO model (name, shortname, data) VALUES (?,?,?)`);
-    existingModelShortNames.forEach((name) => {
-        if (!existingModelShortNames.includes(name)) {
-            const deleteStmt = db.prepare("DELETE FROM model WHERE name = ?");
-            deleteStmt.run(name);
-            console.log("-", "[model]", name);
-        }
-    });
+function updateModels(models) {
+    const allDbModels = readModels();
+    const existingModelShortNames = allDbModels.map(row => row.shortname);
+    const newModelShortNames = models.filter(m => !existingModelShortNames.includes(m.shortname)).map(m => m.shortname);
+    const mm = models.map(m => m.shortname);
+    const modelsToDelete = existingModelShortNames.filter(name => !mm.includes(name));
     db.transaction(() => {
         for (const model of models) {
-            const stmt1 = db.prepare("SELECT * FROM model WHERE shortname = ?");
-            const result = stmt1.get(model.shortname);
-            if (result?.id) {
-                continue;
+            if (!existingModelShortNames.includes(model.shortname)) {
+                const insertStmt = db.prepare("INSERT INTO model (name, shortname, data) VALUES (?, ?, ?)");
+                insertStmt.run(model.name, model.shortname, JSON.stringify(model.data));
+                console.log("+", "[model]", model.name);
+            }
+            else {
+                const updateStmt = db.prepare("UPDATE model SET name = ?, data = ? WHERE shortname = ?");
+                updateStmt.run(model.name, JSON.stringify(model.data), model.shortname);
             }
-            stmt.run(model.name, model.shortname, JSON.stringify(model.data));
+        }
+        for (const name of modelsToDelete) {
+            const deleteStmt = db.prepare("DELETE FROM model WHERE shortname = ?");
+            deleteStmt.run(name);
+            console.log("-", "[model]", name);
         }
     })();
 }
@@ -159,4 +162,19 @@ function updateFeatures(feats) {
     upsertAndCleanFeatures(feats.cmd, "cmd");
     upsertAndCleanFeatures(feats.modelfile, "modelfile");
 }
-export { updatePromptfilePath, updateDataDirPath, insertFeaturesPathIfNotExists, insertPluginIfNotExists, updateFeatures, updateAliases, cleanupFeaturePaths, upsertModels, };
+function upsertFilePath(name, newPath) {
+    const selectStmt = db.prepare("SELECT * FROM filepath WHERE name = ?");
+    const result = selectStmt.get(name);
+    if (result?.id) {
+        const q = `UPDATE filepath SET path = ? WHERE name = ?`;
+        const stmt = db.prepare(q);
+        const updateResult = stmt.run(newPath, name);
+        return updateResult.changes > 0;
+    }
+    else {
+        const insertStmt = db.prepare("INSERT INTO filepath (name, path) VALUES (?, ?)");
+        insertStmt.run(name, newPath);
+        return true;
+    }
+}
+export { updatePromptfilePath, updateDataDirPath, insertFeaturesPathIfNotExists, insertPluginIfNotExists, updateFeatures, updateAliases, cleanupFeaturePaths, updateModels, upsertFilePath, };

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.61",
+  "version": "0.0.62",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -20,13 +20,14 @@
     "@wllama/wllama": "^2.3.1",
     "ansi-colors": "^4.1.3",
     "better-sqlite3": "^11.10.0",
+    "chalk": "^5.4.1",
     "clipboardy": "^4.0.0",
     "commander": "^13.1.0",
     "marked-terminal": "^7.3.0",
-    "modprompt": "^0.11.6",
+    "modprompt": "^0.11.7",
+    "ora": "^8.2.0",
     "python-shell": "^5.0.0",
-    "yaml": "^2.7.1",
-    "ora": "^8.2.0"
+    "yaml": "^2.7.1"
   },
   "devDependencies": {
     "@agent-smith/tmem-jobs": "^0.0.4",