@agent-smith/cli 0.0.20 → 0.0.22

package/dist/cmd/clicmds/cmds.js

@@ -1,7 +1,7 @@
-import { formatMode, isChatMode } from "../../state/state.js";
+import { formatMode, isChatMode, promptfile } from "../../state/state.js";
 import { getFeatureSpec, readFeaturesDirs } from "../../state/features.js";
 import { readAliases, readFeatures } from "../../db/read.js";
-import { cleanupFeaturePaths, updateAliases, updateFeatures } from "../../db/write.js";
+import { cleanupFeaturePaths, updateAliases, updateFeatures, updatePromptfilePath } from "../../db/write.js";
 import { processConfPath } from "../../conf.js";
 import { executeActionCmd } from "../lib/execute_action.js";
 import { initAgent, marked, taskBuilder } from "../../agent.js";
@@ -94,11 +94,15 @@ async function _updateConfCmd(args = [], options) {
         console.warn("Provide a config.yml file path");
         return;
     }
-    const allPaths = await processConfPath(args[0]);
-    const feats = readFeaturesDirs(allPaths);
+    const { paths, pf } = await processConfPath(args[0]);
+    if (pf.length > 0) {
+        updatePromptfilePath(pf);
+        promptfile.value = pf;
+    }
+    const feats = readFeaturesDirs(paths);
     updateFeatures(feats);
     updateAliases(feats);
-    const deleted = cleanupFeaturePaths(allPaths);
+    const deleted = cleanupFeaturePaths(paths);
     for (const el of deleted) {
         console.log("- [feature path]", el);
     }
