@amical/aiagent-sdk 0.1.8 → 0.1.9

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';
@@ -555,7 +555,7 @@ var ClineAgent = class {
     }
   }
   /**
-   * 获取当前 Agent 的系统提示词 
+   * 获取当前 Agent 的系统提示词
    * 如果 force 为 true，则强制重新获取系统提示词
    */
   async getPrompt(force = false) {
@@ -830,15 +830,20 @@ 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) {
+            if (regexStr && path3) {
               try {
-                const result = await this.runtime.fs.searchFiles(path3, regexStr, filePattern);
+                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);
+                }
                 toolResults.push({ tool, result: `${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_use_mcp_tool" /* MCP_USE */) {
             const serverName = tool.params.server_name;
@@ -943,9 +948,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 +1013,47 @@ ${searchBlock.substring(0, 100)}...`);
   async getHistory() {
     return this.memory.getHistory();
   }
+  async searchFiles(dirpath, regex, filePattern) {
+    const matches = [];
+    const contentRe = new RegExp(regex);
+    const nameRe = filePattern ? new RegExp(filePattern.replace(/\./g, "\\.").replace(/\*/g, ".*")) : null;
+    const SKIP_DIRS = /* @__PURE__ */ new Set([".git", "dist", ".agent", ".turbopack"]);
+    const walk = async (dir, depth) => {
+      if (depth > 8 || matches.length >= 100) {
+        return;
+      }
+      let entries;
+      try {
+        entries = await this.runtime.fs.readDir(dir, { recursive: false });
+      } catch {
+        return;
+      }
+      for (const entry of entries) {
+        if (matches.length >= 100) {
+          break;
+        }
+        const child = dir === "." ? entry.name : `${dir}/${entry.name}`;
+        if (entry.isDirectory()) {
+          if (!SKIP_DIRS.has(entry.name)) {
+            await walk(child, depth + 1);
+          }
+        } else if (entry.isFile()) {
+          if (nameRe && !nameRe.test(entry.name)) {
+            continue;
+          }
+          try {
+            const content = (await this.runtime.fs.readFile(child, "utf8")).toString();
+            if (contentRe.test(content)) {
+              matches.push(child);
+            }
+          } catch {
+          }
+        }
+      }
+    };
+    await walk(dirpath, 0);
+    return matches.join("\n");
+  }
 };
 var NodeApiHandler = class {
   config;
@@ -1377,6 +1428,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 +1452,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 +1635,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 +1653,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 +1681,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();