deepfish-ai 1.0.19 → 1.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepfish-ai",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "This is an AI-driven command-line tool built on Node.js, equipped with AI agent and workflow capabilities. It is compatible with a wide range of AI models, can convert natural language into cross-system terminal and file operation commands, and features high extensibility. It supports complex tasks such as translation, content creation, and format conversion, while allowing custom extensions to be automatically generated via AI.",
   "main": "src/index.js",
   "type": "commonjs",
@@ -60,6 +60,7 @@
     "pdfkit": "^0.18.0",
     "pizzip": "^3.2.0",
     "pptxgenjs": "^4.0.1",
+    "puppeteer": "^24.41.0",
     "sharp": "^0.34.5",
     "uuid": "^13.0.0",
     "xlsx": "^0.18.5"

package/src/AgentRobot/AgentRobotFactory/MainAgentRobot.js

@@ -4,7 +4,8 @@ const fs = require('fs-extra')
 const dayjs = require('dayjs')
 const Logger = require('../BaseAgentRobot/Logger.js')
 const BaseAgentRobot = require('../BaseAgentRobot/index.js')
-const AttachmentToolScanner = require('../BaseAgentRobot/utils/AttachmentToolScanner.js')
+const {AttachmentToolScanner} = require('../BaseAgentRobot/utils/AttachmentToolScanner.js')
+const AgentTree = require('../BaseAgentRobot/utils/AgentTree.js')
 
 class MainAgentRobot extends BaseAgentRobot {
   // toolCollection = null // 工具集合，包含所有工具函数
@@ -43,26 +44,10 @@ class MainAgentRobot extends BaseAgentRobot {
       })
     }
     fs.writeJsonSync(this.agentRecordFilePath, agentRecord, { spaces: 2 })
-    this.agentSpace = path.join(this.memorySpace, this.id) // 机器人空间，目录
+    this.agentSpace = path.join(this.memorySpace, this.id) // Agent空间，目录
     fs.ensureDirSync(this.agentSpace)
-    this.agentTreeFilePath = path.join(this.agentSpace, 'agentTree.json')
-    if (!fs.pathExistsSync(this.agentTreeFilePath)) {
-      fs.writeJsonSync(
-        this.agentTreeFilePath,
-        { agentId: this.id, children: [] },
-        { spaces: 2 },
-      )
-    } else {
-      const agentTree = fs.readJsonSync(this.agentTreeFilePath)
-      if (agentTree && agentTree.agentId === this.id) {
-        // 恢复子机器人
-        // this._parseAgentTree(this, agentTree)
-      } else {
-        agentTree.push({ agentId: this.id, children: [] })
-        fs.writeJsonSync(this.agentTreeFilePath, agentTree, { spaces: 2 })
-      }
-    }
-    this.agentTree = fs.readJsonSync(this.agentTreeFilePath)
+    this.agentTree = new AgentTree(this)
+    this.agentTree.init()
     this.memoryFilePath = path.join(this.agentSpace, 'memory.json')
     this.logDirPath = path.join(this.agentSpace, 'logs')
     fs.ensureDirSync(this.logDirPath)
@@ -74,7 +59,7 @@ class MainAgentRobot extends BaseAgentRobot {
         currentDate.diff(dayjs(record.updateTime), 'day') >
         opt.maxMemoryExpireTime
       ) {
-        // 删除机器人空间
+        // 删除Agent空间
         fs.removeSync(path.join(this.memorySpace, record.agentId))
         return false
       }

package/src/AgentRobot/AgentRobotFactory/SubAgentRobot.js

@@ -3,7 +3,8 @@ const os = require('os')
 const fs = require('fs-extra')
 const BaseAgentRobot = require('../BaseAgentRobot/index.js')
 const Logger = require('../BaseAgentRobot/Logger.js')
