@zhongqian97-code/ecode 0.4.0 → 0.5.1

package/README.md

@@ -211,7 +211,27 @@ ecode
 # "logDir": "~/.ecode/logs"
 ```
 
-Each session writes a timestamped `.jsonl` file. Each line is a JSON object with `role`, `content`, and `timestamp`.
+Each session writes a timestamped `.jsonl` log file and a companion `-session.json` metadata file (id, title, model, token count, turn count).
+
+### `ecode sessions` subcommands
+
+```bash
+# list all sessions, sorted by most recent activity
+ecode sessions list
+
+# show full metadata for a session (use 8-char prefix or full UUID)
+ecode sessions inspect a1b2c3d4
+
+# get a shell command to replay a session
+ecode sessions replay a1b2c3d4
+# → ecode --replay ~/.ecode/logs/2026-05-13T08-47-00.jsonl
+
+# get a shell command to fork a session at a specific turn (default: last turn)
+ecode sessions fork a1b2c3d4 5
+# → ecode --fork ~/.ecode/logs/2026-05-13T08-47-00.jsonl:5
+```
+
+The `fork` command is the basis for `/goal` rollback: when the evaluator detects context drift, it surfaces a `sessions fork` command pointing to the last known-good turn.
 
 ## Requirements
 

package/dist/index.js

@@ -3,11 +3,11 @@ const _ew=process.emitWarning.bind(process);process.emitWarning=function(w,...a)
 
 // src/index.ts
 import { createRequire } from "module";
-import { resolve as resolve4, dirname as dirname6 } from "path";
+import { resolve as resolve4, dirname as dirname7 } from "path";
 import { fileURLToPath } from "url";
 import React4 from "react";
 import { render } from "ink";
-import { readFileSync as readFileSync2 } from "fs";
+import { readFileSync as readFileSync3 } from "fs";
 
 // src/config.ts
 import { existsSync, readFileSync } from "fs";
@@ -537,13 +537,13 @@ var READ_TOOL = {
   }
 };
 async function readFile2(params) {
-  const { path: path7, offset = 0, limit } = params;
+  const { path: path9, offset = 0, limit } = params;
   let raw;
   try {
-    raw = await fs.readFile(path7, "utf8");
+    raw = await fs.readFile(path9, "utf8");
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    return `Error reading ${path7}: ${msg}`;
+    return `Error reading ${path9}: ${msg}`;
   }
   const lines = raw.split("\n");
   const sliced = limit !== void 0 ? lines.slice(offset, offset + limit) : lines.slice(offset);
@@ -599,28 +599,28 @@ var EDIT_TOOL = {
   }
 };
 async function editFile(params) {
-  const { path: path7, old_string, new_string } = params;
+  const { path: path9, old_string, new_string } = params;
   let content;
   try {
-    content = await fs3.readFile(path7, "utf8");
+    content = await fs3.readFile(path9, "utf8");
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    return `Error reading ${path7}: ${msg}`;
+    return `Error reading ${path9}: ${msg}`;
   }
   const count = countOccurrences(content, old_string);
   if (count === 0) {
-    return `Error: old_string not found in ${path7}`;
+    return `Error: old_string not found in ${path9}`;
   }
   if (count > 1) {
-    return `Error: old_string appears ${count} times in ${path7} (ambiguous \u2014 add more context)`;
+    return `Error: old_string appears ${count} times in ${path9} (ambiguous \u2014 add more context)`;
   }
   const updated = content.replace(old_string, new_string);
   try {
-    await fs3.writeFile(path7, updated, "utf8");
-    return `Edited ${path7}`;
+    await fs3.writeFile(path9, updated, "utf8");
+    return `Edited ${path9}`;
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    return `Error writing ${path7}: ${msg}`;
+    return `Error writing ${path9}: ${msg}`;
   }
 }
 function countOccurrences(haystack, needle) {
@@ -2128,7 +2128,7 @@ function parseMouseScroll(data) {
 
 // src/ui/App.tsx
 import { homedir as homedir2 } from "os";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 
 // src/automation/store.ts
 import { readFile as readFile8, writeFile as writeFile5, mkdir as mkdir2 } from "fs/promises";
@@ -2512,7 +2512,10 @@ async function cmdGoal(args, deps) {
     condition,
     activeTurnCount: 0,
     runCount: 0,
-    failureCount: 0
+    failureCount: 0,
+    // 快照字段：仅在调用方提供时写入，旧格式兼容（undefined 即不存在）
+    snapshotLogFile: deps.snapshotLogFile,
+    snapshotTurn: deps.snapshotTurn
   };
   await upsertJob(deps.dataDir, job);
   deps.onSchedule(job);
@@ -2531,6 +2534,17 @@ async function cmdUngoal(idOrPrefix, deps) {
   return `\u5DF2\u53D6\u6D88 goal job [${target.id.slice(0, 8)}]\uFF1A${target.promptTemplate}`;
 }
 
+// src/automation/goal/rollback.ts
+function buildRollbackMessage(job) {
+  if (job.snapshotLogFile === void 0 || job.snapshotTurn === void 0) {
+    return "";
+  }
+  return `
+
+\u4E0A\u4E0B\u6587\u53EF\u80FD\u5DF2\u504F\u79BB\u76EE\u6807\uFF0C\u56DE\u6EDA\u5230\u76EE\u6807\u521B\u5EFA\u524D\u7684\u4F4D\u7F6E\uFF1A
+ecode --fork ${job.snapshotLogFile}:${job.snapshotTurn}`;
+}
+
 // src/automation/index.ts
 var AutomationManager = class {
   constructor(config2) {
@@ -2597,9 +2611,15 @@ var AutomationManager = class {
       onUnschedule: (id) => this.scheduler.remove(id)
     });
   }
-  async cmdGoal(args) {
+  /**
+   * 处理 /goal 命令，可选接收当前会话上下文以支持 blocked 时的自动回滚提示。
+   * sessionContext 由 App.tsx 在用户提交 /goal 时注入（logFile + turnCount）。
+   */
+  async cmdGoal(args, sessionContext) {
     return cmdGoal(args, {
       dataDir: this.config.dataDir,
+      snapshotLogFile: sessionContext?.logFile,
+      snapshotTurn: sessionContext?.turnCount,
       onSchedule: (job) => this.startGoalRunner(job),
       onUnschedule: (id) => this.stopGoalRunner(id)
     });
@@ -2709,9 +2729,10 @@ var AutomationManager = class {
       if (evaluation.verdict === "blocked") {
         const errorJob = { ...updatedJob, state: "error" };
         await upsertJob(this.config.dataDir, errorJob);
+        const rollback = buildRollbackMessage(errorJob);
         this.config.onJobResult?.(
           job.id,
-          `[goal ${job.id.slice(0, 8)}] \u6267\u884C\u53D7\u963B\uFF1A${evaluation.reason}`
+          `[goal ${job.id.slice(0, 8)}] \u6267\u884C\u53D7\u963B\uFF1A${evaluation.reason}${rollback}`
         );
         break;
       }
@@ -2733,9 +2754,87 @@ var AutomationManager = class {
   }
 };
 
+// src/sessions/metadata.ts
+import * as crypto from "crypto";
+import * as fs9 from "fs";
+import * as path7 from "path";
+function metadataPathFromLogFile(logFilePath2) {
+  const base = path7.basename(logFilePath2, ".jsonl");
+  const dir = path7.dirname(logFilePath2);
+  return path7.join(dir, `${base}-session.json`);
+}
+function createSessionMetadata(logFilePath2, model) {
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  return {
+    id: crypto.randomUUID(),
+    startTime: now,
+    lastActivity: now,
+    cwd: process.cwd(),
+    model,
+    title: "",
+    turnCount: 0,
+    totalTokens: 0,
+    logFile: path7.basename(logFilePath2)
+  };
+}
+function writeSessionMetadata(logFilePath2, metadata) {
+  const metaPath = metadataPathFromLogFile(logFilePath2);
+  try {
+    fs9.writeFileSync(metaPath, JSON.stringify(metadata, null, 2) + "\n");
+  } catch (err) {
+    process.stderr.write(`[sessions] Failed to write metadata: ${err}
+`);
+  }
+}
+function readSessionMetadata(metaFilePath) {
+  try {
+    const raw = fs9.readFileSync(metaFilePath, "utf-8");
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+function updateSessionMetadata(logFilePath2, partial) {
+  const metaPath = metadataPathFromLogFile(logFilePath2);
+  let existing = null;
+  try {
+    const raw = fs9.readFileSync(metaPath, "utf-8");
+    existing = JSON.parse(raw);
+  } catch {
+    return;
+  }
+  writeSessionMetadata(logFilePath2, { ...existing, ...partial });
+}
+function listSessions(logDir) {
+  try {
+    const files = fs9.readdirSync(logDir);
+    const metaFiles = files.filter((f) => f.endsWith("-session.json"));
+    const sessions = [];
+    for (const file of metaFiles) {
+      const meta = readSessionMetadata(path7.join(logDir, file));
+      if (meta) sessions.push(meta);
+    }
+    return sessions.sort(
+      (a, b) => b.lastActivity.localeCompare(a.lastActivity)
+    );
+  } catch {
+    return [];
+  }
+}
+function findSession(logDir, idOrPrefix) {
+  const sessions = listSessions(logDir);
+  return sessions.find(
+    (s) => s.id === idOrPrefix || s.id.startsWith(idOrPrefix)
+  ) ?? null;
+}
+function generateTitle(firstUserMessage) {
+  const oneLine = firstUserMessage.replace(/\n+/g, " ").trim();
+  return oneLine.length > 50 ? oneLine.slice(0, 47) + "..." : oneLine;
+}
+
 // src/ui/App.tsx
 import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
-async function handleAutomationCommand(input, manager) {
+async function handleAutomationCommand(input, manager, sessionContext) {
   if (!input.startsWith("/")) return null;
   const spaceIdx = input.indexOf(" ");
   const command = spaceIdx === -1 ? input : input.slice(0, spaceIdx);
@@ -2743,8 +2842,9 @@ async function handleAutomationCommand(input, manager) {
   switch (command) {
     case "/loop":
       return manager.cmdLoop(args);
+    // 传入会话快照：goal blocked 时可生成 ecode --fork 回滚命令
     case "/goal":
-      return manager.cmdGoal(args);
+      return manager.cmdGoal(args, sessionContext);
     case "/jobs":
       return manager.cmdJobs();
     case "/unloop":
@@ -2788,7 +2888,7 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
   const pendingConfirmRef = useRef2(null);
   const abortControllerRef = useRef2(null);
   const llmRef = useRef2(llmClient ?? createProvider(resolveActiveProfile(config2)));
-  const automationDataDir = config2.logDir ? join9(config2.logDir, "automation") : join9(homedir2(), ".config", "ecode", "automation");
+  const automationDataDir = config2.logDir ? join10(config2.logDir, "automation") : join10(homedir2(), ".config", "ecode", "automation");
   const automationManagerRef = useRef2(
     new AutomationManager({
       dataDir: automationDataDir,
@@ -2808,9 +2908,15 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
   const [fileSuggestions, setFileSuggestions] = useState3([]);
   const loggerRef = useRef2(null);
   const loggedCountRef = useRef2(0);
+  const sessionMetaRef = useRef2(null);
+  const finalTokensRef = useRef2(0);
   useEffect3(() => {
     if (config2.logDir) {
-      loggerRef.current = createLogger(config2.logDir, /* @__PURE__ */ new Date());
+      const now = /* @__PURE__ */ new Date();
+      loggerRef.current = createLogger(config2.logDir, now);
+      const meta = createSessionMetadata(loggerRef.current.filePath, config2.model);
+      writeSessionMetadata(loggerRef.current.filePath, meta);
+      sessionMetaRef.current = meta;
     }
   }, []);
   useEffect3(() => {
@@ -3033,6 +3139,7 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
                   estimated: false,
                   limit: getContextLimit(config2.model, config2.contextLimit)
                 });
+                finalTokensRef.current = chunk.usage.totalTokens;
               }
             } else {
               const estimatedUsed = Math.floor(
@@ -3160,6 +3267,16 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
           }
         }
       }
+      if (loggerRef.current && sessionMetaRef.current) {
+        const prev = sessionMetaRef.current;
+        const updated = {
+          lastActivity: (/* @__PURE__ */ new Date()).toISOString(),
+          totalTokens: finalTokensRef.current,
+          turnCount: prev.turnCount + 1
+        };
+        updateSessionMetadata(loggerRef.current.filePath, updated);
+        sessionMetaRef.current = { ...prev, ...updated };
+      }
       setStatus("idle");
       setToolName(void 0);
       abortControllerRef.current = null;
@@ -3186,7 +3303,12 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
       {
         const automationResult = await handleAutomationCommand(
           trimmed,
-          automationManagerRef.current
+          automationManagerRef.current,
+          // 注入会话快照：/goal blocked 时用于生成 ecode --fork 回滚命令
+          {
+            logFile: loggerRef.current?.filePath,
+            turnCount: sessionMetaRef.current?.turnCount
+          }
         );
         if (automationResult !== null) {
           setMessages((prev) => [
@@ -3240,6 +3362,11 @@ function App({ config: config2, version: version2, autoMode: autoMode2 = false,
       const userMsg = { role: "user", content };
       const nextMessages = [...messages, userMsg];
       setMessages(nextMessages);
+      if (loggerRef.current && sessionMetaRef.current && !sessionMetaRef.current.title) {
+        const title = generateTitle(content);
+        updateSessionMetadata(loggerRef.current.filePath, { title });
+        sessionMetaRef.current = { ...sessionMetaRef.current, title };
+      }
       runLlmLoop(nextMessages).catch((err) => {
         setStatus("idle");
         setToolName(void 0);
@@ -3424,6 +3551,53 @@ function readStdin() {
   });
 }
 
+// src/sessions/command.ts
+import * as path8 from "path";
+function cmdSessionsList(logDir) {
+  const sessions = listSessions(logDir);
+  if (sessions.length === 0) return "(no sessions found)";
+  const lines = sessions.map((s) => {
+    const id = s.id.slice(0, 8);
+    const date = new Date(s.lastActivity).toLocaleString();
+    const title = s.title || "(no title)";
+    const tokens = s.totalTokens.toLocaleString();
+    return `${id}  ${date}  ${tokens}t  ${title}`;
+  });
+  return `Sessions (${sessions.length}):
+` + lines.join("\n");
+}
+function cmdSessionsInspect(logDir, idOrPrefix) {
+  const session = findSession(logDir, idOrPrefix);
+  if (!session) return `Session not found: ${idOrPrefix}`;
+  return formatInspect(session, logDir);
+}
+function cmdSessionsReplay(logDir, idOrPrefix) {
+  const session = findSession(logDir, idOrPrefix);
+  if (!session) return `Session not found: ${idOrPrefix}`;
+  const logPath = path8.join(logDir, session.logFile);
+  return `ecode --replay ${logPath}`;
+}
+function cmdSessionsFork(logDir, idOrPrefix, turn) {
+  const session = findSession(logDir, idOrPrefix);
+  if (!session) return `Session not found: ${idOrPrefix}`;
+  const logPath = path8.join(logDir, session.logFile);
+  const turnStr = turn !== void 0 ? turn : session.turnCount;
+  return `ecode --fork ${logPath}:${turnStr}`;
+}
+function formatInspect(session, logDir) {
+  return [
+    `id:           ${session.id}`,
+    `title:        ${session.title || "(no title)"}`,
+    `model:        ${session.model}`,
+    `cwd:          ${session.cwd}`,
+    `started:      ${new Date(session.startTime).toLocaleString()}`,
+    `last active:  ${new Date(session.lastActivity).toLocaleString()}`,
+    `turns:        ${session.turnCount}`,
+    `tokens:       ${session.totalTokens.toLocaleString()}`,
+    `log file:     ${path8.join(logDir, session.logFile)}`
+  ].join("\n");
+}
+
 // src/index.ts
 var require2 = createRequire(import.meta.url);
 var { version } = require2("../package.json");
@@ -3477,6 +3651,46 @@ for (let i = 0; i < rawArgs.length; i++) {
 }
 var config = loadConfig();
 var finalConfig = cliLogDir ? { ...config, logDir: cliLogDir } : config;
+if (rawArgs[0] === "sessions") {
+  const sub = rawArgs[1];
+  const logDir = finalConfig.logDir;
+  if (!logDir) {
+    console.error(
+      "Error: no log directory configured.\nSet ECODE_LOG_DIR or logDir in ~/.ecode/config.json"
+    );
+    process.exit(1);
+  }
+  let output;
+  if (sub === "list") {
+    output = cmdSessionsList(logDir);
+  } else if (sub === "inspect") {
+    const id = rawArgs[2];
+    if (!id) {
+      console.error("Usage: ecode sessions inspect <id>");
+      process.exit(1);
+    }
+    output = cmdSessionsInspect(logDir, id);
+  } else if (sub === "replay") {
+    const id = rawArgs[2];
+    if (!id) {
+      console.error("Usage: ecode sessions replay <id>");
+      process.exit(1);
+    }
+    output = cmdSessionsReplay(logDir, id);
+  } else if (sub === "fork") {
+    const id = rawArgs[2];
+    if (!id) {
+      console.error("Usage: ecode sessions fork <id> [turn]");
+      process.exit(1);
+    }
+    const turnArg = rawArgs[3] ? parseInt(rawArgs[3], 10) : void 0;
+    output = cmdSessionsFork(logDir, id, turnArg);
+  } else {
+    output = "Usage: ecode sessions <list|inspect|replay|fork> [args...]\n\n  list                     \u5217\u51FA\u6240\u6709\u5386\u53F2\u4F1A\u8BDD\n  inspect <id>             \u663E\u793A\u4F1A\u8BDD\u8BE6\u60C5\n  replay  <id>             \u8F93\u51FA\u7528\u4E8E\u56DE\u653E\u7684\u547D\u4EE4\n  fork    <id> [turn]      \u8F93\u51FA\u7528\u4E8E\u5206\u53C9\u5230\u6307\u5B9A\u8F6E\u6B21\u7684\u547D\u4EE4";
+  }
+  console.log(output);
+  process.exit(0);
+}
 if (!finalConfig.apiKey) {
   console.error(
     "Error: no API key configured.\nSet ECODE_API_KEY or add apiKey to ~/.ecode/config.json"
@@ -3486,7 +3700,7 @@ if (!finalConfig.apiKey) {
 var initialMessages = [];
 if (replayFile) {
   try {
-    const raw = readFileSync2(replayFile, "utf-8");
+    const raw = readFileSync3(replayFile, "utf-8");
     initialMessages = parseReplayLog(raw);
   } catch (err) {
     console.error(`Error reading replay file: ${err}`);
@@ -3494,14 +3708,14 @@ if (replayFile) {
   }
 } else if (forkSpec) {
   try {
-    const raw = readFileSync2(forkSpec.file, "utf-8");
+    const raw = readFileSync3(forkSpec.file, "utf-8");
     initialMessages = truncateToTurn(parseReplayLog(raw), forkSpec.turn);
   } catch (err) {
     console.error(`Error reading fork file: ${err}`);
     process.exit(1);
   }
 }
-var __dirname = dirname6(fileURLToPath(import.meta.url));
+var __dirname = dirname7(fileURLToPath(import.meta.url));
 var builtinSkillsDir = resolve4(__dirname, "../skills");
 var userSkillsDir = resolve4(process.env.HOME ?? "~", ".ecode/skills");
 var projectSkillsDir = resolve4(process.cwd(), ".ecode/skills");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhongqian97-code/ecode",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "A minimal Claude Code clone with REPL interface and bash tool calling",
   "type": "module",
   "author": "zhongqian97-code",