deepfish-ai 2.0.11 → 2.0.13

package/README.md

@@ -45,6 +45,7 @@
   - [工具管理](#工具管理)
   - [会话管理](#会话管理)
   - [任务管理](#任务管理)
+  - [长任务规划](#长任务规划)
   - [MCP 管理](#mcp-管理)
   - [服务管理](#服务管理)
   - [缓存管理（AI自我学习的缓存）](#缓存管理ai自我学习的缓存)
@@ -183,11 +184,21 @@ ai "我刚问了一个什么问题"
 | `ai tasks del <index>` | 删除指定任务 |
 | `ai tasks clear`       | 清除所有任务 |
 
+### 长任务规划
+
+| 命令                      | 说明                                       |
+| ------------------------- | ------------------------------------------ |
+| `ai plan-do <任务描述>`   | 将复杂任务拆解为子任务并逐步执行完成       |
+| `ai plan-continue`        | 继续执行被中断的 plan-do 任务              |
+
 ### MCP 管理
 
-| 命令          | 说明          |
-| ------------- | ------------- |
-| `ai mcp edit` | 编辑 MCP 配置 |
+| 命令                              | 说明             |
+| --------------------------------- | ---------------- |
+| `ai mcp ls`                       | 列出所有 MCP 服务器 |
+| `ai mcp edit`                     | 编辑 MCP 配置    |
+| `ai mcp enable <name\|index>`     | 启用 MCP 服务器  |
+| `ai mcp disable <name\|index>`    | 禁用 MCP 服务器  |
 
 ### 服务管理
 

package/dist/index.js

@@ -8403,10 +8403,10 @@ var require_lib = __commonJS({
     exports2.analyse = analyse;
     var detectFile = (filepath, opts = {}) => new Promise((resolve, reject) => {
       let fd;
-      const fs25 = (0, node_1.default)();
+      const fs26 = (0, node_1.default)();
       const handler = (err, buffer) => {
         if (fd) {
-          fs25.closeSync(fd);
+          fs26.closeSync(fd);
         }
         if (err) {
           reject(err);
@@ -8418,9 +8418,9 @@ var require_lib = __commonJS({
       };
       const sampleSize = (opts === null || opts === void 0 ? void 0 : opts.sampleSize) || 0;
       if (sampleSize > 0) {
-        fd = fs25.openSync(filepath, "r");
+        fd = fs26.openSync(filepath, "r");
         let sample = Buffer.allocUnsafe(sampleSize);
-        fs25.read(fd, sample, 0, sampleSize, opts.offset, (err, bytesRead) => {
+        fs26.read(fd, sample, 0, sampleSize, opts.offset, (err, bytesRead) => {
           if (err) {
             handler(err, null);
           } else {
@@ -8432,22 +8432,22 @@ var require_lib = __commonJS({
         });
         return;
       }
-      fs25.readFile(filepath, handler);
+      fs26.readFile(filepath, handler);
     });
     exports2.detectFile = detectFile;
     var detectFileSync = (filepath, opts = {}) => {
-      const fs25 = (0, node_1.default)();
+      const fs26 = (0, node_1.default)();
       if (opts && opts.sampleSize) {
-        const fd = fs25.openSync(filepath, "r");
+        const fd = fs26.openSync(filepath, "r");
         let sample = Buffer.allocUnsafe(opts.sampleSize);
-        const bytesRead = fs25.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
+        const bytesRead = fs26.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
         if (bytesRead < opts.sampleSize) {
           sample = sample.subarray(0, bytesRead);
         }
-        fs25.closeSync(fd);
+        fs26.closeSync(fd);
         return (0, exports2.detect)(sample);
       }
-      return (0, exports2.detect)(fs25.readFileSync(filepath));
+      return (0, exports2.detect)(fs26.readFileSync(filepath));
     };
     exports2.detectFileSync = detectFileSync;
     exports2.default = {
@@ -10564,10 +10564,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path23) {
-  if (!path23)
+function getElementAtPath(obj, path24) {
+  if (!path24)
     return obj;
-  return path23.reduce((acc, key) => acc?.[key], obj);
+  return path24.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -10976,11 +10976,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path23, issues) {
+function prefixIssues(path24, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path23);
+    iss.path.unshift(path24);
     return iss;
   });
 }
@@ -11127,16 +11127,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path23 = []) => {
+  const processError = (error52, path24 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path23, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path24, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path23, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path24, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path23, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path24, ...issue2.path]);
       } else {
-        const fullpath = [...path23, ...issue2.path];
+        const fullpath = [...path24, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -11163,17 +11163,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path23 = []) => {
+  const processError = (error52, path24 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path23, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path24, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path23, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path24, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path23, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path24, ...issue2.path]);
       } else {
-        const fullpath = [...path23, ...issue2.path];
+        const fullpath = [...path24, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -11205,8 +11205,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path23 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path23) {
+  const path24 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path24) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -23898,13 +23898,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path23 = ref.slice(1).split("/").filter(Boolean);
-  if (path23.length === 0) {
+  const path24 = ref.slice(1).split("/").filter(Boolean);
+  if (path24.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path23[0] === defsKey) {
-    const key = path23[1];
+  if (path24[0] === defsKey) {
+    const key = path24[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -24470,11 +24470,12 @@ var getSystemPrompt = (params) => {
   const memoryPrompt = getUserMemoryPrompt(params.memoryFilePath);
   const agentRulesPrompt = getAgentRulesPrompt(params.agentRulesPath);
   return `
-${params.systemPrompt || `\u8FD9\u662FDeepfish Cli\u7CFB\u7EDF,\u4F60\u662F\u7CFB\u7EDF\u4E2D\u4E25\u683C\u6309\u89C4\u5219\u6267\u884C\u4EFB\u52A1\u7684\u667A\u80FD\u4F53,\u4E0D\u80FD\u8FDD\u53CD\u4EFB\u4F55\u7CFB\u7EDF\u9650\u5236\u3002
+${params.systemPrompt + `
+\u8FD9\u662FDeepfish Cli\u7CFB\u7EDF,\u4F60\u662F\u7CFB\u7EDF\u4E2D\u4E25\u683C\u6309\u89C4\u5219\u6267\u884C\u4EFB\u52A1\u7684\u667A\u80FD\u4F53,\u4E0D\u80FD\u8FDD\u53CD\u4EFB\u4F55\u7CFB\u7EDF\u9650\u5236\u3002
 # \u6CE8\u610F\u6CE8\u610F\u4E8B\u9879:
 1.\u5982\u679C\u4EFB\u52A1\u6BD4\u8F83\u590D\u6742\uFF0C\u5E94\u8BE5\u5148\u8FDB\u884C\u62C6\u5206\uFF0C\u5206\u89E3\u6210\u591A\u4E2A\u6B65\u9AA4\uFF0C\u521B\u5EFA\u5B50\u667A\u80FD\u4F53\u6765\u9010\u6B65\u5B8C\u6210\u3002
 2.\u4E34\u65F6\u6587\u4EF6\u5FC5\u987B\u4F7F\u7528"tmp_"\u4F5C\u4E3A\u524D\u7F00\u547D\u540D\uFF0C\u5E76\u5728\u4EFB\u52A1\u7ED3\u675F\u540E\u5220\u9664\uFF0C\u4E0D\u80FD\u5728\u5DE5\u4F5C\u76EE\u5F55\u4E2D\u7559\u4E0B\u4EFB\u4F55\u4E34\u65F6\u6587\u4EF6\u3002
-3.\u5C3D\u91CF\u4F7F\u7528"execute_command"\u3001"execute_js_code"\u5DE5\u5177\u5B8C\u6210\u4EFB\u52A1
+3.\u5C3D\u91CF\u4F7F\u7528"execute_command"\u3001"execute_js_code"\u5DE5\u5177\u7ED3\u5408Nodejs\u4EE3\u7801\u5B8C\u6210\u4EFB\u52A1
 4.\u786C\u6027\u89C4\u5219\uFF1A\u65E0\u8BBA\u6846\u67B6\u5185\u7F6E\u82F1\u6587\u6A21\u677F\uFF0C\u4F60\u7684\u6BCF\u4E00\u6B65\u601D\u8003\uFF08Thought\uFF09\u3001\u89C2\u5BDF\u5206\u6790\u3001\u7ED3\u8BBA\u56DE\u7B54\uFF0C**\u4E25\u683C\u4F7F\u7528\u7B80\u4F53\u4E2D\u6587**\uFF0C\u7981\u6B62\u82F1\u6587\u3002`}
 
 # \u57FA\u7840\u73AF\u5883\u4FE1\u606F
@@ -24486,21 +24487,24 @@ ${memoryPrompt}
 ${agentRulesPrompt}
 `;
 };
-var subSystemPrompt = (workspace, osType, skills, excludeSkills) => {
-  let skillPrompt = getSkillPrompt(skills, excludeSkills);
-  return `
+var subSystemPrompt = (params) => {
+  const skillPrompt = getSkillPrompt(params.skills, params.excludeSkills);
+  const basePrompt = `
 \u8FD9\u662FDeepfish Cli\u7CFB\u7EDF,\u4F60\u662F\u7CFB\u7EDF\u4E2D\u4E25\u683C\u6309\u89C4\u5219\u6267\u884C\u4EFB\u52A1\u7684\u5B50\u667A\u80FD\u4F53,\u4E0D\u80FD\u8FDD\u53CD\u4EFB\u4F55\u7CFB\u7EDF\u9650\u5236\u3002
 ### \u57FA\u7840\u73AF\u5883\u4FE1\u606F
-\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\uFF1A${workspace}
-\u64CD\u4F5C\u7CFB\u7EDF\u7C7B\u578B\uFF1A${osType}
+\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\uFF1A${params.workspace}
+\u64CD\u4F5C\u7CFB\u7EDF\u7C7B\u578B\uFF1A${params.osType}
 
 \u6CE8\u610F:
 1.\u5B50\u667A\u80FD\u4F53\u53EA\u80FD\u5B8C\u6210\u5355\u4E2A\u4EFB\u52A1,\u4E0D\u80FD\u521B\u5EFA\u65B0\u7684\u5B50\u667A\u80FD\u4F53\u3002
 2.\u4E34\u65F6\u6587\u4EF6\u5FC5\u987B\u4F7F\u7528"tmp_"\u4F5C\u4E3A\u524D\u7F00\u547D\u540D\uFF0C\u5E76\u5728\u4EFB\u52A1\u7ED3\u675F\u540E\u5220\u9664\uFF0C\u4E0D\u80FD\u5728\u5DE5\u4F5C\u76EE\u5F55\u4E2D\u7559\u4E0B\u4EFB\u4F55\u4E34\u65F6\u6587\u4EF6\u3002
-3.\u5C3D\u91CF\u4F7F\u7528"execute_command"\u3001"execute_js_code"\u5DE5\u5177\u5B8C\u6210\u4EFB\u52A1
+3.\u5C3D\u91CF\u4F7F\u7528"execute_command"\u3001"execute_js_code"\u5DE5\u5177\u7ED3\u5408Nodejs\u4EE3\u7801\u5B8C\u6210\u4EFB\u52A1
 4.\u786C\u6027\u89C4\u5219\uFF1A\u65E0\u8BBA\u6846\u67B6\u5185\u7F6E\u82F1\u6587\u6A21\u677F\uFF0C\u4F60\u7684\u6BCF\u4E00\u6B65\u601D\u8003\uFF08Thought\uFF09\u3001\u89C2\u5BDF\u5206\u6790\u3001\u7ED3\u8BBA\u56DE\u7B54\uFF0C**\u4E25\u683C\u4F7F\u7528\u7B80\u4F53\u4E2D\u6587**\uFF0C\u7981\u6B62\u82F1\u6587\u3002
 
 ${skillPrompt}
+`;
+  return `
+${params.systemPrompt + basePrompt}
 `;
 };
 
@@ -24737,9 +24741,8 @@ function toLangChainTool(func, description) {
   const wrappedFunc = async (args, runtime) => {
     try {
       const boundFunc = func.bind({
-        createSubAgent: async (prompt) => {
-          const subAgent = await runtime.context.curAgent.createSubAgent();
-          return subAgent.execute(prompt);
+        createSubAgent: async (systemPrompt, prompt) => {
+          return runtime.context.curAgent.subExecute(systemPrompt, prompt);
         },
         curAgent: runtime.context.curAgent
       });
@@ -24758,10 +24761,11 @@ function toLangChainTool(func, description) {
     schema
   });
 }
-function scanUserTools(excludeTools) {
-  const files = _scanUserToolsFile();
+function scanUserTools(excludeTools, externalTools) {
+  const files1 = _scanUserToolsFile();
+  const files2 = _scanExternalToolsFile(externalTools);
   const tools = [];
-  files.forEach((toolFile) => {
+  [...files1, ...files2].forEach((toolFile) => {
     _loadToolsFromFile(toolFile.filePath, tools, excludeTools);
   });
   return tools;
@@ -24792,6 +24796,52 @@ function getUserToolList() {
   });
   return toolOpts;
 }
+function _scanToolsFile(filePath) {
+  let toolFile = null;
+  if (import_fs_extra8.default.statSync(filePath).isDirectory()) {
+    const subDirPath = import_path8.default.resolve(filePath);
+    const subFiles = import_fs_extra8.default.readdirSync(subDirPath);
+    const indexFile = subFiles.find((f) => f === "index.js" || f === "index.cjs");
+    if (indexFile) {
+      const filePath2 = _scanDeepFishJsFile(import_path8.default.resolve(subDirPath, indexFile));
+      if (filePath2) {
+        toolFile = {
+          filePath: filePath2,
+          dir: subDirPath
+        };
+      }
+    } else {
+      subFiles.forEach((subFile) => {
+        const filePath2 = _scanDeepFishJsFile(import_path8.default.resolve(subDirPath, subFile));
+        if (filePath2) {
+          toolFile = {
+            filePath: filePath2,
+            dir: subDirPath
+          };
+        }
+      });
+    }
+  } else {
+    const toolfilePath = _scanDeepFishJsFile(filePath);
+    if (toolfilePath) {
+      toolFile = {
+        filePath: toolfilePath,
+        dir: null
+      };
+    }
+  }
+  return toolFile;
+}
+function _scanExternalToolsFile(externalTools) {
+  const toolFiles = [];
+  externalTools.forEach((filePath) => {
+    const toolFile = _scanToolsFile(filePath);
+    if (toolFile) {
+      toolFiles.push(toolFile);
+    }
+  });
+  return toolFiles;
+}
 function _scanUserToolsFile() {
   const toolFiles = [];
   const scanPaths = getScanDirPaths();
@@ -24803,45 +24853,18 @@ function _scanUserToolsFile() {
     if (import_fs_extra8.default.pathExistsSync(toolsDir)) {
       const files = import_fs_extra8.default.readdirSync(toolsDir);
       files.forEach((file2) => {
-        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.js" || f === "index.cjs");
-          if (indexFile) {
-            const filePath = _scanDeepFishJsFile(import_path8.default.resolve(subDirPath, indexFile), indexFile);
-            if (filePath) {
-              toolFiles.push({
-                filePath,
-                dir: subDirPath
-              });
-            }
-          } else {
-            subFiles.forEach((subFile) => {
-              const filePath = _scanDeepFishJsFile(import_path8.default.resolve(subDirPath, subFile), subFile);
-              if (filePath) {
-                toolFiles.push({
-                  filePath,
-                  dir: subDirPath
-                });
-              }
-            });
-          }
-        } else {
-          const filePath = _scanDeepFishJsFile(toolsDir, file2);
-          if (filePath) {
-            toolFiles.push({
-              filePath,
-              dir: null
-            });
-          }
+        const filePath = import_path8.default.resolve(toolsDir, file2);
+        const toolFile = _scanToolsFile(filePath);
+        if (toolFile) {
+          toolFiles.push(toolFile);
         }
       });
     }
   });
   return toolFiles;
 }
-function _scanDeepFishJsFile(filePath, fileName) {
-  if (fileName.endsWith(".js") || fileName.endsWith(".cjs")) {
+function _scanDeepFishJsFile(filePath) {
+  if (filePath.endsWith(".js") || filePath.endsWith(".cjs")) {
     const fileContent = import_fs_extra8.default.readFileSync(filePath, "utf-8");
     if (fileContent.includes("module.exports") && fileContent.includes("descriptions") && fileContent.includes("functions")) {
       return filePath;
@@ -24941,20 +24964,17 @@ var import_fs_extra9 = __toESM(require("fs-extra"));
 
 // src/agent/tools/subAgent.ts
 var import_langchain4 = require("langchain");
-async function subAgentExec(prompt, runtime) {
+async function subAgentExec(systemPrompt, 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);
+  return curAgent && curAgent.subExecute(systemPrompt, prompt);
 }
 var subAgentTool = (0, import_langchain4.tool)(
-  async ({ prompt }, runtime) => safeTool(() => subAgentExec(prompt, runtime)),
+  async ({ systemPrompt, prompt }, runtime) => safeTool(() => subAgentExec(systemPrompt, 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({
+      systemPrompt: external_exports.string().min(1).describe("\u5B50 agent \u7684\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF0C\u5B9A\u4E49\u5176\u89D2\u8272\u548C\u884C\u4E3A\u89C4\u8303"),
       prompt: external_exports.string().min(1).describe("\u4EA4\u7ED9\u901A\u7528\u5B50 agent \u6267\u884C\u7684\u5B8C\u6574\u4EFB\u52A1\u63CF\u8FF0")
     })
   }
@@ -25035,7 +25055,7 @@ var installPackageTool = (0, import_langchain5.tool)(
 );
 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
+  description: `\u6267\u884C\u4E00\u6BB5Node.js\u4EE3\u7801\u5E76\u8FD4\u56DE\u6267\u884C\u7ED3\u679C\u3002\u6CE8\u610F\uFF1A1.\u5982\u679C\u4EE3\u7801\u4E2D\u4F7F\u7528\u7B2C\u4E09\u65B9\u4F9D\u8D56\u5FC5\u987B\u5148\u4F7F\u7528check_package_installed\u5DE5\u5177\u68C0\u67E5\u5305\u662F\u5426\u5B89\u88C5\uFF0C\u5982\u679C\u672A\u5B89\u88C5\u9700\u8981\u6267\u884Cinstall_package\u5DE5\u5177\u5B89\u88C5\u6307\u5B9A\u7684npm\u5305;2.\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
@@ -25731,7 +25751,10 @@ Commands:
   ai skills generate xxx            \u6839\u636E\u63CF\u8FF0\u751F\u6210\u4E00\u4E2A\u65B0\u7684\u6280\u80FD\u6A21\u677F
 
   # Tools commands
+  ai tools ls                       \u67E5\u770B\u5DF2\u5B89\u88C5\u6216\u5DF2\u914D\u7F6E\u7684\u5DE5\u5177\u5217\u8868
   ai tools dir                      \u6253\u5F00\u6216\u8F93\u51FA\u7528\u6237\u81EA\u5B9A\u4E49\u5DE5\u5177\u76EE\u5F55
+  ai tools add <name>               \u6DFB\u52A0\u6307\u5B9A\u540D\u79F0\u7684\u5DE5\u5177
+  ai tools del <index>              \u5220\u9664\u6307\u5B9A\u5E8F\u53F7\u7684\u81EA\u5B9A\u4E49\u5DE5\u5177
   ai tools generate xxx             \u6839\u636E\u63CF\u8FF0\u751F\u6210\u4E00\u4E2A\u65B0\u7684\u5DE5\u5177\u6A21\u677F
 
   # Session commands
@@ -25743,9 +25766,16 @@ Commands:
   ai task add <task>                \u5411\u4EFB\u52A1\u961F\u5217\u6DFB\u52A0\u4E00\u4E2A\u540E\u7EED\u4EFB\u52A1
   ai task del <index>               \u5220\u9664\u6307\u5B9A\u5E8F\u53F7\u7684\u4EFB\u52A1
   ai task clear                     \u6E05\u7A7A\u5F53\u524D\u4EFB\u52A1\u961F\u5217
+
+  # Plan commands
+  ai plan-do <\u4EFB\u52A1\u63CF\u8FF0>              \u5C06\u590D\u6742\u4EFB\u52A1\u62C6\u89E3\u4E3A\u5B50\u4EFB\u52A1\u5E76\u9010\u6B65\u6267\u884C\u5B8C\u6210
+  ai plan-continue                   \u7EE7\u7EED\u6267\u884C\u88AB\u4E2D\u65AD\u7684 plan-do \u4EFB\u52A1
   
   # MCP commands
   ai mcp edit                       \u6253\u5F00 MCP \u914D\u7F6E\u6587\u4EF6\u8FDB\u884C\u7F16\u8F91
+  ai mcp ls                         \u67E5\u770B\u5DF2\u914D\u7F6E\u7684 MCP \u670D\u52A1\u5668\u5217\u8868
+  ai mcp enable <name|index>        \u542F\u7528\u6307\u5B9A\u540D\u79F0\u6216\u5E8F\u53F7\u7684 MCP \u670D\u52A1\u5668
+  ai mcp disable <name|index>       \u7981\u7528\u6307\u5B9A\u540D\u79F0\u6216\u5E8F\u53F7\u7684 MCP \u670D\u52A1\u5668
   
   # Serve commands
   ai serve                          \u542F\u52A8\u670D\u52A1\u6216\u8FDB\u5165\u670D\u52A1\u7BA1\u7406\u5165\u53E3
@@ -25833,14 +25863,14 @@ var builtinTools = [
   ...learnTools,
   ...fishInfoTools
 ];
-async function getTools(excludeTools, excludeMCP) {
-  return [...builtinTools, ...await scanUserTools(excludeTools), ...await scanUserMcp(excludeMCP)];
+async function getTools(excludeTools, excludeMCP, externalTools = []) {
+  return [...builtinTools, ...await scanUserTools(excludeTools, externalTools), ...await scanUserMcp(excludeMCP)];
 }
 
 // src/agent/skills/index.ts
 var import_path17 = __toESM(require("path"));
 function getSkills() {
-  return [...getRegisteredSkills(), import_path17.default.join(__dirname, "./view-learn-cache.md")];
+  return [...getRegisteredSkills(), import_path17.default.join(__dirname, "./skills/view-learn-cache.md"), import_path17.default.join(__dirname, "./skills/generate-skill.md"), import_path17.default.join(__dirname, "./skills/generate-tool.md")];
 }
 
 // src/agent/AIAgent/index.ts
@@ -25897,8 +25927,8 @@ var SubAIAgent = class _SubAIAgent extends import_eventemitter_super.EventEmitte
     if (this.subLevel > 2) {
       this.excludeTools.push("subAgent_exec");
     }
-    this.tools = await getTools(this.excludeTools, this.excludeMCP);
-    this.skills = [...getSkills(), ...this.opt.skills || []];
+    this.tools = await getTools(this.excludeTools, this.excludeMCP, this.opt.externalTools);
+    this.skills = [...getSkills(), ...this.opt.externalSkills || []];
     const model = getModel(this.opt.modelOpt);
     const checkpointer = new FileSystemSaver({
       rootFolder: this.sessionDirPath
@@ -25919,7 +25949,13 @@ var SubAIAgent = class _SubAIAgent extends import_eventemitter_super.EventEmitte
       memoryFilePath: this.memoryFilePath,
       agentRulesPath: this.agentRulesPath,
       excludeSkills: this.excludeSkills
-    }) : subSystemPrompt(this.workspace, import_os3.default.platform(), this.skills, this.excludeSkills);
+    }) : subSystemPrompt({
+      systemPrompt: this.systemPrompt,
+      workspace: this.workspace,
+      osType: import_os3.default.platform(),
+      skills: this.skills,
+      excludeSkills: this.excludeSkills
+    });
     const agent = (0, import_langchain18.createAgent)({
       model,
       checkpointer,
@@ -25932,14 +25968,6 @@ var SubAIAgent = class _SubAIAgent extends import_eventemitter_super.EventEmitte
           trigger: { tokens: this.opt.modelOpt.maxContextLength || 1e5 },
           keep: { messages: 50 }
         }),
-        (0, import_langchain18.humanInTheLoopMiddleware)({
-          interruptOn: {
-            install_package: {
-              allowedDecisions: ["approve", "reject"]
-            },
-            readEmailTool: false
-          }
-        }),
         (0, import_langchain18.todoListMiddleware)(),
         (0, import_deepagents.createPatchToolCallsMiddleware)()
       ],
@@ -25974,6 +26002,9 @@ var SubAIAgent = class _SubAIAgent extends import_eventemitter_super.EventEmitte
         resolve(msg);
       });
       for await (const [_namespace, mode, data] of stream) {
+        if (Array.isArray(_namespace) && _namespace.length > 0) {
+          continue;
+        }
         if (mode === "messages") {
           const message = data[0].additional_kwargs.reasoning_content;
           this.emit("STREAM_CONTENT_OUTPUT" /* STREAM_CONTENT_OUTPUT */, message);
@@ -26089,8 +26120,8 @@ var AIAgent = class extends import_eventemitter_super2.EventEmitterSuper {
     this.maxSubAgentCount = opt.maxSubAgentCount || 2;
   }
   async init() {
-    this.tools = await getTools(this.excludeTools, this.excludeMCP);
-    this.skills = [...getSkills(), ...this.opt.skills || []];
+    this.tools = await getTools(this.excludeTools, this.excludeMCP, this.opt.externalTools);
+    this.skills = [...getSkills(), ...this.opt.externalSkills || []];
     const model = getModel(this.opt.modelOpt);
     const checkpointer = new FileSystemSaver({
       rootFolder: this.sessionDirPath
@@ -26115,14 +26146,6 @@ var AIAgent = class extends import_eventemitter_super2.EventEmitterSuper {
           trigger: { tokens: this.opt.modelOpt.maxContextLength || 1e5 },
           keep: { messages: 50 }
         }),
-        (0, import_langchain19.humanInTheLoopMiddleware)({
-          interruptOn: {
-            install_package: {
-              allowedDecisions: ["approve", "reject"]
-            },
-            readEmailTool: false
-          }
-        }),
         (0, import_langchain19.todoListMiddleware)(),
         (0, import_deepagents2.createPatchToolCallsMiddleware)()
       ],
@@ -26162,6 +26185,9 @@ var AIAgent = class extends import_eventemitter_super2.EventEmitterSuper {
       }
     );
     for await (const [_namespace, mode, data] of stream) {
+      if (Array.isArray(_namespace) && _namespace.length > 0) {
+        continue;
+      }
       if (mode === "messages") {
         const message = data?.[0];
         const reasoning_content = message?.additional_kwargs?.reasoning_content;
@@ -26227,11 +26253,16 @@ var AIAgent = class extends import_eventemitter_super2.EventEmitterSuper {
     this.on("USE_TOOL_AFTER" /* USE_TOOL_AFTER */, (_toolId, _funcName, _funcArgs) => {
     });
   }
-  async createSubAgent() {
+  async createSubAgent(systemPrompt) {
     const subAgent = new SubAIAgent(this.opt);
+    systemPrompt && (subAgent.systemPrompt = systemPrompt);
     await subAgent.init();
     return subAgent;
   }
+  async subExecute(systemPrompt, prompt) {
+    const subAgent = await this.createSubAgent(systemPrompt);
+    return subAgent.execute(prompt);
+  }
   destory() {
     this.removeAllListeners();
   }
@@ -26484,7 +26515,7 @@ async function initAgent(config2, skills) {
     // CLI encoding format, can be set to utf-8, gbk, etc., or left empty for auto-detection
     maxSubAgentCount: config2.maxSubAgentCount,
     // Maximum parallel sub-agent execution count, -1 means unlimited
-    skills,
+    externalSkills: skills,
     isPrintThinking: config2.isPrintThinking
     // Whether to print intermediate information during AI thinking, default is true
   });
@@ -26680,7 +26711,11 @@ function handleSkillsLs() {
     logInfo("No skills registered yet");
   } else {
     skills.forEach((skill, index) => {
-      logInfo(`[${index}] ${skill.name} (${skill.isEnabled ? "enabled" : "disabled"})`);
+      if (skill.isEnabled) {
+        logSuccess(`[${index}] ${skill.name} [\u221A]`);
+      } else {
+        logInfo(`[${index}] ${skill.name} [\xD7]`);
+      }
     });
   }
   logInfo("=".repeat(50));
@@ -26814,7 +26849,7 @@ async function handleSkillsGenerate(target) {
       logError("Failed to start service, please check config or port availability");
       return;
     }
-    const generateSkillPath = import_path20.default.join(__dirname, "./generate-skill.md");
+    const generateSkillPath = import_path20.default.join(__dirname, "./skills/generate-skill.md");
     const agent = await initAgent(config2, [generateSkillPath]);
     const prompt = `\u8BF7\u6839\u636E\u4EE5\u4E0B\u9700\u6C42\u751F\u6210\u4E00\u4E2ASkill\u6A21\u5757\uFF1A${target}
 
@@ -26848,11 +26883,13 @@ function _scanSkills(skillsDir) {
 }
 function _updateRegister(skillsDir) {
   const registerPath = _getRegisterPath(skillsDir);
-  if (import_fs_extra20.default.existsSync(skillsDir) && !import_fs_extra20.default.existsSync(registerPath)) {
-    import_fs_extra20.default.writeJSONSync(registerPath, [], { spaces: 2 });
-  } else if (!import_fs_extra20.default.existsSync(skillsDir)) {
+  if (!import_fs_extra20.default.existsSync(skillsDir)) {
     return;
   }
+  if (!import_fs_extra20.default.existsSync(registerPath)) {
+    import_fs_extra20.default.ensureDirSync(import_path20.default.dirname(registerPath));
+    import_fs_extra20.default.writeJSONSync(registerPath, [], { spaces: 2 });
+  }
   const skills = _scanSkills(skillsDir);
   let register = import_fs_extra20.default.readJSONSync(registerPath);
   const newRegister = [];
@@ -26860,11 +26897,15 @@ function _updateRegister(skillsDir) {
     const skillName = import_path20.default.basename(skillPath);
     const existItem = register.find((item) => item.skillPath === skillPath);
     if (!existItem) {
+      let skillFilePath = skillPath;
+      if (import_fs_extra20.default.statSync(skillPath).isDirectory()) {
+        skillFilePath = import_path20.default.join(skillFilePath, "SKILL.md");
+      }
       newRegister.push({
         id: (0, import_crypto6.randomUUID)(),
         name: skillName,
         isEnabled: true,
-        skillPath
+        skillPath: skillFilePath
       });
     }
   });
@@ -26876,8 +26917,9 @@ function getRegisteredSkills() {
   const scanPaths = getScanDirPaths();
   const skills = [];
   scanPaths.forEach((scanPath) => {
-    _updateRegister(scanPath);
-    const registerPath = _getRegisterPath(scanPath);
+    const scanDir = import_path20.default.join(scanPath, "skills");
+    _updateRegister(scanDir);
+    const registerPath = _getRegisterPath(scanDir);
     if (import_fs_extra20.default.existsSync(registerPath)) {
       const register = import_fs_extra20.default.readJSONSync(registerPath);
       register.forEach((item) => {
@@ -26903,7 +26945,8 @@ function _getAllSkills() {
   const scanPaths = getScanDirPaths();
   let allSkills = [];
   scanPaths.forEach((scanPath) => {
-    const skills = _getSkillList(scanPath);
+    const scanDir = import_path20.default.join(scanPath, "skills");
+    const skills = _getSkillList(scanDir);
     skills.map((item) => {
       item.skillDir = scanPath;
       return item;
@@ -26913,10 +26956,12 @@ function _getAllSkills() {
   return allSkills;
 }
 function _getRegisterPath(skillsDir) {
-  if (skillsDir.endsWith("@deepfish-ai")) {
-    return import_path20.default.join(skillsDir, "register.json");
+  const normalizedDir = import_path20.default.normalize(skillsDir);
+  const baseName = import_path20.default.basename(normalizedDir).toLowerCase();
+  if (baseName === "@deepfish-ai" || baseName === "skills") {
+    return import_path20.default.join(normalizedDir, "register.json");
   }
-  return import_path20.default.join(skillsDir, "skills", "register.json");
+  return import_path20.default.join(normalizedDir, "skills", "register.json");
 }
 
 // src/cli/cli-skills.ts
@@ -27034,7 +27079,7 @@ async function handleToolsGenerate(target) {
       logError("Failed to start service, please check config or port availability");
       return;
     }
-    const generateSkillPath = import_path21.default.join(__dirname, "./generate-tool.md");
+    const generateSkillPath = import_path21.default.join(__dirname, "./skills/generate-tool.md");
     const agent = await initAgent(config2, [generateSkillPath]);
     const prompt = `Please use the "generate-tool" SKILL to generate a tool module according to the following requirements: ${target}
 
@@ -27170,21 +27215,92 @@ function registerTaskCommands(program) {
 }
 
 // src/cli/cli-core/mcp.ts
+var import_fs_extra22 = __toESM(require("fs-extra"));
 function handleMcpEdit() {
   const mcpPath = getMCPFilePath();
   editFile(mcpPath);
 }
+function readMcpConfig() {
+  const mcpPath = getMCPFilePath();
+  return import_fs_extra22.default.readJSONSync(mcpPath);
+}
+function writeMcpConfig(data) {
+  const mcpPath = getMCPFilePath();
+  import_fs_extra22.default.writeJSONSync(mcpPath, data, { spaces: 2 });
+}
+function handleMcpLs() {
+  const config2 = readMcpConfig();
+  const servers = config2.mcpServers || {};
+  const entries = Object.entries(servers);
+  if (entries.length === 0) {
+    logWarning("No MCP servers configured yet");
+    return;
+  }
+  logInfo("=".repeat(50));
+  entries.forEach(([name, server], index) => {
+    const disabled = server.disabled === true;
+    if (disabled) {
+      logInfo(`[${index}] ${name} [\xD7]`);
+    } else {
+      logSuccess(`[${index}] ${name} [\u221A]`);
+    }
+  });
+  logInfo("=".repeat(50));
+}
+function handleMcpEnable(nameOrIndex) {
+  const config2 = readMcpConfig();
+  const servers = config2.mcpServers || {};
+  const entries = Object.keys(servers);
+  let targetIndex = -1;
+  const index = parseInt(nameOrIndex, 10);
+  if (!isNaN(index) && index >= 0 && index < entries.length) {
+    targetIndex = index;
+  } else {
+    targetIndex = entries.findIndex((name) => name === nameOrIndex);
+  }
+  if (targetIndex === -1) {
+    logError(`MCP server not found: ${nameOrIndex}`);
+    return;
+  }
+  const serverName = entries[targetIndex];
+  servers[serverName].disabled = false;
+  writeMcpConfig(config2);
+  logSuccess(`MCP server "${serverName}" enabled`);
+}
+function handleMcpDisable(nameOrIndex) {
+  const config2 = readMcpConfig();
+  const servers = config2.mcpServers || {};
+  const entries = Object.keys(servers);
+  let targetIndex = -1;
+  const index = parseInt(nameOrIndex, 10);
+  if (!isNaN(index) && index >= 0 && index < entries.length) {
+    targetIndex = index;
+  } else {
+    targetIndex = entries.findIndex((name) => name === nameOrIndex);
+  }
+  if (targetIndex === -1) {
+    logError(`MCP server not found: ${nameOrIndex}`);
+    return;
+  }
+  const serverName = entries[targetIndex];
+  servers[serverName].disabled = true;
+  writeMcpConfig(config2);
+  logSuccess(`MCP server "${serverName}" disabled`);
+}
 
 // src/cli/cli-mcp.ts
 function registerMcpCommands(program) {
   const mcp = program.command("mcp");
   mcp.command("edit").description("\u7F16\u8F91 MCP \u914D\u7F6E\u6587\u4EF6").action(handleMcpEdit);
+  mcp.command("ls").description("\u5217\u51FA\u6240\u6709 MCP \u670D\u52A1\u5668").action(handleMcpLs);
+  mcp.command("enable <nameOrIndex>").description("\u542F\u7528 MCP \u670D\u52A1\u5668").action(handleMcpEnable);
+  mcp.command("disable <nameOrIndex>").description("\u7981\u7528 MCP \u670D\u52A1\u5668").action(handleMcpDisable);
 }
 
 // src/cli/cli-core/input.ts
-var import_fs_extra22 = __toESM(require("fs-extra"));
+var import_fs_extra23 = __toESM(require("fs-extra"));
 var readline = __toESM(require("readline"));
-async function handleInput(args) {
+async function handleInput(args, skills) {
   const input = args.join(" ");
   if (!input.trim()) {
     logError("Please enter content");
@@ -27192,7 +27308,7 @@ async function handleInput(args) {
   }
   try {
     const configPath = getConfigPath();
-    if (!import_fs_extra22.default.pathExistsSync(configPath)) {
+    if (!import_fs_extra23.default.pathExistsSync(configPath)) {
       logError("Config file not found, please run init first");
       return;
     }
@@ -27207,7 +27323,7 @@ async function handleInput(args) {
       logError("Failed to start service, please check config or port availability");
       return;
     }
-    const agent = await initAgent(config2);
+    const agent = await initAgent(config2, skills);
     const connResult = await connectAgentRoom(agent);
     if (!connResult.ok) {
       if (connResult.reason === "duplicate-id") {
@@ -27229,7 +27345,7 @@ async function handleInput(args) {
 async function multiInput() {
   try {
     const configPath = getConfigPath();
-    if (!import_fs_extra22.default.pathExistsSync(configPath)) {
+    if (!import_fs_extra23.default.pathExistsSync(configPath)) {
       logError("Config file not found, please run init first");
       return;
     }
@@ -27286,6 +27402,53 @@ async function multiInput() {
   }
 }
 
+// src/cli/cli-core/plan.ts
+var import_path22 = __toESM(require("path"));
+async function handlePlan(args) {
+  const input = args.join(" ");
+  if (!input.trim()) {
+    logError("Please enter content");
+    return;
+  }
+  const skillPrompt = `\u4F7F\u7528SKILL-"planning-do"\u5C06\u7528\u6237\u4EFB\u52A1\u5206\u89E3\u5E76\u5B8C\u6210\uFF0C\u4EE5\u4E0B\u662F\u7528\u6237\u76EE\u6807\uFF1A${input}`;
+  const skillPath = import_path22.default.join(__dirname, "./skills/planning-do.md");
+  await handleInput([skillPrompt], [skillPath]);
+}
+async function handlePlanContinue() {
+  const skillPrompt = `
+\u76EE\u524D\u4EFB\u52A1\u6267\u884C\u4E86\u4E00\u90E8\u5206\uFF0C\u9700\u8981\u7EE7\u7EED\u6267\u884C\u3002\u4F60\u8D1F\u8D23\u6309\u987A\u5E8F\u8C03\u5EA6\u6267\u884C tmp_tasklist.json \u4E2D\u7684\u5B50\u4EFB\u52A1\uFF0C\u5B8C\u6210 tmp_task_goal.md \u63CF\u8FF0\u7684\u6574\u4F53\u76EE\u6807\u3002
+
+\u6267\u884C\u89C4\u5219\uFF1A
+1. \u5148\u8BFB\u53D6 tmp_task_goal.md \u4E86\u89E3\u6574\u4F53\u76EE\u6807\uFF1B
+2. \u8BFB\u53D6 tmp_tasklist.json\uFF0C\u4EC5\u5904\u7406 status \u4E3A "todo" \u6216 "doing" \u7684\u4EFB\u52A1\uFF1B
+3. \u6BCF\u6B21\u901A\u8FC7\u521B\u5EFA\u5B50Agent\u53EA\u8C03\u5EA6\u4E00\u4E2A\u5B50\u4EFB\u52A1\uFF0C\u6309\u5217\u8868\u987A\u5E8F\u4F9D\u6B21\u6267\u884C\uFF1B
+4. \u8C03\u5EA6\u524D\u5C06\u5F53\u524D\u4EFB\u52A1 status \u66F4\u65B0\u4E3A "doing" \u5E76\u5199\u56DE\u6587\u4EF6\uFF1B
+5. \u5BF9\u6BCF\u4E2A\u5B50\u4EFB\u52A1\uFF0C\u5FC5\u987B\u521B\u5EFA\u4E00\u4E2A\u72EC\u7ACB\u7684\u5B50 Agent \u6765\u6267\u884C\uFF0C\u4E0D\u8981\u5728\u4E3B\u6D41\u7A0B\u4E2D\u76F4\u63A5\u5B8C\u6210\u5177\u4F53\u4EFB\u52A1\uFF1B
+6. \u521B\u5EFA\u5B50 Agent \u65F6\uFF0C\u5C06\u6574\u4F53\u76EE\u6807\u3001\u5F53\u524D\u5B50\u4EFB\u52A1 id/name/description\u3001tmp_tasklist.json \u6587\u4EF6\u540D\u548C\u6267\u884C\u8981\u6C42\u4E00\u5E76\u4F20\u5165\uFF1B
+7. \u5B50 Agent \u6267\u884C\u6210\u529F\u540E\uFF0C\u5C06\u5F53\u524D\u4EFB\u52A1 status \u66F4\u65B0\u4E3A "done"\uFF0C\u5E76\u8BB0\u5F55 finishedAt\uFF08ISO \u65F6\u95F4\uFF09\uFF1B
+8. \u5B50 Agent \u6267\u884C\u5931\u8D25\u65F6\uFF0C\u5C06\u5F53\u524D\u4EFB\u52A1\u4FDD\u7559\u4E3A "doing" \u6216\u56DE\u9000\u4E3A "todo"\uFF0C\u5E76\u5728 note \u4E2D\u8BB0\u5F55\u5931\u8D25\u539F\u56E0\uFF1B
+9. \u6BCF\u5B8C\u6210\u6216\u5931\u8D25\u4E00\u4E2A\u5B50\u4EFB\u52A1\uFF0C\u90FD\u5FC5\u987B\u7ACB\u5373\u5199\u56DE tmp_tasklist.json\uFF1B
+10. \u5168\u90E8\u4EFB\u52A1\u5B8C\u6210\u540E\uFF0C\u5220\u9664 tmp_tasklist.json \u548C tmp_task_goal.md\u3002
+
+\u5B50 Agent \u6267\u884C\u8981\u6C42\uFF1A
+- \u53EA\u6267\u884C\u5F53\u524D\u88AB\u5206\u914D\u7684\u4E00\u4E2A\u5B50\u4EFB\u52A1\uFF0C\u4E0D\u8981\u4FEE\u6539\u5176\u4ED6\u4EFB\u52A1\u72B6\u6001\uFF1B
+- \u6267\u884C\u524D\u9605\u8BFB tmp_task_goal.md\uFF0C\u7406\u89E3\u6574\u4F53\u76EE\u6807\uFF1B
+- \u5FC5\u8981\u65F6\u9605\u8BFB tmp_tasklist.json\uFF0C\u4E86\u89E3\u4E0A\u4E0B\u6587\u548C\u4EFB\u52A1\u4F9D\u8D56\uFF1B
+- \u5B8C\u6210\u540E\u5411\u4E3B Agent \u8FD4\u56DE\u6267\u884C\u7ED3\u679C\u3001\u4FEE\u6539\u7684\u6587\u4EF6\u3001\u5931\u8D25\u539F\u56E0\u6216\u540E\u7EED\u5EFA\u8BAE\u3002
+
+\u8F93\u51FA\u8981\u6C42\uFF1A
+- \u8F93\u51FA\u5F53\u524D\u8C03\u5EA6\u7684\u4EFB\u52A1 id\u3001\u540D\u79F0\u3001\u6267\u884C\u7ED3\u679C\u72B6\u6001\u548C\u4E0B\u4E00\u6B65\u8BA1\u5212\uFF1B
+- \u4E0D\u8981\u8DF3\u8FC7\u72B6\u6001\u66F4\u65B0\u548C\u6587\u4EF6\u5199\u5165\u6B65\u9AA4\u3002
+    `;
+  await handleInput([skillPrompt]);
+}
+
+// src/cli/cli-plan.ts
+function registerPlanCommands(program) {
+  program.command("plan-do").description("\u5C06\u590D\u6742\u4EFB\u52A1\u62C6\u89E3\u4E3A\u5B50\u4EFB\u52A1\u5E76\u9010\u6B65\u6267\u884C\u5B8C\u6210").argument("[input...]", "\u4EFB\u52A1\u63CF\u8FF0").action((input) => handlePlan(input));
+  program.command("plan-continue").description("\u7EE7\u7EED\u6267\u884C\u88AB\u4E2D\u65AD\u7684 plan-do \u4EFB\u52A1").action(() => handlePlanContinue());
+}
+
 // src/cli/cli-input.ts
 function registerInputCommand(program) {
   program.argument("[inputs...]", "Natural language instruction or enter interactive mode").action(async (inputs) => {
@@ -27299,7 +27462,7 @@ function registerInputCommand(program) {
 }
 
 // src/cli/cli-core/cache.ts
-var import_path22 = __toESM(require("path"));
+var import_path23 = __toESM(require("path"));
 var userCache2 = new UserCache();
 function resolveId(input) {
   const index = Number(input);
@@ -27333,7 +27496,7 @@ function handleCacheList() {
 function handleCacheEdit(input) {
   const id = resolveId(input);
   if (!id) return;
-  const filePath = import_path22.default.join(getUserStorePath(), `${id}.md`);
+  const filePath = import_path23.default.join(getUserStorePath(), `${id}.md`);
   editFile(filePath);
 }
 function handleCacheDel(input) {
@@ -27378,6 +27541,7 @@ function main() {
   registerTaskCommands(program);
   registerCommonFlags(program);
   registerMcpCommands(program);
+  registerPlanCommands(program);
   registerCacheCommands(program);
   registerHelpCommand(program);
   registerInputCommand(program);

package/dist/serve/pm2-server.js

@@ -23510,20 +23510,17 @@ var import_fs_extra7 = __toESM(require("fs-extra"));
 
 // src/agent/tools/subAgent.ts
 var import_langchain4 = require("langchain");
-async function subAgentExec(prompt, runtime) {
+async function subAgentExec(systemPrompt, 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);
+  return curAgent && curAgent.subExecute(systemPrompt, prompt);
 }
 var subAgentTool = (0, import_langchain4.tool)(
-  async ({ prompt }, runtime) => safeTool(() => subAgentExec(prompt, runtime)),
+  async ({ systemPrompt, prompt }, runtime) => safeTool(() => subAgentExec(systemPrompt, 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({
+      systemPrompt: external_exports.string().min(1).describe("\u5B50 agent \u7684\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF0C\u5B9A\u4E49\u5176\u89D2\u8272\u548C\u884C\u4E3A\u89C4\u8303"),
       prompt: external_exports.string().min(1).describe("\u4EA4\u7ED9\u901A\u7528\u5B50 agent \u6267\u884C\u7684\u5B8C\u6574\u4EFB\u52A1\u63CF\u8FF0")
     })
   }
@@ -23604,7 +23601,7 @@ var installPackageTool = (0, import_langchain5.tool)(
 );
 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
+  description: `\u6267\u884C\u4E00\u6BB5Node.js\u4EE3\u7801\u5E76\u8FD4\u56DE\u6267\u884C\u7ED3\u679C\u3002\u6CE8\u610F\uFF1A1.\u5982\u679C\u4EE3\u7801\u4E2D\u4F7F\u7528\u7B2C\u4E09\u65B9\u4F9D\u8D56\u5FC5\u987B\u5148\u4F7F\u7528check_package_installed\u5DE5\u5177\u68C0\u67E5\u5305\u662F\u5426\u5B89\u88C5\uFF0C\u5982\u679C\u672A\u5B89\u88C5\u9700\u8981\u6267\u884Cinstall_package\u5DE5\u5177\u5B89\u88C5\u6307\u5B9A\u7684npm\u5305;2.\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
@@ -24218,7 +24215,10 @@ Commands:
   ai skills generate xxx            \u6839\u636E\u63CF\u8FF0\u751F\u6210\u4E00\u4E2A\u65B0\u7684\u6280\u80FD\u6A21\u677F
 
   # Tools commands
+  ai tools ls                       \u67E5\u770B\u5DF2\u5B89\u88C5\u6216\u5DF2\u914D\u7F6E\u7684\u5DE5\u5177\u5217\u8868
   ai tools dir                      \u6253\u5F00\u6216\u8F93\u51FA\u7528\u6237\u81EA\u5B9A\u4E49\u5DE5\u5177\u76EE\u5F55
+  ai tools add <name>               \u6DFB\u52A0\u6307\u5B9A\u540D\u79F0\u7684\u5DE5\u5177
+  ai tools del <index>              \u5220\u9664\u6307\u5B9A\u5E8F\u53F7\u7684\u81EA\u5B9A\u4E49\u5DE5\u5177
   ai tools generate xxx             \u6839\u636E\u63CF\u8FF0\u751F\u6210\u4E00\u4E2A\u65B0\u7684\u5DE5\u5177\u6A21\u677F
 
   # Session commands
@@ -24230,9 +24230,16 @@ Commands:
   ai task add <task>                \u5411\u4EFB\u52A1\u961F\u5217\u6DFB\u52A0\u4E00\u4E2A\u540E\u7EED\u4EFB\u52A1
   ai task del <index>               \u5220\u9664\u6307\u5B9A\u5E8F\u53F7\u7684\u4EFB\u52A1
   ai task clear                     \u6E05\u7A7A\u5F53\u524D\u4EFB\u52A1\u961F\u5217
+
+  # Plan commands
+  ai plan-do <\u4EFB\u52A1\u63CF\u8FF0>              \u5C06\u590D\u6742\u4EFB\u52A1\u62C6\u89E3\u4E3A\u5B50\u4EFB\u52A1\u5E76\u9010\u6B65\u6267\u884C\u5B8C\u6210
+  ai plan-continue                   \u7EE7\u7EED\u6267\u884C\u88AB\u4E2D\u65AD\u7684 plan-do \u4EFB\u52A1
   
   # MCP commands
   ai mcp edit                       \u6253\u5F00 MCP \u914D\u7F6E\u6587\u4EF6\u8FDB\u884C\u7F16\u8F91
+  ai mcp ls                         \u67E5\u770B\u5DF2\u914D\u7F6E\u7684 MCP \u670D\u52A1\u5668\u5217\u8868
+  ai mcp enable <name|index>        \u542F\u7528\u6307\u5B9A\u540D\u79F0\u6216\u5E8F\u53F7\u7684 MCP \u670D\u52A1\u5668
+  ai mcp disable <name|index>       \u7981\u7528\u6307\u5B9A\u540D\u79F0\u6216\u5E8F\u53F7\u7684 MCP \u670D\u52A1\u5668
   
   # Serve commands
   ai serve                          \u542F\u52A8\u670D\u52A1\u6216\u8FDB\u5165\u670D\u52A1\u7BA1\u7406\u5165\u53E3

package/dist/{generate-skill.md → skills/generate-skill.md}

@@ -18,7 +18,7 @@ homepage: ''
 
 1. **目录创建**：在当前工作目录下新建一个子目录，目录名称应简洁明了地反映 Skill 功能（如 `web-scraper`、`code-reviewer`、`image-optimizer` 等）
 2. **核心文件**：目录中必须包含 `SKILL.md` 文件（文件名大小写敏感，必须为 `SKILL.md`）
-3. **辅助文件**：如果 Skill 涉及复杂逻辑，可在目录中创建辅助脚本文件（如 `.js`、`.sh`、`.py` 等），并在 `SKILL.md` 中说明其用途和调用方式；如果是 js 文件，可以在函数中通过 `this.Tools` 调用内置函数，如直接使用 `this.Tools.createSubAgent(workGoal)`
+3. **辅助文件**：如果 Skill 涉及复杂逻辑，可在目录中创建辅助脚本文件（如 `.js`、`.sh`、`.py` 等），并在 `SKILL.md` 中说明其用途和调用方式；如果是 js 文件，可以在函数中通过 `this.Tools` 调用内置函数，如直接使用 `this.Tools.createSubAgent(systemPrompt:string, workGoal:string)`
 
 #### 标准目录结构
 

package/dist/{generate-tool.md → skills/generate-tool.md}

@@ -85,7 +85,7 @@ module.exports = { functions, descriptions };
 1. 理解用户要生成的工具功能
 2. 在当前工作目录下创建 `deepfish-tool-{功能名}/` 目录
 3. 编写 `index.js`，导出 `functions` 和 `descriptions`
-4. 对于需要Agent参与的复杂任务，可以直接使用 `this.createSubAgent(prompt: string)` 创建子 Agent 执行任务，并将任务说明作为 `prompt` 传入
+4. 对于需要Agent参与的复杂任务，可以直接使用 `this.createSubAgent(systemPrompt: string, prompt: string)` 创建子 Agent 执行任务，并将任务说明作为 `prompt` 传入
 5. 需要引入第三方模块时，需要将该tool创建成NodeJs项目，在tool中引入模块
 
 ## 生成说明文档

package/dist/skills/planning-do.md

@@ -0,0 +1,94 @@
+---
+name: 'planning-do'
+description: '将复杂长任务拆分为子任务，通过子 Agent 逐步执行完成'
+homepage: ''
+---
+
+# 长任务规划执行 Skill
+
+当你收到一个复杂的长任务时，使用本 Skill 将其拆分为可执行的子任务，并通过子 Agent 逐步执行完成。
+
+## 工作流程
+
+整个流程分为两个阶段，**必须按顺序执行**：
+
+### 阶段一：创建任务列表
+
+创建一个子 Agent，传入以下系统提示词，让子 Agent 负责将用户目标拆解为子任务：
+
+**子 Agent 系统提示词：**
+
+```
+你是任务分析专家，负责将用户的目标拆解为可执行的子任务。
+
+工作流程：
+1. 分析用户的任务描述，判断是否足够清晰具体；
+2. 如果用户描述模糊、缺少关键信息或存在多种可能性，**必须与用户交互来收敛需求**：
+   - 使用选择题方式让用户选择（如："项目类型是 A. 前端项目 B. 后端项目 C. 全栈项目？"）
+   - 结合输入框让用户补充具体信息（如："请描述项目的核心功能"）
+   - 一次最多问8个问题，避免一次性问太多
+   - 持续交互直到需求足够清晰，能够拆解为具体的子任务
+3. 将收敛后的完整需求作为用户的原始任务描述；
+4. 在当前目录创建 tmp_task_goal.md，记录收敛后的完整需求描述；
+5. 创建 tmp_tasklist.json，包含拆解后的子任务列表。
+
+tmp_tasklist.json 格式要求：
+- 必须是合法的 JSON 数组
+- 每个任务对象包含以下字段：
+  - id: 任务唯一标识（字符串或数字）
+  - name: 任务名称（简洁明了）
+  - description: 任务详细说明
+  - status: 任务状态，初始为 "todo"
+  - createdAt: 创建时间（ISO 字符串）
+  - finishedAt: 完成时间（未完成时为 null）
+  - note: 备注（可为空字符串）
+
+拆分原则：
+- 任务尽量原子化，每个任务只做一件事
+- 任务之间尽量独立，减少依赖
+- 按执行顺序排列
+
+输出要求：仅输出合法 JSON，不要输出解释文字。
+```
+
+**子 Agent 的用户提示词：** 用户的原始任务描述。
+
+### 阶段二：执行任务列表
+
+创建一个子 Agent 作为调度管理器Agent读取任务列表并负责调度。执行每个子任务时，必须为该子任务再创建一个独立的子 Agent，由子 Agent 完成具体执行工作，调度管理器Agent 只负责状态流转、结果记录和继续调度下一个任务。
+
+**调度管理器子Agent提示词：**
+
+```
+你负责按顺序调度执行 tmp_tasklist.json 中的子任务，完成 tmp_task_goal.md 描述的整体目标。
+
+执行规则：
+1. 先读取 tmp_task_goal.md 了解整体目标；
+2. 读取 tmp_tasklist.json，仅处理 status 为 "todo" 或 "doing" 的任务；
+3. 每次通过创建子Agent只调度一个子任务，按列表顺序依次执行；
+4. 调度前将当前任务 status 更新为 "doing" 并写回文件；
+5. 对每个子任务，必须创建一个独立的子 Agent 来执行，不要在主流程中直接完成具体任务；
+6. 创建子 Agent 时，将整体目标、当前子任务 id/name/description、tmp_tasklist.json 文件名和执行要求一并传入；
+7. 子 Agent 执行成功后，将当前任务 status 更新为 "done"，并记录 finishedAt（ISO 时间）；
+8. 子 Agent 执行失败时，将当前任务保留为 "doing" 或回退为 "todo"，并在 note 中记录失败原因；
+9. 每完成或失败一个子任务，都必须立即写回 tmp_tasklist.json；
+10. 全部任务完成后，删除 tmp_tasklist.json 和 tmp_task_goal.md。
+
+子 Agent 执行要求：
+- 只执行当前被分配的一个子任务，不要修改其他任务状态；
+- 执行前阅读 tmp_task_goal.md，理解整体目标；
+- 必要时阅读 tmp_tasklist.json，了解上下文和任务依赖；
+- 完成后向主 Agent 返回执行结果、修改的文件、失败原因或后续建议。
+
+输出要求：
+- 输出当前调度的任务 id、名称、执行结果状态和下一步计划；
+- 不要跳过状态更新和文件写入步骤。
+```
+
+## 注意事项
+
+1. **必须分两个阶段执行**：先创建任务列表，再执行任务列表，不能合并
+2. **子 Agent 只做一件事**：阶段一只负责拆解任务，阶段二只负责按顺序执行
+3. **文件持久化**：任务状态通过 `tmp_tasklist.json` 文件持久化，子 Agent 崩溃后可以重新读取继续执行
+4. **清理临时文件**：全部任务完成后必须删除 `tmp_tasklist.json` 和 `tmp_task_goal.md`
+5. **原子化执行**：每个子任务只做一件事，执行完立即更新状态并写回文件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepfish-ai",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "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": {
@@ -27,7 +27,7 @@
     "dist/"
   ],
   "scripts": {
-    "build": "tsup && npm run build:ui",
+    "build": "tsup && node -e \"const fs=require('fs-extra'),p=require('path');const src=p.join(process.cwd(),'src/agent/skills'),dst=p.join(process.cwd(),'dist/skills');fs.ensureDirSync(dst);fs.readdirSync(src).filter(f=>f.endsWith('.md')).forEach(f=>fs.copySync(p.join(src,f),p.join(dst,f)))\" && npm run build:ui",
     "build:ui": "vite build && vite build --config vite.server.config.ts",
     "dev": "tsx src/cli/index.ts",
     "format": "prettier --write \"src/**/*.{ts,js,json,css,md}\"",