-const AttachmentToolScanner = require('../BaseAgentRobot/utils/AttachmentToolScanner.js')
+const {AttachmentToolScanner} = require('../BaseAgentRobot/utils/AttachmentToolScanner.js')
+const AgentTree = require('../BaseAgentRobot/utils/AgentTree.js')
 
 class SubAgentRobot extends BaseAgentRobot {
   // opt: { root, parent, ...MainAgentOpt }
@@ -21,20 +22,12 @@ class SubAgentRobot extends BaseAgentRobot {
     this.basespace = opt.basespace || path.join(os.homedir(), '.deepfish-ai') // 记忆空间，目录
     this.memorySpace = path.join(this.basespace, 'memory') // 记忆空间，目录
     this.agentRecordFilePath = path.join(this.memorySpace, 'agentRecord.json')
-    this.agentSpace = path.join(this.memorySpace, this.root.id) // 机器人空间，目录
-    this.agentTreeFilePath = path.join(this.agentSpace, 'agentTree.json')
+    this.agentSpace = path.join(this.memorySpace, this.root.id) // Agent空间，目录
     this.memoryFilePath = path.join(this.agentSpace, `memory-${this.id}.json`)
     this.logDirPath = path.join(this.agentSpace, 'logs')
     this.logger = new Logger(this) // 初始化日志系统
-    const parentAgentTree = this.parent.agentTree
-    const rootAgentTree = this.root.agentTree
-    if (parentAgentTree && parentAgentTree.children) {
-      const currentNode = parentAgentTree.children.find((child) => child.agentId === this.id)
-      if (!currentNode) {
-        parentAgentTree.children.push({ agentId: this.id, children: [], type: 'sub' })
-        fs.writeJsonSync(this.agentTreeFilePath, rootAgentTree, { spaces: 2 })
-      }
-    }
+    this.agentTree = new AgentTree(this)
+    this.agentTree.init()
     this.toolCollection = AttachmentToolScanner.getToolCollection(
       this.workspace,
     ) // 加载工具集合

package/src/AgentRobot/AgentRobotFactory/SubSkillAgentRobot.js

@@ -1,8 +1,11 @@
 const path = require('path')
 const os = require('os')
-const fs = require('fs-extra')
 const BaseAgentRobot = require('../BaseAgentRobot/index.js')
 const Logger = require('../BaseAgentRobot/Logger.js')
+const AgentTree = require('../BaseAgentRobot/utils/AgentTree.js')
+const {
+  AttachmentToolScanner,
+} = require('../BaseAgentRobot/utils/AttachmentToolScanner.js')
 
 class SubSkillAgentRobot extends BaseAgentRobot {
   // opt: { root, parent, ...MainAgentOpt }
@@ -19,26 +22,28 @@ class SubSkillAgentRobot extends BaseAgentRobot {
     this.basespace = opt.basespace || path.join(os.homedir(), '.deepfish-ai') // 记忆空间，目录
     this.memorySpace = path.join(this.basespace, 'memory') // 记忆空间，目录
     this.agentRecordFilePath = path.join(this.memorySpace, 'agentRecord.json')
-    this.agentSpace = path.join(this.memorySpace, this.root.id) // 机器人空间，目录
+    this.agentSpace = path.join(this.memorySpace, this.root.id) // Agent空间，目录
     this.agentTreeFilePath = path.join(this.agentSpace, 'agentTree.json')
     this.memoryFilePath = path.join(this.agentSpace, `memory-${this.id}.json`)
     this.logDirPath = path.join(this.agentSpace, 'logs')
     this.logger = new Logger(this) // 初始化日志系统
-    const parentAgentTree = this.parent.agentTree
-    const rootAgentTree = this.root.agentTree
-    if (parentAgentTree && parentAgentTree.children) {
-      const currentNode = parentAgentTree.children.find(
-        (child) => child.agentId === this.id,
-      )
-      if (!currentNode) {
-        parentAgentTree.children.push({
-          agentId: this.id,
-          children: [],
-          type: 'sub-skill',
-        })
-        fs.writeJsonSync(this.agentTreeFilePath, rootAgentTree, { spaces: 2 })
-      }
-    }
+    this.agentTree = new AgentTree(this)
+    this.agentTree.init()
+
+    this.toolCollection = AttachmentToolScanner.getToolCollection(
+      this.workspace,
+    ) // 加载工具集合
+    this.clawSkillCollection = AttachmentToolScanner.getClawSkillCollection(
+      this.basespace,
+    ) // 加载Claw技能集合
+  }
+
+  _getDefaultSystemPrompt(opt) {
+    const clawSkills = opt.clawSkills || []
+    let systemPrompt = super._getDefaultSystemPrompt(opt)
+    systemPrompt =
+      systemPrompt + '\n' + AttachmentToolScanner.getClawSkillPrompt(clawSkills, this.toolCollection, this.clawSkillCollection)
+    return systemPrompt
   }
 }
 

package/src/AgentRobot/AgentRobotFactory/index.js

@@ -1,4 +1,4 @@
-const { AttachmentToolScanner, AttachmentToolType } = require('../BaseAgentRobot/utils/AttachmentToolScanner.js')
+const { AttachmentToolType, AttachmentToolScanner } = require('../BaseAgentRobot/utils/AttachmentToolScanner.js')
 const MainAgentRobot = require('./MainAgentRobot.js')
 const SubAgentRobot = require('./SubAgentRobot.js')
 const SubSkillAgentRobot = require('./SubSkillAgentRobot.js')
@@ -7,7 +7,7 @@ class AgentRobotFactory {
   createMainAgent(opt) {
     return new MainAgentRobot(opt)
   }
-  // 创建子技能机器人
+  // 创建子技能Agent
   createSubSkillAgent(parent, id, attachTools = []) {
     const baseSkill = []
     const clawSkill = []
@@ -25,18 +25,13 @@ class AgentRobotFactory {
       parent: parent,
       root: parent.root || parent,
       attachTools: baseSkill,
+      clawSkills: clawSkill
     })
-    if (clawSkill.length > 0) {
-      parent.systemPrompt =
-        parent.systemPrompt +
-        '\n' +
-        AttachmentToolScanner.getClawSkillPrompt(clawSkill)
-    }
     parent.children.push(subAgent)
     return subAgent
   }
 
-  // 创建子机器人
+  // 创建子Agent
   createSubAgent(parent, id) {
     const subAgent = new SubAgentRobot({
       ...parent.opt,

package/src/AgentRobot/BaseAgentRobot/Brain.js

@@ -12,7 +12,6 @@ class Brain extends EventEmitterSuper {
     this.maxIterations = agentRobot.opt.maxIterations
     this.maxContextLength = agentRobot.opt.aiConfig.maxContextLength
     this.memoryFilePath = agentRobot.memoryFilePath
-    this.systemPrompt = agentRobot.systemPrompt // 系统提示词
     this.messageCompresser = new MessageCompresser(this)
     this.aiConfig = agentRobot.opt.aiConfig
     this.aiClient = creatClient(agentRobot.opt.aiConfig)
@@ -55,7 +54,7 @@ class Brain extends EventEmitterSuper {
       // 初始化message
       this.storeMemory({
         role: 'system',
-        content: this.systemPrompt,
+        content: this.agentRobot.systemPrompt,
       })
       this.storeMemory({
         role: 'user',
@@ -181,6 +180,13 @@ class Brain extends EventEmitterSuper {
   }
 
   _initMessages(messages) {
+    let firstMessage = messages[0]
+    if (firstMessage.role === 'system') {
+      messages[0] = {
+        role: 'system',
+        content: this.agentRobot.systemPrompt,
+      }
+    }
     let lastMessage = messages[messages.length - 1]
     while (
       messages.length > 1 &&

package/src/AgentRobot/BaseAgentRobot/index.js

@@ -18,32 +18,34 @@ const TestTools = require('./tools/TestTools.js')
 const axios = require('axios')
 const echarts = require('echarts')
 const canvas = require('canvas')
+const cheerio = require('cheerio')
+const puppeteer = require('puppeteer')
 
 class BaseAgentRobot {
-  id = '' // 机器人id
-  name = '' // 机器人名字
+  id = '' // Agentid
+  name = '' // Agent名字
 
   brain = null // 大脑，负责思考、记忆、决策
   hand = null // 手，负责使用工具
   originalTools = null // 原装工具
-  attachTools = null // 附加工具, 机器人后续安装的工具函数
+  attachTools = null // 附加工具, Agent后续安装的工具函数
   heart = null // 心脏，负责心跳、连接
   sender = null // 发送器，负责发送消息
   receiver = null // 接收器，负责接收消息
-  screenPrinter = null // 机器人连接的打印机，能向屏幕输出文字
-  logger = null // 机器人连接的日志系统，能记录日志
-  children = [] // 子机器人，能分担任务
-  parent = null // 父机器人，能分配任务
-  root = null // 根机器人
-  state = 0 // 机器人状态，-1表示销毁 0表示空闲，1表示思考中 2表示工作中
-  type = 'main' // 机器人类型，main表示主机器人，sub表示子机器人，sub-skill表示子技能机器人
+  screenPrinter = null // Agent连接的打印机，能向屏幕输出文字
+  logger = null // Agent连接的日志系统，能记录日志
+  children = [] // 子Agent，能分担任务
+  parent = null // 父Agent，能分配任务
+  root = null // 根Agent
+  state = 0 // Agent状态，-1表示销毁 0表示空闲，1表示思考中 2表示工作中
+  type = 'main' // Agent类型，main表示主Agent，sub表示子Agent，sub-skill表示子技能Agent
 
   workspace = null
   basespace = null
   memorySpace = null
   agentRecordFilePath = null
   agentSpace = null
-  agentTreeFilePath = null
+  agentTree = null
   memoryFilePath = null
   logDirPath = null
 
@@ -51,7 +53,7 @@ class BaseAgentRobot {
     opt = {
       id: '',
       name: '',
-      attachTools: [], // 附加工具, 机器人后续安装的工具函数
+      attachTools: [], // 附加工具, Agent后续安装的工具函数
       workspace: process.cwd(), // 工作空间，目录
       basespace: path.join(os.homedir(), '.deepfish-ai'), // 记忆空间，目录
       maxIterations: -1, // 思考的最大迭代次数，-1表示无限制
@@ -81,7 +83,7 @@ class BaseAgentRobot {
     this._initFiles(opt) // 初始化文件
 
     this.originalTools = this._getOriginalTools() // 天赋技能
-    this.attachTools = opt.attachTools || [] // 附加工具, 机器人后续安装的工具函数
+    this.attachTools = opt.attachTools || [] // 附加工具, Agent后续安装的工具函数
     this.systemPrompt = opt.systemPrompt || this._getDefaultSystemPrompt(opt) // 系统提示语
     this.brain = new Brain(this) // 初始化大脑
     this.hand = new Hand(this) // 初始化手
@@ -89,35 +91,7 @@ class BaseAgentRobot {
   }
 
   // 初始化文件
-  _initFiles(opt) {
-    this.root = opt.root
-    this.parent = opt.parent
-    this.workspace = opt.workspace || process.cwd() // 工作空间，目录
-    this.basespace = opt.basespace || path.join(os.homedir(), '.deepfish-ai') // 记忆空间，目录
-    this.memorySpace = path.join(this.basespace, 'memory') // 记忆空间，目录
-    this.agentRecordFilePath = path.join(this.memorySpace, 'agentRecord.json')
-    this.agentSpace = path.join(this.memorySpace, this.root.id) // 机器人空间，目录
-    this.agentTreeFilePath = path.join(this.agentSpace, 'agentTree.json')
-    this.memoryFilePath = path.join(this.agentSpace, `memory-${this.id}.json`)
-    this.logDirPath = path.join(this.agentSpace, 'logs')
-    let agentRecord = fs.readJsonSync(this.agentRecordFilePath)
-    // 自动清除过期的记忆和日志
-    const currentDate = dayjs()
-    agentRecord = agentRecord.filter((record) => {
-      if (
-        currentDate.diff(dayjs(record.updateTime), 'day') >
-        opt.maxMemoryExpireTime
-      ) {
-        // 删除机器人空间
-        fs.removeSync(path.join(this.memorySpace, record.agentId))
-        return false
-      }
-      return true
-    })
-    fs.writeJsonSync(this.agentRecordFilePath, agentRecord, { spaces: 2 })
-    this.logger = new Logger(this) // 初始化日志系统
-    this.logger.clearAllLogs()
-  }
+  _initFiles(opt) {}
 
   _initEvents() {
     const aiConfig = this.opt.aiConfig
@@ -215,6 +189,14 @@ class BaseAgentRobot {
     })
   }
 
+  loadAttachTool(toolName) {
+      let tool = this.attachTools.find((t) => t.name === toolName)
+      if (!tool) {
+        tool = this.toolCollection.find((t) => t.name === toolName)
+        this.attachTools.push(tool)
+      }
+  }
+
   getTools() {
     const tools = [...this.originalTools, ...this.attachTools]
     const toolFunctions = {
@@ -223,8 +205,11 @@ class BaseAgentRobot {
       dayjs,
       lodash,
       canvas,
-      echarts
+      echarts,
+      cheerio,
+      puppeteer
     }
+    
     tools.forEach((tool) => {
       Object.assign(toolFunctions, tool.functions)
     })
@@ -276,12 +261,15 @@ class BaseAgentRobot {
     const id = this.id
     const name = this.name
     return `
-你叫${name}, 编号${id}, 是一个严格按规则执行任务的智能体，不能违反任何系统限制。
+你叫${name}, 编号${id}, 是一个严格按规则执行任务的智能体，不能违反任何系统限制，具有INTJ人格，高冷、做事以及回复问题精简、准确、不废话。
 ### 基础环境信息
 当前工作目录：${workspace}
 操作系统类型：${osType}
 语言类型: 与用户输入语言一致
 
+### 工具使用
+执行任务前，应仔细阅读工具描述以及可以使用的Skills的描述内容，选择最合适的工具或技能来完成任务。
+
 ### 大文本文件处理规则（分步执行）
 处理长文档等大文件（单文件＞${maxBlockFileSize}KB）时，必须按以下步骤分块处理：
 1. 预处理：先执行文件大小/结构检查（如通过命令行/JS 代码获取文件大小、判断文件格式），输出检查结果；
@@ -314,13 +302,13 @@ class BaseAgentRobot {
     return this._agentRobotFactory
   }
 
-  // 创建子技能机器人
+  // 创建子技能Agent
   createSubSkillAgent(id, attachTools = []) {
     const agentRobotFactory = this._getAgentRobotFactory()
     return agentRobotFactory.createSubSkillAgent(this, id, attachTools)
   }
 
-  // 创建子机器人
+  // 创建子Agent
   createSubAgent(id) {
     const agentRobotFactory = this._getAgentRobotFactory()
     return agentRobotFactory.createSubAgent(this, id)
@@ -329,6 +317,7 @@ class BaseAgentRobot {
   destroy() {
     this.brain.removeAllListeners()
     this.state = -1
+    this.agentTree.clear()
   }
 }
 

package/src/AgentRobot/BaseAgentRobot/tools/CreateAgentTools.js

@@ -28,6 +28,7 @@ async function createSubSkillAgent(skillName, skillType, workGoal) {
     const agentId = `${Date.now()}-${Math.floor(Math.random() * 10000)}`
     const agent = this.agentRobot.createSubSkillAgent(agentId, [tool])
     const result = await agent.executeTask(workGoal)
+    agent.destroy()
 
     return {
       success: true,
@@ -36,6 +37,7 @@ async function createSubSkillAgent(skillName, skillType, workGoal) {
       result,
     }
   } catch (error) {
+    console.error('Error in createSubSkillAgent:', error)
     return {
       success: false,
       error: error?.message || String(error),
@@ -49,6 +51,7 @@ async function createSubAgent(workGoal) {
     const agentId = `${Date.now()}-${Math.floor(Math.random() * 10000)}`
     const agent = this.agentRobot.createSubAgent(agentId)
     const result = await agent.executeTask(workGoal)
+    agent.destroy()
     return {
       success: true,
       agentId,
@@ -62,6 +65,15 @@ async function createSubAgent(workGoal) {
   }
 }
 
+function loadAttachTool(toolName) {
+  try {
+    this.agentRobot.loadAttachTool(toolName)
+    return `Tool ${toolName} loaded successfully`
+  } catch (error) {
+    return `Failed to load tool ${toolName}: ${error.message}`
+  }
+}
+
 const descriptions = [
   {
     type: 'function',
@@ -108,11 +120,30 @@ const descriptions = [
       },
     },
   },
+  {
+    type: 'function',
+    function: {
+      name: 'loadAttachTool',
+      description:
+        '按名称加载一个附加工具（Attach Tool）到当前agent实例中，返回加载结果信息。',
+      parameters: {
+        type: 'object',
+        properties: {
+          toolName: {
+            type: 'string',
+            description: '要加载的附加工具名称（与可用工具名称一致）。',
+          },
+        },
+        required: ['toolName'],
+      },
+    },
+  },
 ]
 
 const functions = {
   createSubSkillAgent,
-  createSubAgent
+  createSubAgent,
+  loadAttachTool,
 }
 
 const CreateAgentTool = {

package/src/AgentRobot/BaseAgentRobot/tools/SystemTools.js

@@ -2,7 +2,7 @@
  * @Author: Roman 306863030@qq.com
  * @Date: 2026-03-17 11:59:19
  * @LastEditors: Roman 306863030@qq.com
- * @LastEditTime: 2026-04-13 17:46:49
+ * @LastEditTime: 2026-04-21 21:08:34
  * @FilePath: \deepfish\src\AgentRobot\BaseAgentRobot\tools\SystemTools.js
  * @Description: 默认扩展函数
  * @
@@ -83,7 +83,13 @@ async function requestAI(
 async function executeJSCode(code) {
   aiConsole.logSuccess('Executing JavaScript code: ')
   aiConsole.logSuccess(code)
-
+  // 检测code最后一行代码包含return，如果不包含，则返回一个错误信息，提示agent需要使用return返回结果
+  const codeLines = code.trim().split('\n')
+  const lastLine = codeLines[codeLines.length - 1].trim()
+  if (!lastLine.startsWith('return')) {
+    const error = new Error('The last line of the code must contain a return statement.')
+    throw error
+  }
   try {
     const functions = this.agentRobot.getTools()
     const Func = new Function(
@@ -97,9 +103,12 @@ async function executeJSCode(code) {
             this.logMessages.push(Array.from(arguments).join(' '))
           }
           console.log = newLog.bind(this)
-          ${code}
+          function __main() {
+            ${code}
+          }
+          const result = await __main()
           console.log = originalLog
-          return this.logMessages.join('\\n')
+          return result || this.logMessages.join('\\n')
         })()`,
     )
     const originalRequire = require
@@ -112,7 +121,6 @@ async function executeJSCode(code) {
     }
 
     const result = await Func(functions, newRequire)
-
     return result || ''
   } catch (error) {
     aiConsole.logError(`Error executing code: ${error.stack}`)
@@ -123,7 +131,7 @@ async function executeJSCode(code) {
 // 了解自己
 function getSelfInfo() {
   // 返回自己的代码路径、package.json路径、readme路径等基本信息，供AI有选择的了解自己，回答用户的问题
-  const homeDir = path.resolve(__filename, '../../../../')
+  const homeDir = path.resolve(__dirname, '../../../../')
   const packageJson = fs.readJSONSync(path.resolve(homeDir, 'package.json'))
   return {
     config: {
@@ -192,7 +200,7 @@ const descriptions = [
     function: {
       name: 'executeJSCode',
       description:
-        '执行JavaScript代码，返回代码执行结果。代码中可通过Tools命名空间直接调用其他工具函数（如await Tools.createFile(),注意：不需要使用require引入）,Tools中引入了一些常用库可直接调用（Tools.fs="fs-extra", Tools.dayjs="dayjs", Tools.axios="axios", Tools.lodash="lodash", Tools.echarts="echarts", Tools.canvas="canvas"），支持引入自定义模块（需使用绝对路径）。注意：1.代码中不要使用__dirname获取当前目录，请使用path.resolve(".")来获取当前目录。2.执行失败时会抛出错误，成功时返回代码执行结果或空字符串。3.使用require(module_path)函数引入自定义模块，module_path为模块路径字符串，支持相对路径（如"./myModule.js"）和绝对路径，返回引入的模块内容。',
+        '执行JavaScript代码，返回代码执行结果。代码中可通过Tools命名空间直接调用其他工具函数（如await Tools.createFile(),注意：不需要使用require引入）,Tools中引入了一些常用库可直接调用（Tools.fs="fs-extra", Tools.dayjs="dayjs", Tools.axios="axios", Tools.lodash="lodash", Tools.echarts="echarts", Tools.canvas="canvas" Tools.cheerio="cheerio" Tools.puppeteer="puppeteer"），支持引入自定义模块（需使用绝对路径）。注意：1.代码中不要使用__dirname获取当前目录，请使用path.resolve(".")来获取当前目录。2.执行失败时会抛出错误，成功时返回代码执行结果或空字符串。3.使用require(module_path)函数引入自定义模块，module_path为模块路径字符串，支持相对路径（如"./myModule.js"）和绝对路径，返回引入的模块内容。4.执行主函数必须使用return返回，如return main()',
       parameters: {
         type: 'object',
         properties: {

package/src/AgentRobot/BaseAgentRobot/utils/AgentTree.js

@@ -0,0 +1,66 @@
+const path = require('path')
+const fs = require('fs-extra')
+
+class AgentTree {
+  content = null
+  constructor(agentRobot) {
+    this.agentRobot = agentRobot
+    this.agentTreeFilePath = path.join(
+      this.agentRobot.agentSpace,
+      'agentTree.json',
+    )
+    this.parentAgentTree = this.agentRobot.parent?.agentTree
+    this.rootAgentTree = this.agentRobot.root?.agentTree
+  }
+  init() {
+    if (!this.rootAgentTree && !fs.pathExistsSync(this.agentTreeFilePath)) {
+      fs.writeJsonSync(
+        this.agentTreeFilePath,
+        { agentId: this.agentRobot.id, children: [] },
+        { spaces: 2 },
+      )
+    }
+    if (!this.rootAgentTree) {
+      this.content = fs.readJsonSync(this.agentTreeFilePath)
+    } else {
+      if (this.parentAgentTree && this.parentAgentTree.content.children) {
+        this.content = this.parentAgentTree.content.children.find(
+          (child) => child.agentId === this.agentRobot.id,
+        )
+        if (!this.content) {
+          this.content = {
+            agentId: this.agentRobot.id,
+            children: [],
+            type: this.agentRobot.type,
+          }
+          this.parentAgentTree.content.children.push(this.content)
+          fs.writeJsonSync(this.agentTreeFilePath, this.rootAgentTree.content, {
+            spaces: 2,
+          })
+        }
+      }
+    }
+  }
+
+  clear() {
+    if (this.rootAgentTree) {
+      if (this.parentAgentTree && this.parentAgentTree.content.children) {
+        const currentNode = this.parentAgentTree.content.children.findIndex(
+          (child) => child.agentId === this.agentRobot.id,
+        )
+        if (currentNode !== -1) {
+          this.parentAgentTree.content.children.splice(currentNode, 1)
+          fs.writeJsonSync(this.agentTreeFilePath, this.rootAgentTree.content, {
+            spaces: 2,
+          })
+        }
+      }
+      // 清除子memory
+      this.agentRobot.memoryFilePath &&
+        fs.removeSync(this.agentRobot.memoryFilePath)
+    }
+  }
+}
+
+module.exports = AgentTree
+

package/src/AgentRobot/BaseAgentRobot/utils/AttachmentToolScanner.js

@@ -1,5 +1,6 @@
 const fs = require('fs-extra')
 const path = require('path')
+const { getGlobalNodeModulesPath } = require('./node-root')
 
 class AttachmentToolType {
   static BASE_SKILL = 'BaseSkill' // 基础技能，提供技能定义的基本结构
@@ -53,8 +54,9 @@ class AttachmentToolScanner {
     const dir1 = path.resolve(__dirname, '../../../../') // 程序所在目录
     const dir2 = path.resolve(workspace, './node_modules') // 工作目录下node_modules目录
     const dir3 = path.resolve(workspace, './') // 工作目录
+    const dir4 = getGlobalNodeModulesPath()
     const result = []
-    const searchDirs = [...new Set([dir1, dir2, dir3])]
+    const searchDirs = [...new Set([dir1, dir2, dir3, dir4])]
     for (const dirPath of searchDirs) {
       if (!fs.existsSync(dirPath)) {
         continue
@@ -132,7 +134,7 @@ class AttachmentToolScanner {
           `| ${s.name} | ${s.type} | ${s.description || s.extensionDescription} | ${s.location} | ${s.filePath || s.skillFilePath} |`,
       )
       .join('\n')
-    if (!table) {
+    if (!table || !table.length) {
       return '### 暂无可用的Skills'
     }
     return `
@@ -151,16 +153,22 @@ ${table}
 `
   }
 
-  static getClawSkillPrompt(clawSkills) {
-    const table = clawSkills
+  static getClawSkillPrompt(clawSkills=[], toolCollection=[], clawSkillCollection=[]) {
+    const table1 = clawSkills
       .map(
         (s) =>
           `| ${s.name} | ${s.type} | ${s.description} | ${s.location} | ${s.skillFilePath} |`,
       )
       .join('\n')
-    return `
-    ### 可以使用的Skills
-可以调用以下Skill来完成用户的请求，Skill的调用方式：
+    const table2 = ([].concat(toolCollection).concat(clawSkillCollection))
+      .map(
+        (s) =>
+          `| ${s.name} | ${s.type} | ${s.description || s.extensionDescription} | ${s.location} | ${s.filePath || s.skillFilePath} |`,
+      )
+      .join('\n')
+    let skills1 = `
+    ### 优先使用的Skills
+可以优先调用以下Skill来完成用户的请求，Skill的调用方式：
 - 使用用户请求匹配 skill description，
 - 一次只加载一个Skill，优先匹配最具体的Skill
 - 当用户请求不匹配任何Skill描述时，不加载任何Skill
@@ -169,9 +177,26 @@ ${table}
 
 | Skill | Type | Description | Location | SkillFilePath |
 |-------|------|-------------|----------|---------------|
-${table}
+${table1}
 |-------|------|-------------|----------|---------------|
 `
+  let skills2 = `
+### 其他可以使用的Skills
+可以调用以下Skill来完成用户的请求，Skill的调用方式：
+- 使用用户请求匹配 skill description，
+- 一次只加载一个Skill，优先匹配最具体的Skill
+- 当用户请求不匹配任何Skill描述时，不加载任何Skill
+- Type类型为'ClawSkill'时，使用Skill前先使用readFile函数读取SKILL.md文件获取调用说明，通过仔细阅读说明文件学习Skill的使用方法，来完成任务
+- Type类型为'BaseSkill'时，使用loadAttachTool函数加载Skill后，通过使用该Skill提供的函数来完成任务
+## Available Skills
+
+| Skill | Type | Description | Location | FilePath |
+|-------|------|-------------|----------|----------|
+${table2}
+|-------|------|-------------|----------|----------|
+`
+return skills1 + '\n' + skills2
+
   }
 
   // 扫描包
@@ -203,5 +228,7 @@ ${table}
   }
 }
 
-module.exports = AttachmentToolScanner
-module.exports.AttachmentToolType = AttachmentToolType
+module.exports = {
+  AttachmentToolScanner,
+  AttachmentToolType,
+}

package/src/cli/SkillConfigManager.js

@@ -2,7 +2,7 @@
  * @Author: Roman 306863030@qq.com
  * @Date: 2026-03-23 15:23:42
  * @LastEditors: Roman 306863030@qq.com
- * @LastEditTime: 2026-04-07 15:56:35
+ * @LastEditTime: 2026-04-17 09:38:33
  * @FilePath: \deepfish\src\cli\SkillConfigManager.js
  * @Description: Skill configuration manager
  */
@@ -54,43 +54,6 @@ class SkillConfigManager {
     openDirectory(this.skillDir)
   }
 
-  // 预加载skills，拼接提示词
-  preLoadSkills() {
-    const skills = this.readSkills().filter((skill) => skill.enable)
-    if (skills.length === 0) {
-        return '### 暂无可以使用的Skill'
-    }
-    const table = skills
-      .map((s) => `| ${s.name} | ${s.description} | ${s.location} | ${s.skillFilePath} |`)
-      .join('\n')
-    return (
-`
-### 可以使用的Skill
-除了使用内置函数，还可以调用以下Skill来完成用户的请求，Skill的调用方式：当用户的请求匹配技能描述时，调用executeSkill函数加载对应Skill的SKILL.md说明文件，获取调用说明，通过仔细阅读说明文件学习Skill的使用方法，来完成任务。
-## Available Skills
-
-| Skill | Description | Location | SkillFilePath |
-|-------|-------------|----------|---------------|
-${table}
-
-## Skills Policy
-- 当用户请求匹配 skill description 时，调用 executeSkill 函数加载对应 SKILL.md
-- 一次只加载一个Skill，优先匹配最具体的Skill
-- 当用户请求不匹配任何Skill描述时，不加载任何Skill
-- Skill即你可以使用的技能`
-    )
-  }
-
-  // 调用skill，传入参数，返回结果
-  loadSkill(skillFilePath) {
-    // 读取skill的SKILL.md，获取调用说明
-    if (!fs.existsSync(skillFilePath)) {
-        aiConsole.logError(`Skill file "${skillFilePath}" does not exist.`)
-        return null
-    }
-    return fs.readFileSync(skillFilePath, 'utf-8')
-  }
-
   // 解析skill文件，写入到json中，获取名称、版本、作者、元数据、描述等信息
   _parseSkill(skillDirPath) {
     const skillMdPath = ['SKILL.md', 'skill.md']
@@ -168,11 +131,13 @@ ${table}
         // 如果是目录，则拷贝到skills目录下，并添加到config中
         fs.copySync(baseDir, path.join(this.skillDir, file))
         this._registerSkill(baseName)
+        aiConsole.logSuccess(`Skill "${baseName}" added successfully!`)
       } else if (path.extname(file) === '.zip') {
         // 如果是zip文件，则解压到skills目录下，并添加到config中
         const extractPath = path.join(this.skillDir, baseName)
         await extract(baseDir, { dir: extractPath })
         this._registerSkill(baseName)
+        aiConsole.logSuccess(`Skill "${baseName}" added successfully!`)
       } else {
         aiConsole.logError(`File "${file}" is not a directory or a zip file.`)
       }
@@ -244,7 +209,10 @@ ${table}
       // 解析HTML获取下载链接
       const html = response.data
       const $ = cheerio.load(html)
-      const downloadHref = $('.skill-hero-cta a').first().attr('href')
+      const downloadHref = $('a').filter((i, el) => {
+        const href = $(el).attr('href')
+        return href && (href.startsWith('https://wry-manatee-359.convex.site/api/v1/download') ||  href.endsWith('.zip'))
+      }).attr('href')
 
       if (!downloadHref) {
         aiConsole.logError(`No download link found for skill "${skillName}".`)

package/src/cli/SkillParser.js

@@ -2,20 +2,25 @@ const fs = require('fs-extra')
 const path = require('path')
 const yaml = require('js-yaml')
 
-function parseSkillMetadata(skillPath) {
-  const content = fs.readFileSync(skillPath, 'utf-8');
-  
-  // 提取 frontmatter (--- 之间的内容)
-  const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
+function extractFrontmatter(content, skillPath) {
+  // Support UTF-8 BOM and both LF/CRLF line endings.
+  const normalizedContent = content.replace(/^\uFEFF/, '');
+  const frontmatterMatch = normalizedContent.match(/^---\s*\r?\n([\s\S]*?)\r?\n---\s*(?:\r?\n|$)/);
   if (!frontmatterMatch) {
     throw new Error(`No frontmatter found in ${skillPath}`);
   }
-  
-  const frontmatter = frontmatterMatch[1];
+
+  return frontmatterMatch[1];
+}
+
+function parseSkillMetadata(skillPath) {
+  const content = fs.readFileSync(skillPath, 'utf-8');
+
+  const frontmatter = extractFrontmatter(content, skillPath);
   const metadata = {};
   
   // 解析 key: value 或 key: "quoted value"
-  const lines = frontmatter.split('\n');
+  const lines = frontmatter.split(/\r?\n/);
   for (const line of lines) {
     const match = line.match(/^(\w+):\s*(.+)$/);
     if (match) {
@@ -37,13 +42,8 @@ function parseSkillMetadata(skillPath) {
 
 function parseSkillMetadataYaml(skillPath) {
   const content = fs.readFileSync(skillPath, 'utf-8');
-  const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
-  
-  if (!frontmatterMatch) {
-    throw new Error(`No frontmatter found in ${skillPath}`);
-  }
-  
-  const frontmatter = yaml.load(frontmatterMatch[1]);
+  const frontmatterContent = extractFrontmatter(content, skillPath);
+  const frontmatter = yaml.load(frontmatterContent);
   
   return {
     name: frontmatter.name,

package/src/index.js

@@ -5,7 +5,7 @@ const readline = require('readline')
 
 class DeepFishAI {
   constructor(config) {
-    // 启动一个机器人
+    // 启动一个Agent
     this.agentRobot = new MainAgentRobot(config)
   }