@vietor/easy-agent 0.4.3 → 0.4.5

package/README.md

@@ -73,17 +73,17 @@ A stdio server omits `type` (or sets `"stdio"`); only `command` is required, `ar
 
 Easy Agent reads instructions files and appends them to the system prompt, so you can set persistent rules, conventions, or preferences. It looks in two places:
 
-1. **Global** — your home directory, applied to every conversation. Checks `~/.agents/AGENTS.md` first, then `~/.claude/CLAUDE.md`; uses the first one found.
+1. **Global** — your home directory, applied to every conversation. Checks `~/.easy-agent/AGENTS.md` first, then `~/.claude/CLAUDE.md`; uses the first one found.
 2. **Project** — your current working directory, applied per-project. Checks `./AGENTS.md` first, then `./CLAUDE.md`; uses the first one found.
 
 Both global and project files are loaded and concatenated into the system prompt if they exist.
 
 ### Skills (optional)
 
-Skills are reusable prompts that register themselves as slash commands. Create a subdirectory for each skill under `~/.agents/skills/` (or `~/.claude/skills/`) with a `SKILL.md` file:
+Skills are reusable prompts that register themselves as slash commands. Create a subdirectory for each skill under `~/.easy-agent/skills/` (or `~/.claude/skills/`) with a `SKILL.md` file:
 
 ```
-~/.claude/skills/
+~/.easy-agent/skills/
   deploy/
     SKILL.md
   review/
@@ -108,11 +108,16 @@ Only `name` is required; if omitted the directory name is used. The body is the
 Launch the TUI:
 
 ```bash
-easy-agent
+easy-agent          # start a new session
+easy-agent --continue  # resume the most recent session
+easy-agent --resume <id>  # resume a specific session by ID
+easy-agent --resume      # list all saved sessions for this directory
 ```
 
 Type a prompt and press Enter. The agent streams its reply and calls tools as needed, showing each tool call and a one-line preview of its result. It iterates until the task is done (capped at 50 tool rounds per turn).
 
