deepfish-ai 2.0.5 → 2.0.6

package/README.md

@@ -230,6 +230,7 @@ MCP（Model Context Protocol）允许 AI 连接外部工具和服务。通过 `a
 DeepFish 支持通过 Tool 和 Skill 扩展 AI 的能力。扩展文件可以放在当前工作目录的 `.deepfish-ai` 目录中，也可以放在全局配置目录中。
 
 - **Tool 扩展**：用于定义 AI 可直接调用的自定义函数工具，适合封装 API 调用、数据库操作、文件处理等能力。可以使用 `ai tools generate xxx` 命令让 AI 根据描述生成 Tool。
+  - 在 Tool 函数中，可以通过调用 `this.createSubAgent(prompt: string)` 创建子 Agent，并将任务说明作为 `prompt` 传入。
 - **Skill 扩展**：用于定义 AI 的工作流知识包，适合沉淀某类任务的执行步骤、规范和最佳实践。可以使用 `ai skills generate xxx` 命令让 AI 根据描述生成 Skill。
 
 ### 当前目录扩展

package/dist/generate-tool.md

@@ -85,4 +85,4 @@ module.exports = { functions, descriptions };
 1. 理解用户要生成的工具功能
 2. 在当前工作目录下创建 `deepfish-tool-{功能名}/` 目录
 3. 编写 `index.js`，导出 `functions` 和 `descriptions`
-4. 确保代码语法正确、可以直接 `require` 使用
+4. 确保代码语法正确、可以直接使用 `require` 

package/dist/index.js

@@ -8936,7 +8936,7 @@ function registerModelsCommands(program) {
 }
 
 // src/cli/cli-core/skills.ts
-var import_crypto5 = require("crypto");
+var import_crypto6 = require("crypto");
 var import_inquirer3 = __toESM(require("inquirer"));
 var import_fs_extra19 = __toESM(require("fs-extra"));
 var import_path19 = __toESM(require("path"));
@@ -8998,11 +8998,11 @@ function getConfig() {
 // src/cli/cli-utils/init-agent.ts
 var import_fs_extra18 = __toESM(require("fs-extra"));
 var import_path18 = __toESM(require("path"));
-var import_crypto4 = require("crypto");
+var import_crypto5 = require("crypto");
 
 // src/agent/AIAgent/index.ts
-var import_langchain16 = require("langchain");
-var import_deepagents = require("deepagents");
+var import_langchain17 = require("langchain");
+var import_deepagents2 = require("deepagents");
 
 // src/agent/AIAgent/utils/langgraph-checkpoint-filesystem/filesystem-saver.ts
 var import_path5 = require("path");
@@ -24228,7 +24228,7 @@ function date4(params) {
 config(en_default());
 
 // src/agent/AIAgent/index.ts
-var import_eventemitter_super = require("eventemitter-super");
+var import_eventemitter_super2 = require("eventemitter-super");
 
 // src/agent/AIAgent/middleware/eventEmitMiddleware.ts
 var import_langchain = require("langchain");
@@ -24625,9 +24625,15 @@ function toLangChainTool(func, description) {
     zodProperties[key] = zodType;
   }
   const schema = external_exports.object(zodProperties);
-  const wrappedFunc = async (args) => {
+  const wrappedFunc = async (args, runtime) => {
     try {
-      const result = await func(...Object.values(args));
+      const boundFunc = func.bind({
+        createSubAgent: (prompt) => {
+          const subAgent = runtime.context.mainAgent.createSubAgent();
+          return subAgent.execute(prompt);
+        }
+      });
+      const result = await boundFunc(...Object.values(args));
       if (typeof result === "object" && result !== null && "success" in result) {
         return serializeToolResult(result);
       }
@@ -24653,7 +24659,7 @@ function scanUserTools() {
         if (import_fs_extra8.default.statSync(import_path8.default.resolve(toolsDir, file2)).isDirectory()) {
           const subDirPath = import_path8.default.resolve(toolsDir, file2);
           const subFiles = import_fs_extra8.default.readdirSync(subDirPath);
-          const indexFile = subFiles.find((f) => f === "index" || f === "index.cjs");
+          const indexFile = subFiles.find((f) => f === "index.js" || f === "index.cjs");
           if (indexFile) {
             const filePath = _scanDeepFishJsFile(import_path8.default.resolve(subDirPath, indexFile), indexFile);
             if (filePath) {
@@ -24688,15 +24694,32 @@ function _scanDeepFishJsFile(filePath, fileName) {
   return null;
 }
 function _loadToolsFromFile(filePath, tools) {
-  const toolModule = require(filePath);
-  const { functions, descriptions } = toolModule;
-  descriptions.forEach((desc) => {
-    const func = functions[desc.function.name];
-    if (func) {
+  try {
+    const toolModule = require(filePath);
+    const { functions, descriptions } = toolModule;
+    if (!functions || typeof functions !== "object" || !Array.isArray(descriptions)) {
+      logWarning(`Skip invalid tool file: ${filePath}`);
+      return;
+    }
+    descriptions.forEach((desc) => {
+      if (!desc.type) {
+        desc = {
+          type: "function",
+          function: desc
+        };
+      }
+      const func = functions[desc.function.name];
+      if (typeof func !== "function") {
+        logWarning(`Skip tool "${desc.function.name}": implementation not found in ${filePath}`);
+        return;
+      }
       const langChainTool = toLangChainTool(func, desc);
       tools.push(langChainTool);
-    }
-  });
+    });
+  } catch (error51) {
+    const message = error51 instanceof Error ? error51.message : String(error51);
+    logWarning(`Failed to load tool file: ${filePath}. ${message}`);
+  }
 }
 
 // src/agent/tools/executeCommand.ts
@@ -24756,7 +24779,6 @@ var executeCommandTool = (0, import_langchain3.tool)(({ command, timeout }) => s
 var import_langchain4 = require("langchain");
 var import_path9 = __toESM(require("path"));
 var import_fs_extra9 = __toESM(require("fs-extra"));
-var _require = require;
 async function executeJSCode(code) {
   logInfo("Executing JavaScript code: ");
   logInfo(code);
@@ -24767,7 +24789,15 @@ async function executeJSCode(code) {
         return result || "Code executed successfully, but __main() did not return anything."
     })()`;
     const fn = new Function("require", wrapped);
