@vietor/easy-agent 0.4.1 → 0.4.2

package/dist/cmds/builtin.js

@@ -2,75 +2,28 @@ import { writeFileSync } from "node:fs";
 export const exitCommand = {
     name: "exit",
     description: "Exit the conversation",
-    async execute(_ctx, host) {
-        host.exit();
-    },
-};
-export const clearCommand = {
-    name: "clear",
-    description: "Clear the conversation and log",
     async execute(ctx) {
-        ctx.session.clear();
-    },
-};
-export const mcpCommand = {
-    name: "mcp",
-    description: "List linked MCP servers",
-    async execute(ctx, host) {
-        const servers = ctx.mcp.list();
-        const text = servers.length
-            ? [
-                "MCP servers:",
-                ...servers.map((s) => `❯ ${s.name} ⋅ ${s.type} ⋅ ${s.status} ∶ ${s.tools.join(", ") || "(no tools)"}`),
-            ].join("\n")
-            : "No MCP servers linked.";
-        host.info(text);
-    },
-};
-export const compactCommand = {
-    name: "compact",
-    description: "Compact the agent context",
-    async execute(ctx, host) {
-        host.thinking(true);
-        try {
-            const ok = await ctx.session.compact();
-            if (ok)
-                host.info("context compacted");
-        }
-        catch (e) {
-            host.error(e.message);
-        }
-        finally {
-            host.thinking(false);
-        }
+        ctx.session.local.set("exitRequested", true);
     },
 };
 export const exportCommand = {
     name: "export",
     description: "Export the conversation to a JSONL file",
-    async execute(ctx, host) {
-        try {
-            const d = new Date();
-            const pad = (n) => String(n).padStart(2, "0");
-            const ts = `${d.getFullYear()}${pad(d.getMonth() + 1)}${pad(d.getDate())}-${pad(d.getHours())}${pad(d.getMinutes())}${pad(d.getSeconds())}`;
-            const file = `conversation-${ts}.jsonl`;
-            const lines = ctx.session
-                .export()
-                .map((m) => JSON.stringify(m))
-                .join("\n");
-            writeFileSync(file, lines + "\n", "utf-8");
-            host.info(`exported to ${file}`);
-        }
-        catch (e) {
-            host.error(e.message);
-        }
+    async execute(ctx) {
+        const d = new Date();
+        const pad = (n) => String(n).padStart(2, "0");
+        const ts = `${d.getFullYear()}${pad(d.getMonth() + 1)}${pad(d.getDate())}-${pad(d.getHours())}${pad(d.getMinutes())}${pad(d.getSeconds())}`;
+        const file = `conversation-${ts}.jsonl`;
+        const lines = ctx.session
+            .export()
+            .map((m) => JSON.stringify(m))
+            .join("\n");
+        writeFileSync(file, lines + "\n", "utf-8");
+        ctx.message(`exported to ${file}`);
     },
 };
 export const builtinCommands = [
     exitCommand,
     { ...exitCommand, name: "quit" },
-    clearCommand,
-    mcpCommand,
-    compactCommand,
     exportCommand,
 ];

package/dist/main.js

@@ -1,7 +1,7 @@
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { loadConfig } from "./config.js";
-import { tryLoadSkills, tryReadFileText, readFirstFileContent, startSession, } from "@vietor/easy-agent-core";
+import { tryLoadSkills, tryReadFileText, startSession, } from "@vietor/easy-agent-core";
 import { builtinCommands } from "./cmds/builtin.js";
 import { startApp } from "./tui/App.js";
 const SYSTEM_PROMPT_BASE = [
@@ -9,13 +9,21 @@ const SYSTEM_PROMPT_BASE = [
     `Output:
 - Be concise and use GitHub-flavored markdown.
 - State what you did and stop once the task is complete; report outcomes faithfully.
-- Do not lay out alternative approaches in prose - if a choice is the user's, use AskUser.`,
+- Reference code as file_path:line_number.`,
+    `Environment:
+- Platform: ${process.platform}
+- Working directory: ${process.cwd()}`,
+    `Decision making:
+- When a decision belongs to the user, call AskUser and wait for the answer rather than listing options in prose. Ask when there are multiple reasonable approaches, an irreversible or consequential action, or the request is ambiguous; when you have enough to proceed, act without asking.`,
 ].join("\n\n");
 export async function main() {
     const config = loadConfig();
-    const globalSkills = readFirstFileContent([join(homedir(), ".agents", "skills"), join(homedir(), ".claude", "skills")], tryLoadSkills);
-    const globalPrompt = readFirstFileContent([join(homedir(), ".agents", "AGENTS.md"), join(homedir(), ".claude", "CLAUDE.md")], tryReadFileText);
-    const projectPrompt = readFirstFileContent([join(process.cwd(), "AGENTS.md"), join(process.cwd(), "CLAUDE.md")], tryReadFileText);
+    const globalSkills = tryLoadSkills(join(homedir(), ".agents", "skills"))
+        ?? tryLoadSkills(join(homedir(), ".claude", "skills"));
+    const globalPrompt = tryReadFileText(join(homedir(), ".agents", "AGENTS.md"))
+        ?? tryReadFileText(join(homedir(), ".claude", "CLAUDE.md"));
+    const projectPrompt = tryReadFileText(join(process.cwd(), "AGENTS.md"))
+        ?? tryReadFileText(join(process.cwd(), "CLAUDE.md"));
     const systemPrompt = [SYSTEM_PROMPT_BASE, globalPrompt, projectPrompt]
         .filter(Boolean)
         .join("\n\n=================\n\n");
@@ -25,7 +33,7 @@ export async function main() {
         mcpServers: config.mcpServers,
         skills: globalSkills,
         commands: builtinCommands,
-        enableTools: {
+        builtinTools: {
             askUser: true,
             todoWrite: true
         }

package/dist/tui/App.js

@@ -13,9 +13,7 @@ const STREAM_FRAME_MS = 120;
 export function App({ session }) {
     const { exit } = useApp();
     const version = useSyncExternalStore(session.subscribe, session.getSnapshot);
-    const [running, setRunning] = useState(false);
-    const [runElapsed, setRunElapsed] = useState(0);
-    const [runUsage, setRunUsage] = useState({ prompt: 0, completion: 0 });
+    const [runState, setRunState] = useState({ running: false, elapsed: 0, promptTokens: 0, completionTokens: 0 });
     const [streamingText, setStreamingText] = useState("");
     const streamingRef = useRef("");
     const renderTimerRef = useRef(undefined);
@@ -27,9 +25,7 @@ export function App({ session }) {
                 streamingRef.current = text;
                 scheduleStreamingRender();
             },
-            onRunStateChange: (r) => setRunning(r),
-            onRunElapsedChange: (s) => setRunElapsed(s),
-            onRunUsageChange: (p, c) => setRunUsage({ prompt: p, completion: c }),
+            onRunStateChange: setRunState,
         });
     }, []);
     const scheduleStreamingRender = () => {
@@ -50,25 +46,27 @@ export function App({ session }) {
             session.abort();
         }
         else if (key.ctrl && _input === "c") {
-            if (running)
+            if (runState.running)
                 session.abort();
             else
                 exit();
         }
     });
-    async function handleCommand(name) {
-        await session.executeCommand(name, { exit, setRunning });
+    async function handleCommand(name, args) {
+        await session.executeCommand(name, args);
+        if (session.local.get("exitRequested"))
+            exit();
     }
     async function handlePrompt(text) {
         if (session.isCommand(text)) {
-            await handleCommand(text);
+            await handleCommand(text, "");
         }
         else {
             await session.startPrompt(text);
         }
     }
     let runningView = null;
-    if (running) {
+    if (runState.running) {
         if (pendingQuestion) {
             runningView = (_jsx(QuestionView, { question: pendingQuestion, onAnswer: (ans) => session.submitAnswer(pendingQuestion.id, ans) }));
         }
@@ -76,10 +74,10 @@ export function App({ session }) {
             runningView = (_jsx(Box, { marginTop: 1, paddingLeft: 1, paddingRight: 1, children: _jsx(Markdown, { color: "green", children: streamingText }) }));
         }
         else {
-            runningView = (_jsx(Box, { marginTop: 1, paddingLeft: 1, children: _jsx(Spinner, { label: "thinking", elapsed: runElapsed, promptTokens: runUsage.prompt, completionTokens: runUsage.completion }) }));
+            runningView = (_jsx(Box, { marginTop: 1, paddingLeft: 1, children: _jsx(Spinner, { label: "thinking", elapsed: runState.elapsed, promptTokens: runState.promptTokens, completionTokens: runState.completionTokens }) }));
         }
     }
-    return (_jsxs(Box, { flexDirection: "column", minWidth: 80, children: [_jsx(AppHeader, {}), _jsx(LogList, { session: session }), session.todos.length > 0 ? _jsx(TodoView, { todos: session.todos }) : null, runningView, !running ? (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { dimColor: true, children: ["[CTX ", compactDisplay(session.contextTokens), "] \u00B7 ESC to stop \u00B7 type / for commands"] }), _jsx(PromptOrCommandInput, { commands: allCmds, onCommand: handleCommand, onPrompt: handlePrompt })] })) : null] }));
+    return (_jsxs(Box, { flexDirection: "column", minWidth: 80, children: [_jsx(AppHeader, {}), _jsx(LogList, { session: session }), session.todos.length > 0 ? _jsx(TodoView, { todos: session.todos }) : null, runningView, !runState.running ? (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { dimColor: true, children: ["[CTX ", compactDisplay(session.contextTokens), "] \u00B7 ESC to stop \u00B7 type / for commands"] }), _jsx(PromptOrCommandInput, { commands: allCmds, onCommand: handleCommand, onPrompt: handlePrompt })] })) : null] }));
 }
 export function startApp(session) {
     process.stdout.write("");

package/dist/tui/AppHeader.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { memo } from "react";
 import { Box, Text } from "ink";
-import { getPackageInfo } from "@vietor/easy-agent-core";
+import { getPackageInfo } from "../util/package.js";
 export const AppHeader = memo(function AppHeader() {
     const pkginfo = getPackageInfo();
     return (_jsxs(Box, { flexDirection: "column", paddingLeft: 1, children: [_jsxs(Box, { children: [_jsx(Text, { color: "red", bold: true, children: "Easy Agent" }), _jsxs(Text, { dimColor: true, children: [" v", pkginfo.version] })] }), _jsx(Text, { dimColor: true, children: process.cwd() })] }));

package/dist/tui/PromptOrCommandInput.js

@@ -6,7 +6,7 @@ const MAX_ITEMS = 4;
 export function PromptOrCommandInput({ commands, onCommand, onPrompt }) {
     const [input, setInput] = useState("");
     const showMenu = input.startsWith("/");
-    const prefix = showMenu ? input.slice(1) : "";
+    const prefix = showMenu ? input.slice(1).split(/\s+/)[0] : "";
     const filtered = useMemo(() => {
         if (!showMenu)
             return [];
@@ -45,9 +45,14 @@ export function PromptOrCommandInput({ commands, onCommand, onPrompt }) {
         if (!text)
             return;
         if (text.startsWith("/")) {
+            const [name, ...rest] = text.slice(1).split(/\s+/);
+            const args = rest.join(" ");
             if (filtered.length > 0) {
                 const cmd = filtered[selectedIndex];
-                onCommand(cmd ? cmd.name : prefix);
+                onCommand(cmd ? cmd.name : name, args);
+            }
+            else {
+                onCommand(name, args);
             }
             return;
         }

package/dist/util/package.js

@@ -0,0 +1,25 @@
+import { existsSync, readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+const __dirname = import.meta.dirname;
+const MAX_PARENT_TRAVERSAL = 10;
+let _pkg = null;
+function findPackageJson() {
+    let current = __dirname;
+    for (let i = 0; i < MAX_PARENT_TRAVERSAL; i++) {
+        const pkgPath = join(current, "package.json");
+        if (existsSync(pkgPath))
+            return pkgPath;
+        const parent = dirname(current);
+        if (parent === current)
+            break;
+        current = parent;
+    }
+    throw new Error("Cannot find package.json");
+}
+export function getPackageInfo() {
+    if (_pkg === null) {
+        const pkgPath = findPackageJson();
+        _pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+    }
+    return _pkg;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vietor/easy-agent",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "main": "dist/cli.js",
   "bin": {
@@ -22,7 +22,7 @@
     "react": "^19.2.7",
     "string-width": "^8.2.1",
     "zod": "^4.4.3",
-    "@vietor/easy-agent-core": "0.4.1"
+    "@vietor/easy-agent-core": "0.4.2"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",