deepfish-ai 2.0.8 → 2.0.11

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 fs23 = (0, node_1.default)();
+      const fs25 = (0, node_1.default)();
       const handler = (err, buffer) => {
         if (fd) {
-          fs23.closeSync(fd);
+          fs25.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 = fs23.openSync(filepath, "r");
+        fd = fs25.openSync(filepath, "r");
         let sample = Buffer.allocUnsafe(sampleSize);
-        fs23.read(fd, sample, 0, sampleSize, opts.offset, (err, bytesRead) => {
+        fs25.read(fd, sample, 0, sampleSize, opts.offset, (err, bytesRead) => {
           if (err) {
             handler(err, null);
           } else {
@@ -8432,22 +8432,22 @@ var require_lib = __commonJS({
         });
         return;
       }
-      fs23.readFile(filepath, handler);
+      fs25.readFile(filepath, handler);
     });
     exports2.detectFile = detectFile;
     var detectFileSync = (filepath, opts = {}) => {
-      const fs23 = (0, node_1.default)();
+      const fs25 = (0, node_1.default)();
       if (opts && opts.sampleSize) {
-        const fd = fs23.openSync(filepath, "r");
+        const fd = fs25.openSync(filepath, "r");
         let sample = Buffer.allocUnsafe(opts.sampleSize);
-        const bytesRead = fs23.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
+        const bytesRead = fs25.readSync(fd, sample, 0, opts.sampleSize, opts.offset);
         if (bytesRead < opts.sampleSize) {
           sample = sample.subarray(0, bytesRead);
         }
-        fs23.closeSync(fd);
+        fs25.closeSync(fd);
         return (0, exports2.detect)(sample);
       }
-      return (0, exports2.detect)(fs23.readFileSync(filepath));
+      return (0, exports2.detect)(fs25.readFileSync(filepath));
     };
     exports2.detectFileSync = detectFileSync;
     exports2.default = {
@@ -8631,6 +8631,79 @@ var ADD_MODEL_Config = {
 // src/cli/cli-utils/getGlobalPath.ts
 var import_path2 = __toESM(require("path"));
 var import_fs_extra = __toESM(require("fs-extra"));
+
+// src/cli/cli-utils/node-root.ts
+var { execSync } = require("child_process");
+var path2 = require("path");
+var fs = require("fs");
+function safeExec(cmd) {
+  try {
+    return execSync(cmd, { encoding: "utf8", stdio: "pipe" }).trim();
+  } catch (err) {
+    return null;
+  }
+}
+function resolveValidPath(targetPath) {
+  if (!targetPath) return null;
+  try {
+    const realPath = fs.realpathSync(targetPath);
+    return fs.existsSync(realPath) ? realPath : null;
+  } catch (err) {
+    return null;
+  }
+}
+function getNvmGlobalPath() {
+  const nvmDir = process.env["NVM_DIR"] || (process.platform === "win32" ? path2.join(process.env["USERPROFILE"], ".nvm") : path2.join(process.env["HOME"], ".nvm"));
+  const nodeVersion = safeExec("nvm current");
+  if (!nodeVersion || nodeVersion.includes("N/A")) return null;
+  const nvmGlobalPath = path2.join(
+    nvmDir,
+    "versions",
+    "node",
+    nodeVersion,
+    "lib",
+    "node_modules"
+  );
+  return resolveValidPath(nvmGlobalPath);
+}
+function getNpmGlobalPath() {
+  const npmPath = safeExec("npm root -g");
+  return resolveValidPath(npmPath);
+}
+function getFallbackGlobalPath() {
+  try {
+    const nodeExecPath = process.execPath;
+    let globalPrefix;
+    if (process.platform === "win32") {
+      globalPrefix = path2.dirname(path2.dirname(nodeExecPath));
+    } else {
+      globalPrefix = path2.dirname(path2.dirname(path2.dirname(nodeExecPath)));
+    }
+    const fallbackPath = path2.join(globalPrefix, "lib", "node_modules");
+    return resolveValidPath(fallbackPath);
+  } catch (err) {
+    return null;
+  }
+}
+function getGlobalNodeModulesPath() {
+  const nvmPath = getNvmGlobalPath();
+  if (nvmPath) {
+    return nvmPath;
+  }
+  const npmPath = getNpmGlobalPath();
+  if (npmPath) {
+    return npmPath;
+  }
+  const fallbackPath = getFallbackGlobalPath();
+  if (fallbackPath) {
+    return fallbackPath;
+  }
+  console.error("\u65E0\u6CD5\u83B7\u53D6\u5168\u5C40 node_modules \u8DEF\u5F84");
+  return null;
+}
+var node_root_default = getGlobalNodeModulesPath;
+
+// src/cli/cli-utils/getGlobalPath.ts
 var getDirname = () => __dirname;
 function getHomePath() {
   return HOME_DIR;
@@ -8693,6 +8766,10 @@ function getScanDirPaths() {
   const paths = /* @__PURE__ */ new Set();
   paths.add(import_path2.default.join(workspacePath, ".deepfish-ai"));
   paths.add(import_path2.default.join(homePath));
+  const nodeRoot = import_path2.default.join(node_root_default(), "@deepfish-ai");
+  if (import_fs_extra.default.existsSync(nodeRoot)) {
+    paths.add(nodeRoot);
+  }
   return Array.from(paths);
 }
 function getMCPFilePath() {
@@ -8728,8 +8805,11 @@ function handleConfigView() {
   }
   const content = import_fs_extra2.default.readFileSync(configPath, "utf-8");
   const data = import_json5.default.parse(content);
+  data.aiList?.forEach((item) => {
+    item.apiKey = "******";
+  });
   logInfo("Current config:");
-  console.log(JSON.stringify(data, null, 2));
+  logInfo(JSON.stringify(data, null, 2));
 }
 function handleConfigReset() {
   const configPath = getConfigPath();
@@ -8938,8 +9018,8 @@ function registerModelsCommands(program) {
 // src/cli/cli-core/skills.ts
 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"));
+var import_fs_extra20 = __toESM(require("fs-extra"));
+var import_path20 = __toESM(require("path"));
 
 // src/cli/cli-utils/init-config.ts
 var import_fs_extra4 = __toESM(require("fs-extra"));
@@ -8966,18 +9046,8 @@ function initConfig() {
   if (!import_fs_extra4.default.pathExistsSync(skillsRegisterPath)) {
     import_fs_extra4.default.writeFileSync(skillsRegisterPath, "[]", "utf-8");
   }
-  const dynamicToolsDir = getToolsPath();
-  import_fs_extra4.default.ensureDirSync(dynamicToolsDir);
-  const dynamicToolsRegisterPath = import_path3.default.join(dynamicToolsDir, "register.json");
-  if (!import_fs_extra4.default.pathExistsSync(dynamicToolsRegisterPath)) {
-    import_fs_extra4.default.writeFileSync(dynamicToolsRegisterPath, "[]", "utf-8");
-  }
   const toolsDir = getToolsPath();
   import_fs_extra4.default.ensureDirSync(toolsDir);
-  const toolsRegisterPath = import_path3.default.join(toolsDir, "register.json");
-  if (!import_fs_extra4.default.pathExistsSync(toolsRegisterPath)) {
-    import_fs_extra4.default.writeFileSync(toolsRegisterPath, "[]", "utf-8");
-  }
   const sessionsDir = getSessionsPath();
   import_fs_extra4.default.ensureDirSync(sessionsDir);
   const sessionsIndexPath = import_path3.default.join(sessionsDir, "sessions.json");
@@ -8996,12 +9066,12 @@ 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_fs_extra19 = __toESM(require("fs-extra"));
+var import_path19 = __toESM(require("path"));
 var import_crypto5 = require("crypto");
 
 // src/agent/AIAgent/index.ts
-var import_langchain18 = require("langchain");
+var import_langchain19 = require("langchain");
 var import_deepagents2 = require("deepagents");
 
 // src/agent/AIAgent/utils/langgraph-checkpoint-filesystem/filesystem-saver.ts
@@ -10494,10 +10564,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path21) {
-  if (!path21)
+function getElementAtPath(obj, path23) {
+  if (!path23)
     return obj;
-  return path21.reduce((acc, key) => acc?.[key], obj);
+  return path23.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -10906,11 +10976,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path21, issues) {
+function prefixIssues(path23, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path21);
+    iss.path.unshift(path23);
     return iss;
   });
 }
@@ -11057,16 +11127,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path21 = []) => {
+  const processError = (error52, path23 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path21, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path23, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path21, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path23, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path21, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path23, ...issue2.path]);
       } else {
-        const fullpath = [...path21, ...issue2.path];
+        const fullpath = [...path23, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -11093,17 +11163,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path21 = []) => {
+  const processError = (error52, path23 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path21, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path23, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path21, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path23, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path21, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path23, ...issue2.path]);
       } else {
-        const fullpath = [...path21, ...issue2.path];
+        const fullpath = [...path23, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -11135,8 +11205,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path21 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path21) {
+  const path23 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path23) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -23828,13 +23898,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path21 = ref.slice(1).split("/").filter(Boolean);
-  if (path21.length === 0) {
+  const path23 = ref.slice(1).split("/").filter(Boolean);
+  if (path23.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path21[0] === defsKey) {
-    const key = path21[1];
+  if (path23[0] === defsKey) {
+    const key = path23[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -24247,6 +24317,7 @@ var import_eventemitter_super2 = require("eventemitter-super");
 
 // src/agent/AIAgent/middleware/eventEmitMiddleware.ts
 var import_langchain = require("langchain");
+var import_messages = require("@langchain/core/messages");
 function createAgentEventMiddleware(emitter) {
   return (0, import_langchain.createMiddleware)({
     name: "AgentEventMiddleware",
@@ -24276,7 +24347,7 @@ function createAgentEventMiddleware(emitter) {
         return await handler(request);
       } catch (error51) {
         emitter.emit("MODEL_ERROR" /* MODEL_ERROR */, error51);
-        throw error51;
+        return new import_messages.AIMessage(error51.message);
       }
     },
     // Around each tool call
@@ -24291,7 +24362,7 @@ function createAgentEventMiddleware(emitter) {
       } catch (err) {
         emitter.emit("USE_TOOL_ERROR" /* USE_TOOL_ERROR */, toolCall.id, toolCall.name, err);
         emitter.emit("USE_TOOL_AFTER" /* USE_TOOL_AFTER */, toolCall.id, toolCall.name, toolCall.args);
-        throw err;
+        return new import_langchain.ToolMessage(err.message);
       }
     }
   });
@@ -24317,8 +24388,8 @@ var Thinking = class {
 };
 
 // src/agent/AIAgent/utils/skill-parser.ts
-var fs5 = require("fs-extra");
-var path4 = require("path");
+var fs6 = require("fs-extra");
+var path5 = require("path");
 var yaml = require_js_yaml();
 function extractFrontmatter(content, skillPath) {
   const normalizedContent = content.replace(/^\uFEFF/, "");
@@ -24329,14 +24400,14 @@ function extractFrontmatter(content, skillPath) {
   return frontmatterMatch[1];
 }
 function parseSkillMetadataYaml(skillPath) {
-  const content = fs5.readFileSync(skillPath, "utf-8");
+  const content = fs6.readFileSync(skillPath, "utf-8");
   const frontmatterContent = extractFrontmatter(content, skillPath);
   const frontmatter = yaml.load(frontmatterContent);
   return {
     name: frontmatter.name,
     description: frontmatter.description,
     homepage: frontmatter.homepage,
-    location: path4.dirname(skillPath),
+    location: path5.dirname(skillPath),
     metadata: frontmatter.metadata || {},
     skillFilePath: skillPath
   };
@@ -24403,12 +24474,12 @@ ${params.systemPrompt || `\u8FD9\u662FDeepfish Cli\u7CFB\u7EDF,\u4F60\u662F\u7CF
 # \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\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
 \u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\uFF1A${params.workspace}
 \u64CD\u4F5C\u7CFB\u7EDF\u7C7B\u578B\uFF1A${params.osType}
-\u8BED\u8A00\u7C7B\u578B: \u4E0E\u7528\u6237\u8F93\u5165\u8BED\u8A00\u4E00\u81F4
 
 ${skillPrompt}
 ${memoryPrompt}
@@ -24422,12 +24493,12 @@ var subSystemPrompt = (workspace, osType, skills, excludeSkills) => {
 ### \u57FA\u7840\u73AF\u5883\u4FE1\u606F
 \u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\uFF1A${workspace}
 \u64CD\u4F5C\u7CFB\u7EDF\u7C7B\u578B\uFF1A${osType}
-\u8BED\u8A00\u7C7B\u578B: \u4E0E\u7528\u6237\u8F93\u5165\u8BED\u8A00\u4E00\u81F4
 
 \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
+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}
 `;
@@ -24688,10 +24759,47 @@ function toLangChainTool(func, description) {
   });
 }
 function scanUserTools(excludeTools) {
+  const files = _scanUserToolsFile();
   const tools = [];
+  files.forEach((toolFile) => {
+    _loadToolsFromFile(toolFile.filePath, tools, excludeTools);
+  });
+  return tools;
+}
+function getUserToolList() {
+  const files = _scanUserToolsFile();
+  const toolOpts = [];
+  files.forEach((toolFile) => {
+    const toolModule = require(toolFile.filePath);
+    const { functions, descriptions } = toolModule;
+    descriptions.forEach((desc) => {
+      if (!desc.type) {
+        desc = {
+          type: "function",
+          function: desc
+        };
+      }
+      const func = functions[desc.function.name];
+      if (typeof func !== "function") {
+        return;
+      }
+      toolOpts.push({
+        name: desc.function.name,
+        path: toolFile.filePath,
+        dir: toolFile.dir
+      });
+    });
+  });
+  return toolOpts;
+}
+function _scanUserToolsFile() {
+  const toolFiles = [];
   const scanPaths = getScanDirPaths();
   scanPaths.forEach((scanPath) => {
-    const toolsDir = import_path8.default.resolve(scanPath, "tools");
+    let toolsDir = scanPath;
+    if (!scanPath.endsWith("@deepfish-ai")) {
+      toolsDir = import_path8.default.resolve(scanPath, "tools");
+    }
     if (import_fs_extra8.default.pathExistsSync(toolsDir)) {
       const files = import_fs_extra8.default.readdirSync(toolsDir);
       files.forEach((file2) => {
@@ -24702,26 +24810,35 @@ function scanUserTools(excludeTools) {
           if (indexFile) {
             const filePath = _scanDeepFishJsFile(import_path8.default.resolve(subDirPath, indexFile), indexFile);
             if (filePath) {
-              _loadToolsFromFile(filePath, tools, excludeTools);
+              toolFiles.push({
+                filePath,
+                dir: subDirPath
+              });
             }
           } else {
             subFiles.forEach((subFile) => {
               const filePath = _scanDeepFishJsFile(import_path8.default.resolve(subDirPath, subFile), subFile);
               if (filePath) {
-                _loadToolsFromFile(filePath, tools, excludeTools);
+                toolFiles.push({
+                  filePath,
+                  dir: subDirPath
+                });
               }
             });
           }
         } else {
           const filePath = _scanDeepFishJsFile(toolsDir, file2);
           if (filePath) {
-            _loadToolsFromFile(filePath, tools, excludeTools);
+            toolFiles.push({
+              filePath,
+              dir: null
+            });
           }
         }
       });
     }
   });
-  return tools;
+  return toolFiles;
 }
 function _scanDeepFishJsFile(filePath, fileName) {
   if (fileName.endsWith(".js") || fileName.endsWith(".cjs")) {
@@ -25268,15 +25385,15 @@ async function grepFiles(query, cwd, includePattern = "**/*", isRegexp = false,
 }
 var grepTool = (0, import_langchain10.tool)(
   async ({ query, pattern, cwd, includePattern, isRegexp, maxResults, includeHidden }) => safeTool(() => {
-    const searchQuery = query || pattern;
+    const searchQuery = (query ?? pattern ?? "").trim();
     if (!searchQuery) {
-      throw new Error("query \u6216 pattern \u81F3\u5C11\u9700\u8981\u63D0\u4F9B\u4E00\u4E2A");
+      return '\u8BF7\u63D0\u4F9B query \u6216 pattern \u4E4B\u4E00\uFF1B\u4F8B\u5982 query: "foo" \u6216 pattern: "foo"';
     }
     return grepFiles(searchQuery, cwd, includePattern, isRegexp, maxResults, includeHidden);
   }),
   {
     name: "grep_files",
-    description: "\u5728\u6587\u672C\u6587\u4EF6\u4E2D\u641C\u7D22\u5185\u5BB9\uFF0C\u652F\u6301\u666E\u901A\u5B57\u7B26\u4E32\u6216\u6B63\u5219\u8868\u8FBE\u5F0F\uFF0C\u53EF\u7528 includePattern \u9650\u5B9A\u6587\u4EF6\u8303\u56F4\u3002query \u4E3A\u641C\u7D22\u5185\u5BB9\uFF1B\u517C\u5BB9 pattern \u4F5C\u4E3A query \u7684\u522B\u540D\u3002",
+    description: "\u5728\u6587\u672C\u6587\u4EF6\u4E2D\u641C\u7D22\u5185\u5BB9\uFF0C\u652F\u6301\u666E\u901A\u5B57\u7B26\u4E32\u6216\u6B63\u5219\u8868\u8FBE\u5F0F\uFF0C\u53EF\u7528 includePattern \u9650\u5B9A\u6587\u4EF6\u8303\u56F4\u3002query \u4E3A\u641C\u7D22\u5185\u5BB9\uFF1B\u517C\u5BB9 pattern \u4F5C\u4E3A query \u7684\u522B\u540D\uFF1B\u5982\u679C\u672A\u63D0\u4F9B\u641C\u7D22\u8BCD\uFF0C\u4F1A\u8FD4\u56DE\u63D0\u793A\u3002",
     schema: external_exports.object({
       query: external_exports.string().optional().describe("\u8981\u641C\u7D22\u7684\u5B57\u7B26\u4E32\u6216\u6B63\u5219\u8868\u8FBE\u5F0F"),
       pattern: external_exports.string().optional().describe("query \u7684\u517C\u5BB9\u522B\u540D\uFF0C\u8981\u641C\u7D22\u7684\u5B57\u7B26\u4E32\u6216\u6B63\u5219\u8868\u8FBE\u5F0F"),
@@ -25285,9 +25402,6 @@ var grepTool = (0, import_langchain10.tool)(
       isRegexp: external_exports.boolean().default(false).describe("query/pattern \u662F\u5426\u4E3A\u6B63\u5219\u8868\u8FBE\u5F0F"),
       maxResults: external_exports.number().default(100).describe("\u6700\u5927\u8FD4\u56DE\u5339\u914D\u6570\u91CF"),
       includeHidden: external_exports.boolean().default(false).describe("\u662F\u5426\u5305\u542B\u9690\u85CF\u6587\u4EF6\u6216\u9690\u85CF\u76EE\u5F55")
-    }).refine((input) => input.query || input.pattern, {
-      message: "query \u6216 pattern \u81F3\u5C11\u9700\u8981\u63D0\u4F9B\u4E00\u4E2A",
-      path: ["query"]
     })
   }
 );
@@ -25584,6 +25698,124 @@ var writeFileTool = (0, import_langchain16.tool)(async ({ filePath, content, mod
   })
 });
 
+// src/agent/tools/getFishInfo.ts
+var import_langchain17 = require("langchain");
+
+// src/cli/cli-help.ts
+var import_commander = require("commander");
+function helpInformation() {
+  return `Usage: ai [options] [command]
+
+Commands:
+  ai "xxx"                         \u76F4\u63A5\u5411 AI \u53D1\u8D77\u4E00\u6B21\u4EFB\u52A1\u6216\u5BF9\u8BDD
+
+  # Configuration commands
+  ai config edit                    \u6253\u5F00\u5168\u5C40\u914D\u7F6E\u6587\u4EF6\u8FDB\u884C\u7F16\u8F91
+  ai config view                    \u67E5\u770B\u5F53\u524D\u5168\u5C40\u914D\u7F6E\u5185\u5BB9
+  ai config reset                   \u91CD\u7F6E\u5168\u5C40\u914D\u7F6E\u4E3A\u9ED8\u8BA4\u503C
+  ai config dir                     \u6253\u5F00\u6216\u8F93\u51FA\u5168\u5C40\u914D\u7F6E\u76EE\u5F55
+
+  # Model commands
+  ai models add                     \u6DFB\u52A0\u4E00\u4E2A\u65B0\u7684\u6A21\u578B\u914D\u7F6E
+  ai models ls                      \u67E5\u770B\u5DF2\u914D\u7F6E\u7684\u6A21\u578B\u5217\u8868
+  ai models use <name>              \u5207\u6362\u5F53\u524D\u9ED8\u8BA4\u4F7F\u7528\u7684\u6A21\u578B
+  ai models del <name>              \u5220\u9664\u6307\u5B9A\u540D\u79F0\u7684\u6A21\u578B\u914D\u7F6E
+
+  # Skill commands
+  ai skills ls                      \u67E5\u770B\u5DF2\u5B89\u88C5\u6216\u5DF2\u914D\u7F6E\u7684\u6280\u80FD\u5217\u8868
+  ai skills add <name>              \u6DFB\u52A0\u6307\u5B9A\u540D\u79F0\u7684\u6280\u80FD
+  ai skills del <index>             \u5220\u9664\u6307\u5B9A\u5E8F\u53F7\u7684\u6280\u80FD
+  ai skills enable <name|index>     \u542F\u7528\u6307\u5B9A\u540D\u79F0\u6216\u5E8F\u53F7\u7684\u6280\u80FD
+  ai skills disable <name|index>    \u7981\u7528\u6307\u5B9A\u540D\u79F0\u6216\u5E8F\u53F7\u7684\u6280\u80FD
+  ai skills dir                     \u6253\u5F00\u6216\u8F93\u51FA\u6280\u80FD\u76EE\u5F55
+  ai skills generate xxx            \u6839\u636E\u63CF\u8FF0\u751F\u6210\u4E00\u4E2A\u65B0\u7684\u6280\u80FD\u6A21\u677F
+
+  # Tools commands
+  ai tools dir                      \u6253\u5F00\u6216\u8F93\u51FA\u7528\u6237\u81EA\u5B9A\u4E49\u5DE5\u5177\u76EE\u5F55
+  ai tools generate xxx             \u6839\u636E\u63CF\u8FF0\u751F\u6210\u4E00\u4E2A\u65B0\u7684\u5DE5\u5177\u6A21\u677F
+
+  # Session commands
+  ai session clear                  \u6E05\u7A7A\u5F53\u524D\u4F1A\u8BDD\u8BB0\u5F55
+  ai session dir                    \u6253\u5F00\u6216\u8F93\u51FA\u4F1A\u8BDD\u6570\u636E\u76EE\u5F55
+  
+  # Task commands
+  ai task ls                        \u67E5\u770B\u5F53\u524D\u4EFB\u52A1\u961F\u5217
+  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
+  
+  # MCP commands
+  ai mcp edit                       \u6253\u5F00 MCP \u914D\u7F6E\u6587\u4EF6\u8FDB\u884C\u7F16\u8F91
+  
+  # Serve commands
+  ai serve                          \u542F\u52A8\u670D\u52A1\u6216\u8FDB\u5165\u670D\u52A1\u7BA1\u7406\u5165\u53E3
+  ai serve start                    \u542F\u52A8\u540E\u53F0\u670D\u52A1
+  ai serve stop                     \u505C\u6B62\u540E\u53F0\u670D\u52A1
+  ai serve restart                  \u91CD\u542F\u540E\u53F0\u670D\u52A1
+  
+  # Cache commands
+  ai cache ls                       \u67E5\u770B\u5DF2\u7F13\u5B58\u7684\u5B66\u4E60\u5185\u5BB9\u5217\u8868
+  ai cache edit <index|id>          \u7F16\u8F91\u6307\u5B9A\u5E8F\u53F7\u6216 ID \u7684\u7F13\u5B58\u5185\u5BB9
+  ai cache del <index|id>           \u5220\u9664\u6307\u5B9A\u5E8F\u53F7\u6216 ID \u7684\u7F13\u5B58\u5185\u5BB9
+`;
+}
+function registerHelpCommand(program) {
+  program.helpInformation = helpInformation;
+  program.command("help").description("Displaying help information").action(() => {
+    logInfo(helpInformation());
+  });
+}
+
+// src/agent/tools/getFishInfo.ts
+var import_path16 = __toESM(require("path"));
+var import_fs_extra18 = __toESM(require("fs-extra"));
+var getFishCodePathTool = (0, import_langchain17.tool)(
+  async () => safeTool(() => {
+    const codePath = getCodePath();
+    return { codePath };
+  }),
+  {
+    name: "get_fish_code_path",
+    description: "\u83B7\u53D6 Deepfish CLI \u7CFB\u7EDF\u7684\u4EE3\u7801\u6839\u76EE\u5F55\u8DEF\u5F84",
+    schema: external_exports.object({})
+  }
+);
+var getFishReadmeTool = (0, import_langchain17.tool)(
+  async ({ lang }) => safeTool(() => {
+    const codePath = getCodePath();
+    const readmePath = lang === "en" ? import_path16.default.join(codePath, "README_EN.md") : import_path16.default.join(codePath, "README.md");
+    const fallbackPath = lang === "en" ? import_path16.default.join(codePath, "README.md") : import_path16.default.join(codePath, "README_EN.md");
+    let targetPath = readmePath;
+    if (!import_fs_extra18.default.existsSync(targetPath)) {
+      targetPath = fallbackPath;
+    }
+    if (!import_fs_extra18.default.existsSync(targetPath)) {
+      return { error: "\u672A\u627E\u5230 README \u6587\u4EF6", readmePath: targetPath };
+    }
+    const content = import_fs_extra18.default.readFileSync(targetPath, "utf-8");
+    return { readmePath: targetPath, content };
+  }),
+  {
+    name: "get_fish_readme",
+    description: "\u83B7\u53D6 Deepfish CLI \u7CFB\u7EDF\u7684 README \u6587\u4EF6\u5185\u5BB9\uFF0C\u7528\u4E8E\u4E86\u89E3\u7CFB\u7EDF\u7684\u529F\u80FD\u3001\u7528\u6CD5\u548C\u7279\u6027\u3002\u53EF\u9009\u53C2\u6570 lang \u6307\u5B9A\u8BED\u8A00\uFF08zh \u6216 en\uFF09\uFF0C\u9ED8\u8BA4\u4E2D\u6587\u3002",
+    schema: external_exports.object({
+      lang: external_exports.string().optional().default("zh").describe("\u8BED\u8A00\uFF0Czh \u4E3A\u4E2D\u6587 README\uFF0Cen \u4E3A\u82F1\u6587 README")
+    })
+  }
+);
+var getFishHelpTool = (0, import_langchain17.tool)(
+  async () => safeTool(() => {
+    const help = helpInformation();
+    return { help };
+  }),
+  {
+    name: "get_fish_help",
+    description: "\u83B7\u53D6 Deepfish CLI \u7CFB\u7EDF\u7684\u6240\u6709\u53EF\u7528\u547D\u4EE4\u53CA\u4F7F\u7528\u8BF4\u660E\uFF0C\u5305\u62EC\u914D\u7F6E\u3001\u6A21\u578B\u3001\u6280\u80FD\u3001\u5DE5\u5177\u3001\u4F1A\u8BDD\u3001\u4EFB\u52A1\u3001MCP\u3001\u670D\u52A1\u3001\u7F13\u5B58\u7B49\u5B50\u547D\u4EE4\u7684\u8BE6\u7EC6\u7528\u6CD5",
+    schema: external_exports.object({})
+  }
+);
+var fishInfoTools = [getFishCodePathTool, getFishReadmeTool, getFishHelpTool];
+
 // src/agent/tools/index.ts
 var builtinTools = [
   taskTool,
@@ -25598,23 +25830,24 @@ var builtinTools = [
   webFetchTool,
   ...packageTools,
   ...semanticMemoryTools,
-  ...learnTools
+  ...learnTools,
+  ...fishInfoTools
 ];
 async function getTools(excludeTools, excludeMCP) {
   return [...builtinTools, ...await scanUserTools(excludeTools), ...await scanUserMcp(excludeMCP)];
 }
 
 // src/agent/skills/index.ts
-var import_path16 = __toESM(require("path"));
+var import_path17 = __toESM(require("path"));
 function getSkills() {
-  return [...getRegisteredSkills(), import_path16.default.join(__dirname, "./view-learn-cache.md")];
+  return [...getRegisteredSkills(), import_path17.default.join(__dirname, "./view-learn-cache.md")];
 }
 
 // src/agent/AIAgent/index.ts
 var import_os4 = __toESM(require("os"));
 
 // src/agent/AIAgent/SubAgents/SubAIAgent.ts
-var import_langchain17 = require("langchain");
+var import_langchain18 = require("langchain");
 var import_deepagents = require("deepagents");
 var import_eventemitter_super = require("eventemitter-super");
 var import_os3 = __toESM(require("os"));
@@ -25687,19 +25920,19 @@ var SubAIAgent = class _SubAIAgent extends import_eventemitter_super.EventEmitte
       agentRulesPath: this.agentRulesPath,
       excludeSkills: this.excludeSkills
     }) : subSystemPrompt(this.workspace, import_os3.default.platform(), this.skills, this.excludeSkills);
-    const agent = (0, import_langchain17.createAgent)({
+    const agent = (0, import_langchain18.createAgent)({
       model,
       checkpointer,
       tools: this.tools,
       contextSchema,
       middleware: [
         createAgentEventMiddleware(this),
-        (0, import_langchain17.summarizationMiddleware)({
+        (0, import_langchain18.summarizationMiddleware)({
           model,
           trigger: { tokens: this.opt.modelOpt.maxContextLength || 1e5 },
           keep: { messages: 50 }
         }),
-        (0, import_langchain17.humanInTheLoopMiddleware)({
+        (0, import_langchain18.humanInTheLoopMiddleware)({
           interruptOn: {
             install_package: {
               allowedDecisions: ["approve", "reject"]
@@ -25707,7 +25940,7 @@ var SubAIAgent = class _SubAIAgent extends import_eventemitter_super.EventEmitte
             readEmailTool: false
           }
         }),
-        (0, import_langchain17.todoListMiddleware)(),
+        (0, import_langchain18.todoListMiddleware)(),
         (0, import_deepagents.createPatchToolCallsMiddleware)()
       ],
       systemPrompt
@@ -25717,7 +25950,7 @@ var SubAIAgent = class _SubAIAgent extends import_eventemitter_super.EventEmitte
     this.initEvents();
   }
   async execute(input) {
-    const humanMessage = new import_langchain17.HumanMessage(input);
+    const humanMessage = new import_langchain18.HumanMessage(input);
     this.messages.push(humanMessage);
     const stream = await this.agent.stream(
       { messages: this.messages },
@@ -25870,19 +26103,19 @@ var AIAgent = class extends import_eventemitter_super2.EventEmitterSuper {
       agentId: external_exports.string().optional(),
       curAgent: external_exports.object().optional()
     });
-    const agent = (0, import_langchain18.createAgent)({
+    const agent = (0, import_langchain19.createAgent)({
       model,
       checkpointer,
       tools: this.tools,
       contextSchema,
       middleware: [
         createAgentEventMiddleware(this),
-        (0, import_langchain18.summarizationMiddleware)({
+        (0, import_langchain19.summarizationMiddleware)({
           model,
           trigger: { tokens: this.opt.modelOpt.maxContextLength || 1e5 },
           keep: { messages: 50 }
         }),
-        (0, import_langchain18.humanInTheLoopMiddleware)({
+        (0, import_langchain19.humanInTheLoopMiddleware)({
           interruptOn: {
             install_package: {
               allowedDecisions: ["approve", "reject"]
@@ -25890,7 +26123,7 @@ var AIAgent = class extends import_eventemitter_super2.EventEmitterSuper {
             readEmailTool: false
           }
         }),
-        (0, import_langchain18.todoListMiddleware)(),
+        (0, import_langchain19.todoListMiddleware)(),
         (0, import_deepagents2.createPatchToolCallsMiddleware)()
       ],
       systemPrompt: getSystemPrompt({
@@ -25909,7 +26142,7 @@ var AIAgent = class extends import_eventemitter_super2.EventEmitterSuper {
     this.initEvents();
   }
   async execute(input) {
-    const humanMessage = new import_langchain18.HumanMessage(input);
+    const humanMessage = new import_langchain19.HumanMessage(input);
     this.messages.push(humanMessage);
     const stream = await this.agent.stream(
       { messages: this.messages },
@@ -26094,12 +26327,12 @@ var AgentRoomClient = class {
 };
 
 // src/cli/cli-core/serve.ts
-var import_path17 = __toESM(require("path"));
+var import_path18 = __toESM(require("path"));
 var import_pm2 = __toESM(require("pm2"));
 var PM2_APP_NAME = "deepfish-ai-server";
 function getPm2Config() {
   const port = getServePort();
-  const serverScript = import_path17.default.join(getCodePath(), "dist/serve/pm2-server");
+  const serverScript = import_path18.default.join(getCodePath(), "dist/serve/pm2-server");
   return {
     name: PM2_APP_NAME,
     script: serverScript,
@@ -26111,8 +26344,8 @@ function getPm2Config() {
     autorestart: true,
     watch: false,
     max_memory_restart: "1G",
-    error_file: import_path17.default.join(getCodePath(), "logs", "pm2-error.log"),
-    out_file: import_path17.default.join(getCodePath(), "logs", "pm2-out.log"),
+    error_file: import_path18.default.join(getCodePath(), "logs", "pm2-error.log"),
+    out_file: import_path18.default.join(getCodePath(), "logs", "pm2-out.log"),
     log_date_format: "YYYY-MM-DD HH:mm:ss Z"
   };
 }
@@ -26344,20 +26577,20 @@ function removeSessionById(agentId) {
     return;
   }
   const sessionDir = getSessionPath(agentId);
-  import_fs_extra18.default.removeSync(sessionDir);
+  import_fs_extra19.default.removeSync(sessionDir);
   const sessionsPath = getSessionsPath();
-  const sessionsFilePath = import_path18.default.join(sessionsPath, "sessions.json");
-  if (!import_fs_extra18.default.pathExistsSync(sessionsFilePath)) {
+  const sessionsFilePath = import_path19.default.join(sessionsPath, "sessions.json");
+  if (!import_fs_extra19.default.pathExistsSync(sessionsFilePath)) {
     logSuccess("Current session history cleared");
     return;
   }
-  const content = import_fs_extra18.default.readFileSync(sessionsFilePath, "utf-8");
+  const content = import_fs_extra19.default.readFileSync(sessionsFilePath, "utf-8");
   const parsed = JSON.parse(content);
   const sessions = Array.isArray(parsed) ? parsed : [];
   const existingSessionIndex = sessions.findIndex((s) => s.id === agentId);
   if (existingSessionIndex !== -1) {
     sessions.splice(existingSessionIndex, 1);
-    import_fs_extra18.default.writeFileSync(sessionsFilePath, JSON.stringify(sessions, null, 2), "utf-8");
+    import_fs_extra19.default.writeFileSync(sessionsFilePath, JSON.stringify(sessions, null, 2), "utf-8");
   }
   logSuccess("Current session history cleared");
 }
@@ -26373,15 +26606,15 @@ function openSessionDir() {
 }
 function initSession() {
   const sessionsPath = getSessionsPath();
-  const sessionsFilePath = import_path18.default.join(sessionsPath, "sessions.json");
+  const sessionsFilePath = import_path19.default.join(sessionsPath, "sessions.json");
   let sessions = [];
-  if (import_fs_extra18.default.pathExistsSync(sessionsFilePath)) {
-    const content = import_fs_extra18.default.readFileSync(sessionsFilePath, "utf-8");
+  if (import_fs_extra19.default.pathExistsSync(sessionsFilePath)) {
+    const content = import_fs_extra19.default.readFileSync(sessionsFilePath, "utf-8");
     const parsed = JSON.parse(content);
     sessions = Array.isArray(parsed) ? parsed : [];
   } else {
-    import_fs_extra18.default.ensureDirSync(sessionsPath);
-    import_fs_extra18.default.writeFileSync(sessionsFilePath, "[]", "utf-8");
+    import_fs_extra19.default.ensureDirSync(sessionsPath);
+    import_fs_extra19.default.writeFileSync(sessionsFilePath, "[]", "utf-8");
   }
   const workspace = getWorkspacePath();
   const existingSession = sessions.find((s) => s.workspace === workspace);
@@ -26392,23 +26625,23 @@ function initSession() {
   const agentId = (0, import_crypto5.randomUUID)();
   const newSession = {
     id: agentId,
-    name: import_path18.default.basename(workspace),
+    name: import_path19.default.basename(workspace),
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
     workspace
   };
   sessions.push(newSession);
-  import_fs_extra18.default.writeFileSync(sessionsFilePath, JSON.stringify(sessions, null, 2), "utf-8");
+  import_fs_extra19.default.writeFileSync(sessionsFilePath, JSON.stringify(sessions, null, 2), "utf-8");
   initSessionDir(newSession.id);
   return newSession;
 }
 function initSessionDir(agentId) {
   const sessionDir = getSessionPath(agentId);
-  import_fs_extra18.default.ensureDirSync(sessionDir);
+  import_fs_extra19.default.ensureDirSync(sessionDir);
   const mainSessionPath = `${sessionDir}/main-session/`;
   const mainMsgQueuePath = `${sessionDir}/main-msg-queue.json`;
-  import_fs_extra18.default.ensureDirSync(mainSessionPath);
-  import_fs_extra18.default.ensureFileSync(mainMsgQueuePath);
+  import_fs_extra19.default.ensureDirSync(mainSessionPath);
+  import_fs_extra19.default.ensureFileSync(mainMsgQueuePath);
 }
 function _getCurrentAIConfig(config2) {
   const currentModelName = config2.currentModel;
@@ -26423,11 +26656,11 @@ function _getCurrentAIConfig(config2) {
 }
 function getAgentId() {
   const sessionsPath = getSessionsPath();
-  const sessionsFilePath = import_path18.default.join(sessionsPath, "sessions.json");
-  if (!import_fs_extra18.default.pathExistsSync(sessionsFilePath)) {
+  const sessionsFilePath = import_path19.default.join(sessionsPath, "sessions.json");
+  if (!import_fs_extra19.default.pathExistsSync(sessionsFilePath)) {
     return;
   }
-  const content = import_fs_extra18.default.readFileSync(sessionsFilePath, "utf-8");
+  const content = import_fs_extra19.default.readFileSync(sessionsFilePath, "utf-8");
   const parsed = JSON.parse(content);
   const sessions = Array.isArray(parsed) ? parsed : [];
   const workspace = getWorkspacePath();
@@ -26455,8 +26688,8 @@ function handleSkillsLs() {
 async function handleSkillsAdd(name) {
   logInfo(`Adding skill: ${name}`);
   const workspace = getWorkspacePath();
-  const skillDir = import_path19.default.join(workspace, name);
-  if (!import_fs_extra19.default.existsSync(skillDir)) {
+  const skillDir = import_path20.default.join(workspace, name);
+  if (!import_fs_extra20.default.existsSync(skillDir)) {
     logError(`Skill directory does not exist: ${skillDir}`);
     return;
   }
@@ -26472,16 +26705,16 @@ async function handleSkillsAdd(name) {
     }
   ]);
   const homePath = getHomePath();
-  const globalSkillDir = import_path19.default.join(homePath, "skills");
-  const localSkillDir = import_path19.default.join(workspace, ".deepfish-ai", "skills");
+  const globalSkillDir = import_path20.default.join(homePath, "skills");
+  const localSkillDir = import_path20.default.join(workspace, ".deepfish-ai", "skills");
   if (scope === "local") {
-    import_fs_extra19.default.ensureDirSync(localSkillDir);
+    import_fs_extra20.default.ensureDirSync(localSkillDir);
   } else {
-    import_fs_extra19.default.ensureDirSync(globalSkillDir);
+    import_fs_extra20.default.ensureDirSync(globalSkillDir);
   }
   const targetDir = scope === "local" ? localSkillDir : globalSkillDir;
-  const targetPath = import_path19.default.join(targetDir, name);
-  if (import_fs_extra19.default.existsSync(targetPath)) {
+  const targetPath = import_path20.default.join(targetDir, name);
+  if (import_fs_extra20.default.existsSync(targetPath)) {
     const { overwrite } = await import_inquirer3.default.prompt([
       {
         type: "confirm",
@@ -26494,9 +26727,9 @@ async function handleSkillsAdd(name) {
       logWarning("Add cancelled");
       return;
     }
-    import_fs_extra19.default.removeSync(targetPath);
+    import_fs_extra20.default.removeSync(targetPath);
   }
-  import_fs_extra19.default.moveSync(skillDir, targetPath, { overwrite: true });
+  import_fs_extra20.default.moveSync(skillDir, targetPath, { overwrite: true });
   logSuccess(`Skill ${scope === "local" ? "locally" : "globally"} added: ${targetPath}`);
   _updateRegister(targetDir);
 }
@@ -26508,13 +26741,13 @@ function handleSkillsDel(index) {
     return;
   }
   const skill = skills[skillIndex];
-  import_fs_extra19.default.removeSync(skill.skillPath);
+  import_fs_extra20.default.removeSync(skill.skillPath);
   const skillDir = skill.skillDir;
-  const registerPath = import_path19.default.join(skillDir, "skills", "register.json");
-  if (import_fs_extra19.default.existsSync(registerPath)) {
-    let register = import_fs_extra19.default.readJSONSync(registerPath);
+  const registerPath = _getRegisterPath(skillDir);
+  if (import_fs_extra20.default.existsSync(registerPath)) {
+    let register = import_fs_extra20.default.readJSONSync(registerPath);
     register = register.filter((item) => item.skillPath !== skill.skillPath);
-    import_fs_extra19.default.writeJSONSync(registerPath, register, { spaces: 2 });
+    import_fs_extra20.default.writeJSONSync(registerPath, register, { spaces: 2 });
   }
   logSuccess(`Skill deleted: ${skill.name}`);
 }
@@ -26528,8 +26761,8 @@ function handleSkillsEnable(index) {
   const skill = skills[skillIndex];
   skill.isEnabled = true;
   const skillDir = skill.skillDir;
-  const registerPath = import_path19.default.join(skillDir, "skills", "register.json");
-  import_fs_extra19.default.writeJSONSync(
+  const registerPath = _getRegisterPath(skillDir);
+  import_fs_extra20.default.writeJSONSync(
     registerPath,
     skills.filter((item) => item.skillDir === skillDir),
     { spaces: 2 }
@@ -26546,8 +26779,8 @@ function handleSkillsDisable(index) {
   const skill = skills[skillIndex];
   skill.isEnabled = false;
   const skillDir = skill.skillDir;
-  const registerPath = import_path19.default.join(skillDir, "skills", "register.json");
-  import_fs_extra19.default.writeJSONSync(
+  const registerPath = _getRegisterPath(skillDir);
+  import_fs_extra20.default.writeJSONSync(
     registerPath,
     skills.filter((item) => item.skillDir === skillDir),
     { spaces: 2 }
@@ -26557,7 +26790,7 @@ function handleSkillsDisable(index) {
 function handleSkillsDir() {
   logInfo("Opening skills directory");
   const homePath = getHomePath();
-  const globalSkillDir = import_path19.default.join(homePath, "skills");
+  const globalSkillDir = import_path20.default.join(homePath, "skills");
   openDirectory(globalSkillDir);
 }
 async function handleSkillsGenerate(target) {
@@ -26581,7 +26814,7 @@ async function handleSkillsGenerate(target) {
       logError("Failed to start service, please check config or port availability");
       return;
     }
-    const generateSkillPath = import_path19.default.join(__dirname, "./generate-skill.md");
+    const generateSkillPath = import_path20.default.join(__dirname, "./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}
 
@@ -26599,13 +26832,13 @@ async function handleSkillsGenerate(target) {
 }
 function _scanSkills(skillsDir) {
   const skills = [];
-  if (import_fs_extra19.default.existsSync(skillsDir)) {
-    const files = import_fs_extra19.default.readdirSync(skillsDir);
+  if (import_fs_extra20.default.existsSync(skillsDir)) {
+    const files = import_fs_extra20.default.readdirSync(skillsDir);
     files.forEach((file2) => {
-      const filePath = import_path19.default.resolve(skillsDir, file2);
-      if (import_fs_extra19.default.statSync(filePath).isDirectory()) {
-        const skillMdPath = import_path19.default.resolve(filePath, "SKILL.md");
-        if (import_fs_extra19.default.existsSync(skillMdPath)) {
+      const filePath = import_path20.default.resolve(skillsDir, file2);
+      if (import_fs_extra20.default.statSync(filePath).isDirectory()) {
+        const skillMdPath = import_path20.default.resolve(filePath, "SKILL.md");
+        if (import_fs_extra20.default.existsSync(skillMdPath)) {
           skills.push(filePath);
         }
       }
@@ -26614,17 +26847,17 @@ function _scanSkills(skillsDir) {
   return skills;
 }
 function _updateRegister(skillsDir) {
-  const registerPath = import_path19.default.resolve(skillsDir, "register.json");
-  if (import_fs_extra19.default.existsSync(skillsDir) && !import_fs_extra19.default.existsSync(registerPath)) {
-    import_fs_extra19.default.writeJSONSync(registerPath, [], { spaces: 2 });
-  } else if (!import_fs_extra19.default.existsSync(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)) {
     return;
   }
   const skills = _scanSkills(skillsDir);
-  let register = import_fs_extra19.default.readJSONSync(registerPath);
+  let register = import_fs_extra20.default.readJSONSync(registerPath);
   const newRegister = [];
   skills.forEach((skillPath) => {
-    const skillName = import_path19.default.basename(skillPath);
+    const skillName = import_path20.default.basename(skillPath);
     const existItem = register.find((item) => item.skillPath === skillPath);
     if (!existItem) {
       newRegister.push({
@@ -26637,16 +26870,16 @@ function _updateRegister(skillsDir) {
   });
   register = register.filter((item) => skills.includes(item.skillPath));
   register.push(...newRegister);
-  import_fs_extra19.default.writeJSONSync(registerPath, register, { spaces: 2 });
+  import_fs_extra20.default.writeJSONSync(registerPath, register, { spaces: 2 });
 }
 function getRegisteredSkills() {
   const scanPaths = getScanDirPaths();
   const skills = [];
   scanPaths.forEach((scanPath) => {
     _updateRegister(scanPath);
-    const registerPath = import_path19.default.join(scanPath, "skills", "register.json");
-    if (import_fs_extra19.default.existsSync(registerPath)) {
-      const register = import_fs_extra19.default.readJSONSync(registerPath);
+    const registerPath = _getRegisterPath(scanPath);
+    if (import_fs_extra20.default.existsSync(registerPath)) {
+      const register = import_fs_extra20.default.readJSONSync(registerPath);
       register.forEach((item) => {
         if (item.isEnabled) {
           skills.push(item.skillPath);
@@ -26658,10 +26891,10 @@ function getRegisteredSkills() {
 }
 function _getSkillList(skillsDir) {
   let allSkills = [];
-  const registerPath = import_path19.default.join(skillsDir, "skills", "register.json");
-  if (import_fs_extra19.default.existsSync(registerPath)) {
+  const registerPath = _getRegisterPath(skillsDir);
+  if (import_fs_extra20.default.existsSync(registerPath)) {
     _updateRegister(skillsDir);
-    const register = import_fs_extra19.default.readJSONSync(registerPath);
+    const register = import_fs_extra20.default.readJSONSync(registerPath);
     allSkills = allSkills.concat(register);
   }
   return allSkills;
@@ -26679,6 +26912,12 @@ function _getAllSkills() {
   });
   return allSkills;
 }
+function _getRegisterPath(skillsDir) {
+  if (skillsDir.endsWith("@deepfish-ai")) {
+    return import_path20.default.join(skillsDir, "register.json");
+  }
+  return import_path20.default.join(skillsDir, "skills", "register.json");
+}
 
 // src/cli/cli-skills.ts
 function registerSkillsCommands(program) {
@@ -26694,8 +26933,38 @@ function registerSkillsCommands(program) {
 
 // src/cli/cli-core/tools.ts
 var import_inquirer4 = __toESM(require("inquirer"));
-var import_fs_extra20 = __toESM(require("fs-extra"));
-var import_path20 = __toESM(require("path"));
+var import_fs_extra21 = __toESM(require("fs-extra"));
+var import_path21 = __toESM(require("path"));
+function handleToolsLs() {
+  const toolNames = getUserToolList().map((tool17) => {
+    return tool17.name;
+  });
+  logInfo("=".repeat(50));
+  if (toolNames.length === 0) {
+    logInfo("No tools registered yet");
+  } else {
+    toolNames.forEach((name, index) => {
+      logInfo(`[${index}] ${name}`);
+    });
+  }
+  logInfo("=".repeat(50));
+}
+function handleToolsDel(index) {
+  const toolList = getUserToolList();
+  const toolIndex = parseInt(index, 10);
+  if (isNaN(toolIndex) || toolIndex < 0 || toolIndex >= toolList.length) {
+    logError("Invalid tool index");
+    return;
+  }
+  const tool17 = toolList[toolIndex];
+  if (tool17.dir) {
+    import_fs_extra21.default.removeSync(tool17.dir);
+    logSuccess(`Tool directory deleted: ${tool17.dir}`);
+  } else {
+    import_fs_extra21.default.removeSync(tool17.path);
+    logSuccess(`Tool file deleted: ${tool17.path}`);
+  }
+}
 function handleToolsDir() {
   const toolsPath = getToolsPath();
   openDirectory(toolsPath);
@@ -26704,8 +26973,8 @@ function handleToolsDir() {
 async function handleToolsAdd(name) {
   logInfo(`Adding tool: ${name}`);
   const workspace = getWorkspacePath();
-  const toolDir = import_path20.default.join(workspace, name);
-  if (!import_fs_extra20.default.existsSync(toolDir)) {
+  const toolDir = import_path21.default.join(workspace, name);
+  if (!import_fs_extra21.default.existsSync(toolDir)) {
     logError(`Tool directory does not exist: ${toolDir}`);
     return;
   }
@@ -26721,12 +26990,12 @@ async function handleToolsAdd(name) {
     }
   ]);
   const homePath = getHomePath();
-  const globalToolDir = import_path20.default.join(homePath, "tools");
-  const localToolDir = import_path20.default.join(workspace, ".deepfish-ai", "tools");
+  const globalToolDir = import_path21.default.join(homePath, "tools");
+  const localToolDir = import_path21.default.join(workspace, ".deepfish-ai", "tools");
   const targetDir = scope === "local" ? localToolDir : globalToolDir;
-  const targetPath = import_path20.default.join(targetDir, name);
-  import_fs_extra20.default.ensureDirSync(targetDir);
-  if (import_fs_extra20.default.existsSync(targetPath)) {
+  const targetPath = import_path21.default.join(targetDir, name);
+  import_fs_extra21.default.ensureDirSync(targetDir);
+  if (import_fs_extra21.default.existsSync(targetPath)) {
     const { overwrite } = await import_inquirer4.default.prompt([
       {
         type: "confirm",
@@ -26739,9 +27008,9 @@ async function handleToolsAdd(name) {
       logWarning("Add cancelled");
       return;
     }
-    import_fs_extra20.default.removeSync(targetPath);
+    import_fs_extra21.default.removeSync(targetPath);
   }
-  import_fs_extra20.default.moveSync(toolDir, targetPath, { overwrite: true });
+  import_fs_extra21.default.moveSync(toolDir, targetPath, { overwrite: true });
   logSuccess(`Tool ${scope === "local" ? "locally" : "globally"} added: ${targetPath}`);
 }
 async function handleToolsGenerate(target) {
@@ -26765,7 +27034,7 @@ async function handleToolsGenerate(target) {
       logError("Failed to start service, please check config or port availability");
       return;
     }
-    const generateSkillPath = import_path20.default.join(__dirname, "./generate-tool.md");
+    const generateSkillPath = import_path21.default.join(__dirname, "./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}
 
@@ -26784,8 +27053,10 @@ async function handleToolsGenerate(target) {
 // src/cli/cli-tools.ts
 function registerToolsCommands(program) {
   const tools = program.command("tools");
+  tools.command("ls").description("\u5217\u51FA\u6240\u6709\u5DE5\u5177").action(handleToolsLs);
   tools.command("dir").description("\u6253\u5F00\u5DE5\u5177\u76EE\u5F55").action(handleToolsDir);
   tools.command("add <name>").description("\u6DFB\u52A0\u672C\u5730\u5DE5\u5177\u76EE\u5F55").action(handleToolsAdd);
+  tools.command("del <index>").description("\u6309\u7D22\u5F15\u5220\u9664\u5DE5\u5177").action(handleToolsDel);
   tools.command("generate <target>").description("\u751F\u6210\u5DE5\u5177").action(handleToolsGenerate);
 }
 
@@ -26891,10 +27162,10 @@ function handleTaskClear() {
 
 // src/cli/cli-task.ts
 function registerTaskCommands(program) {
-  const task = program.command("task");
+  const task = program.command("tasks");
   task.command("ls").description("\u5217\u51FA\u6240\u6709\u4EFB\u52A1").action(handleTaskLs);
   task.command("add <task>").description("\u6DFB\u52A0\u4EFB\u52A1").action(handleTaskAdd);
-  task.command("del <index>").description("\u5220\u9664\u6307\u5B9A\u5E8F\u53F7\u7684\u4EFB\u52D9").action(handleTaskDel);
+  task.command("del <index>").description("\u5220\u9664\u6307\u5B9A\u5E8F\u53F7\u7684\u4EFB\u52A1").action(handleTaskDel);
   task.command("clear").description("\u6E05\u9664\u6240\u6709\u4EFB\u52A1").action(handleTaskClear);
 }
 
@@ -26911,7 +27182,7 @@ function registerMcpCommands(program) {
 }
 
 // src/cli/cli-core/input.ts
-var import_fs_extra21 = __toESM(require("fs-extra"));
+var import_fs_extra22 = __toESM(require("fs-extra"));
 var readline = __toESM(require("readline"));
 async function handleInput(args) {
   const input = args.join(" ");
@@ -26921,7 +27192,7 @@ async function handleInput(args) {
   }
   try {
     const configPath = getConfigPath();
-    if (!import_fs_extra21.default.pathExistsSync(configPath)) {
+    if (!import_fs_extra22.default.pathExistsSync(configPath)) {
       logError("Config file not found, please run init first");
       return;
     }
@@ -26958,7 +27229,7 @@ async function handleInput(args) {
 async function multiInput() {
   try {
     const configPath = getConfigPath();
-    if (!import_fs_extra21.default.pathExistsSync(configPath)) {
+    if (!import_fs_extra22.default.pathExistsSync(configPath)) {
       logError("Config file not found, please run init first");
       return;
     }
@@ -27028,7 +27299,7 @@ function registerInputCommand(program) {
 }
 
 // src/cli/cli-core/cache.ts
-var import_path21 = __toESM(require("path"));
+var import_path22 = __toESM(require("path"));
 var userCache2 = new UserCache();
 function resolveId(input) {
   const index = Number(input);
@@ -27062,7 +27333,7 @@ function handleCacheList() {
 function handleCacheEdit(input) {
   const id = resolveId(input);
   if (!id) return;
-  const filePath = import_path21.default.join(getUserStorePath(), `${id}.md`);
+  const filePath = import_path22.default.join(getUserStorePath(), `${id}.md`);
   editFile(filePath);
 }
 function handleCacheDel(input) {
@@ -27094,71 +27365,6 @@ function registerCommonFlags(program) {
   program.version(handleVersion(), "-v, --version", "Show version");
 }
 
-// src/cli/cli-help.ts
-var import_commander = require("commander");
-function helpInformation() {
-  return `Usage: ai [options] [command]
-
-Commands:
-  ai "xxx"                         \u76F4\u63A5\u5411 AI \u53D1\u8D77\u4E00\u6B21\u4EFB\u52A1\u6216\u5BF9\u8BDD
-
-  # Configuration commands
-  ai config edit                    \u6253\u5F00\u5168\u5C40\u914D\u7F6E\u6587\u4EF6\u8FDB\u884C\u7F16\u8F91
-  ai config view                    \u67E5\u770B\u5F53\u524D\u5168\u5C40\u914D\u7F6E\u5185\u5BB9
-  ai config reset                   \u91CD\u7F6E\u5168\u5C40\u914D\u7F6E\u4E3A\u9ED8\u8BA4\u503C
-  ai config dir                     \u6253\u5F00\u6216\u8F93\u51FA\u5168\u5C40\u914D\u7F6E\u76EE\u5F55
-
-  # Model commands
-  ai models add                     \u6DFB\u52A0\u4E00\u4E2A\u65B0\u7684\u6A21\u578B\u914D\u7F6E
-  ai models ls                      \u67E5\u770B\u5DF2\u914D\u7F6E\u7684\u6A21\u578B\u5217\u8868
-  ai models use <name>              \u5207\u6362\u5F53\u524D\u9ED8\u8BA4\u4F7F\u7528\u7684\u6A21\u578B
-  ai models del <name>              \u5220\u9664\u6307\u5B9A\u540D\u79F0\u7684\u6A21\u578B\u914D\u7F6E
-
-  # Skill commands
-  ai skills ls                      \u67E5\u770B\u5DF2\u5B89\u88C5\u6216\u5DF2\u914D\u7F6E\u7684\u6280\u80FD\u5217\u8868
-  ai skills add <name>              \u6DFB\u52A0\u6307\u5B9A\u540D\u79F0\u7684\u6280\u80FD
-  ai skills del <index>             \u5220\u9664\u6307\u5B9A\u5E8F\u53F7\u7684\u6280\u80FD
-  ai skills enable <name|index>     \u542F\u7528\u6307\u5B9A\u540D\u79F0\u6216\u5E8F\u53F7\u7684\u6280\u80FD
-  ai skills disable <name|index>    \u7981\u7528\u6307\u5B9A\u540D\u79F0\u6216\u5E8F\u53F7\u7684\u6280\u80FD
-  ai skills dir                     \u6253\u5F00\u6216\u8F93\u51FA\u6280\u80FD\u76EE\u5F55
-  ai skills generate xxx            \u6839\u636E\u63CF\u8FF0\u751F\u6210\u4E00\u4E2A\u65B0\u7684\u6280\u80FD\u6A21\u677F
-
-  # Tools commands
-  ai tools dir                      \u6253\u5F00\u6216\u8F93\u51FA\u7528\u6237\u81EA\u5B9A\u4E49\u5DE5\u5177\u76EE\u5F55
-  ai tools generate xxx             \u6839\u636E\u63CF\u8FF0\u751F\u6210\u4E00\u4E2A\u65B0\u7684\u5DE5\u5177\u6A21\u677F
-
-  # Session commands
-  ai session clear                  \u6E05\u7A7A\u5F53\u524D\u4F1A\u8BDD\u8BB0\u5F55
-  ai session dir                    \u6253\u5F00\u6216\u8F93\u51FA\u4F1A\u8BDD\u6570\u636E\u76EE\u5F55
-  
-  # Task commands
-  ai task ls                        \u67E5\u770B\u5F53\u524D\u4EFB\u52A1\u961F\u5217
-  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
-  
-  # MCP commands
-  ai mcp edit                       \u6253\u5F00 MCP \u914D\u7F6E\u6587\u4EF6\u8FDB\u884C\u7F16\u8F91
-  
-  # Serve commands
-  ai serve                          \u542F\u52A8\u670D\u52A1\u6216\u8FDB\u5165\u670D\u52A1\u7BA1\u7406\u5165\u53E3
-  ai serve start                    \u542F\u52A8\u540E\u53F0\u670D\u52A1
-  ai serve stop                     \u505C\u6B62\u540E\u53F0\u670D\u52A1
-  ai serve restart                  \u91CD\u542F\u540E\u53F0\u670D\u52A1
-  
-  # Cache commands
-  ai cache ls                       \u67E5\u770B\u5DF2\u7F13\u5B58\u7684\u5B66\u4E60\u5185\u5BB9\u5217\u8868
-  ai cache edit <index|id>          \u7F16\u8F91\u6307\u5B9A\u5E8F\u53F7\u6216 ID \u7684\u7F13\u5B58\u5185\u5BB9
-  ai cache del <index|id>           \u5220\u9664\u6307\u5B9A\u5E8F\u53F7\u6216 ID \u7684\u7F13\u5B58\u5185\u5BB9
-`;
-}
-function registerHelpCommand(program) {
-  program.helpInformation = helpInformation;
-  program.command("help").description("Displaying help information").action(() => {
-    logInfo(helpInformation());
-  });
-}
-
 // src/cli/index.ts
 function main() {
   initConfig();