deepfish-ai 2.0.13 → 2.0.15

package/dist/index.js

@@ -8704,6 +8704,7 @@ function getGlobalNodeModulesPath() {
 var node_root_default = getGlobalNodeModulesPath;
 
 // src/cli/cli-utils/getGlobalPath.ts
+var import_os2 = __toESM(require("os"));
 var getDirname = () => __dirname;
 function getHomePath() {
   return HOME_DIR;
@@ -8772,6 +8773,11 @@ function getScanDirPaths() {
   }
   return Array.from(paths);
 }
+function getScanSkillDirPaths() {
+  const workspacePath = getWorkspacePath();
+  const paths = getScanDirPaths();
+  return [...paths, import_path2.default.join(import_os2.default.homedir(), ".agents"), import_path2.default.join(workspacePath, ".agents")];
+}
 function getMCPFilePath() {
   const mcpPath = import_path2.default.join(HOME_DIR, "mcp.json");
   if (!import_fs_extra.default.pathExistsSync(mcpPath)) {
@@ -24511,7 +24517,7 @@ ${params.systemPrompt + basePrompt}
 // src/agent/tools/executeCommand.ts
 var import_child_process2 = require("child_process");
 var import_chardet = __toESM(require_lib());
-var import_os2 = __toESM(require("os"));
+var import_os3 = __toESM(require("os"));
 var import_iconv_lite = __toESM(require("iconv-lite"));
 var import_langchain3 = require("langchain");
 
@@ -24936,7 +24942,7 @@ Command executed successfully`);
 }
 function detectEncoding(buffer) {
   if (!buffer) {
-    return import_os2.default.platform() === "win32" ? "gbk" : "utf-8";
+    return import_os3.default.platform() === "win32" ? "gbk" : "utf-8";
   }
   const detected = import_chardet.default.detect(buffer);
   const encoding = detected?.toLowerCase();
@@ -24946,11 +24952,11 @@ function detectEncoding(buffer) {
   if (encoding && ["gbk", "gb2312", "gb18030"].includes(encoding)) {
     return "gbk";
   }
-  return import_os2.default.platform() === "win32" ? "gbk" : "utf-8";
+  return import_os3.default.platform() === "win32" ? "gbk" : "utf-8";
 }
 var executeCommandTool = (0, import_langchain3.tool)(({ command, timeout }) => safeTool(() => executeCommand(command, timeout)), {
   name: "execute_command",
-  description: `\u5728\u672C\u5730\u7CFB\u7EDF(${import_os2.default.platform()})\u4E0A\u6267\u884C\u4E00\u6761 shell \u547D\u4EE4\u5E76\u8FD4\u56DE\u8F93\u51FA\u7ED3\u679C\u3002\u9002\u7528\u4E8Erunning\u811A\u672C\u3001\u64CD\u4F5C\u6587\u4EF6\u7CFB\u7EDF\u3001\u542F\u52A8\u8FDB\u7A0B\u7B49\u573A\u666F\u3002\u5FC5\u987B\u6CE8\u610F\u64CD\u4F5C\u7CFB\u7EDF\u7684\u517C\u5BB9\u6027\uFF0C\u5F53\u524D\u64CD\u4F5C\u7CFB\u7EDF\u4E3A ${import_os2.default.platform()}\u3002`,
+  description: `\u5728\u672C\u5730\u7CFB\u7EDF(${import_os3.default.platform()})\u4E0A\u6267\u884C\u4E00\u6761 shell \u547D\u4EE4\u5E76\u8FD4\u56DE\u8F93\u51FA\u7ED3\u679C\u3002\u9002\u7528\u4E8Erunning\u811A\u672C\u3001\u64CD\u4F5C\u6587\u4EF6\u7CFB\u7EDF\u3001\u542F\u52A8\u8FDB\u7A0B\u7B49\u573A\u666F\u3002\u5FC5\u987B\u6CE8\u610F\u64CD\u4F5C\u7CFB\u7EDF\u7684\u517C\u5BB9\u6027\uFF0C\u5F53\u524D\u64CD\u4F5C\u7CFB\u7EDF\u4E3A ${import_os3.default.platform()}\u3002`,
   schema: external_exports.object({
     command: external_exports.string().describe("\u8981\u6267\u884C\u7684 shell \u547D\u4EE4"),
     timeout: external_exports.number().default(-1).describe("\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09\uFF0C-1 \u8868\u793A\u4E0D\u9650\u5236")
@@ -25874,13 +25880,13 @@ function getSkills() {
 }
 
 // src/agent/AIAgent/index.ts
-var import_os4 = __toESM(require("os"));
+var import_os5 = __toESM(require("os"));
 
 // src/agent/AIAgent/SubAgents/SubAIAgent.ts
 var import_langchain18 = require("langchain");
 var import_deepagents = require("deepagents");
 var import_eventemitter_super = require("eventemitter-super");
-var import_os3 = __toESM(require("os"));
+var import_os4 = __toESM(require("os"));
 var import_crypto4 = require("crypto");
 var import_lodash = require("lodash");
 var SubAIAgent = class _SubAIAgent extends import_eventemitter_super.EventEmitterSuper {
@@ -25944,7 +25950,7 @@ var SubAIAgent = class _SubAIAgent extends import_eventemitter_super.EventEmitte
     const systemPrompt = this.subLevel > 2 ? getSystemPrompt({
       systemPrompt: this.systemPrompt,
       workspace: this.workspace,
-      osType: import_os3.default.platform(),
+      osType: import_os4.default.platform(),
       skills: this.skills,
       memoryFilePath: this.memoryFilePath,
       agentRulesPath: this.agentRulesPath,
@@ -25952,7 +25958,7 @@ var SubAIAgent = class _SubAIAgent extends import_eventemitter_super.EventEmitte
     }) : subSystemPrompt({
       systemPrompt: this.systemPrompt,
       workspace: this.workspace,
-      osType: import_os3.default.platform(),
+      osType: import_os4.default.platform(),
       skills: this.skills,
       excludeSkills: this.excludeSkills
     });
@@ -26152,7 +26158,7 @@ var AIAgent = class extends import_eventemitter_super2.EventEmitterSuper {
       systemPrompt: getSystemPrompt({
         systemPrompt: this.systemPrompt,
         workspace: this.workspace,
-        osType: import_os4.default.platform(),
+        osType: import_os5.default.platform(),
         skills: this.skills,
         memoryFilePath: this.memoryFilePath,
         agentRulesPath: this.agentRulesPath,
@@ -26749,6 +26755,17 @@ async function handleSkillsAdd(name) {
   }
   const targetDir = scope === "local" ? localSkillDir : globalSkillDir;
   const targetPath = import_path20.default.join(targetDir, name);
+  const { action } = await import_inquirer3.default.prompt([
+    {
+      type: "select",
+      name: "action",
+      message: "Select add action:",
+      choices: [
+        { name: "Move (cut)", value: "move" },
+        { name: "Copy", value: "copy" }
+      ]
+    }
+  ]);
   if (import_fs_extra20.default.existsSync(targetPath)) {
     const { overwrite } = await import_inquirer3.default.prompt([
       {
@@ -26764,8 +26781,12 @@ async function handleSkillsAdd(name) {
     }
     import_fs_extra20.default.removeSync(targetPath);
   }
-  import_fs_extra20.default.moveSync(skillDir, targetPath, { overwrite: true });
-  logSuccess(`Skill ${scope === "local" ? "locally" : "globally"} added: ${targetPath}`);
+  if (action === "move") {
+    import_fs_extra20.default.moveSync(skillDir, targetPath, { overwrite: true });
+  } else {
+    import_fs_extra20.default.copySync(skillDir, targetPath, { overwrite: true });
+  }
+  logSuccess(`Skill ${scope === "local" ? "locally" : "globally"} ${action === "move" ? "moved" : "copied"}: ${targetPath}`);
   _updateRegister(targetDir);
 }
 function handleSkillsDel(index) {
@@ -26914,7 +26935,7 @@ function _updateRegister(skillsDir) {
   import_fs_extra20.default.writeJSONSync(registerPath, register, { spaces: 2 });
 }
 function getRegisteredSkills() {
-  const scanPaths = getScanDirPaths();
+  const scanPaths = getScanSkillDirPaths();
   const skills = [];
   scanPaths.forEach((scanPath) => {
     const scanDir = import_path20.default.join(scanPath, "skills");
@@ -26942,7 +26963,7 @@ function _getSkillList(skillsDir) {
   return allSkills;
 }
 function _getAllSkills() {
-  const scanPaths = getScanDirPaths();
+  const scanPaths = getScanSkillDirPaths();
   let allSkills = [];
   scanPaths.forEach((scanPath) => {
     const scanDir = import_path20.default.join(scanPath, "skills");
@@ -26958,10 +26979,17 @@ function _getAllSkills() {
 function _getRegisterPath(skillsDir) {
   const normalizedDir = import_path20.default.normalize(skillsDir);
   const baseName = import_path20.default.basename(normalizedDir).toLowerCase();
+  let resultPath = "";
   if (baseName === "@deepfish-ai" || baseName === "skills") {
-    return import_path20.default.join(normalizedDir, "register.json");
+    resultPath = import_path20.default.join(normalizedDir, "register.json");
+  } else {
+    resultPath = import_path20.default.join(normalizedDir, "skills", "register.json");
+  }
+  if (import_fs_extra20.default.existsSync(normalizedDir) && !import_fs_extra20.default.existsSync(resultPath)) {
+    import_fs_extra20.default.ensureDirSync(import_path20.default.dirname(resultPath));
+    import_fs_extra20.default.writeJSONSync(resultPath, [], { spaces: 2 });
   }
-  return import_path20.default.join(normalizedDir, "skills", "register.json");
+  return resultPath;
 }
 
 // src/cli/cli-skills.ts
@@ -27039,6 +27067,17 @@ async function handleToolsAdd(name) {
   const localToolDir = import_path21.default.join(workspace, ".deepfish-ai", "tools");
   const targetDir = scope === "local" ? localToolDir : globalToolDir;
   const targetPath = import_path21.default.join(targetDir, name);
+  const { action } = await import_inquirer4.default.prompt([
+    {
+      type: "select",
+      name: "action",
+      message: "Select add action:",
+      choices: [
+        { name: "Move (cut)", value: "move" },
+        { name: "Copy", value: "copy" }
+      ]
+    }
+  ]);
   import_fs_extra21.default.ensureDirSync(targetDir);
   if (import_fs_extra21.default.existsSync(targetPath)) {
     const { overwrite } = await import_inquirer4.default.prompt([
@@ -27055,8 +27094,12 @@ async function handleToolsAdd(name) {
     }
     import_fs_extra21.default.removeSync(targetPath);
   }
-  import_fs_extra21.default.moveSync(toolDir, targetPath, { overwrite: true });
-  logSuccess(`Tool ${scope === "local" ? "locally" : "globally"} added: ${targetPath}`);
+  if (action === "move") {
+    import_fs_extra21.default.moveSync(toolDir, targetPath, { overwrite: true });
+  } else {
+    import_fs_extra21.default.copySync(toolDir, targetPath, { overwrite: true });
+  }
+  logSuccess(`Tool ${scope === "local" ? "locally" : "globally"} ${action === "move" ? "moved" : "copied"}: ${targetPath}`);
 }
 async function handleToolsGenerate(target) {
   if (!target.trim()) {
@@ -27416,7 +27459,7 @@ async function handlePlan(args) {
 }
 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
+\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\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\u6587\u4EF6 tmp_tasklist.json \u4E2D\u7684\u5B50\u4EFB\u52A1\uFF0C\u5B8C\u6210\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\u6587\u4EF6 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

package/dist/skills/planning-do.md

@@ -29,8 +29,8 @@ homepage: ''
    - 一次最多问8个问题，避免一次性问太多
    - 持续交互直到需求足够清晰，能够拆解为具体的子任务
 3. 将收敛后的完整需求作为用户的原始任务描述；
-4. 在当前目录创建 tmp_task_goal.md，记录收敛后的完整需求描述；
-5. 创建 tmp_tasklist.json，包含拆解后的子任务列表。
+4. 在当前工作目录创建文件 tmp_task_goal.md，记录收敛后的完整需求描述；
+5. 在当前工作目录创建文件 tmp_tasklist.json，包含拆解后的子任务列表。
 
 tmp_tasklist.json 格式要求：
 - 必须是合法的 JSON 数组
@@ -60,7 +60,7 @@ tmp_tasklist.json 格式要求：
 **调度管理器子Agent提示词：**
 
 ```
-你负责按顺序调度执行 tmp_tasklist.json 中的子任务，完成 tmp_task_goal.md 描述的整体目标。
+你负责按顺序调度执行当前工作目录文件 tmp_tasklist.json 中的子任务，完成当前工作目录文件 tmp_task_goal.md 描述的整体目标。
 
 执行规则：
 1. 先读取 tmp_task_goal.md 了解整体目标；

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepfish-ai",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "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": {