@amical/aiagent-sdk 0.1.9 → 0.1.11

package/dist/index.mjs

@@ -12,6 +12,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";
@@ -185,11 +186,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."
     }
   },
   {
@@ -258,6 +270,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 */,
@@ -266,6 +279,44 @@ var READ_ONLY_TOOLS = [
   "agent_load_skill" /* LOAD_SKILL */,
   "agent_use_subagents" /* USE_SUBAGENTS */
 ];
+
+// src/shared/custom-tools.ts
+function isCustomToolGroup(tool) {
+  return Array.isArray(tool.children) && tool.children.length > 0;
+}
+function collectCustomToolNames(tools) {
+  const names = [];
+  const visit = (list) => {
+    for (const tool of list) {
+      names.push(tool.name);
+      if (Array.isArray(tool.children) && tool.children.length > 0) {
+        visit(tool.children);
+      }
+    }
+  };
+  visit(tools);
+  return names;
+}
+function renderCustomToolPrompt(tool, cwd = "") {
+  const params = tool.params ? Object.entries(tool.params) : [];
+  const replaceCwd = (text) => String(text).replaceAll("${context.cwd}", cwd);
+  const paramLines = params.map(([name, description]) => `- ${name}: ${replaceCwd(description)}`).join("\n");
+  const usageLines = params.map(([name, description]) => `<${name}>${replaceCwd(description)}</${name}>`).join("\n");
+  return `### ${tool.name}
+Description: ${tool.description}
+Parameters: 
+${paramLines}
+- task_progress: (optional) A checklist showing task progress after this tool use is completed. The task_progress parameter must be included as a separate parameter inside of the parent tool call, it must be separate from other parameters such as content, arguments, etc. (See 'UPDATING TASK PROGRESS' section for more details)
+Usage: 
+<${tool.name}>
+${usageLines}
+<task_progress>Checklist here (optional)</task_progress>
+</${tool.name}>
+`;
+}
+function renderCustomToolsPrompt(tools, cwd = "") {
+  return tools.map((tool) => renderCustomToolPrompt(tool, cwd)).join("\n");
+}
 function parseAssistantMessageV2(assistantMessage, toolParamNames2) {
   const contentBlocks = [];
   let currentTextContentStart = 0;
@@ -427,6 +478,7 @@ var toolParamNames = [
   "diff",
   "regex",
   "file_pattern",
+  "include_node_modules",
   "recursive",
   "action",
   "url",
@@ -465,6 +517,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";
@@ -488,9 +600,19 @@ var ClineAgent = class {
   skillDir;
   rulesDir;
   customTools;
+  /** 当前可用（已展开集合）的顶层工具列表，传给 PromptManager 渲染 */
+  activeCustomTools;
+  /** 所有已知工具名（含未激活 children），便于查找定义 */
+  customToolsByName;
   customToolNames;
   allowDefaultTools;
   customInstructions;
+  /** 已激活的工具集入口名 */
+  activatedGroups = /* @__PURE__ */ new Set();
+  /** activeCustomTools 变更版本号，用于 Prompt 缓存失效 */
+  activeToolsVersion = 0;
+  /** 缓存 sysPrompt 时记录的版本号 */
+  promptActiveToolsVersion = -1;
   sysPrompt;
   noUseTollSysPrompt;
   // 简单的事件回调系统，供宿主环境注册以监听 Agent 内部事件
@@ -510,31 +632,38 @@ var ClineAgent = class {
       this.allowDefaultTools.push("agent_attempt_completion" /* ATTEMPT */);
     }
     this.customInstructions = options.customInstructions;
+    this.customToolsByName = /* @__PURE__ */ new Map();
+    this.activeCustomTools = [...this.customTools];
+    this.customToolNames = new Set(collectCustomToolNames(this.customTools));
     if (this.customTools.length > 0) {
-      const dynamicToolNames = /* @__PURE__ */ new Set();
       const customToolParams = /* @__PURE__ */ new Set();
-      for (const customTool of this.customTools) {
-        dynamicToolNames.add(customTool.name);
-        if (customTool.params) {
-          for (const key in customTool.params) {
-            if (!Object.hasOwn(customTool.params, key)) continue;
-            customToolParams.add(key);
+      const visit = (tools) => {
+        for (const customTool of tools) {
+          this.customToolsByName.set(customTool.name, customTool);
+          if (customTool.params) {
+            for (const key in customTool.params) {
+              if (!Object.hasOwn(customTool.params, key)) continue;
+              customToolParams.add(key);
+            }
+          }
+          if (Array.isArray(customTool.children) && customTool.children.length > 0) {
+            visit(customTool.children);
           }
         }
-      }
+      };
+      visit(this.customTools);
       const defaultToolNames = Object.values(AgentDefaultTool);
-      const overlappingTools = Array.from(dynamicToolNames).filter((name) => defaultToolNames.includes(name));
+      const overlappingTools = Array.from(this.customToolNames).filter((name) => defaultToolNames.includes(name));
       if (overlappingTools.length > 0) {
         throw new Error(`Custom tools and default tools have overlapping names: ${overlappingTools.join(", ")}`);
       }
-      if (dynamicToolNames.size > 0) {
-        setDynamicToolUseNames("customUser", Array.from(dynamicToolNames));
+      if (this.customToolNames.size > 0) {
+        setDynamicToolUseNames("customUser", Array.from(this.customToolNames));
       }
       if (customToolParams.size > 0) {
         this.allToolParamNames = Array.from(/* @__PURE__ */ new Set([...this.allToolParamNames, ...Array.from(customToolParams)]));
       }
     }
-    this.customToolNames = new Set(this.customTools.map((t) => t.name));
     this.skillDir = this.runtime.path.join(this.runtime.env.cwd(), ".agents/skills");
     this.rulesDir = this.runtime.path.join(this.runtime.env.cwd(), ".agents/rules");
   }
@@ -558,10 +687,11 @@ var ClineAgent = class {
       shell: this.runtime.env.shell(),
       skills: await this.getSkills(),
       agentRules: await this.getAgentRules(),
-      customTools: this.customTools,
+      customTools: this.activeCustomTools,
       allowDefaultTools: this.allowDefaultTools,
       customInstructions: this.customInstructions
     };
+    this.promptActiveToolsVersion = this.activeToolsVersion;
     this.sysPrompt = await this.promptManager.getSystemPrompt(context);
     this.noUseTollSysPrompt = this.promptManager.getNoUseToolInstructions(context);
     return { sysPrompt: this.sysPrompt, noUseTollSysPrompt: this.noUseTollSysPrompt };
@@ -670,9 +800,9 @@ ${content.trim()}\`\`\``);
    * 核心任务循环
    */
   async loop() {
-    const { sysPrompt, noUseTollSysPrompt } = await this.getPrompt(true);
-    const { customTools, customToolNames } = this;
+    const { customToolsByName, customToolNames } = this;
     while (this.state === "thinking" /* THINKING */) {
+      const { sysPrompt, noUseTollSysPrompt } = await this.getCurrentPrompt();
       this.loopCount++;
       if (this.loopCount > this.maxLoopCount) {
         await this.memory.appendMessage({
@@ -717,7 +847,33 @@ ${content.trim()}\`\`\``);
             }
           }
           if (customToolNames.has(tool.name)) {
-            const customTool = customTools.find((t) => t.name === tool.name);
+            const customTool = customToolsByName.get(tool.name);
+            if (!customTool) {
+              toolResults.push({ tool, result: `Error: Custom tool "${tool.name}" not found.` });
+              continue;
+            }
+            if (isCustomToolGroup(customTool)) {
+              let groupResult;
+              if (customTool.onCall) {
+                try {
+                  groupResult = await customTool.onCall(tool.params);
+                } catch (error) {
+                  toolResults.push({ tool, result: `Error: ${error.message}` });
+                  continue;
+                }
+              }
+              const childrenPrompt = this.activateCustomToolGroup(customTool);
+              const finalPrompt = `# New Available Tools
+
+The following are instructions for using the new available tools.
+
+${childrenPrompt}`;
+              const promptBlock = groupResult !== void 0 ? `${typeof groupResult === "string" ? groupResult : JSON.stringify(groupResult)}
+
+${finalPrompt}` : finalPrompt;
+              toolResults.push({ tool, result: promptBlock });
+              continue;
+            }
             if (customTool.onCall) {
               try {
                 const res = await customTool.onCall(tool.params);
@@ -820,15 +976,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: `${result}` });
+                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 });
               } catch (e) {
                 toolResults.push({ tool, result: `Error: ${e.message}` });
               }
@@ -957,6 +1134,27 @@ ${this.promptManager.getUsedToolResultInstructions()}`;
       }
     }
   }
+  /**
+   * 激活自定义工具集：将入口的 children 注册到活跃工具列表并返回渲染后的 prompt。
+   */
+  activateCustomToolGroup(group) {
+    if (this.activatedGroups.has(group.name)) {
+      return renderCustomToolsPrompt(group.children || [], this.runtime.env.cwd());
+    }
+    this.activatedGroups.add(group.name);
+    this.activeCustomTools = [...this.activeCustomTools, ...group.children || []];
+    this.activeToolsVersion++;
+    return renderCustomToolsPrompt(group.children || [], this.runtime.env.cwd());
+  }
+  /**
+   * 检查自上次获取 prompt 后是否有工具集被激活，若有则刷新缓存。
+   */
+  async getCurrentPrompt() {
+    if (this.promptActiveToolsVersion !== this.activeToolsVersion) {
+      return this.getPrompt(true);
+    }
+    return this.getPrompt();
+  }
   /**
    * 简单的 Diff 解析与替换辅助方法
    */
@@ -1003,13 +1201,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;
@@ -1019,21 +1284,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 {
@@ -1042,6 +1310,9 @@ ${searchBlock.substring(0, 100)}...`);
       }
     };
     await walk(dirpath, 0);
+    if (matches.length === 0) {
+      return "No files found with matching content.";
+    }
     return matches.join("\n");
   }
 };
@@ -1050,6 +1321,6 @@ ${searchBlock.substring(0, 100)}...`);
 var VERSION = "0.1.0";
 globalThis.AI_SDK_LOG_WARNINGS = false;
 
-export { AgentDefaultTool, AgentState, ClineAgent, READ_ONLY_TOOLS, TOOL_RESULT_BLOCK, VERSION, defaultTools, getToolUseNames, parseAssistantMessageV2, setDynamicToolUseNames, toolParamNames, toolUseNames };
+export { AgentDefaultTool, AgentState, ClineAgent, READ_ONLY_TOOLS, TOOL_RESULT_BLOCK, VERSION, collectCustomToolNames, defaultTools, getToolUseNames, isCustomToolGroup, parseAssistantMessageV2, renderCustomToolPrompt, renderCustomToolsPrompt, setDynamicToolUseNames, toolParamNames, toolUseNames };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map