-    const result = await fn(_require);
+    const _require = require;
+    const newRequire = (modulePath) => {
+      if (modulePath.startsWith("./")) {
+        const resolvedPath = import_path9.default.resolve(process.cwd(), modulePath);
+        return _require(resolvedPath);
+      }
+      return _require(modulePath);
+    };
+    const result = await fn(newRequire);
     return result;
   } catch (error51) {
     logError(`Error executing code: ${error51.stack}`);
@@ -25022,13 +25052,17 @@ function wrapMcpTool(mcpTool) {
 }
 async function loadMcpToolsFromConfigPath(mcpFilePath) {
   const jsonContent = import_fs_extra11.default.readJSONSync(mcpFilePath);
-  const { mcpServers } = jsonContent;
+  let mcpServers = jsonContent.mcpServers;
   if (!mcpServers || Object.keys(mcpServers).length === 0) {
     return [];
   }
   try {
     for (const key of Object.keys(mcpServers)) {
       const server = mcpServers[key];
+      if (server.disabled) {
+        delete mcpServers[key];
+        continue;
+      }
       if (!server.transport) {
         if (server.url) {
           if (server.url.startsWith("ws://") || server.url.startsWith("wss://")) {
@@ -25045,6 +25079,9 @@ async function loadMcpToolsFromConfigPath(mcpFilePath) {
         delete mcpServers[key];
       }
     }
+    if (Object.keys(mcpServers).length === 0) {
+      return [];
+    }
     logInfo(`Loading MCP tools from config path: ${mcpFilePath}`);
     const client = new import_mcp_adapters.MultiServerMCPClient(jsonContent.mcpServers);
     const tools = await client.getTools();
@@ -25501,15 +25538,22 @@ function getSkills() {
 }
 
 // src/agent/AIAgent/index.ts
+var import_os4 = __toESM(require("os"));
+
+// src/agent/AIAgent/SubAIAgent.ts
+var import_langchain16 = require("langchain");
+var import_deepagents = require("deepagents");
+var import_eventemitter_super = require("eventemitter-super");
 var import_os3 = __toESM(require("os"));
-var AIAgent = class extends import_eventemitter_super.EventEmitterSuper {
+var import_crypto4 = require("crypto");
+var SubAIAgent = class extends import_eventemitter_super.EventEmitterSuper {
   id = "";
   opt = {};
   tools = [];
   dynamicTools = [];
   skills = [];
   mcp = [];
-  subLevel = 0;
+  subLevel = 1;
   agent = {};
   messages = [];
   basespace = "";
@@ -25518,12 +25562,10 @@ var AIAgent = class extends import_eventemitter_super.EventEmitterSuper {
   sessionDirPath = "";
   userStorePath = "";
   agentRulesPath = "";
-  roomClient = null;
-  taskQueue = {};
   isPrintThinking = true;
   constructor(opt) {
     super();
-    this.id = opt.id || `agent-${Date.now()}`;
+    this.id = opt.id || `agent-${(0, import_crypto4.randomUUID)()}`;
     this.basespace = opt.basespace;
     this.workspace = opt.workspace;
     this.memoryFilePath = opt.memoryFilePath;
@@ -25537,19 +25579,16 @@ var AIAgent = class extends import_eventemitter_super.EventEmitterSuper {
     this.tools = await getTools();
     this.skills = [...getSkills(), ...this.opt.skills || []];
     const model = getModel(this.opt.modelOpt);
-    const checkpointer = new FileSystemSaver({
-      rootFolder: this.sessionDirPath
-    });
     const contextSchema = external_exports.object({
       agent_name: external_exports.string(),
       encoding: external_exports.string(),
       skills: external_exports.array(external_exports.string()).optional(),
       memoryFilePath: external_exports.string().optional(),
-      agentId: external_exports.string().optional()
+      agentId: external_exports.string().optional(),
+      mainAgent: external_exports.object().optional()
     });
     const agent = (0, import_langchain16.createAgent)({
       model,
-      checkpointer,
       tools: this.tools,
       contextSchema,
       middleware: [
@@ -25586,7 +25625,6 @@ var AIAgent = class extends import_eventemitter_super.EventEmitterSuper {
       systemPrompt: systemPrompt(this.workspace, import_os3.default.platform(), this.skills, this.memoryFilePath, this.agentRulesPath)
     });
     this.agent = agent;
-    this.taskQueue = new TaskQueue(this.id);
     this.initEvents();
   }
   async execute(input) {
@@ -25599,7 +25637,191 @@ var AIAgent = class extends import_eventemitter_super.EventEmitterSuper {
         recursionLimit: 2e3,
         subgraphs: true,
         configurable: { thread_id: this.id },
-        context: { agent_name: "deepfish", encoding: this.opt.encoding, skills: this.skills, memoryFilePath: this.memoryFilePath, agentId: this.id }
+        context: {
+          agent_name: "deepfish",
+          encoding: this.opt.encoding,
+          skills: this.skills,
+          memoryFilePath: this.memoryFilePath,
+          agentId: this.id,
+          mainAgent: this
+        }
+      }
+    );
+    return new Promise(async (resolve) => {
+      this.once("TASK_AFTER" /* TASK_AFTER */, (msg) => {
+        resolve(msg);
+      });
+      for await (const [_namespace, mode, data] of stream) {
+        if (mode === "messages") {
+          const message = data[0].additional_kwargs.reasoning_content;
+          this.emit("STREAM_CONTENT_OUTPUT" /* STREAM_CONTENT_OUTPUT */, message);
+        }
+      }
+    });
+  }
+  initEvents() {
+    const thinking = new Thinking();
+    this.on("TASK_BEFORE" /* TASK_BEFORE */, () => {
+    });
+    this.on("TASK_AFTER" /* TASK_AFTER */, (msg) => {
+      logInfo(msg);
+    });
+    this.on("MODEL_BEFORE" /* MODEL_BEFORE */, () => {
+    });
+    this.on("MODEL_AFTER" /* MODEL_AFTER */, () => {
+      if (this.isPrintThinking) {
+        thinking.stop();
+      }
+    });
+    this.on("MODEL_ERROR" /* MODEL_ERROR */, (error51) => {
+      if (this.isPrintThinking) {
+        thinking.stop();
+      }
+      logError(error51?.message + "\n" + error51?.stack);
+    });
+    this.on("STREAM_CONTENT_OUTPUT" /* STREAM_CONTENT_OUTPUT */, (content) => {
+      if (this.isPrintThinking) {
+        if (content && typeof content === "string") {
+          streamOutput(content, "#f2c97d");
+        }
+      } else {
+        if (content && typeof content === "string") {
+          thinking.start();
+        } else {
+          thinking.stop();
+        }
+      }
+    });
+    this.on("COMPRESS_MESSAGES_BEFORE" /* COMPRESS_MESSAGES_BEFORE */, (_currentLength) => {
+    });
+    this.on("COMPRESS_MESSAGES_AFTER" /* COMPRESS_MESSAGES_AFTER */, (_currentLength) => {
+    });
+    this.on("NEW_MESSAGE" /* NEW_MESSAGE */, (_msg) => {
+    });
+    this.on("USE_TOOL_BEFORE" /* USE_TOOL_BEFORE */, (_toolId, funcName, _funcArgs) => {
+      log(`[Tool Call] ${funcName}`, "#c2a654");
+    });
+    this.on("USE_TOOL_RETURN" /* USE_TOOL_RETURN */, (_toolId, _funcName, _toolContent) => {
+      logInfo(`[Tool Return] ${_funcName} returned: ${_toolContent}`);
+    });
+    this.on("USE_TOOL_ERROR" /* USE_TOOL_ERROR */, (_toolId, _funcName, _error) => {
+      logError(`Error in tool ${_funcName}: ${_error instanceof Error ? _error.message : String(_error)}`);
+    });
+    this.on("USE_TOOL_AFTER" /* USE_TOOL_AFTER */, (_toolId, _funcName, _funcArgs) => {
+    });
+  }
+  destory() {
+    this.removeAllListeners();
+  }
+};
+
+// src/agent/AIAgent/index.ts
+var AIAgent = class extends import_eventemitter_super2.EventEmitterSuper {
+  id = "";
+  opt = {};
+  tools = [];
+  dynamicTools = [];
+  skills = [];
+  mcp = [];
+  subLevel = 0;
+  agent = {};
+  messages = [];
+  basespace = "";
+  workspace = "";
+  memoryFilePath = "";
+  sessionDirPath = "";
+  userStorePath = "";
+  agentRulesPath = "";
+  roomClient = null;
+  taskQueue = {};
+  isPrintThinking = true;
+  constructor(opt) {
+    super();
+    this.id = opt.id || `agent-${Date.now()}`;
+    this.basespace = opt.basespace;
+    this.workspace = opt.workspace;
+    this.memoryFilePath = opt.memoryFilePath;
+    this.sessionDirPath = opt.sessionDirPath;
+    this.userStorePath = opt.userStorePath;
+    this.agentRulesPath = opt.agentRulesPath;
+    this.isPrintThinking = opt.isPrintThinking;
+    this.opt = opt;
+  }
+  async init() {
+    this.tools = await getTools();
+    this.skills = [...getSkills(), ...this.opt.skills || []];
+    const model = getModel(this.opt.modelOpt);
+    const checkpointer = new FileSystemSaver({
+      rootFolder: this.sessionDirPath
+    });
+    const contextSchema = external_exports.object({
+      agent_name: external_exports.string(),
+      encoding: external_exports.string(),
+      skills: external_exports.array(external_exports.string()).optional(),
+      memoryFilePath: external_exports.string().optional(),
+      agentId: external_exports.string().optional(),
+      mainAgent: external_exports.object().optional()
+    });
+    const agent = (0, import_langchain17.createAgent)({
+      model,
+      checkpointer,
+      tools: this.tools,
+      contextSchema,
+      middleware: [
+        createAgentEventMiddleware(this),
+        (0, import_langchain17.summarizationMiddleware)({
+          model,
+          trigger: { tokens: this.opt.modelOpt.maxContextLength || 1e5 },
+          keep: { messages: 50 }
+        }),
+        (0, import_langchain17.humanInTheLoopMiddleware)({
+          interruptOn: {
+            install_package: {
+              allowedDecisions: ["approve", "reject"]
+            },
+            readEmailTool: false
+          }
+        }),
+        (0, import_langchain17.todoListMiddleware)(),
+        (0, import_deepagents2.createPatchToolCallsMiddleware)(),
+        (0, import_deepagents2.createSubAgentMiddleware)({
+          defaultModel: model,
+          subagents: [
+            {
+              name: "subagent",
+              description: "This subagent can execute sub tasks.",
+              systemPrompt: subSystemPrompt(this.workspace, import_os4.default.platform(), this.skills),
+              tools: this.tools,
+              model,
+              middleware: []
+            }
+          ]
+        })
+      ],
+      systemPrompt: systemPrompt(this.workspace, import_os4.default.platform(), this.skills, this.memoryFilePath, this.agentRulesPath)
+    });
+    this.agent = agent;
+    this.taskQueue = new TaskQueue(this.id);
+    this.initEvents();
+  }
+  async execute(input) {
+    const humanMessage = new import_langchain17.HumanMessage(input);
+    this.messages.push(humanMessage);
+    const stream = await this.agent.stream(
+      { messages: this.messages },
+      {
+        streamMode: ["messages"],
+        recursionLimit: 2e3,
+        subgraphs: true,
+        configurable: { thread_id: this.id },
+        context: {
+          agent_name: "deepfish",
+          encoding: this.opt.encoding,
+          skills: this.skills,
+          memoryFilePath: this.memoryFilePath,
+          agentId: this.id,
+          mainAgent: this
+        }
       }
     );
     for await (const [_namespace, mode, data] of stream) {
@@ -25657,12 +25879,17 @@ var AIAgent = class extends import_eventemitter_super.EventEmitterSuper {
       log(`[Tool Call] ${funcName}`, "#c2a654");
     });
     this.on("USE_TOOL_RETURN" /* USE_TOOL_RETURN */, (_toolId, _funcName, _toolContent) => {
+      logInfo(`[Tool Return] ${_funcName} returned: ${_toolContent}`);
     });
     this.on("USE_TOOL_ERROR" /* USE_TOOL_ERROR */, (_toolId, _funcName, _error) => {
+      logError(`Error in tool ${_funcName}: ${_error instanceof Error ? _error.message : String(_error)}`);
     });
     this.on("USE_TOOL_AFTER" /* USE_TOOL_AFTER */, (_toolId, _funcName, _funcArgs) => {
     });
   }
+  createSubAgent() {
+    return new SubAIAgent(this.opt);
+  }
   destory() {
     this.removeAllListeners();
   }
@@ -26053,7 +26280,7 @@ function initSession() {
     initSessionDir(existingSession.id);
     return existingSession;
   }
-  const agentId = (0, import_crypto4.randomUUID)();
+  const agentId = (0, import_crypto5.randomUUID)();
   const newSession = {
     id: agentId,
     name: import_path18.default.basename(workspace),
@@ -26106,15 +26333,15 @@ function getAgentId() {
 // src/cli/cli-core/skills.ts
 function handleSkillsLs() {
   const skills = _getAllSkills();
-  console.log("=".repeat(50));
+  logInfo("=".repeat(50));
   if (skills.length === 0) {
     logInfo("No skills registered yet");
   } else {
     skills.forEach((skill, index) => {
-      console.log(`[${index}] ${skill.name} (${skill.isEnabled ? "enabled" : "disabled"})`);
+      logInfo(`[${index}] ${skill.name} (${skill.isEnabled ? "enabled" : "disabled"})`);
     });
   }
-  console.log("=".repeat(50));
+  logInfo("=".repeat(50));
 }
 async function handleSkillsAdd(name) {
   logInfo(`Adding skill: ${name}`);
@@ -26126,7 +26353,7 @@ async function handleSkillsAdd(name) {
   }
   const { scope } = await import_inquirer3.default.prompt([
     {
-      type: "list",
+      type: "select",
       name: "scope",
       message: "Select skill scope:",
       choices: [
@@ -26292,7 +26519,7 @@ function _updateRegister(skillsDir) {
     const existItem = register.find((item) => item.skillPath === skillPath);
     if (!existItem) {
       newRegister.push({
-        id: (0, import_crypto5.randomUUID)(),
+        id: (0, import_crypto6.randomUUID)(),
         name: skillName,
         isEnabled: true,
         skillPath
@@ -26375,7 +26602,7 @@ async function handleToolsAdd(name) {
   }
   const { scope } = await import_inquirer4.default.prompt([
     {
-      type: "list",
+      type: "select",
       name: "scope",
       message: "Select tool scope:",
       choices: [
@@ -26720,7 +26947,6 @@ function handleCacheList() {
   }
   catalog.forEach((item, index) => {
     const desc = item.description.length > 20 ? item.description.slice(0, 20) + "..." : item.description;
-    console.log(`[${index}] ${item.id} ${desc}`);
   });
 }
 function handleCacheEdit(input) {

package/dist/serve/pm2-server.js

@@ -8703,8 +8703,8 @@ var import_fs_extra17 = __toESM(require("fs-extra"));
 var import_path12 = __toESM(require("path"));
 
 // src/agent/AIAgent/index.ts
-var import_langchain16 = require("langchain");
-var import_deepagents = require("deepagents");
+var import_langchain17 = require("langchain");
+var import_deepagents2 = require("deepagents");
 
 // src/agent/AIAgent/utils/langgraph-checkpoint-filesystem/filesystem-saver.ts
 var import_runnables = require("@langchain/core/runnables");
@@ -23265,7 +23265,7 @@ function date4(params) {
 config(en_default());
 
 // src/agent/AIAgent/index.ts
-var import_eventemitter_super = require("eventemitter-super");
+var import_eventemitter_super2 = require("eventemitter-super");
 
 // src/agent/AIAgent/middleware/eventEmitMiddleware.ts
 var import_langchain = require("langchain");
@@ -23499,7 +23499,6 @@ var executeCommandTool = (0, import_langchain3.tool)(({ command, timeout }) => s
 var import_langchain4 = require("langchain");
 var import_path6 = __toESM(require("path"));
 var import_fs_extra7 = __toESM(require("fs-extra"));
-var _require = require;
 async function executeJSCode(code) {
   logInfo("Executing JavaScript code: ");
   logInfo(code);
@@ -23510,7 +23509,15 @@ async function executeJSCode(code) {
         return result || "Code executed successfully, but __main() did not return anything."
     })()`;
     const fn = new Function("require", wrapped);
-    const result = await fn(_require);
+    const _require = require;
+    const newRequire = (modulePath) => {
+      if (modulePath.startsWith("./")) {
+        const resolvedPath = import_path6.default.resolve(process.cwd(), modulePath);
+        return _require(resolvedPath);
+      }
+      return _require(modulePath);
+    };
+    const result = await fn(newRequire);
     return result;
   } catch (error51) {
     logError(`Error executing code: ${error51.stack}`);
@@ -24163,6 +24170,11 @@ 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");
+var import_deepagents = require("deepagents");
+var import_eventemitter_super = require("eventemitter-super");
+
 // 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.5",
+  "version": "2.0.6",
   "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": {