@amical/aiagent-sdk 0.1.8 → 0.1.10

package/dist/runtime/nodeRuntime.mjs

@@ -4,7 +4,7 @@ import { streamText } from 'ai';
 import { createOpenAI } from '@ai-sdk/openai';
 import { createDifyProvider } from 'dify-ai-provider';
 import * as fs2 from 'fs/promises';
-import * as path2 from 'path';
+import * as path from 'path';
 import * as os from 'os';
 import { exec } from 'child_process';
 import { promisify } from 'util';
@@ -22,6 +22,7 @@ var AgentDefaultTool = /* @__PURE__ */ ((AgentDefaultTool2) => {
   AgentDefaultTool2["FILE_DELETE"] = "agent_delete_file";
   AgentDefaultTool2["DIR_DELETE"] = "agent_delete_directory";
   AgentDefaultTool2["SEARCH"] = "agent_search_files";
+  AgentDefaultTool2["SEARCH_CONTENT"] = "agent_search_file_content";
   AgentDefaultTool2["LIST_FILES"] = "agent_list_files";
   AgentDefaultTool2["LIST_CODE_DEF"] = "agent_list_code_definition_names";
   AgentDefaultTool2["BROWSER"] = "agent_browser_action";
@@ -195,11 +196,22 @@ return (
   },
   {
     name: "agent_search_files" /* SEARCH */,
-    description: "Search for files in a directory that match a regex pattern or glob pattern.",
+    description: "Search for files or directories by name in a directory tree, matching the name against a regex (and optionally a glob). Directories are traversed level by level: all matches in the current level are returned before descending into deeper levels. Use this tool only to locate files/directories by name.",
     params: {
       path: "(required) The absolute or relative directory path to search.",
-      regex: "(required) The regex pattern to match files against.",
-      file_pattern: "(optional) glob pattern like *.ts."
+      regex: "(required) The regex pattern to match file or directory names against.",
+      file_pattern: "(optional) glob pattern like *.ts.",
+      include_node_modules: "(optional) set to true to include node_modules in the search. Defaults to false, so node_modules is skipped."
+    }
+  },
+  {
+    name: "agent_search_file_content" /* SEARCH_CONTENT */,
+    description: "Search the contents of files in a directory tree for a regex pattern. Use this tool when you need to find text or code inside files rather than matching file or directory names.",
+    params: {
+      path: "(required) The absolute or relative directory path to search.",
+      regex: "(required) The regex pattern to match file content against.",
+      file_pattern: "(optional) glob pattern like *.ts to limit which files are searched.",
+      include_node_modules: "(optional) set to true to include node_modules in the search. Defaults to false, so node_modules is skipped."
     }
   },
   {
@@ -268,6 +280,7 @@ var READ_ONLY_TOOLS = [
   "agent_list_files" /* LIST_FILES */,
   "agent_read_file" /* FILE_READ */,
   "agent_search_files" /* SEARCH */,
+  "agent_search_file_content" /* SEARCH_CONTENT */,
   "agent_list_code_definition_names" /* LIST_CODE_DEF */,
   "agent_browser_action" /* BROWSER */,
   "agent_ask_followup_question" /* ASK */,
@@ -437,6 +450,7 @@ var toolParamNames = [
   "diff",
   "regex",
   "file_pattern",
+  "include_node_modules",
   "recursive",
   "action",
   "url",
@@ -475,6 +489,66 @@ var toolParamNames = [
   "start_line",
   "end_line"
 ];
+var TEXT_FILE_EXTENSIONS = /* @__PURE__ */ new Set([
+  "txt",
+  "md",
+  "markdown",
+  "json",
+  "js",
+  "mjs",
+  "cjs",
+  "ts",
+  "tsx",
+  "jsx",
+  "html",
+  "htm",
+  "css",
+  "scss",
+  "sass",
+  "less",
+  "py",
+  "java",
+  "c",
+  "cpp",
+  "cc",
+  "cxx",
+  "h",
+  "hpp",
+  "cs",
+  "go",
+  "rs",
+  "rb",
+  "php",
+  "sh",
+  "bash",
+  "zsh",
+  "bat",
+  "cmd",
+  "ps1",
+  "yaml",
+  "yml",
+  "toml",
+  "ini",
+  "cfg",
+  "conf",
+  "xml",
+  "svg",
+  "csv",
+  "log",
+  "sql",
+  "vue",
+  "svelte",
+  "astro",
+  "graphql",
+  "gql",
+  "prisma",
+  "env",
+  "gitignore",
+  "dockerfile",
+  "makefile",
+  "properties",
+  "lock"
+]);
 var AgentState = /* @__PURE__ */ ((AgentState2) => {
   AgentState2["IDLE"] = "idle";
   AgentState2["THINKING"] = "thinking";
@@ -555,7 +629,7 @@ var ClineAgent = class {
     }
   }
   /**
-   * 获取当前 Agent 的系统提示词 
+   * 获取当前 Agent 的系统提示词
    * 如果 force 为 true，则强制重新获取系统提示词
    */
   async getPrompt(force = false) {
@@ -830,15 +904,41 @@ STDERR: ${result.stderr}` });
             const path3 = tool.params.path || this.runtime.env.cwd();
             const regexStr = tool.params.regex;
             const filePattern = tool.params.file_pattern;
-            if (regexStr && this.runtime.fs.searchFiles) {
+            const includeNodeModules = tool.params.include_node_modules === "true";
+            if (regexStr && path3) {
               try {
-                const result = await this.runtime.fs.searchFiles(path3, regexStr, filePattern);
-                toolResults.push({ tool, result: `${result}` });
+                let result;
+                if (typeof this.runtime.fs.searchFiles === "function") {
+                  result = await this.runtime.fs.searchFiles(path3, regexStr, filePattern);
+                } else {
+                  result = await this.searchFiles(path3, regexStr, filePattern, includeNodeModules);
+                }
+                toolResults.push({ tool, result });
               } catch (e) {
                 toolResults.push({ tool, result: `Error: ${e.message}` });
               }
             } else {
-              toolResults.push({ tool, result: `Error: searchFiles not supported by runtime or missing regex.` });
+              toolResults.push({ tool, result: `Error: miss path or regex params` });
+            }
+          } else if (tool.name === "agent_search_file_content" /* SEARCH_CONTENT */) {
+            const path3 = tool.params.path || this.runtime.env.cwd();
+            const regexStr = tool.params.regex;
+            const filePattern = tool.params.file_pattern;
+            const includeNodeModules = tool.params.include_node_modules === "true";
+            if (regexStr && path3) {
+              try {
+                let result;
+                if (typeof this.runtime.fs.searchFileContent === "function") {
+                  result = await this.runtime.fs.searchFileContent(path3, regexStr, filePattern);
+                } else {
+                  result = await this.searchFileContent(path3, regexStr, filePattern, includeNodeModules);
+                }
+                toolResults.push({ tool, result });
+              } catch (e) {
+                toolResults.push({ tool, result: `Error: ${e.message}` });
+              }
+            } else {
+              toolResults.push({ tool, result: `Error: miss path or regex params` });
             }
           } else if (tool.name === "agent_use_mcp_tool" /* MCP_USE */) {
             const serverName = tool.params.server_name;
@@ -943,9 +1043,14 @@ IMPORTANT: The skill is now loaded. Do NOT call agent_load_skill again for this
           }
         }
         if (this.state === "thinking" /* THINKING */ && toolResults.length > 0) {
-          const toolResultsContext = toolResults.map((tr) => `<${TOOL_RESULT_BLOCK} tool_name="${tr.tool.name}">
+          let toolResultsContext = toolResults.map((tr) => `<${TOOL_RESULT_BLOCK} tool_name="${tr.tool.name}">
 ${typeof tr.result === "string" ? tr.result.trim() : JSON.stringify(tr.result)}
 </${TOOL_RESULT_BLOCK}>`).join("\n\n");
+          const lastResult = toolResults[toolResults.length - 1];
+          if (lastResult && lastResult.tool.name !== "agent_attempt_completion" /* ATTEMPT */) {
+            toolResultsContext += `
+${this.promptManager.getUsedToolResultInstructions()}`;
+          }
           if (this.onStreamChunk) {
             this.onStreamChunk({ type: "text", text: toolResultsContext });
           }
@@ -1003,6 +1108,120 @@ ${searchBlock.substring(0, 100)}...`);
   async getHistory() {
     return this.memory.getHistory();
   }
+  /**
+   * 判断文件是否为可进行内容搜索的文本类文件
+   */
+  isTextFile(name) {
+    const ext = name.includes(".") ? String(name.split(".").pop()).toLowerCase() : "";
+    if (!ext) {
+      return true;
+    }
+    return TEXT_FILE_EXTENSIONS.has(ext);
+  }
+  /**
+   * 按文件名/目录名搜索，层级优先（BFS）：
+   * 每一层先匹配完当前层级的所有条目，再进入更深的子目录。
+   */
+  async searchFiles(dirpath, regex, filePattern, includeNodeModules = false) {
+    const matches = [];
+    const MAX_RESULTS = 100;
+    const MAX_DEPTH = 8;
+    const SKIP_DIRS = /* @__PURE__ */ new Set([".git", "dist", ".agent", ".turbopack"]);
+    const shouldSkipDir = (name) => SKIP_DIRS.has(name) || name === "node_modules" && !includeNodeModules;
+    const nameRe = new RegExp(regex);
+    const globRe = filePattern ? new RegExp(filePattern.replace(/\./g, "\\.").replace(/\*/g, ".*")) : null;
+    const queue = [{ dir: dirpath, depth: 0 }];
+    while (queue.length > 0 && matches.length < MAX_RESULTS) {
+      const { dir, depth } = queue.shift();
+      if (depth > MAX_DEPTH) {
+        continue;
+      }
+      let entries;
+      try {
+        entries = await this.runtime.fs.readDir(dir, { recursive: false });
+      } catch {
+        continue;
+      }
+      for (const entry of entries) {
+        if (matches.length >= MAX_RESULTS) {
+          break;
+        }
+        const child = dir === "." ? entry.name : `${dir}/${entry.name}`;
+        if (entry.isDirectory()) {
+          if (!shouldSkipDir(entry.name)) {
+            if (nameRe.test(entry.name)) {
+              matches.push(`${child}/`);
+            }
+            queue.push({ dir: child, depth: depth + 1 });
+          }
+        } else if (entry.isFile()) {
+          if (globRe && !globRe.test(entry.name)) {
+            continue;
+          }
+          if (nameRe.test(entry.name)) {
+            matches.push(child);
+          }
+        }
+      }
+    }
+    if (matches.length === 0) {
+      return "No files found.";
+    }
+    return matches.join("\n");
+  }
+  /**
+   * 按文件内容搜索：正则匹配文件内容，返回匹配文件路径。
+   */
+  async searchFileContent(dirpath, regex, filePattern, includeNodeModules = false) {
+    const matches = [];
+    const MAX_RESULTS = 100;
+    const MAX_DEPTH = 8;
+    const SKIP_DIRS = /* @__PURE__ */ new Set([".git", "dist", ".agent", ".turbopack"]);
+    const shouldSkipDir = (name) => SKIP_DIRS.has(name) || name === "node_modules" && !includeNodeModules;
+    const contentRe = new RegExp(regex);
+    const globRe = filePattern ? new RegExp(filePattern.replace(/\./g, "\\.").replace(/\*/g, ".*")) : null;
+    const walk = async (dir, depth) => {
+      if (depth > MAX_DEPTH || matches.length >= MAX_RESULTS) {
+        return;
+      }
+      let entries;
+      try {
+        entries = await this.runtime.fs.readDir(dir, { recursive: false });
+      } catch {
+        return;
+      }
+      for (const entry of entries) {
+        if (matches.length >= MAX_RESULTS) {
+          break;
+        }
+        const child = dir === "." ? entry.name : `${dir}/${entry.name}`;
+        if (entry.isDirectory()) {
+          if (!shouldSkipDir(entry.name)) {
+            await walk(child, depth + 1);
+          }
+        } else if (entry.isFile()) {
+          if (!this.isTextFile(entry.name)) {
+            continue;
+          }
+          if (globRe && !globRe.test(entry.name)) {
+            continue;
+          }
+          try {
+            const content = await this.runtime.fs.readFile(child);
+            if (typeof content === "string" && contentRe.test(content)) {
+              matches.push(child);
+            }
+          } catch {
+          }
+        }
+      }
+    };
+    await walk(dirpath, 0);
+    if (matches.length === 0) {
+      return "No files found with matching content.";
+    }
+    return matches.join("\n");
+  }
 };
 var NodeApiHandler = class {
   config;
@@ -1377,6 +1596,21 @@ Otherwise, if you have not completed the task and do not need additional informa
 (This is an automated message, so do not respond to it conversationally.)
 ${this?.getEnvironmentInfoPrompt?.(context)}`;
   }
+  getUsedToolResultInstructions() {
+    return `The above are the results of the tool call. Please continue to complete the remaining tasks.
+
+# TODO LIST UPDATE REQUIRED - You MUST include the task_progress parameter in your NEXT tool call.
+
+1. To create or update a todo list, include the task_progress parameter in the next tool call
+2. Review each item and update its status:
+   - Mark completed items with: - [x]
+   - Keep incomplete items as: - [ ]
+   - Add new items if you discover additional steps
+3. Modify the list as needed:
+		- Add any new steps you've discovered
+		- Reorder if the sequence has changed
+4. Ensure the list accurately reflects the current state`;
+  }
 };
 var NodeMemoryManager = class {
   filePath;
@@ -1386,14 +1620,14 @@ var NodeMemoryManager = class {
    * @param maxMessages 保留的最大消息数量，用于简单的历史截断（默认 150）
    */
   constructor(dbPath, maxMessages = 150) {
-    this.filePath = path2.resolve(dbPath);
+    this.filePath = path.resolve(dbPath);
     this.maxMessages = maxMessages;
   }
   async ensureFile() {
     try {
       await fs2.access(this.filePath);
     } catch {
-      const dir = path2.dirname(this.filePath);
+      const dir = path.dirname(this.filePath);
       await fs2.mkdir(dir, { recursive: true });
       await fs2.writeFile(this.filePath, "[]", "utf-8");
     }
@@ -1569,10 +1803,13 @@ var NodeMcpManager = class {
 var execAsync = promisify(exec);
 var DefaultNodeRuntime = class {
   fs = {
-    readFile: async (filepath) => fs2.readFile(filepath, "utf-8"),
+    readFile: async (filepath, options = "utf8") => fs2.readFile(filepath, options),
     writeFile: async (filepath, content) => {
-      await fs2.mkdir(path2.dirname(filepath), { recursive: true });
-      await fs2.writeFile(filepath, content, "utf-8");
+      const dir = filepath.substring(0, filepath.lastIndexOf("/"));
+      if (dir && dir !== filepath) {
+        await fs2.mkdir(dir, { recursive: true });
+      }
+      await fs2.writeFile(filepath, content, "utf8");
     },
     deleteFile: (filepath) => fs2.unlink(filepath),
     deleteDirectory: (dirpath) => fs2.rm(dirpath, { recursive: true, force: true }),
@@ -1584,13 +1821,13 @@ var DefaultNodeRuntime = class {
         return false;
       }
     },
-    readDir: (dirpath) => fs2.readdir(dirpath, { withFileTypes: true }),
+    readDir: (dirpath, options) => fs2.readdir(dirpath, { withFileTypes: true, ...options || {} }),
     mkdir: async (dirpath) => {
       await fs2.mkdir(dirpath, { recursive: true });
     }
   };
   path = {
-    join: (...paths) => path2.join(...paths)
+    join: (...paths) => path.join(...paths)
   };
   env = {
     get: (key) => process.env[key],
@@ -1612,7 +1849,7 @@ var DefaultNodeRuntime = class {
 function createNodeAgent(options) {
   const runtime = new DefaultNodeRuntime();
   const api = new NodeApiHandler(options.apiConfig);
-  const memory = options.memory || new NodeMemoryManager(options.dbPath || path2.join(runtime.env.cwd(), ".cline_memory.json"));
+  const memory = options.memory || new NodeMemoryManager(options.dbPath || path.join(runtime.env.cwd(), ".cline_memory.json"));
   const customTools = options.customTools || [];
   const customToolNames = new Set(customTools.map((t) => t.name));
   const promptManager = new NodePromptManager();