agent.libx.js 0.94.3 → 0.94.5

package/README.md

@@ -104,7 +104,7 @@ agentx --resume <id> "…"    # resume a specific session
 ```
 
 - **Filesystem + Shell** — by default the CLI has **full real-filesystem access like Claude Code** (root `/` is the machine root, the launch dir is the working dir, absolute host paths and above-cwd reach both work) with a **real `/bin/sh`** (`Shell` tool) so the agent can run git, bun, node, curl, and any installed binary. Secrets (`.env`, `.ssh`, keys, `.git`) stay hidden by the jail; env secrets are scrubbed from the child shell. `--sandbox` instead operates over an in-memory copy of the working dir with a VFS-only `bash` — the real disk is never touched. `--boddb <dir>` runs over a **persistent database workspace** (a bod-db store at `<dir>` — `meta.db` tree + `files/` bytes) that survives across runs while the real disk stays untouched; DB-native by default, or add `--seed` to hydrate it from cwd on the first run. `--no-shell` forces the VFS bash in disk mode. (`/sandbox` shows the active mode.)
-- **Sessions** — every conversation persists to `./.agent/sessions/<id>.json`; `--continue`/`--resume` (and `/sessions`, `/resume`) pick it back up, *with memory across turns* — a REPL turn sees the previous one. A global symlink index at `~/.agent/sessions/` enables cross-project lookup: `--resume 090715-335` resolves from any directory, and `/sessions all` lists every project's sessions in one picker.
+- **Sessions** — every conversation persists to `./.agent/sessions/<id>.json`; `--continue`/`--resume` (and `/sessions`, `/resume`) pick it back up, *with memory across turns* — a REPL turn sees the previous one. A global symlink index at `~/.agent/sessions/` enables cross-project lookup: `--resume 090715-myproject` resolves from any directory, and `/sessions all` lists every project's sessions in one picker.
 - **Diffs** — every `Edit`/`Write`/`MultiEdit` renders a colorized `+/-` diff (TTY-gated; plain when piped).
 - **Slash commands** — `/help /tools /model /compact /clear /sessions /resume /commands /init`; user-defined `./.agent/commands/<name>.md` are invokable directly as `/<name>` (the same registry the model's `SlashCommand` tool uses).
 - **Project instructions** — `./AGENTS.md` (or `CLAUDE.md`) auto-loads into every run; `/init` scaffolds one.

package/dist/cli.js

@@ -6576,11 +6576,22 @@ var SessionStore = class {
   constructor(cwd) {
     this.dir = join6(cwd, ".agent", "sessions");
   }
-  /** Sortable, human-readable id: `YYYYMMDD-HHMMSS-mmm`. */
-  newId(now5 = Date.now()) {
+  /** Sortable, human-readable id: `YYYYMMDD-HHMMSS-<folder>`. */
+  newId(now5 = Date.now(), cwd) {
     const d = new Date(now5);
     const p = (n, w = 2) => String(n).padStart(w, "0");
-    return `${d.getFullYear()}${p(d.getMonth() + 1)}${p(d.getDate())}-${p(d.getHours())}${p(d.getMinutes())}${p(d.getSeconds())}-${p(d.getMilliseconds(), 3)}`;
+    const slug2 = (cwd ?? process.cwd()).split("/").pop()?.replace(/[^A-Za-z0-9_-]/g, "") || "session";
+    let id = `${d.getFullYear()}${p(d.getMonth() + 1)}${p(d.getDate())}-${p(d.getHours())}${p(d.getMinutes())}${p(d.getSeconds())}-${slug2}`;
+    if (existsSync5(this.dir) && existsSync5(join6(this.dir, `${id}.json`))) {
+      for (let i = 2; i <= 99; i++) {
+        const c = `${id}-${i}`;
+        if (!existsSync5(join6(this.dir, `${c}.json`))) {
+          id = c;
+          break;
+        }
+      }
+    }
+    return id;
   }
   /** A session id must be one safe path segment — blocks `../`-style traversal via --resume/load/save. */
   safeId(id) {
@@ -7770,7 +7781,7 @@ function applyKey(s, key, str) {
       }
       if (s.vim === "normal" && s.buf.length) return "none";
       if (s.buf.length) return "cancel";
-      if (wasEsc) return "rewind";
+      if (wasEsc || key?.sequence === "\x1B\x1B") return "rewind";
       s.prevEsc = true;
       return "none";
     // first Esc on empty → arm double-Esc
@@ -9167,7 +9178,7 @@ async function runTurn(agent, store, session, task, cp, cwd = process.cwd(), sen
   const lastUser = res.messages.map((m2) => m2.role).lastIndexOf("user");
   const tools = res.messages.slice(lastUser).filter((m2) => m2.role === "tool").length;
   const ok = res.finishReason === "stop";
-  const shortId = session.meta.id.slice(-10);
+  const shortId = session.meta.id.replace(/^\d{8}-/, "");
   const silentAbort = res.finishReason === "aborted" && !res.usage?.totalTokens;
   if (!silentAbort)
     err("\n" + (process.stderr.isTTY ? "\r\x1B[0J" : "") + (ok ? green("  \u2713 done") : red(`  \u2717 ${res.finishReason}`)) + dim(` \xB7 ${res.steps} steps \xB7 ${tools} tools \xB7 ${tok}${secs}s \xB7 ${shortId}
@@ -9203,7 +9214,7 @@ function startSession(args, store, agent, cwd) {
       agent.transcript = data.messages;
       if (args.fork) {
         const now6 = Date.now();
-        const forked = { meta: { ...data.meta, id: args.sessionId ?? store.newId(now6), created: now6, updated: now6, turns: data.meta.turns }, messages: data.messages };
+        const forked = { meta: { ...data.meta, id: args.sessionId ?? store.newId(now6, cwd), created: now6, updated: now6, turns: data.meta.turns }, messages: data.messages };
         err(dim(`  forked ${data.meta.id} \u2192 ${forked.meta.id} (${data.meta.turns} turns)
 `));
         if (!args.task) printHistory(data.messages);
@@ -9218,7 +9229,7 @@ function startSession(args, store, agent, cwd) {
 `));
   }
   const now5 = Date.now();
-  const id = args.sessionId ?? store.newId(now5);
+  const id = args.sessionId ?? store.newId(now5, cwd);
   if (!args.task) err(dim(`  session ${id}
 `));
   return { meta: { id, created: now5, updated: now5, cwd, model: agent.options.model, turns: 0, title: "" }, messages: [] };