@ghenya/clinn 0.8.8 → 0.9.0

package/Tools/extended_tools.js

@@ -182,26 +182,101 @@ const globTool = {
 
 const grepTool = {
   name: "grep",
-  description: "正则搜索文件内容(ripgrep风格). 返回 文件路径:行号:内容",
+  description: "超快速内容搜索(优先使用ripgrep). 支持上下文行/files_only/count三种输出模式. 比系统grep快5-10x",
   parameters: {
-    pattern: { type: "string", required: true, description: "正则表达式" },
+    pattern: { type: "string", required: true, description: "正则表达式搜索模式" },
     dirPath: { type: "string", required: false, description: "搜索目录, 默认当前目录" },
-    glob: { type: "string", required: false, description: "文件过滤glob, 如 '*.js'" },
+    glob: { type: "string", required: false, description: "文件过滤, 如 '*.js' 或 '*.{ts,tsx}'" },
     headLimit: { type: "number", required: false, description: "结果上限, 默认50" },
     ignoreCase: { type: "boolean", required: false, description: "忽略大小写, 默认true" },
+    context: { type: "number", required: false, description: "上下文行数(前后各N行), 默认0" },
+    outputMode: { type: "string", required: false, description: "输出模式: content(默认)/files_only/count" },
   },
-  execute: async ({ pattern, dirPath, glob, headLimit, ignoreCase }) => {
-    const root = dirPath || process.cwd();
+  execute: async ({ pattern, dirPath, glob, headLimit, ignoreCase, context, outputMode }) => {
+    const root = path.resolve(dirPath || process.cwd());
     if (!fs.existsSync(root)) return `[不存在] ${root}`;
     const max = headLimit || 50;
     const ic = ignoreCase !== false;
+    const mode = outputMode || "content";
+
+    // 优先使用 ripgrep (更快, 支持 --json + 上下文)
+    const rgPath = (() => {
+      try { return execSync("which rg", { encoding: "utf-8", timeout: 2000 }).trim(); }
+      catch (_) { return null; }
+    })();
+
+    if (rgPath) {
+      const args = ["--json"];
+      if (ic) args.push("-i");
+      if (glob) args.push("-g", glob);
+      args.push("-m", String(max));
+      if (context && context > 0) args.push("-C", String(context));
+      args.push("--no-ignore-vcs");
+      args.push("-g", "!node_modules");
+      args.push("-g", "!.git");
+      args.push("-g", "!__pycache__");
+      args.push("-g", "!.DS_Store");
+
+      try {
+        const stdout = execSync(
+          `rg ${args.map(a => JSON.stringify(a)).join(" ")} ${JSON.stringify(pattern)} ${JSON.stringify(root)}`,
+          { encoding: "utf-8", timeout: 30000, maxBuffer: 4 * 1024 * 1024 }
+        );
+        if (!stdout.trim()) return `[无匹配] "${pattern}" 在 ${root}`;
+
+        const lines = stdout.trim().split("\n").filter(Boolean);
+
+        if (mode === "count") {
+          const counts = {};
+          for (const line of lines) {
+            try {
+              const obj = JSON.parse(line);
+              if (obj.type === "match") counts[obj.data.path.text] = (counts[obj.data.path.text] || 0) + 1;
+            } catch (_) {}
+          }
+          return Object.entries(counts).map(([f, c]) => `${f}: ${c} 处匹配`).join("\n");
+        }
+
+        if (mode === "files_only") {
+          const files = new Set();
+          for (const line of lines) {
+            try {
+              const obj = JSON.parse(line);
+              if (obj.type === "match" || obj.type === "begin") files.add(obj.data.path.text);
+            } catch (_) {}
+          }
+          return [...files].join("\n");
+        }
+
+        // content 模式
+        const results = [];
+        for (const line of lines) {
+          try {
+            const obj = JSON.parse(line);
+            if (obj.type === "match") {
+              const d = obj.data;
+              results.push(`${d.path.text}:${d.line_number}: ${d.lines.text.trimEnd()}`);
+            }
+          } catch (_) {}
+        }
+        if (results.length === 0) return `[无匹配] "${pattern}" 在 ${root}`;
+        return results.join("\n");
+      } catch (e) {
+        if (e.status === 1) return `[无匹配] "${pattern}" 在 ${root}`;
+        // ripgrep 失败, 回退到系统 grep
+      }
+    }
+
+    // 回退: 系统 grep
     const globFilter = glob ? ` --include="${glob}"` : "";
     const icFlag = ic ? " -i" : "";
+    const ctxFlag = context && context > 0 ? ` -C ${context}` : "";
     try {
-      const cmd = `grep -rn${icFlag}${globFilter} -m ${max} "${pattern.replace(/"/g, '\\"')}" "${root}"`;
+      const cmd = `grep -rn${icFlag}${ctxFlag}${globFilter} -m ${max} "${pattern.replace(/"/g, '\\"')}" "${root}"`;
       const output = execSync(cmd, { cwd: root, encoding: "utf-8", timeout: 15000, maxBuffer: 2 * 1024 * 1024 });
-      const lines = output.trim().split("\n").slice(0, max);
-      return lines.length > 0 ? lines.join("\n") : `[无匹配] "${pattern}" 在 ${root}`;
+      const lines = output.trim().split("\n").slice(0, mode === "count" ? 9999 : max);
+      if (lines.length === 0 || (lines.length === 1 && !lines[0])) return `[无匹配] "${pattern}" 在 ${root}`;
+      return lines.join("\n");
     } catch (e) {
       if (e.stdout) return e.stdout.trim().split("\n").slice(0, max).join("\n");
       return `[无匹配] "${pattern}" 在 ${root}`;

package/Tools/index.js

@@ -241,7 +241,7 @@ function filterToolDeclarations(prompt) {
     return toFunctionDeclarations();
   }
 
-  const alwaysInclude = ["search_memory", "save_memory", "list_memory", "delete_memory", "search_history", "list_history_files", "browse_page", "browse_page_text", "compress_context", "forget_conversation", "restart_session", "todo_write"];
+  const alwaysInclude = ["search_memory", "save_memory", "list_memory", "delete_memory", "mem_rom", "mem_ram", "search_history", "list_history_files", "list_sessions", "view_session", "search_sessions", "browse_page", "browse_page_text", "compress_context", "forget_conversation", "restart_session", "todo_write"];
   for (const name of alwaysInclude) {
     if (toolRegistry[name]) matched.add(name);
   }

package/Tools/search_tools.js

@@ -172,7 +172,7 @@ const searchMemoryTool = {
 
 const saveMemoryTool = {
   name: "save_memory",
-  description: "保存一条关键信息到记忆(每条不超过200字)",
+  description: "保存一条关键信息到 ROM(永久记忆, 重启不丢). 等价于 mem_rom",
   parameters: {
     content: { type: "string", required: true, description: "记忆内容" },
     tags: { type: "string", required: false, description: "标签,逗号分隔" },
@@ -180,6 +180,26 @@ const saveMemoryTool = {
   execute: () => { return "save_memory must be injected"; },
 };
 
+const memRomTool = {
+  name: "mem_rom",
+  description: "保存一条 ROM 记忆(永久保存, 写入磁盘, 重启后仍存在). 用于身份、偏好、配置等跨会话信息",
+  parameters: {
+    content: { type: "string", required: true, description: "记忆内容, 不超过200字" },
+    tags: { type: "string", required: false, description: "标签,逗号分隔, 如 habit,config" },
+  },
+  execute: () => { return "mem_rom must be injected"; },
+};
+
+const memRamTool = {
+  name: "mem_ram",
+  description: "保存一条 RAM 记忆(仅本次窗口, 关闭即丢失). 用于临时上下文、当前任务状态等",
+  parameters: {
+    content: { type: "string", required: true, description: "记忆内容, 不超过200字" },
+    tags: { type: "string", required: false, description: "标签,逗号分隔" },
+  },
+  execute: () => { return "mem_ram must be injected"; },
+};
+
 const listMemoryTool = {
   name: "list_memory",
   description: "列出所有记忆条目",
@@ -215,6 +235,35 @@ const listHistoryTool = {
   execute: () => { return "list_history_files must be injected"; },
 };
 
+const listSessionsTool = {
+  name: "list_sessions",
+  description: "列出所有对话 session（会话分组），每次 /new 或重启算一个新 session。可以看到过去的对话主题、时间、轮数。用这个来回答「之前聊过什么」类问题。",
+  parameters: {
+    limit: { type: "number", required: false, description: "返回数量, 默认20" },
+  },
+  execute: () => { return "list_sessions must be injected"; },
+};
+
+const viewSessionTool = {
+  name: "view_session",
+  description: "查看某个 session 的完整对话内容，包括用户消息和 AI 回复。用 list_sessions 获取 session_id 后再调用此工具。",
+  parameters: {
+    session_id: { type: "string", required: true, description: "Session ID (从 list_sessions 获取)" },
+    limit: { type: "number", required: false, description: "返回轮数上限, 默认50" },
+  },
+  execute: () => { return "view_session must be injected"; },
+};
+
+const searchSessionsTool = {
+  name: "search_sessions",
+  description: "在全部历史 session 中全文搜索。比 search_history 更好——会按 session 分组、显示匹配得分和上下文。用这个来回答「你记得关于 X 的哪次对话？」类问题。",
+  parameters: {
+    query: { type: "string", required: true, description: "搜索关键词，支持多词空格分隔" },
+    limit: { type: "number", required: false, description: "返回数量, 默认10" },
+  },
+  execute: () => { return "search_sessions must be injected"; },
+};
+
 const compressContextTool = {
   name: "compress_context",
   description: "压缩当前上下文: 将历史对话摘要存入记忆并清空对话历史",
@@ -268,10 +317,15 @@ module.exports = {
   set_timer: setTimerTool,
   search_memory: searchMemoryTool,
   save_memory: saveMemoryTool,
+  mem_rom: memRomTool,
+  mem_ram: memRamTool,
   list_memory: listMemoryTool,
   delete_memory: deleteMemoryTool,
   search_history: searchHistoryTool,
   list_history_files: listHistoryTool,
+  list_sessions: listSessionsTool,
+  view_session: viewSessionTool,
+  search_sessions: searchSessionsTool,
   compress_context: compressContextTool,
   agent_self_invoke: agentSelfInvokeTool,
   save_tool: saveToolTool,

package/config.json

@@ -1,7 +1,7 @@
 {
   "agent": {
     "name": "Clinn",
-    "version": "0.8.8",
+    "version": "0.9.0",
     "description": "控制台智能体助手"
   },
   "llm": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghenya/clinn",
-  "version": "0.8.8",
+  "version": "0.9.0",
   "description": "终端原生 AI 编程助手 — DeepSeek 驱动，50+ 工具，对话记忆，虚拟浏览器，Ink 全屏界面",
   "main": "Src/index.jsx",
   "bin": {
@@ -11,13 +11,13 @@
     "Tools/",
     "Mem/",
     "Logos/",
-    "Skills/",
     "bin/",
     "config.json",
     "README.md",
     "install.cjs",
     "install.sh",
-    "install.bat"
+    "install.bat",
+    "Skills/"
   ],
   "scripts": {
     "postinstall": "node install.cjs",
@@ -52,11 +52,11 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "puppeteer-core": "^25.1.0",
-    "ink": "^5.2.0",
-    "ink-text-input": "^6.0.0",
+    "ink": "^7.0.5",
     "ink-spinner": "^5.0.0",
-    "react": "^18.3.1",
+    "ink-text-input": "^6.0.0",
+    "puppeteer-core": "^25.1.0",
+    "react": "^19.2.7",
     "tsx": "^4.0.0"
   }
-}
+}