@vietor/easy-agent 0.4.4 → 0.4.5

package/dist/main.js

@@ -1,41 +1,26 @@
 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";
+import { getPackageInfo } from "./util/package.js";
 import { FileSessionPersistence } from "./util/sessionStore.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:
+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");
-function parseArgs(argv) {
-    let mode = "new";
-    let id;
-    for (let i = 0; i < argv.length; i++) {
-        const a = argv[i];
-        if (a === "-c" || a === "--continue") {
-            mode = "continue";
-        }
-        else if (a === "-r" || a === "--resume") {
-            mode = "resume";
-            const next = argv[i + 1];
-            if (next && !next.startsWith("-")) {
-                id = next;
-                i++;
-            }
-        }
-    }
-    return { mode, id };
+    ].join("\n\n");
 }
 async function listSessions(store) {
     const sessions = await store.listSessions();
@@ -51,35 +36,43 @@ async function listSessions(store) {
     console.log("\nResume with: easy-agent --resume <id>");
 }
 export async function main(argv = []) {
-    const { mode, id } = parseArgs(argv);
-    const store = new FileSessionPersistence(process.cwd());
-    if (mode === "resume" && !id) {
+    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();
     let sessionId;
     let resume = false;
-    if (mode === "continue") {
+    if (opts.continue) {
         const sessions = await store.listSessions();
         if (sessions.length) {
             sessionId = sessions[0].id;
             resume = true;
         }
     }
-    else if (mode === "resume" && id) {
-        sessionId = id;
+    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(process.cwd(), "AGENTS.md"))
-        ?? tryReadFileText(join(process.cwd(), "CLAUDE.md"));
-    const systemPrompt = [SYSTEM_PROMPT_BASE, globalPrompt, projectPrompt]
+    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({
@@ -90,13 +83,17 @@ export async function main(argv = []) {
         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

@@ -89,7 +89,7 @@ export function App({ session }) {
             runningView = (_jsx(Box, { marginTop: 1, paddingLeft: 1, children: _jsx(Spinner, { label: "thinking", elapsed: runState.elapsed, promptTokens: runState.promptTokens, completionTokens: runState.completionTokens }) }));
         }
     }
-    return (_jsxs(Box, { width: columns, flexDirection: "column", children: [_jsx(AppHeader, {}), _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] }));
+    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

@@ -2,8 +2,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { memo } from "react";
 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, { 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: 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vietor/easy-agent",
-  "version": "0.4.4",
+  "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.4"
+    "@vietor/easy-agent-core": "0.4.5"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",