@ghenya/clinn 0.8.7 → 0.9.0

package/Src/agent.cjs

@@ -2,7 +2,12 @@ const os = require("os");
 const LLMClient = require("./llm.cjs");
 const Tools = require("../Tools");
 const { ConversationMemory } = require("../Mem");
-const { saveTurn, searchHistory, getFileList, loadFileTurns } = require("../Mem/history");
+const {
+  saveTurn, searchHistory, getFileList, loadFileTurns,
+  startSession, endSession, listSessions, getSession,
+  loadSessionTurns, searchSessions, globalSearch,
+  migrateLegacySessions,
+} = require("../Mem/history");
 
 const MAX_ITERATIONS = 500;
 const MAX_TOOL_RESULT_CHARS = 3000;
@@ -84,6 +89,10 @@ class Agent {
     this.maxContextTokens = (config.llm?.contextWindow || getContextWindow(config.llm?.model)) * 0.8;
     this._lastToolCalls = [];
 
+    // session management
+    migrateLegacySessions();
+    this.sessionId = startSession();
+
     Tools.setTrusted(config.tools?.trustedTools || []);
     Tools.setPermissionCallback(async (name, args) => {
       if (callbacks.onPermission) return callbacks.onPermission(name, args);
@@ -98,10 +107,12 @@ class Agent {
     const self = this;
     const memTools = [
       "search_memory", "save_memory", "list_memory", "delete_memory",
+      "mem_rom", "mem_ram",
       "compress_context", "agent_self_invoke", "set_timer",
       "save_tool", "delete_tool_file", "list_saved_tools",
       "forget_conversation", "restart_session",
       "search_history", "list_history_files",
+      "list_sessions", "view_session", "search_sessions",
     ];
     for (const name of memTools) {
       const tool = Tools.getTool(name);
@@ -114,10 +125,16 @@ class Agent {
     switch (name) {
       case "search_memory":
         return this._fmtEntries(this.memory.searchEntries(args.query, args.limit || 5));
-      case "save_memory": {
+      case "save_memory":
+      case "mem_rom": {
+        const tags = args.tags ? args.tags.split(",").map((t) => t.trim()) : [];
+        const entry = this.memory.addRomEntry(args.content, tags);
+        return entry ? `[ROM] 已保存 #${entry.id}: ${entry.text}` : "[失败] 内容为空";
+      }
+      case "mem_ram": {
         const tags = args.tags ? args.tags.split(",").map((t) => t.trim()) : [];
-        const entry = this.memory.addEntry(args.content, tags);
-        return entry ? `[OK] 已保存 #${entry.id}: ${entry.text}` : "[失败] 内容为空";
+        const entry = this.memory.addRamEntry(args.content, tags);
+        return entry ? `[RAM] 已保存 #${entry.id}: ${entry.text}` : "[失败] 内容为空";
       }
       case "list_memory": {
         const all = this.memory.getAllEntries().slice(-(args.limit || 20));
@@ -131,7 +148,7 @@ class Agent {
         const compressed = this.memory.compressHistory();
         if (!compressed) return "[跳过] 对话太短";
         const summary = await this._summarize(compressed);
-        this.memory.addEntry(summary, ["auto-summary"]);
+        this.memory.addRamEntry(summary, ["auto-summary"]);
         this.memory.clear();
         return `[OK] 上下文已压缩, 摘要存入记忆: ${summary}`;
       }
@@ -174,16 +191,18 @@ class Agent {
           if (compressed) summary = await this._summarize(compressed);
         }
         this.memory.clear();
-        if (summary) { this.memory.addEntry(summary, ["auto-summary"]); }
+        if (summary) { this.memory.addRamEntry(summary, ["auto-summary"]); }
         return summary
           ? `[OK] 对话已遗忘, 摘要已保存: ${summary}`
           : "[OK] 对话历史已清空, 像全新对话一样";
       }
       case "restart_session": {
+        endSession(this.sessionId);
         this.memory.clear();
-        this.memory.clearEntries();
+        this.memory.clearRamEntries();
         this.llm.resetUsage();
-        return "[OK] 会话已完全重启: 历史+记忆+token计数均已重置. 可以开始全新任务.";
+        this.sessionId = startSession();
+        return "[OK] 会话已完全重启: 历史+记忆+token计数均已重置, 新session已创建. 可以开始全新任务.";
       }
       case "search_history": {
         const q = args.query || "";
@@ -199,6 +218,47 @@ class Agent {
         if (files.length === 0) return "(暂无历史对话文件)";
         return files.map((f) => `${f.file} | ${f.turns}轮 | ${f.size}KB | ${f.created.slice(0, 10)}`).join("\n");
       }
+      case "list_sessions": {
+        const sessions = listSessions(args.limit || 20);
+        if (sessions.length === 0) return "(暂无对话 session)";
+        const now = this.sessionId;
+        return sessions.map((s, i) => {
+          const marker = s.id === now ? " ◀ 当前" : "";
+          const status = s.status === "active" ? "●" : "○";
+          const date = s.started ? s.started.slice(0, 16) : "?";
+          return `${i + 1}. ${status} [${date}] ${s.title || "(无标题)"} | ${s.turnCount}轮${marker}`;
+        }).join("\n");
+      }
+      case "view_session": {
+        const sid = args.session_id || "";
+        if (!sid) return "[错误] 请提供 session_id (用 list_sessions 获取)";
+        const session = getSession(sid);
+        if (!session) return `[未找到] session ${sid}`;
+        const turns = loadSessionTurns(sid, args.limit || 50);
+        if (turns.length === 0) return `[空] session ${sid} 中没有对话轮次`;
+        const header = [
+          `=== Session: ${session.title || "(无标题)"} ===`,
+          `ID: ${session.id}  |  开始: ${session.started?.slice(0, 16) || "?"}  |  共 ${session.turnCount} 轮`,
+          ``,
+        ];
+        const body = turns.map((t, i) => {
+          return `[${i + 1}] ${t.time?.slice(0, 16) || "?"}\n` +
+            `  > 用户: ${t.user ? t.user.slice(0, 200) : ""}\n` +
+            `  < 回复: ${t.assistant ? t.assistant.slice(0, 300) : ""}`;
+        });
+        return header.join("\n") + "\n" + body.join("\n\n");
+      }
+      case "search_sessions": {
+        const q = args.query || "";
+        if (!q.trim()) return "[错误] 请提供搜索关键词";
+        const results = globalSearch(q, args.limit || 10);
+        if (results.length === 0) return `[无匹配] 在所有历史 session 中未找到 "${q}"`;
+        return results.map((r, i) => {
+          const date = r.sessionStarted ? r.sessionStarted.slice(0, 16) : "?";
+          const previews = r.topMatches.map((m) => `    · ${m.user.slice(0, 80)}`).join("\n");
+          return `${i + 1}. [${date}] ${r.sessionTitle} | 匹配 ${r.matchCount} 处 | 得分 ${r.totalScore}\n${previews}`;
+        }).join("\n\n");
+      }
       default:
         return `[未知内部工具] ${name}`;
     }
@@ -219,7 +279,10 @@ class Agent {
 
   _fmtEntries(entries) {
     if (!entries || entries.length === 0) return "(无记忆条目)";
-    return entries.map((e) => `#${e.id} [${e.tags?.join(",") || "-"}] ${e.text}`).join("\n");
+    return entries.map((e) => {
+      const tag = (e._type === "ram") ? "[RAM]" : "[ROM]";
+      return `${tag} #${e.id} [${e.tags?.join(",") || "-"}] ${e.text}`;
+    }).join("\n");
   }
 
   refreshTools() {
@@ -326,7 +389,7 @@ class Agent {
     this.memory.addAssistant(finalResponse);
 
     try {
-      saveTurn(userMessage, finalResponse, process.cwd(), allMsgs);
+      saveTurn(userMessage, finalResponse, process.cwd(), allMsgs, this.sessionId);
     } catch (_) {}
 
     if (opts._noAutoSave) return finalResponse;
@@ -341,7 +404,7 @@ class Agent {
           ];
           const res = await this.llm.chat(msgs);
           const habit = res.choices?.[0]?.message?.content?.trim().slice(0, 100);
-          if (habit) this.memory.addEntry(habit, ["habit"]);
+          if (habit) this.memory.addRamEntry(habit, ["habit"]);
         }
       } catch (_) {}
     });

package/Src/index.js

@@ -4,7 +4,7 @@ const readline = require("readline");
 const { spawn } = require("child_process");
 const Agent = require("./agent");
 const Tools = require("../Tools");
-const { listRecentTurns, searchHistory, getFileList, loadFileTurns } = require("../Mem/history");
+const { listRecentTurns, searchHistory, getFileList, loadFileTurns, listSessions, getSession, loadSessionTurns, globalSearch, endSession, startSession } = require("../Mem/history");
 
 const C = {
   reset: "\x1b[0m",
@@ -345,6 +345,8 @@ function showHelp() {
     ["/memory_clear", "清空所有记忆"], ["/compress", "手动压缩上下文"],
     ["/history [n]", "查看最近n条历史对话"], ["/history files", "查看历史文件列表"],
     ["/history search <q>", "搜索历史对话"], ["/history read <f>", "读取文件含完整工具调用"],
+    ["/sessions [n]", "列出对话session"], ["/session <id>", "查看某个session"],
+    ["/session_search <q>", "全局搜索session"],
     ["/tool_save <name>", "持久化保存工具"], ["/tool_list_saved", "列出持久化工具"],
     ["/tool_del_saved <name>", "删除持久化工具"],
     ["/trusted", "查看受信任工具"], ["/trust <name>", "永久信任工具"],
@@ -369,7 +371,7 @@ function showStatus() {
   console.log(`  模型: ${C.bold}${config.llm.model}${C.reset}  温度: ${config.llm.temperature}`);
   console.log(`  Tokens 累计: ${emoji("tokenIn")}${C.cyan}${usage.prompt}${C.reset}  ${emoji("tokenOut")}${C.magenta}${usage.completion}${C.reset}`);
   console.log(`  上下文使用: ${ctxBar(ctxPct)}`);
-  console.log(`  记忆: ${mem.entries || 0}/${mem.maxEntries || config.memory.maxEntries} 条目, 历史 ${mem.historyMessages || 0} 条`);
+  console.log(`  记忆: ROM${mem.romEntries || mem.entries || 0} RAM${mem.ramEntries || 0}  · 历史 ${mem.historyMessages || 0} 条`);
   const tools = Tools.listToolNames();
   console.log(`  工具: ${tools.length} 个 — ${tools.slice(0, 8).join(", ")}${tools.length > 8 ? " ..." : ""}`);
   console.log(div("="));
@@ -436,8 +438,10 @@ async function handleSlashCommand(input) {
       console.log(C.dim + `再见~ ${emoji("done")}` + C.reset);
       process.exit(0);
     case "reset":
+      endSession(agent.sessionId);
       agent.reset();
-      console.log(`${C.green}对话已重置${C.reset}`);
+      agent.sessionId = startSession();
+      console.log(`${C.green}对话已重置, 新 session 已创建${C.reset}`);
       break;
     case "tools": {
       const names = Tools.listToolNames();
@@ -563,7 +567,7 @@ async function handleSlashCommand(input) {
     case "memory": {
       const s = agent.memory.stats();
       console.log(div());
-      console.log(`  条目: ${s.entries}/${s.maxEntries}  历史消息: ${s.historyMessages}`);
+      console.log(`  条目: ROM${s.romEntries || s.entries} RAM${s.ramEntries || 0}  历史消息: ${s.historyMessages}`);
       console.log(div());
       break;
     }
@@ -572,7 +576,10 @@ async function handleSlashCommand(input) {
       const entries = agent.memory.getAllEntries().slice(-n);
       if (entries.length === 0) { console.log("(无记忆条目)"); break; }
       console.log(div());
-      for (const e of entries) console.log(`  ${C.yellow}#${e.id}${C.reset} ${C.dim}[${e.tags?.join(",") || "-"}]${C.reset} ${e.text}`);
+      for (const e of entries) {
+        const tag = e._type === "ram" ? `${C.yellow}[RAM]${C.reset}` : `${C.green}[ROM]${C.reset}`;
+        console.log(`  ${tag} ${C.yellow}#${e.id}${C.reset} ${C.dim}[${e.tags?.join(",") || "-"}]${C.reset} ${e.text}`);
+      }
       console.log(div());
       break;
     }
@@ -581,7 +588,10 @@ async function handleSlashCommand(input) {
       const results = agent.memory.searchEntries(rest, 10);
       if (results.length === 0) { console.log(`无匹配: ${rest}`); break; }
       console.log(div());
-      for (const e of results) console.log(`  ${C.yellow}#${e.id}${C.reset} ${e.text}`);
+      for (const e of results) {
+        const tag = e._type === "ram" ? `${C.yellow}[RAM]${C.reset}` : `${C.green}[ROM]${C.reset}`;
+        console.log(`  ${tag} ${C.yellow}#${e.id}${C.reset} ${e.text}`);
+      }
       console.log(div());
       break;
     }
@@ -593,8 +603,8 @@ async function handleSlashCommand(input) {
       break;
     }
     case "memory_clear":
-      agent.memory.clearEntries();
-      console.log(`${C.green}所有记忆条目已清空${C.reset}`);
+      agent.memory.clearAllEntries();
+      console.log(`${C.green}所有记忆条目已清空 (ROM+RAM)${C.reset}`);
       break;
     case "history": {
       const subCmd = rest ? rest.split(/\s+/)[0] : "";
@@ -662,6 +672,68 @@ async function handleSlashCommand(input) {
       await pipeToPager(wrapped);
       break;
     }
+    case "sessions": {
+      const limit = rest ? parseInt(rest, 10) || 20 : 20;
+      const sessions = listSessions(limit);
+      if (sessions.length === 0) { console.log("(暂无对话 session)"); break; }
+      let out = `${C.bold + C.cyan}对话 Sessions${C.reset}  (${sessions.length})\n` + div() + "\n";
+      for (const [i, s] of sessions.entries()) {
+        const marker = s.status === "active" ? `${C.green}●${C.reset}` : `${C.dim}○${C.reset}`;
+        const active = s.status === "active" ? ` ${C.green}◀ 当前${C.reset}` : "";
+        out += `  ${String(i + 1).padStart(2)}. ${marker} [${(s.started || "?").slice(0, 16)}] ${s.title || "(无标题)"} | ${s.turnCount}轮${active}\n`;
+      }
+      out += "\n" + div() + `\n用 ${C.cyan}/session <编号>${C.reset} 查看详情, ${C.yellow}/session_search <关键词>${C.reset} 搜索`;
+      console.log(out);
+      break;
+    }
+    case "session": {
+      if (!rest) { console.log(`用法: /session <session_id 或列表序号>\n请先用 /sessions 查看列表`); break; }
+      const sessions = listSessions(999);
+      let sid = rest.trim();
+      if (/^\d+$/.test(sid)) {
+        const idx = parseInt(sid) - 1;
+        if (idx < 0 || idx >= sessions.length) { console.log(`序号超出范围 (1-${sessions.length})`); break; }
+        sid = sessions[idx].id;
+      }
+      const session = getSession(sid);
+      if (!session) { console.log(`未找到 session: ${sid}`); break; }
+      const turns = loadSessionTurns(sid, 30);
+      let out = `${C.bold + C.cyan}=== ${session.title || "(无标题)"} ===${C.reset}\n`;
+      out += `ID: ${C.dim}${session.id}${C.reset}  |  ${(session.started || "?").slice(0, 16)}  |  ${session.turnCount}轮\n` + div() + "\n";
+      if (turns.length === 0) { out += "(这个 session 暂无对话轮次)\n"; }
+      else {
+        for (const [i, t] of turns.entries()) {
+          out += `${C.yellow}[${i + 1}] ${(t.time || "?").slice(0, 16)}${C.reset}\n`;
+          if (t.cwd) out += `  ${C.dim}${t.cwd}${C.reset}\n`;
+          out += `  ${C.cyan}▸${C.reset} ${(t.user || "").slice(0, 400)}\n`;
+          out += `  ${C.green}◂${C.reset} ${(t.assistant || "").slice(0, 400)}\n\n`;
+        }
+        out += `(共 ${turns.length} 轮, 显示最近 30 轮)`;
+      }
+      out += "\n" + div();
+      await pipeToPager(out);
+      break;
+    }
+    case "session_search": {
+      if (!rest) { console.log("用法: /session_search <关键词> [数量]\n在整个历史中搜索相关 session"); break; }
+      const parts = rest.trim().split(/\s+/);
+      const maybeNum = parseInt(parts[parts.length - 1], 10);
+      const limit = !isNaN(maybeNum) ? maybeNum : 10;
+      const query = !isNaN(maybeNum) ? parts.slice(0, -1).join(" ") : rest.trim();
+      const results = globalSearch(query, limit);
+      if (results.length === 0) { console.log(`全史搜索未找到 "${query}"`); break; }
+      let out = `${C.bold + C.yellow}搜索: "${query}"${C.reset}  — ${results.length} 个 session\n` + div() + "\n";
+      for (const [i, r] of results.entries()) {
+        out += `${C.yellow}${i + 1}.${C.reset} [${(r.sessionStarted || "?").slice(0, 16)}] ${r.sessionTitle} | ${r.matchCount}处 | 得分${r.totalScore}\n`;
+        for (const m of r.topMatches) {
+          out += `  ${C.dim}·${C.reset} ${m.user.slice(0, 100)}\n`;
+        }
+        out += "\n";
+      }
+      out += div() + `\n用 ${C.cyan}/session <编号>${C.reset} 查看详情`;
+      console.log(out);
+      break;
+    }
     case "compress": {
       console.log(`${C.yellow}正在压缩上下文...${C.reset}`);
       const result = await agent._handleAgentTool("compress_context", {});
@@ -963,6 +1035,7 @@ async function main() {
         `${C.cyan}tools${C.reset}`, `${C.cyan}status${C.reset}`, `${C.cyan}ctx${C.reset}`,
         `${C.cyan}temp${C.reset}`, `${C.cyan}token${C.reset}`,
         `${C.cyan}compress${C.reset}`, `${C.cyan}memory${C.reset}`, `${C.cyan}history${C.reset}`,
+        `${C.cyan}sessions${C.reset}`, `${C.cyan}session_search${C.reset}`,
         `${C.cyan}tool_save${C.reset}`, `${C.cyan}tool_del${C.reset}`,
       ];
       process.stdout.write("\n" + C.dim + menu.join("  ") + C.reset + "\n");