+The TUI automatically adapts to your terminal width. A status bar at the bottom shows the current context token count, with hints for keyboard shortcuts (<kbd>ESC</kbd> to abort a running task, <kbd>/</kbd> for commands).
+
 ### Built-in tools
 
 - **Shell** — run shell commands using this platform's native syntax.

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { main } from "./main.js";
-main().catch((e) => {
+main(process.argv.slice(2)).catch((e) => {
     console.error(e);
     process.exit(1);
 });

package/dist/main.js

@@ -1,30 +1,78 @@
+import { randomUUID } from "node:crypto";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { Command } from "commander";
 import { loadConfig } from "./config.js";
-import { tryLoadSkills, tryReadFileText, createSession, } from "@vietor/easy-agent-core";
+import { tryLoadSkills, tryReadFileText, createSession } from "@vietor/easy-agent-core";
 import { builtinCommands } from "./cmds/builtin.js";
 import { startApp } from "./tui/App.js";
-const SYSTEM_PROMPT_BASE = [
-    "You are Easy Agent, an autonomous assistant. You complete tasks by calling tools, inspecting their results, and iterating until the work is done.",
-    `Output:
+import { getPackageInfo } from "./util/package.js";
+import { FileSessionPersistence } from "./util/sessionStore.js";
+function buildSystemPromptBase(cwd) {
+    return [
+        "You are Easy Agent, an autonomous assistant. You complete tasks by calling tools, inspecting their results, and iterating until the work is done.",
+        `Output:
 - Be concise and use GitHub-flavored markdown.
 - State what you did and stop once the task is complete; report outcomes faithfully.
 - Reference code as file_path:line_number.`,
-    `Environment:
+        `Environment:
 - Platform: ${process.platform}
-- Working directory: ${process.cwd()}`,
-    `Decision making:
+- Working directory: ${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() {
+    ].join("\n\n");
+}
+async function listSessions(store) {
+    const sessions = await store.listSessions();
+    if (!sessions.length) {
+        console.log("No previous sessions found in this directory.");
+        return;
+    }
+    console.log("Previous sessions (most recent first):");
+    for (const s of sessions) {
+        const title = s.title ? `  ${s.title}` : "";
+        console.log(`  ${s.id}  ${new Date(s.updatedAt).toLocaleString()}${title}`);
+    }
+    console.log("\nResume with: easy-agent --resume <id>");
+}
+export async function main(argv = []) {
+    const pkg = getPackageInfo();
+    const program = new Command();
+    program
+        .name("easy-agent")
+        .version(pkg.version)
+        .description("Terminal-based AI agent CLI with conversational TUI")
+        .option("-c, --continue", "Continue the most recent session")
+        .option("-r, --resume [id]", "Resume a session by ID (omit to list sessions)")
+        .parse(argv, { from: "user" });
+    const opts = program.opts();
+    const cwd = process.cwd();
+    const store = new FileSessionPersistence(cwd);
+    if (opts.resume !== undefined && typeof opts.resume !== "string") {
+        await listSessions(store);
+        return;
+    }
     const config = loadConfig();
-    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]
+    let sessionId;
+    let resume = false;
+    if (opts.continue) {
+        const sessions = await store.listSessions();
+        if (sessions.length) {
+            sessionId = sessions[0].id;
+            resume = true;
+        }
+    }
+    else if (opts.resume && typeof opts.resume === "string") {
+        sessionId = opts.resume;
+        resume = true;
+    }
+    if (!sessionId)
+        sessionId = randomUUID();
+    const globalSkills = tryLoadSkills(join(homedir(), ".easy-agent", "skills")) ?? tryLoadSkills(join(homedir(), ".claude", "skills"));
+    const globalPrompt = tryReadFileText(join(homedir(), ".easy-agent", "AGENTS.md")) ??
+        tryReadFileText(join(homedir(), ".claude", "CLAUDE.md"));
+    const projectPrompt = tryReadFileText(join(cwd, "AGENTS.md")) ?? tryReadFileText(join(cwd, "CLAUDE.md"));
+    const systemPrompt = [buildSystemPromptBase(cwd), globalPrompt, projectPrompt]
         .filter(Boolean)
         .join("\n\n=================\n\n");
     const session = await createSession({
@@ -35,9 +83,17 @@ export async function main() {
         commands: builtinCommands,
         builtinTools: {
             askUser: true,
-            todoWrite: true
-        }
+            todoWrite: true,
+        },
+        cwd: cwd,
+        sessionId,
+        persistence: store,
     });
+    if (resume)
+        await session.restore();
     const app = startApp(session);
-    await app.waitUntilExit().finally(() => session.dispose());
+    await app.waitUntilExit().finally(() => {
+        session.dispose();
+        console.log(["Resume this session with:", `easy-agent --resume ${sessionId}`].join("\n"));
+    });
 }

package/dist/tui/App.js

@@ -1,17 +1,18 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
-import { Box, render, Text, useApp, useInput } from "ink";
+import { Box, render, useApp, useInput, useWindowSize } from "ink";
 import { Markdown } from "./components/Markdown.js";
-import { LogList } from "./LogList.js";
+import { TimelineList } from "./TimelineList.js";
 import { TodoView } from "./TodoView.js";
 import { AppHeader } from "./AppHeader.js";
 import { PromptOrCommandInput } from "./PromptOrCommandInput.js";
 import { QuestionView } from "./QuestionView.js";
 import { Spinner } from "./Spinner.js";
-import { compactDisplay } from "../util/format.js";
+import { StatusBar } from "./StatusBar.js";
 const STREAM_FRAME_MS = 120;
 export function App({ session }) {
     const { exit } = useApp();
+    const { columns } = useWindowSize();
     const view = useSyncExternalStore(session.subscribe, session.getSnapshot);
     const [runState, setRunState] = useState({ running: false, elapsed: 0, promptTokens: 0, completionTokens: 0 });
     const [streamingText, setStreamingText] = useState("");
@@ -20,13 +21,22 @@ export function App({ session }) {
     const allCmds = useMemo(() => session.commandSchemas, [session]);
     const pendingQuestion = session.getPendingQuestion();
     useEffect(() => {
-        session.setRunHandler({
-            onStream: (text) => {
-                streamingRef.current = text;
-                scheduleStreamingRender();
-            },
-            onState: setRunState,
+        const unsub = session.subscribeEvents((e) => {
+            switch (e.type) {
+                case "assistant_delta":
+                    streamingRef.current += e.text;
+                    scheduleStreamingRender();
+                    break;
+                case "assistant":
+                    streamingRef.current = "";
+                    setStreamingText("");
+                    break;
+                case "state":
+                    setRunState(e);
+                    break;
+            }
         });
+        return unsub;
     }, []);
     const scheduleStreamingRender = () => {
         if (renderTimerRef.current)
@@ -54,7 +64,7 @@ export function App({ session }) {
     });
     async function handleCommand(name, args) {
         await session.executeCommand(name, args);
-        if (session.localStore.get("exitRequested"))
+        if (session.localStore.get("exitRequested") != null)
             exit();
     }
     async function handlePrompt(text) {
@@ -73,13 +83,13 @@ export function App({ session }) {
             runningView = (_jsx(QuestionView, { question: pendingQuestion, onAnswer: (ans) => session.submitAnswer(pendingQuestion.id, ans) }));
         }
         else if (streamingText) {
-            runningView = (_jsx(Box, { marginTop: 1, paddingLeft: 1, paddingRight: 1, children: _jsx(Markdown, { color: "green", children: streamingText }) }));
+            runningView = (_jsx(Box, { marginTop: 1, paddingLeft: 1, paddingRight: 1, borderStyle: "single", borderTop: false, borderRight: false, borderBottom: false, borderColor: "gray", children: _jsx(Markdown, { color: "green", children: streamingText }) }));
         }
         else {
             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 }), view.todos.length > 0 ? _jsx(TodoView, { todos: view.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] }));
+    return (_jsxs(Box, { width: columns, flexDirection: "column", children: [_jsx(AppHeader, { cwd: session.cwd }), _jsx(TimelineList, { session: session }), view.todos.length > 0 ? _jsx(TodoView, { todos: view.todos }) : null, runningView, !runState.running ? (_jsxs(_Fragment, { children: [_jsx(StatusBar, { contextTokens: session.contextTokens }), _jsx(PromptOrCommandInput, { commands: allCmds, onCommand: handleCommand, onPrompt: handlePrompt })] })) : null] }));
 }
 export function startApp(session) {
     process.stdout.write("");

package/dist/tui/AppHeader.js

@@ -1,8 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { memo } from "react";
-import { Box, Text } from "ink";
+import { Box, Text, useWindowSize } from "ink";
 import { getPackageInfo } from "../util/package.js";
-export const AppHeader = memo(function AppHeader() {
+export const AppHeader = memo(function AppHeader({ cwd }) {
+    const { columns } = useWindowSize();
     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() })] }));
+    return (_jsxs(Box, { width: columns, paddingX: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Easy Agent" }), _jsxs(Text, { dimColor: true, children: [" v", pkginfo.version] })] }), _jsx(Text, { dimColor: true, children: cwd })] }));
 });

package/dist/tui/PromptOrCommandInput.js

@@ -61,5 +61,5 @@ export function PromptOrCommandInput({ commands, onCommand, onPrompt }) {
     return (_jsxs(Box, { flexDirection: "column", children: [showMenu && filtered.length > 0 ? (_jsx(Box, { flexDirection: "column", borderStyle: "single", borderColor: "gray", children: visibleItems.items.map((cmd, i) => {
                     const realIdx = visibleItems.start + i;
                     return (_jsxs(Box, { children: [_jsxs(Text, { color: realIdx === selectedIndex ? "cyan" : undefined, children: [realIdx === selectedIndex ? "▸ " : "  ", "/", cmd.name] }), _jsxs(Text, { dimColor: true, children: ["  ", cmd.description] })] }, cmd.name));
-                }) })) : null, _jsxs(Box, { borderStyle: "single", borderLeft: false, borderRight: false, borderColor: "gray", children: [_jsx(Text, { color: "gray", children: "\u276F " }), _jsx(TextInput, { value: input, onChange: setInput, onSubmit: onSubmit })] })] }));
+                }) })) : null, _jsxs(Box, { borderStyle: "single", borderLeft: false, borderRight: false, borderColor: "gray", children: [_jsx(Text, { color: "gray", children: "> " }), _jsx(TextInput, { value: input, onChange: setInput, onSubmit: onSubmit })] })] }));
 }

package/dist/tui/StatusBar.js

@@ -0,0 +1,8 @@
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { memo } from "react";
+import { Box, Text, useWindowSize } from "ink";
+import { compactDisplay } from "../util/format.js";
+export const StatusBar = memo(function StatusBar({ contextTokens }) {
+    const { columns } = useWindowSize();
+    return (_jsx(Box, { width: columns, paddingX: 1, flexDirection: "row", children: _jsxs(Text, { dimColor: true, children: ["Context: ", compactDisplay(contextTokens), " tokens \u00B7 ESC to stop \u00B7 / for commands"] }) }));
+});

package/dist/tui/{LogList.js → TimelineList.js}

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { memo, useSyncExternalStore } from "react";
 import { Box } from "ink";
-import { LogView } from "./LogView.js";
-export const LogList = memo(function LogList({ session }) {
+import { TimelineView } from "./TimelineView.js";
+export const TimelineList = memo(function TimelineList({ session }) {
     const view = useSyncExternalStore(session.subscribe, session.getSnapshot);
-    const entries = view.logEntries;
-    return (_jsx(Box, { flexDirection: "column", paddingLeft: 1, paddingRight: 1, children: entries.map((entry, i) => (_jsx(LogView, { entry: entry }, i))) }));
+    const entries = view.timeline;
+    return (_jsx(Box, { flexDirection: "column", paddingLeft: 1, paddingRight: 1, children: entries.map((entry, i) => (_jsx(TimelineView, { entry: entry }, i))) }));
 });

package/dist/tui/{LogView.js → TimelineView.js}

@@ -11,7 +11,7 @@ function preview(isError, text) {
     const byteCount = Buffer.byteLength(text, "utf-8");
     return `Result: ${byteCount} bytes, ${lineCount} lines`;
 }
-export const LogView = memo(function Entry({ entry }) {
+export const TimelineView = memo(function Entry({ entry }) {
     switch (entry.kind) {
         case "user":
             return (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: "\u276F " }), entry.text] }) }));
@@ -20,11 +20,11 @@ export const LogView = memo(function Entry({ entry }) {
         case "assistant":
             return (_jsx(Box, { marginTop: 1, children: _jsx(Markdown, { color: "green", children: entry.text }) }));
         case "tool":
-            return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { color: "yellow", children: "\u25CF " }), _jsx(Text, { color: "yellow", bold: true, children: entry.name }), entry.summary ? _jsxs(Text, { dimColor: true, children: [" ", entry.summary] }) : null] }), entry.result !== null ? (_jsx(Text, { color: entry.isError ? "red" : "gray", children: `  ${preview(entry.isError ?? false, entry.result)}` })) : null] }));
+            return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { children: [_jsx(Text, { color: "yellow", children: "\u25CF " }), _jsx(Text, { color: "yellow", bold: true, children: entry.name }), entry.summary ? _jsxs(Text, { dimColor: true, children: [" ", entry.summary] }) : null] }), entry.result !== null ? (_jsx(Text, { color: entry.isError ? "red" : "gray", children: `  ${preview(entry.isError ?? false, entry.result)}` })) : null] }));
         case "retry":
             return (_jsx(Box, { children: _jsxs(Text, { children: [_jsx(Text, { color: "yellow", children: "\u21BB " }), _jsxs(Text, { dimColor: true, children: ["retry ", entry.attempt, "/", entry.max] })] }) }));
         case "error":
-            return (_jsx(Box, { children: _jsxs(Text, { color: "red", children: [_jsx(Text, { bold: true, children: "\u2717 " }), entry.text] }) }));
+            return (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", children: [_jsx(Text, { bold: true, children: "\u2717 " }), entry.text] }) }));
         case "interrupted":
             return (_jsx(Box, { children: _jsxs(Text, { children: [_jsx(Text, { color: "yellow", children: "\u25FC " }), _jsx(Text, { dimColor: true, children: "interrupted" })] }) }));
         case "question":

package/dist/util/sessionStore.js

@@ -0,0 +1,104 @@
+import { existsSync, mkdirSync, readFileSync, readdirSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+function encodeCwd(cwd) {
+    return cwd.replace(/[\/\\:]/g, "-");
+}
+export class FileSessionPersistence {
+    cwd;
+    dir;
+    constructor(cwd) {
+        this.cwd = cwd;
+        this.dir = join(homedir(), ".easy-agent", "projects", encodeCwd(cwd));
+    }
+    file(sessionId) {
+        return join(this.dir, `${sessionId}.jsonl`);
+    }
+    ensureDir() {
+        if (!existsSync(this.dir))
+            mkdirSync(this.dir, { recursive: true });
+    }
+    async load(sessionId) {
+        const path = this.file(sessionId);
+        if (!existsSync(path))
+            return null;
+        const messages = [];
+        let todos = [];
+        for (const line of readFileSync(path, "utf-8").split("\n")) {
+            if (!line.trim())
+                continue;
+            let rec;
+            try {
+                rec = JSON.parse(line);
+            }
+            catch {
+                continue;
+            }
+            const r = rec;
+            if (r.t === "m" && r.m)
+                messages.push(r.m);
+            else if (r.t === "todo" && r.todos)
+                todos = r.todos;
+        }
+        return { messages, todos };
+    }
+    async saveAll(sessionId, state) {
+        this.ensureDir();
+        const lines = state.messages
+            .map((m) => JSON.stringify({ t: "m", m }))
+            .concat([JSON.stringify({ t: "todo", todos: state.todos })]);
+        writeFileSync(this.file(sessionId), lines.join("\n") + "\n", "utf-8");
+    }
+    async listSessions() {
+        if (!existsSync(this.dir))
+            return [];
+        const out = [];
+        for (const name of readdirSync(this.dir)) {
+            if (!name.endsWith(".jsonl"))
+                continue;
+            const id = name.slice(0, -6);
+            const path = join(this.dir, name);
+            try {
+                const stat = statSync(path);
+                out.push({
+                    id,
+                    title: this.readTitle(path),
+                    createdAt: stat.birthtimeMs || stat.mtimeMs,
+                    updatedAt: stat.mtimeMs,
+                    cwd: this.cwd,
+                });
+            }
+            catch { }
+        }
+        return out.sort((a, b) => b.updatedAt - a.updatedAt);
+    }
+    async delete(sessionId) {
+        const path = this.file(sessionId);
+        if (existsSync(path))
+            unlinkSync(path);
+    }
+    readTitle(path) {
+        const first = this.readFirstUser(path);
+        if (!first)
+            return undefined;
+        const oneline = first.replace(/\s+/g, " ").trim();
+        return oneline.length > 60 ? oneline.slice(0, 60) + "…" : oneline;
+    }
+    readFirstUser(path) {
+        for (const line of readFileSync(path, "utf-8").split("\n")) {
+            if (!line.trim())
+                continue;
+            let rec;
+            try {
+                rec = JSON.parse(line);
+            }
+            catch {
+                continue;
+            }
+            const r = rec;
+            if (r.t === "m" && r.m && r.m.role === "user" && typeof r.m.content === "string")
+                return r.m.content;
+        }
+        return undefined;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vietor/easy-agent",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "type": "module",
   "main": "dist/cli.js",
   "bin": {
@@ -16,13 +16,14 @@
     "url": "https://github.com/vietor/easy-agent.git"
   },
   "dependencies": {
+    "commander": "^13.0.0",
     "ink": "^7.1.0",
     "ink-text-input": "^6.0.0",
     "marked": "^18.0.5",
     "react": "^19.2.7",
     "string-width": "^8.2.1",
     "zod": "^4.4.3",
-    "@vietor/easy-agent-core": "0.4.3"
+    "@vietor/easy-agent-core": "0.4.5"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",