@@ -121,7 +125,7 @@ async function _executeTaskCmd(args = [], options) {
         console.warn(error);
     }
     if (formatMode.value == "markdown") {
-        console.log("\n\n------------------\n");
+        console.log("\n------------------\n");
         console.log(marked.parse(data).trim());
     }
     else {

package/dist/cmd/lib/execute_action.js

@@ -4,7 +4,7 @@ import { readYmlAction } from "../sys/read_yml_action.js";
 import { execute } from "../sys/execute.js";
 import { runPyScript } from "../sys/run_python.js";
 import { pyShell } from "../../state/state.js";
-import { processOutput } from "./utils.js";
+import { parseInputOptions, processOutput } from "./utils.js";
 function _systemAction(path) {
     const action = useAgentTask({
         id: "system_action",
@@ -32,7 +32,7 @@ async function executeActionCmd(args = [], options = {}, quiet = false) {
     const name = args.shift();
     const { found, path, ext } = getFeatureSpec(name, "action");
     if (!found) {
-        return { ok: false, data: {}, error: "FeatureType not found" };
+        return { ok: false, data: {}, error: "Action not found" };
     }
     let act;
     switch (ext) {
@@ -49,7 +49,11 @@ async function executeActionCmd(args = [], options = {}, quiet = false) {
         default:
             throw new Error(`Action ext ${ext} not implemented`);
     }
-    const res = await act.run(args, options);
+    const input = await parseInputOptions(options);
+    if (input) {
+        args.push(input);
+    }
+    const res = await act.run(args, {});
     if (!quiet) {
         console.log(res.data);
     }

package/dist/cmd/lib/execute_task.js

@@ -1,8 +1,7 @@
 import { brain, initAgent, taskBuilder } from "../../agent.js";
 import { getFeatureSpec } from "../../state/features.js";
-import { inputMode, isChatMode, isDebug } from "../../state/state.js";
-import { initTaskVars, readPromptFile, readTask } from "./utils.js";
-import { readClipboard } from "../sys/clipboard.js";
+import { isChatMode, isDebug } from "../../state/state.js";
+import { initTaskVars, parseInputOptions, readTask } from "./utils.js";
 async function executeTaskCmd(args = [], options = {}) {
     await initAgent();
     if (isDebug.value) {
@@ -11,17 +10,14 @@ async function executeTaskCmd(args = [], options = {}) {
     }
     const name = args.shift();
     const params = args.filter((x) => x.length > 0);
-    let pr;
-    if (options?.Ic == true || inputMode.value == "clipboard") {
-        pr = await readClipboard();
-    }
-    else if (options.Pf || inputMode.value == "promptfile") {
-        pr = readPromptFile();
-    }
-    else if (params.length > 0) {
-        pr = params.shift();
+    let pr = await parseInputOptions(options);
+    if (!pr) {
+        const p = params.shift();
+        if (p) {
+            pr = p;
+        }
     }
-    else {
+    if (!pr) {
         throw new Error("Please provide a prompt");
     }
     const { found, path } = getFeatureSpec(name, "task");
@@ -52,7 +48,14 @@ async function executeTaskCmd(args = [], options = {}) {
         throw new Error("No expert found for model " + m);
     }
     ex.checkStatus();
+    let i = 0;
     ex.backend.setOnToken((t) => {
+        if (i == 0) {
+            if (t == "\n\n") {
+                return;
+            }
+        }
+        ++i;
         process.stdout.write(t);
     });
     conf.expert = ex;

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

@@ -10,4 +10,5 @@ declare function initTaskVars(args: Array<any>): {
     conf: Record<string, any>;
     vars: Record<string, any>;
 };
-export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, initTaskVars, };
+declare function parseInputOptions(options: any): Promise<string | null>;
+export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, initTaskVars, parseInputOptions, };

package/dist/cmd/lib/utils.js

@@ -20,8 +20,12 @@ async function setOptions(args = [], options) {
     return args;
 }
 function readPromptFile() {
-    const res = fs.readFileSync(promptfile.value, 'utf8');
-    return res;
+    try {
+        return fs.readFileSync(promptfile.value, 'utf8');
+    }
+    catch (e) {
+        return "";
+    }
 }
 async function processOutput(res) {
     if (!(outputMode.value == "clipboard")) {
@@ -102,4 +106,14 @@ function initTaskVars(args) {
     });
     return { conf, vars };
 }
-export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, initTaskVars, };
+async function parseInputOptions(options) {
+    let out = null;
+    if (options?.Ic == true || inputMode.value == "clipboard") {
+        out = await readClipboard();
+    }
+    else if (options.Pf || inputMode.value == "promptfile") {
+        out = readPromptFile();
+    }
+    return out;
+}
+export { readPromptFile, processOutput, setOptions, readTask, readTasksDir, initTaskVars, parseInputOptions, };

package/dist/conf.d.ts

@@ -1,5 +1,8 @@
 declare const confDir: string;
 declare const dbPath: string;
 declare function createConfDirIfNotExists(): boolean;
-declare function processConfPath(confPath: string): Promise<Array<string>>;
+declare function processConfPath(confPath: string): Promise<{
+    paths: Array<string>;
+    pf: string;
+}>;
 export { confDir, dbPath, createConfDirIfNotExists, processConfPath, };

package/dist/conf.js

@@ -18,7 +18,7 @@ async function processConfPath(confPath) {
         console.warn(`Config file ${confPath} not found`);
     }
     const allPaths = new Array();
-    if ("features" in data) {
+    if (data?.features) {
         allPaths.push(...data.features);
         const fts = new Array();
         data.features.forEach((f) => {
@@ -28,13 +28,17 @@ async function processConfPath(confPath) {
             }
         });
     }
-    if ("plugins" in data) {
+    if (data?.plugins) {
         const plugins = await buildPluginsPaths(data.plugins);
         plugins.forEach((_pl) => {
             allPaths.push(_pl.path);
             insertPluginIfNotExists(_pl.name, _pl.path);
         });
     }
-    return allPaths;
+    let pf = "";
+    if (data.promptfile) {
+        pf = data.promptfile;
+    }
+    return { paths: allPaths, pf: pf };
 }
 export { confDir, dbPath, createConfDirIfNotExists, processConfPath, };

package/dist/db/read.d.ts

@@ -10,4 +10,5 @@ declare function readFeature(name: string, type: FeatureType): {
     found: boolean;
     feature: FeatureSpec;
 };
-export { readFeatures, readFeaturePaths, readFeature, readPlugins, readAliases };
+declare function readPromptFile(): string;
+export { readFeatures, readFeaturePaths, readFeature, readPlugins, readAliases, readPromptFile };

package/dist/db/read.js

@@ -17,7 +17,7 @@ function readPlugins() {
     });
     return f;
 }
-function readFeaturesType(type) {
+function _readFeaturesType(type) {
     const stmt = db.prepare(`SELECT name, path FROM ${type}`);
     const data = stmt.all();
     let f = {};
@@ -28,10 +28,10 @@ function readFeaturesType(type) {
 }
 function readFeatures() {
     const feats = { task: {}, job: {}, action: {}, cmd: {} };
-    feats.task = readFeaturesType("task");
-    feats.job = readFeaturesType("job");
-    feats.action = readFeaturesType("action");
-    feats.cmd = readFeaturesType("cmd");
+    feats.task = _readFeaturesType("task");
+    feats.job = _readFeaturesType("job");
+    feats.action = _readFeaturesType("action");
+    feats.cmd = _readFeaturesType("cmd");
     return feats;
 }
 function readAliases() {
@@ -59,4 +59,13 @@ function readFeature(name, type) {
     }
     return { found: false, feature: {} };
 }
-export { readFeatures, readFeaturePaths, readFeature, readPlugins, readAliases };
+function readPromptFile() {
+    const stmt1 = db.prepare("SELECT * FROM filepath WHERE name = ?");
+    const result = stmt1.get("promptfile");
+    let res = "";
+    if (result?.id) {
+        res = result.path;
+    }
+    return res;
+}
+export { readFeatures, readFeaturePaths, readFeature, readPlugins, readAliases, readPromptFile };

package/dist/db/write.d.ts

@@ -1,8 +1,8 @@
 import { Features } from "../interfaces.js";
-declare function insertDefaultFilepaths(): void;
+declare function updatePromptfilePath(pf: string): void;
 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 updateFeatures(feats: Features): void;
-export { insertDefaultFilepaths, insertFeaturesPathIfNotExists, insertPluginIfNotExists, updateFeatures, updateAliases, cleanupFeaturePaths, };
+export { updatePromptfilePath, insertFeaturesPathIfNotExists, insertPluginIfNotExists, updateFeatures, updateAliases, cleanupFeaturePaths, };

package/dist/db/write.js

@@ -1,13 +1,9 @@
 import { db } from "./db.js";
-const defaultFilepaths = {
-    prompt: "",
-    override: "",
-};
-function insertDefaultFilepaths() {
-    for (const [k, v] of Object.entries(defaultFilepaths)) {
-        const stmt = db.prepare("INSERT INTO filepath (name, path) VALUES (?, ?)");
-        stmt.run(k, v);
-    }
+function updatePromptfilePath(pf) {
+    const deleteStmt = db.prepare("DELETE FROM featurespath WHERE path = ?");
+    deleteStmt.run("promptfile");
+    const stmt = db.prepare("INSERT INTO filepath (name, path) VALUES (?, ?)");
+    stmt.run("promptfile", pf);
 }
 function insertFeaturesPathIfNotExists(path) {
     const stmt1 = db.prepare("SELECT * FROM featurespath WHERE path = ?");
@@ -93,4 +89,4 @@ function updateFeatures(feats) {
     upsertAndCleanFeatures(feats.action, "action");
     upsertAndCleanFeatures(feats.cmd, "cmd");
 }
-export { insertDefaultFilepaths, insertFeaturesPathIfNotExists, insertPluginIfNotExists, updateFeatures, updateAliases, cleanupFeaturePaths, };
+export { updatePromptfilePath, insertFeaturesPathIfNotExists, insertPluginIfNotExists, updateFeatures, updateAliases, cleanupFeaturePaths, };

package/dist/interfaces.d.ts

@@ -31,9 +31,9 @@ interface Features {
     }>;
 }
 interface ConfigFile {
-    promptfile: string;
-    features: Array<string>;
-    plugins: Array<string>;
+    promptfile?: string;
+    features?: Array<string>;
+    plugins?: Array<string>;
 }
 type CmdExecutor = (args: Array<string>, options: any) => Promise<any>;
 type InputMode = "manual" | "promptfile" | "clipboard";

package/dist/state/state.js

@@ -1,7 +1,7 @@
 import { reactive, ref } from "@vue/reactivity";
 import { createConfDirIfNotExists, confDir } from "../conf.js";
 import { initDb } from "../db/db.js";
-import { readFeaturePaths } from "../db/read.js";
+import { readFeaturePaths, readPromptFile } from "../db/read.js";
 import { updateAliases, updateFeatures } from "../db/write.js";
 import { readFeaturesDirs } from "./features.js";
 import { readPluginsPaths } from "./plugins.js";
@@ -31,6 +31,7 @@ async function initFeatures() {
     const feats = readFeaturesDirs(p);
     updateFeatures(feats);
     updateAliases(feats);
+    promptfile.value = readPromptFile();
 }
 async function initState() {
     initConf();

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.20",
+  "version": "0.0.22",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",
@@ -19,7 +19,6 @@
     "better-sqlite3": "^11.5.0",
     "clipboardy": "^4.0.0",
     "commander": "^12.1.0",
-    "draftlog": "^1.0.13",
     "marked-terminal": "^7.2.1",
     "modprompt": "^0.9.1",
     "python-shell": "^5.0.0",