deepfish-ai 2.0.6 → 2.0.7

package/dist/serve/pm2-server.js

@@ -8703,7 +8703,7 @@ var import_fs_extra17 = __toESM(require("fs-extra"));
 var import_path12 = __toESM(require("path"));
 
 // src/agent/AIAgent/index.ts
-var import_langchain17 = require("langchain");
+var import_langchain18 = require("langchain");
 var import_deepagents2 = require("deepagents");
 
 // src/agent/AIAgent/utils/langgraph-checkpoint-filesystem/filesystem-saver.ts
@@ -23496,10 +23496,33 @@ var executeCommandTool = (0, import_langchain3.tool)(({ command, timeout }) => s
 });
 
 // src/agent/tools/executeJSCode.ts
-var import_langchain4 = require("langchain");
+var import_langchain5 = require("langchain");
 var import_path6 = __toESM(require("path"));
 var import_fs_extra7 = __toESM(require("fs-extra"));
-async function executeJSCode(code) {
+
+// src/agent/tools/subAgent.ts
+var import_langchain4 = require("langchain");
+async function subAgentExec(prompt, runtime) {
+  const curAgent = runtime.context?.curAgent;
+  if (!curAgent || typeof curAgent.createSubAgent !== "function") {
+    throw new Error("\u5F53\u524D\u8FD0\u884C\u4E0A\u4E0B\u6587\u4E0D\u652F\u6301\u521B\u5EFA\u5B50 agent");
+  }
+  const subAgent = await curAgent.createSubAgent();
+  return subAgent.execute(prompt);
+}
+var subAgentTool = (0, import_langchain4.tool)(
+  async ({ prompt }, runtime) => safeTool(() => subAgentExec(prompt, runtime)),
+  {
+    name: "subAgent_exec",
+    description: "\u521B\u5EFA\u4E00\u4E2A\u901A\u7528\u5B50 agent \u6765\u6267\u884C\u72EC\u7ACB\u4EFB\u52A1\uFF0C\u5E76\u8FD4\u56DE\u5B50 agent \u7684\u6267\u884C\u7ED3\u679C\u3002\u9002\u5408\u62C6\u5206\u590D\u6742\u4EFB\u52A1\u3001\u5E76\u884C\u8C03\u7814\u6216\u59D4\u6D3E\u5B50\u4EFB\u52A1\u3002",
+    schema: external_exports.object({
+      prompt: external_exports.string().min(1).describe("\u4EA4\u7ED9\u901A\u7528\u5B50 agent \u6267\u884C\u7684\u5B8C\u6574\u4EFB\u52A1\u63CF\u8FF0")
+    })
+  }
+);
+
+// src/agent/tools/executeJSCode.ts
+async function executeJSCode(code, runtime) {
   logInfo("Executing JavaScript code: ");
   logInfo(code);
   try {
@@ -23508,7 +23531,7 @@ async function executeJSCode(code) {
         const result = await __main()
         return result || "Code executed successfully, but __main() did not return anything."
     })()`;
-    const fn = new Function("require", wrapped);
+    const fn = new Function("require", "agentExec", wrapped);
     const _require = require;
     const newRequire = (modulePath) => {
       if (modulePath.startsWith("./")) {
@@ -23517,14 +23540,17 @@ async function executeJSCode(code) {
       }
       return _require(modulePath);
     };
-    const result = await fn(newRequire);
+    const agentExec = async (prompt) => {
+      return subAgentExec(prompt, runtime);
+    };
+    const result = await fn(newRequire, agentExec);
     return result;
   } catch (error51) {
     logError(`Error executing code: ${error51.stack}`);
     throw error51;
   }
 }
-var getInstalledPackagesTool = (0, import_langchain4.tool)(
+var getInstalledPackagesTool = (0, import_langchain5.tool)(
   async () => safeTool(() => {
     const packageJson = import_path6.default.join(getCodePath(), "./package.json");
     const pkg = import_fs_extra7.default.readJsonSync(packageJson);
@@ -23536,7 +23562,7 @@ var getInstalledPackagesTool = (0, import_langchain4.tool)(
     schema: external_exports.object({})
   }
 );
-var checkPackageInstalledTool = (0, import_langchain4.tool)(
+var checkPackageInstalledTool = (0, import_langchain5.tool)(
   async ({ packageName }) => safeTool(() => {
     const packageJson = import_path6.default.join(getCodePath(), "./package.json");
     const pkg = import_fs_extra7.default.readJsonSync(packageJson);
@@ -23551,7 +23577,7 @@ var checkPackageInstalledTool = (0, import_langchain4.tool)(
     })
   }
 );
-var installPackageTool = (0, import_langchain4.tool)(
+var installPackageTool = (0, import_langchain5.tool)(
   async ({ packageName }) => safeTool(() => {
     const packageJson = import_path6.default.join(getCodePath(), "./package.json");
     const pkg = import_fs_extra7.default.readJsonSync(packageJson);
@@ -23568,12 +23594,16 @@ var installPackageTool = (0, import_langchain4.tool)(
     })
   }
 );
-var executeJSCodeTool = (0, import_langchain4.tool)(async ({ code }) => safeTool(() => executeJSCode(code)), {
+var executeJSCodeTool = (0, import_langchain5.tool)(async ({ code }, runtime) => safeTool(() => executeJSCode(code, runtime)), {
   name: "execute_js_code",
-  description: `\u6267\u884C\u4E00\u6BB5Node.js\u4EE3\u7801\u5E76\u8FD4\u56DE\u6267\u884C\u7ED3\u679C\u3002\u6CE8\u610F\uFF1A\u4EE3\u7801\u5FC5\u987B\u5305\u542B\u4E00\u4E2A__main()\u51FD\u6570\u4F5C\u4E3A\u6267\u884C\u5165\u53E3\uFF0C__main()\u51FD\u6570\u5185\u5FC5\u987B\u662F\u4E00\u4E2A\u4F7F\u7528async\u524D\u7F00\u7684\u51FD\u6570\u3002\u793A\u4F8B\u4EE3\u7801\uFF1A
+  description: `\u6267\u884C\u4E00\u6BB5Node.js\u4EE3\u7801\u5E76\u8FD4\u56DE\u6267\u884C\u7ED3\u679C\u3002\u6CE8\u610F\uFF1A\u4EE3\u7801\u5FC5\u987B\u5305\u542B\u4E00\u4E2A__main()\u51FD\u6570\u4F5C\u4E3A\u6267\u884C\u5165\u53E3\uFF0C__main()\u51FD\u6570\u5185\u5FC5\u987B\u662F\u4E00\u4E2A\u4F7F\u7528async\u524D\u7F00\u7684\u51FD\u6570\u3002
+        \u53EF\u7528\u5185\u7F6E\u51FD\u6570\uFF1A
+        - agentExec(prompt: string): Promise<string>\uFF0C\u521B\u5EFA\u4E00\u4E2A\u901A\u7528\u5B50 agent \u6267\u884C\u6307\u5B9A\u4EFB\u52A1\u5E76\u8FD4\u56DE\u7ED3\u679C\uFF0C\u9002\u5408\u5C06\u590D\u6742\u4EFB\u52A1\u62C6\u5206\u7ED9\u5B50 agent \u5B8C\u6210\u3002
+        \u793A\u4F8B\u4EE3\u7801\uFF1A
         async function __main() {
           const data = await fs.readFile("data.txt", "utf-8")
-          return data
+          const analysis = await agentExec("\u8BF7\u5206\u6790\u8FD9\u6BB5\u6587\u4EF6\u5185\u5BB9\u5E76\u603B\u7ED3\u91CD\u70B9\uFF1A" + data)
+          return analysis
         }
         `,
   schema: external_exports.object({
@@ -23669,9 +23699,9 @@ var UserCache = class {
 };
 
 // src/agent/tools/learn-self.ts
-var import_langchain5 = require("langchain");
+var import_langchain6 = require("langchain");
 var userCache = new UserCache();
-var learnSelfTool = (0, import_langchain5.tool)(
+var learnSelfTool = (0, import_langchain6.tool)(
   ({ description, content }) => safeTool(() => {
     userCache.add(description, content);
     return `\u5DF2\u7F13\u5B58\u89E3\u51B3\u65B9\u6848: ${description}`;
@@ -23685,7 +23715,7 @@ var learnSelfTool = (0, import_langchain5.tool)(
     })
   }
 );
-var getLearnedDetailTool = (0, import_langchain5.tool)(
+var getLearnedDetailTool = (0, import_langchain6.tool)(
   ({ indexOrId }) => safeTool(() => {
     const index = Number(indexOrId);
     let item;
@@ -23714,7 +23744,7 @@ ${detail.content}`;
     })
   }
 );
-var updateLearnContentTool = (0, import_langchain5.tool)(
+var updateLearnContentTool = (0, import_langchain6.tool)(
   ({ id, content }) => safeTool(() => {
     const success2 = userCache.update(id, content);
     if (!success2) {
@@ -23731,7 +23761,7 @@ var updateLearnContentTool = (0, import_langchain5.tool)(
     })
   }
 );
-var getCatalogFilePathTool = (0, import_langchain5.tool)(() => safeTool(() => userCache.getCatalogFilePath()), {
+var getCatalogFilePathTool = (0, import_langchain6.tool)(() => safeTool(() => userCache.getCatalogFilePath()), {
   name: "get_catalog_file_path",
   description: "\u83B7\u53D6\u7F13\u5B58\u7D22\u5F15\u6587\u4EF6 catalog.json \u7684\u7EDD\u5BF9\u8DEF\u5F84\u3002\u8BE5\u6587\u4EF6\u5305\u542B\u6240\u6709\u5DF2\u7F13\u5B58\u65B9\u6848\u7684 id \u548C description \u5217\u8868\u3002\u83B7\u53D6\u8DEF\u5F84\u540E\uFF0C\u4F7F\u7528 read_file \u5DE5\u5177\u8BFB\u53D6\u8BE5\u6587\u4EF6\u5373\u53EF\u67E5\u770B\u6240\u6709\u7F13\u5B58\u9879\u3002",
   schema: external_exports.object({})
@@ -23741,11 +23771,11 @@ var learnTools = [learnSelfTool, getLearnedDetailTool, updateLearnContentTool, g
 // src/agent/tools/mcp.ts
 var import_mcp_adapters = require("@langchain/mcp-adapters");
 var import_fs_extra9 = __toESM(require("fs-extra"));
-var import_langchain6 = require("langchain");
+var import_langchain7 = require("langchain");
 
 // src/agent/tools/edit.ts
 var import_fs_extra10 = __toESM(require("fs-extra"));
-var import_langchain7 = require("langchain");
+var import_langchain8 = require("langchain");
 async function editFileByReplace(filePath, oldString, newString, replaceAll = false) {
   const absPath = resolveWorkspacePath(filePath);
   if (!await import_fs_extra10.default.pathExists(absPath)) {
@@ -23766,7 +23796,7 @@ async function editFileByReplace(filePath, oldString, newString, replaceAll = fa
   await import_fs_extra10.default.writeFile(absPath, nextContent, "utf-8");
   return `\u5DF2\u7F16\u8F91\u6587\u4EF6: ${absPath}\uFF0C\u66FF\u6362 ${replaceAll ? matches : 1} \u5904`;
 }
-var editFileTool = (0, import_langchain7.tool)(
+var editFileTool = (0, import_langchain8.tool)(
   async ({ filePath, oldString, newString, replaceAll }) => safeTool(() => editFileByReplace(filePath, oldString, newString, replaceAll)),
   {
     name: "edit_file",
@@ -23782,7 +23812,7 @@ var editFileTool = (0, import_langchain7.tool)(
 
 // src/agent/tools/glob.ts
 var import_path8 = __toESM(require("path"));
-var import_langchain8 = require("langchain");
+var import_langchain9 = require("langchain");
 async function globFiles(pattern, cwd, maxResults = 200, includeHidden = false) {
   const rootDir = resolveWorkspacePath(cwd || ".");
   const allFiles = await walkFiles(rootDir, { includeHidden, maxFiles: Math.max(maxResults * 20, 1e3) });
@@ -23790,7 +23820,7 @@ async function globFiles(pattern, cwd, maxResults = 200, includeHidden = false)
   const matches = allFiles.map((file2) => normalizePathForMatch(import_path8.default.relative(rootDir, file2))).filter((relativePath) => matchesGlob(relativePath, normalizedPattern)).slice(0, maxResults);
   return truncateOutput(formatJson({ cwd: rootDir, pattern, count: matches.length, files: matches }));
 }
-var globTool = (0, import_langchain8.tool)(
+var globTool = (0, import_langchain9.tool)(
   async ({ pattern, cwd, maxResults, includeHidden }) => safeTool(() => globFiles(pattern, cwd, maxResults, includeHidden)),
   {
     name: "glob_files",
@@ -23807,7 +23837,7 @@ var globTool = (0, import_langchain8.tool)(
 // src/agent/tools/grep.ts
 var import_fs_extra11 = __toESM(require("fs-extra"));
 var import_path9 = __toESM(require("path"));
-var import_langchain9 = require("langchain");
+var import_langchain10 = require("langchain");
 async function grepFiles(query, cwd, includePattern = "**/*", isRegexp = false, maxResults = 100, includeHidden = false) {
   const rootDir = resolveWorkspacePath(cwd || ".");
   const matcher = isRegexp ? new RegExp(query, "i") : null;
@@ -23832,7 +23862,7 @@ async function grepFiles(query, cwd, includePattern = "**/*", isRegexp = false,
   }
   return truncateOutput(formatJson({ cwd: rootDir, query, includePattern, count: matches.length, matches }));
 }
-var grepTool = (0, import_langchain9.tool)(
+var grepTool = (0, import_langchain10.tool)(
   async ({ query, pattern, cwd, includePattern, isRegexp, maxResults, includeHidden }) => safeTool(() => {
     const searchQuery = query || pattern;
     if (!searchQuery) {
@@ -23860,7 +23890,7 @@ var grepTool = (0, import_langchain9.tool)(
 
 // src/agent/tools/question.ts
 var import_inquirer = __toESM(require("inquirer"));
-var import_langchain10 = require("langchain");
+var import_langchain11 = require("langchain");
 async function askQuestion(question, type = "input", choices = []) {
   const promptType = type === "select" ? "list" : type;
   const answer = await import_inquirer.default.prompt([
@@ -23874,7 +23904,7 @@ async function askQuestion(question, type = "input", choices = []) {
   const value = answer["value"];
   return typeof value === "string" ? value : JSON.stringify(value);
 }
-var questionTool = (0, import_langchain10.tool)(async ({ question, type, choices }) => safeTool(() => askQuestion(question, type, choices)), {
+var questionTool = (0, import_langchain11.tool)(async ({ question, type, choices }) => safeTool(() => askQuestion(question, type, choices)), {
   name: "ask_question",
   description: "\u5F53\u7EE7\u7EED\u4EFB\u52A1\u5FC5\u987B\u83B7\u53D6\u7528\u6237\u6F84\u6E05\u3001\u786E\u8BA4\u6216\u9009\u62E9\u65F6\uFF0C\u5411\u7528\u6237\u53D1\u8D77\u547D\u4EE4\u884C\u63D0\u95EE\u5E76\u8FD4\u56DE\u7B54\u6848\u3002\u4E0D\u8981\u8BE2\u95EE\u5BC6\u7801\u3001\u5BC6\u94A5\u7B49\u654F\u611F\u4FE1\u606F\u3002",
   schema: external_exports.object({
@@ -23887,7 +23917,7 @@ var questionTool = (0, import_langchain10.tool)(async ({ question, type, choices
 // src/agent/tools/read.ts
 var import_fs_extra12 = __toESM(require("fs-extra"));
 var import_iconv_lite2 = __toESM(require("iconv-lite"));
-var import_langchain11 = require("langchain");
+var import_langchain12 = require("langchain");
 async function readFile(filePath, startLine = 1, endLine = -1, encoding) {
   const absPath = resolveWorkspacePath(filePath);
   if (!await import_fs_extra12.default.pathExists(absPath)) {
@@ -23909,7 +23939,7 @@ async function readFile(filePath, startLine = 1, endLine = -1, encoding) {
   const selected = lines.slice(safeStart - 1, safeEnd).map((line, index) => `${safeStart + index}: ${line}`).join("\n");
   return truncateOutput(formatJson({ filePath: absPath, totalLines: lines.length, startLine: safeStart, endLine: safeEnd, content: selected }));
 }
-var readFileTool = (0, import_langchain11.tool)(
+var readFileTool = (0, import_langchain12.tool)(
   async ({ filePath, startLine, endLine, encoding }) => safeTool(() => readFile(filePath, startLine, endLine, encoding)),
   {
     name: "read_file",
@@ -23926,7 +23956,7 @@ var readFileTool = (0, import_langchain11.tool)(
 // src/agent/tools/semanticMemory.ts
 var import_fs_extra13 = __toESM(require("fs-extra"));
 var import_path10 = __toESM(require("path"));
-var import_langchain12 = require("langchain");
+var import_langchain13 = require("langchain");
 var DEFAULT_MEMORY_MARKDOWN = `# \u7528\u6237\u8BED\u4E49\u8BB0\u5FC6
 
 > \u8BE5\u6587\u4EF6\u7531\u8BED\u4E49\u8BB0\u5FC6\u5DE5\u5177\u7EF4\u62A4\u3002\u4EC5\u8BB0\u5F55\u53EF\u957F\u671F\u590D\u7528\u7684\u7528\u6237\u4FE1\u606F\u3001\u4E60\u60EF\u548C\u504F\u597D\uFF1B\u4E0D\u8981\u8BB0\u5F55\u5BC6\u7801\u3001\u5BC6\u94A5\u3001\u4EE4\u724C\u7B49\u654F\u611F\u4FE1\u606F\u3002
@@ -23962,7 +23992,7 @@ async function updateSemanticMemory(memoryFilePath, content) {
 `, "utf-8");
   return `\u5DF2\u66F4\u65B0\u7528\u6237\u8BED\u4E49\u8BB0\u5FC6: ${memoryFilePath}`;
 }
-var readSemanticMemoryTool = (0, import_langchain12.tool)(
+var readSemanticMemoryTool = (0, import_langchain13.tool)(
   async (_input, runtime) => safeTool(() => readSemanticMemory(getMemoryFilePath(runtime.context?.memoryFilePath))),
   {
     name: "read_user_semantic_memory",
@@ -23970,7 +24000,7 @@ var readSemanticMemoryTool = (0, import_langchain12.tool)(
     schema: external_exports.object({})
   }
 );
-var updateSemanticMemoryTool = (0, import_langchain12.tool)(
+var updateSemanticMemoryTool = (0, import_langchain13.tool)(
   async ({ content }, runtime) => safeTool(() => updateSemanticMemory(getMemoryFilePath(runtime.context?.memoryFilePath), content)),
   {
     name: "update_user_semantic_memory",
@@ -24030,7 +24060,7 @@ var TaskQueue = class {
 };
 
 // src/agent/tools/task.ts
-var import_langchain13 = require("langchain");
+var import_langchain14 = require("langchain");
 function getCurrentTaskQueue(agentId) {
   return agentId ? new TaskQueue(agentId) : null;
 }
@@ -24062,7 +24092,7 @@ function manageTaskQueue(agentId, action, task, index) {
   queue.clearTasks();
   return "\u5DF2\u6E05\u7A7A\u4EFB\u52A1\u961F\u5217";
 }
-var taskTool = (0, import_langchain13.tool)(
+var taskTool = (0, import_langchain14.tool)(
   async ({ action, task, index }, runtime) => safeTool(() => {
     const agentId = runtime.context?.agentId || getAgentId();
     return manageTaskQueue(agentId, action, task, index);
@@ -24079,7 +24109,7 @@ var taskTool = (0, import_langchain13.tool)(
 );
 
 // src/agent/tools/webfetch.ts
-var import_langchain14 = require("langchain");
+var import_langchain15 = require("langchain");
 async function webFetch(url2, timeout = 3e4, maxLength = 6e4) {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeout);
@@ -24112,7 +24142,7 @@ async function webFetch(url2, timeout = 3e4, maxLength = 6e4) {
     clearTimeout(timer);
   }
 }
-var webFetchTool = (0, import_langchain14.tool)(async ({ url: url2, timeout, maxLength }) => safeTool(() => webFetch(url2, timeout, maxLength)), {
+var webFetchTool = (0, import_langchain15.tool)(async ({ url: url2, timeout, maxLength }) => safeTool(() => webFetch(url2, timeout, maxLength)), {
   name: "web_fetch",
   description: "\u901A\u8FC7 HTTP GET \u83B7\u53D6\u7F51\u9875\u3001\u63A5\u53E3\u6216\u8FDC\u7A0B\u6587\u672C\u5185\u5BB9\uFF0C\u5E76\u8FD4\u56DE\u72B6\u6001\u7801\u3001content-type \u548C\u54CD\u5E94\u6B63\u6587\u3002",
   schema: external_exports.object({
@@ -24125,7 +24155,7 @@ var webFetchTool = (0, import_langchain14.tool)(async ({ url: url2, timeout, max
 // src/agent/tools/write.ts
 var import_fs_extra15 = __toESM(require("fs-extra"));
 var import_path11 = __toESM(require("path"));
-var import_langchain15 = require("langchain");
+var import_langchain16 = require("langchain");
 async function writeFile(filePath, content, mode = "overwrite") {
   const absPath = resolveWorkspacePath(filePath);
   const exists = await import_fs_extra15.default.pathExists(absPath);
@@ -24140,7 +24170,7 @@ async function writeFile(filePath, content, mode = "overwrite") {
   await import_fs_extra15.default.writeFile(absPath, content, "utf-8");
   return `${exists ? "\u5DF2\u8986\u76D6\u5199\u5165\u6587\u4EF6" : "\u5DF2\u521B\u5EFA\u6587\u4EF6"}: ${absPath}`;
 }
-var writeFileTool = (0, import_langchain15.tool)(async ({ filePath, content, mode }) => safeTool(() => writeFile(filePath, content, mode)), {
+var writeFileTool = (0, import_langchain16.tool)(async ({ filePath, content, mode }) => safeTool(() => writeFile(filePath, content, mode)), {
   name: "write_file",
   description: "\u5411\u672C\u5730\u6587\u4EF6\u5199\u5165\u6587\u672C\u5185\u5BB9\u3002\u53EF\u521B\u5EFA\u65B0\u6587\u4EF6\u3001\u8986\u76D6\u5DF2\u6709\u6587\u4EF6\u6216\u8FFD\u52A0\u5185\u5BB9\uFF0C\u4F1A\u81EA\u52A8\u521B\u5EFA\u7236\u76EE\u5F55\u3002",
   schema: external_exports.object({
@@ -24153,6 +24183,7 @@ var writeFileTool = (0, import_langchain15.tool)(async ({ filePath, content, mod
 // src/agent/tools/index.ts
 var builtinTools = [
   taskTool,
+  subAgentTool,
   executeCommandTool,
   readFileTool,
   editFileTool,
@@ -24170,10 +24201,14 @@ var builtinTools = [
 var import_inquirer2 = __toESM(require("inquirer"));
 var import_fs_extra16 = __toESM(require("fs-extra"));
 
-// src/agent/AIAgent/SubAIAgent.ts
-var import_langchain16 = require("langchain");
+// src/agent/AIAgent/SubAgents/SubAIAgent.ts
+var import_langchain17 = require("langchain");
 var import_deepagents = require("deepagents");
 var import_eventemitter_super = require("eventemitter-super");
+var import_lodash = require("lodash");
+
+// src/agent/AIAgent/index.ts
+var import_lodash2 = require("lodash");
 
 // src/serve/service/agent-room/agent-client.ts
 var import_ws = __toESM(require("ws"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepfish-ai",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "private": false,
   "description": "An efficient AI-driven command-line tool designed to bridge the gap between natural language and operating system commands, file operations, and more. It enables non-developers to quickly generate executable instructions through simple natural language descriptions, significantly improving terminal operation efficiency.",
   "repository": {
@@ -55,6 +55,7 @@
     "inquirer": "^14.0.2",
     "json5": "^2.2.3",
     "langchain": "^1.4.4",
+    "lodash": "^4.18.1",
     "pm2": "^7.0.1",
     "solid-js": "^1.9.13",
     "tsx": "^4.19.0",
@@ -64,6 +65,7 @@
     "@types/adm-zip": "^0.5.8",
     "@types/express": "^5.0.6",
     "@types/fs-extra": "^11.0.4",
+    "@types/lodash": "^4.17.24",
     "@types/node": "^22.0.0",
     "@types/ws": "^8.18.1",
     "less": "^4.6.6",