@amical/aiagent-sdk 0.1.9 → 0.1.10

package/dist/index.d.mts

@@ -21,7 +21,8 @@ interface IAgentRuntime {
          * @param filePattern (可选) 文件名匹配模式，比如 '*.ts'
          * @returns 返回格式化后的包含上下文的搜索结果字符串
          */
-        searchFiles?(path: string, regex: string, filePattern?: string): Promise<string>;
+        searchFiles?(path: string, regex: string, filePattern?: string, includeNodeModules?: boolean): Promise<string>;
+        searchFileContent?(path: string, regex: string, filePattern?: string, includeNodeModules?: boolean): Promise<string>;
     };
     path: {
         join(...paths: string[]): string;
@@ -59,6 +60,7 @@ declare enum AgentDefaultTool {
     FILE_DELETE = "agent_delete_file",
     DIR_DELETE = "agent_delete_directory",
     SEARCH = "agent_search_files",
+    SEARCH_CONTENT = "agent_search_file_content",
     LIST_FILES = "agent_list_files",
     LIST_CODE_DEF = "agent_list_code_definition_names",
     BROWSER = "agent_browser_action",
@@ -137,11 +139,21 @@ declare const defaultTools: readonly [{
     };
 }, {
     readonly name: AgentDefaultTool.SEARCH;
-    readonly description: "Search for files in a directory that match a regex pattern or glob pattern.";
+    readonly 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.";
     readonly params: {
         readonly path: "(required) The absolute or relative directory path to search.";
-        readonly regex: "(required) The regex pattern to match files against.";
+        readonly regex: "(required) The regex pattern to match file or directory names against.";
         readonly file_pattern: "(optional) glob pattern like *.ts.";
+        readonly include_node_modules: "(optional) set to true to include node_modules in the search. Defaults to false, so node_modules is skipped.";
+    };
+}, {
+    readonly name: AgentDefaultTool.SEARCH_CONTENT;
+    readonly 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.";
+    readonly params: {
+        readonly path: "(required) The absolute or relative directory path to search.";
+        readonly regex: "(required) The regex pattern to match file content against.";
+        readonly file_pattern: "(optional) glob pattern like *.ts to limit which files are searched.";
+        readonly include_node_modules: "(optional) set to true to include node_modules in the search. Defaults to false, so node_modules is skipped.";
     };
 }, {
     readonly name: AgentDefaultTool.LIST_FILES;
@@ -166,7 +178,7 @@ declare const defaultTools: readonly [{
 declare const toolUseNames: AgentDefaultTool[];
 declare function setDynamicToolUseNames(namespace: string, names: string[]): void;
 declare function getToolUseNames(): string[];
-declare const READ_ONLY_TOOLS: readonly [AgentDefaultTool.LIST_FILES, AgentDefaultTool.FILE_READ, AgentDefaultTool.SEARCH, AgentDefaultTool.LIST_CODE_DEF, AgentDefaultTool.BROWSER, AgentDefaultTool.ASK, AgentDefaultTool.WEB_SEARCH, AgentDefaultTool.WEB_FETCH, AgentDefaultTool.LOAD_SKILL, AgentDefaultTool.USE_SUBAGENTS];
+declare const READ_ONLY_TOOLS: readonly [AgentDefaultTool.LIST_FILES, AgentDefaultTool.FILE_READ, AgentDefaultTool.SEARCH, AgentDefaultTool.SEARCH_CONTENT, AgentDefaultTool.LIST_CODE_DEF, AgentDefaultTool.BROWSER, AgentDefaultTool.ASK, AgentDefaultTool.WEB_SEARCH, AgentDefaultTool.WEB_FETCH, AgentDefaultTool.LOAD_SKILL, AgentDefaultTool.USE_SUBAGENTS];
 
 /**
  * @description **Version 2**
@@ -198,7 +210,7 @@ interface TextStreamContent {
     content: string;
     partial: boolean;
 }
-declare const toolParamNames: readonly ["command", "requires_approval", "path", "absolutePath", "content", "diff", "regex", "file_pattern", "recursive", "action", "url", "coordinate", "text", "query", "allowed_domains", "blocked_domains", "prompt", "server_name", "tool_name", "arguments", "uri", "question", "options", "response", "result", "context", "title", "what_happened", "steps_to_reproduce", "api_request_output", "additional_context", "needs_more_exploration", "task_progress", "timeout", "input", "from_ref", "to_ref", "skill_name", "prompt_1", "prompt_2", "prompt_3", "prompt_4", "prompt_5", "start_line", "end_line"];
+declare const toolParamNames: readonly ["command", "requires_approval", "path", "absolutePath", "content", "diff", "regex", "file_pattern", "include_node_modules", "recursive", "action", "url", "coordinate", "text", "query", "allowed_domains", "blocked_domains", "prompt", "server_name", "tool_name", "arguments", "uri", "question", "options", "response", "result", "context", "title", "what_happened", "steps_to_reproduce", "api_request_output", "additional_context", "needs_more_exploration", "task_progress", "timeout", "input", "from_ref", "to_ref", "skill_name", "prompt_1", "prompt_2", "prompt_3", "prompt_4", "prompt_5", "start_line", "end_line"];
 type ToolParamName = (typeof toolParamNames)[number];
 interface ToolUse {
     type: "tool_use";
@@ -484,7 +496,19 @@ declare class ClineAgent {
     resume(userInput?: string): Promise<void>;
     appendHistory(history: AgentMessage[]): Promise<void>;
     getHistory(): Promise<AgentMessage[]>;
-    searchFiles(dirpath: string, regex: string, filePattern?: string): Promise<string>;
+    /**
+     * 判断文件是否为可进行内容搜索的文本类文件
+     */
+    private isTextFile;
+    /**
+     * 按文件名/目录名搜索，层级优先（BFS）：
+     * 每一层先匹配完当前层级的所有条目，再进入更深的子目录。
+     */
+    searchFiles(dirpath: string, regex: string, filePattern?: string, includeNodeModules?: boolean): Promise<string>;
+    /**
+     * 按文件内容搜索：正则匹配文件内容，返回匹配文件路径。
+     */
+    searchFileContent(dirpath: string, regex: string, filePattern?: string, includeNodeModules?: boolean): Promise<string>;
 }
 
 declare const VERSION = "0.1.0";

package/dist/index.d.ts

@@ -21,7 +21,8 @@ interface IAgentRuntime {
          * @param filePattern (可选) 文件名匹配模式，比如 '*.ts'
          * @returns 返回格式化后的包含上下文的搜索结果字符串
          */
-        searchFiles?(path: string, regex: string, filePattern?: string): Promise<string>;
+        searchFiles?(path: string, regex: string, filePattern?: string, includeNodeModules?: boolean): Promise<string>;
+        searchFileContent?(path: string, regex: string, filePattern?: string, includeNodeModules?: boolean): Promise<string>;
     };
     path: {
         join(...paths: string[]): string;
@@ -59,6 +60,7 @@ declare enum AgentDefaultTool {
     FILE_DELETE = "agent_delete_file",
     DIR_DELETE = "agent_delete_directory",
     SEARCH = "agent_search_files",
+    SEARCH_CONTENT = "agent_search_file_content",
     LIST_FILES = "agent_list_files",
     LIST_CODE_DEF = "agent_list_code_definition_names",
     BROWSER = "agent_browser_action",
@@ -137,11 +139,21 @@ declare const defaultTools: readonly [{
     };
 }, {
     readonly name: AgentDefaultTool.SEARCH;
-    readonly description: "Search for files in a directory that match a regex pattern or glob pattern.";
+    readonly 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.";
     readonly params: {
         readonly path: "(required) The absolute or relative directory path to search.";
-        readonly regex: "(required) The regex pattern to match files against.";
+        readonly regex: "(required) The regex pattern to match file or directory names against.";
         readonly file_pattern: "(optional) glob pattern like *.ts.";
+        readonly include_node_modules: "(optional) set to true to include node_modules in the search. Defaults to false, so node_modules is skipped.";
+    };
+}, {
+    readonly name: AgentDefaultTool.SEARCH_CONTENT;
+    readonly 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.";
+    readonly params: {
+        readonly path: "(required) The absolute or relative directory path to search.";
+        readonly regex: "(required) The regex pattern to match file content against.";
+        readonly file_pattern: "(optional) glob pattern like *.ts to limit which files are searched.";
+        readonly include_node_modules: "(optional) set to true to include node_modules in the search. Defaults to false, so node_modules is skipped.";
     };
 }, {
     readonly name: AgentDefaultTool.LIST_FILES;
@@ -166,7 +178,7 @@ declare const defaultTools: readonly [{
 declare const toolUseNames: AgentDefaultTool[];
 declare function setDynamicToolUseNames(namespace: string, names: string[]): void;
 declare function getToolUseNames(): string[];
-declare const READ_ONLY_TOOLS: readonly [AgentDefaultTool.LIST_FILES, AgentDefaultTool.FILE_READ, AgentDefaultTool.SEARCH, AgentDefaultTool.LIST_CODE_DEF, AgentDefaultTool.BROWSER, AgentDefaultTool.ASK, AgentDefaultTool.WEB_SEARCH, AgentDefaultTool.WEB_FETCH, AgentDefaultTool.LOAD_SKILL, AgentDefaultTool.USE_SUBAGENTS];
+declare const READ_ONLY_TOOLS: readonly [AgentDefaultTool.LIST_FILES, AgentDefaultTool.FILE_READ, AgentDefaultTool.SEARCH, AgentDefaultTool.SEARCH_CONTENT, AgentDefaultTool.LIST_CODE_DEF, AgentDefaultTool.BROWSER, AgentDefaultTool.ASK, AgentDefaultTool.WEB_SEARCH, AgentDefaultTool.WEB_FETCH, AgentDefaultTool.LOAD_SKILL, AgentDefaultTool.USE_SUBAGENTS];
 
 /**
  * @description **Version 2**
@@ -198,7 +210,7 @@ interface TextStreamContent {
     content: string;
     partial: boolean;
 }
-declare const toolParamNames: readonly ["command", "requires_approval", "path", "absolutePath", "content", "diff", "regex", "file_pattern", "recursive", "action", "url", "coordinate", "text", "query", "allowed_domains", "blocked_domains", "prompt", "server_name", "tool_name", "arguments", "uri", "question", "options", "response", "result", "context", "title", "what_happened", "steps_to_reproduce", "api_request_output", "additional_context", "needs_more_exploration", "task_progress", "timeout", "input", "from_ref", "to_ref", "skill_name", "prompt_1", "prompt_2", "prompt_3", "prompt_4", "prompt_5", "start_line", "end_line"];
+declare const toolParamNames: readonly ["command", "requires_approval", "path", "absolutePath", "content", "diff", "regex", "file_pattern", "include_node_modules", "recursive", "action", "url", "coordinate", "text", "query", "allowed_domains", "blocked_domains", "prompt", "server_name", "tool_name", "arguments", "uri", "question", "options", "response", "result", "context", "title", "what_happened", "steps_to_reproduce", "api_request_output", "additional_context", "needs_more_exploration", "task_progress", "timeout", "input", "from_ref", "to_ref", "skill_name", "prompt_1", "prompt_2", "prompt_3", "prompt_4", "prompt_5", "start_line", "end_line"];
 type ToolParamName = (typeof toolParamNames)[number];
 interface ToolUse {
     type: "tool_use";
@@ -484,7 +496,19 @@ declare class ClineAgent {
     resume(userInput?: string): Promise<void>;
     appendHistory(history: AgentMessage[]): Promise<void>;
     getHistory(): Promise<AgentMessage[]>;
-    searchFiles(dirpath: string, regex: string, filePattern?: string): Promise<string>;
+    /**
+     * 判断文件是否为可进行内容搜索的文本类文件
+     */
+    private isTextFile;
+    /**
+     * 按文件名/目录名搜索，层级优先（BFS）：
+     * 每一层先匹配完当前层级的所有条目，再进入更深的子目录。
+     */
+    searchFiles(dirpath: string, regex: string, filePattern?: string, includeNodeModules?: boolean): Promise<string>;
+    /**
+     * 按文件内容搜索：正则匹配文件内容，返回匹配文件路径。
+     */
+    searchFileContent(dirpath: string, regex: string, filePattern?: string, includeNodeModules?: boolean): Promise<string>;
 }
 
 declare const VERSION = "0.1.0";

package/dist/index.js

@@ -18,6 +18,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";
@@ -191,11 +192,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."
     }
   },
   {
@@ -264,6 +276,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 */,
@@ -433,6 +446,7 @@ var toolParamNames = [
   "diff",
   "regex",
   "file_pattern",
+  "include_node_modules",
   "recursive",
   "action",
   "url",
@@ -471,6 +485,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";
@@ -826,15 +900,36 @@ STDERR: ${result.stderr}` });
             const path = 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 && path) {
               try {
                 let result;
                 if (typeof this.runtime.fs.searchFiles === "function") {
                   result = await this.runtime.fs.searchFiles(path, regexStr, filePattern);
                 } else {
-                  result = await this.searchFiles(path, regexStr, filePattern);
+                  result = await this.searchFiles(path, 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_search_file_content" /* SEARCH_CONTENT */) {
+            const path = 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 && path) {
+              try {
+                let result;
+                if (typeof this.runtime.fs.searchFileContent === "function") {
+                  result = await this.runtime.fs.searchFileContent(path, regexStr, filePattern);
+                } else {
+                  result = await this.searchFileContent(path, regexStr, filePattern, includeNodeModules);
                 }
-                toolResults.push({ tool, result: `${result}` });
+                toolResults.push({ tool, result });
               } catch (e) {
                 toolResults.push({ tool, result: `Error: ${e.message}` });
               }
@@ -1009,13 +1104,80 @@ ${searchBlock.substring(0, 100)}...`);
   async getHistory() {
     return this.memory.getHistory();
   }
-  async searchFiles(dirpath, regex, filePattern) {
+  /**
+   * 判断文件是否为可进行内容搜索的文本类文件
+   */
+  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 contentRe = new RegExp(regex);
-    const nameRe = filePattern ? new RegExp(filePattern.replace(/\./g, "\\.").replace(/\*/g, ".*")) : null;
+    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 > 8 || matches.length >= 100) {
+      if (depth > MAX_DEPTH || matches.length >= MAX_RESULTS) {
         return;
       }
       let entries;
@@ -1025,21 +1187,24 @@ ${searchBlock.substring(0, 100)}...`);
         return;
       }
       for (const entry of entries) {
-        if (matches.length >= 100) {
+        if (matches.length >= MAX_RESULTS) {
           break;
         }
         const child = dir === "." ? entry.name : `${dir}/${entry.name}`;
         if (entry.isDirectory()) {
-          if (!SKIP_DIRS.has(entry.name)) {
+          if (!shouldSkipDir(entry.name)) {
             await walk(child, depth + 1);
           }
         } else if (entry.isFile()) {
-          if (nameRe && !nameRe.test(entry.name)) {
+          if (!this.isTextFile(entry.name)) {
+            continue;
+          }
+          if (globRe && !globRe.test(entry.name)) {
             continue;
           }
           try {
-            const content = (await this.runtime.fs.readFile(child, "utf8")).toString();
-            if (contentRe.test(content)) {
+            const content = await this.runtime.fs.readFile(child);
+            if (typeof content === "string" && contentRe.test(content)) {
               matches.push(child);
             }
           } catch {
@@ -1048,6 +1213,9 @@ ${searchBlock.substring(0, 100)}...`);
       }
     };
     await walk(dirpath, 0);
+    if (matches.length === 0) {
+      return "No files found with matching content.";
+    }
     return matches.join("\n");
   }
 };