byteplan-cli 1.3.2 → 1.3.3

package/README.md

@@ -45,55 +45,44 @@ byteplan data query <modelCode>
 
 ### Skills Commands
 
-BytePlan CLI 提供了一系列 Claude Code Skills，可以安装到多个 AI CLI 平台。
+BytePlan CLI 提供了一系列 Skills，可以安装到多个 AI CLI 平台。
 
-### 查看可用 Skills
+**命令列表**：
 
 ```bash
+# 查看可用的 Skills
 byteplan skills list
-```
-
-### 安装 Skills
-
-支持多平台安装，使用 `-p` 或 `--platform` 参数指定目标平台：
-
-```bash
-# 安装到 Claude Code
-byteplan skills install byteplan-api -p claude-code
-
-# 安装到多个平台
-byteplan skills install -p claude-code,codex,openclaw
 
 # 安装所有 Skills
-byteplan skills install-all -p claude-code
-```
+byteplan skills install -p claude-code
 
-### 支持的平台
+# 查看已安装的 Skills
+byteplan skills installed -p claude-code
+```
 
-| Platform | 目录 | 说明 |
-|----------|------|------|
-| `claude-code` (alias: `claude`) | `~/.claude/commands` | Claude Code CLI |
-| `codex` | `~/.codex` | OpenAI Codex CLI |
-| `openclaw` | `~/.openclaw/skills` | OpenClaw |
+**支持的平台**：
 
-### 自定义目录
+| Platform | 目录 |
+|----------|------|
+| `claude-code` (alias: `claude`) | `~/.claude/commands` |
+| `codex` | `~/.codex` |
+| `openclaw` | `~/.openclaw/skills` |
 
-也可以使用 `-d` 参数指定自定义目录：
+**安装示例**：
 
 ```bash
-# 向后兼容：指定自定义目录
-byteplan skills install byteplan-api -d ~/.claude/commands
+# 安装到单个平台
+byteplan skills install -p claude-code
 
-# 组合使用：覆盖平台默认目录
-byteplan skills install byteplan-api -p claude-code -d /custom/path
-```
-
-### 查看已安装 Skills
+# 安装到多个平台
+byteplan skills install -p claude-code,codex,openclaw
 
-```bash
-byteplan skills installed -p claude-code
+# 使用自定义目录
+byteplan skills install -d ~/.claude/commands
 ```
 
+**Windows 用户**：`~` 路径会自动展开，也可使用 `%USERPROFILE%` 环境变量。
+
 ## Options
 
 - `-e, --env <environment>` - Environment (uat, prod), default: uat

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "byteplan-cli",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "BytePlan CLI - Command line tool for BytePlan API",
   "keywords": [
     "byteplan",

package/src/commands/skills.js

@@ -12,6 +12,23 @@ import { createRequire } from 'module';
 
 const require = createRequire(import.meta.url);
 
+// 展开 ~ 路径，支持跨平台
+function expandHomeDir(dirPath) {
+  if (!dirPath) return dirPath;
+
+  // 处理 ~ 开头的路径
+  if (dirPath.startsWith('~')) {
+    return path.join(homedir(), dirPath.slice(1));
+  }
+
+  // Windows: 处理 %USERPROFILE% 环境变量
+  if (dirPath.includes('%USERPROFILE%')) {
+    return dirPath.replace('%USERPROFILE%', homedir());
+  }
+
+  return dirPath;
+}
+
 // 平台默认目录映射
 const PLATFORM_DIRS = {
   'claude-code': path.join(homedir(), '.claude', 'commands'),
@@ -22,24 +39,20 @@ const PLATFORM_DIRS = {
 
 // Skills 源目录（在 npm 包中）
 const getSkillsSourceDir = () => {
-  // 获取当前模块所在目录，然后向上找到项目根目录
   const currentDir = path.dirname(new URL(import.meta.url).pathname);
-  // 从 src/commands/skills.js -> src -> 项目根目录 -> skills
   return path.join(currentDir, '..', '..', 'skills');
 };
 
-// 解析平台和目录参数，返回目标目录列表
+// 解析平台和目录参数
 function resolveTargetDirs(platformArg, dirArg) {
   const targets = [];
+  const expandedDirArg = expandHomeDir(dirArg);
 
   if (platformArg) {
-    // 解析平台列表（逗号分隔）
     const platforms = platformArg.split(',').map(p => p.trim());
-
     for (const platform of platforms) {
       const normalizedName = platform.toLowerCase();
       const defaultDir = PLATFORM_DIRS[normalizedName];
-
       if (!defaultDir) {
         return {
           error: true,
@@ -47,20 +60,17 @@ function resolveTargetDirs(platformArg, dirArg) {
           available: Object.keys(PLATFORM_DIRS).filter(k => !k.includes('-')),
         };
       }
-
       targets.push({
         platform: normalizedName,
-        targetDir: dirArg || defaultDir, // 如果指定了 -d，覆盖所有平台的默认目录
+        targetDir: expandedDirArg || defaultDir,
       });
     }
-  } else if (dirArg) {
-    // 向后兼容：只指定 -d 的情况
+  } else if (expandedDirArg) {
     targets.push({
       platform: 'custom',
-      targetDir: dirArg,
+      targetDir: expandedDirArg,
     });
   } else {
-    // 都不指定，返回错误
     return {
       error: true,
       message: 'Must specify at least one of --platform or --dir',
@@ -82,17 +92,11 @@ function printError(error) {
 // 获取 skill 信息
 function getSkillInfo(skillPath) {
   const skillMdPath = path.join(skillPath, 'SKILL.md');
-  if (!existsSync(skillMdPath)) {
-    return null;
-  }
+  if (!existsSync(skillMdPath)) return null;
 
   const content = readFileSync(skillMdPath, 'utf-8');
-
-  // 解析 frontmatter
   const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
-  if (!frontmatterMatch) {
-    return null;
-  }
+  if (!frontmatterMatch) return null;
 
   const frontmatter = frontmatterMatch[1];
   const nameMatch = frontmatter.match(/name:\s*(.+)/);
@@ -101,283 +105,183 @@ function getSkillInfo(skillPath) {
   return {
     name: nameMatch ? nameMatch[1].trim() : path.basename(skillPath),
     description: descMatch ? descMatch[1].trim() : '',
-    path: skillPath,
   };
 }
 
 // 获取所有可用 skills
 function getAvailableSkills() {
   const sourceDir = getSkillsSourceDir();
-  if (!existsSync(sourceDir)) {
-    return [];
-  }
+  if (!existsSync(sourceDir)) return [];
 
   const skills = [];
   const dirs = readdirSync(sourceDir, { withFileTypes: true });
-
   for (const dir of dirs) {
     if (dir.isDirectory()) {
-      const skillPath = path.join(sourceDir, dir.name);
-      const info = getSkillInfo(skillPath);
-      if (info) {
-        skills.push(info);
-      }
+      const info = getSkillInfo(path.join(sourceDir, dir.name));
+      if (info) skills.push(info);
     }
   }
-
   return skills;
 }
 
-// 获取已安装的 skills（支持自定义目录）
+// 获取已安装的 skills
 function getInstalledSkills(targetDir) {
-  if (!existsSync(targetDir)) {
-    return [];
-  }
+  if (!existsSync(targetDir)) return [];
 
   const skills = [];
   const dirs = readdirSync(targetDir, { withFileTypes: true });
-
   for (const dir of dirs) {
     if (dir.isDirectory() && dir.name.startsWith('byteplan-')) {
-      const skillPath = path.join(targetDir, dir.name);
-      const info = getSkillInfo(skillPath);
-      if (info) {
-        skills.push(info);
-      }
+      const info = getSkillInfo(path.join(targetDir, dir.name));
+      if (info) skills.push(info);
     }
   }
-
   return skills;
 }
 
+// 安装所有 skills
+function installAllSkills(targetDirs) {
+  const sourceDir = getSkillsSourceDir();
+  const availableSkills = getAvailableSkills();
+  const toInstall = availableSkills.map(s => s.name);
+  const results = {};
+
+  for (const target of targetDirs) {
+    if (!existsSync(target.targetDir)) {
+      mkdirSync(target.targetDir, { recursive: true });
+    }
+
+    const installed = [];
+    for (const skillName of toInstall) {
+      cpSync(
+        path.join(sourceDir, skillName),
+        path.join(target.targetDir, skillName),
+        { recursive: true }
+      );
+      installed.push(skillName);
+    }
+
+    results[target.platform] = {
+      targetDir: target.targetDir,
+      installed: installed,
+      count: installed.length,
+    };
+  }
+
+  return { results, totalSkills: toInstall.length };
+}
+
 // Skills 命令
 const skillsCmd = new Command('skills')
-  .description('Manage BytePlan Claude Code skills')
-  .option('-d, --dir <directory>', 'Target installation directory (overrides platform default)')
-  .option('-p, --platform <platforms>', 'Target platform(s): claude-code, codex, openclaw (comma-separated for multiple)')
+  .description('Manage BytePlan skills (install, list, check installed)')
+  .option('-p, --platform <platforms>', 'Target platform(s): claude-code, codex, openclaw (comma-separated)')
+  .option('-d, --dir <directory>', 'Custom target directory')
   .addHelpText('after', `
 Commands:
-  skills list              List all available skills
-  skills installed         List installed skills (requires -p or -d)
-  skills install [names]   Install skills (requires -p or -d)
-  skills install-all       Install all BytePlan skills (requires -p or -d)
+  skills install     Install all BytePlan skills
+  skills list        List all available skills
+  skills installed   List installed skills
 
-Supported Platforms:
-  claude-code (alias: claude)  → ~/.claude/commands
-  codex                        → ~/.codex
-  openclaw                     → ~/.openclaw/skills
+Platforms:
+  claude-code (claude)  ~/.claude/commands
+  codex                 ~/.codex
+  openclaw              ~/.openclaw/skills
 
 Examples:
-  $ byteplan skills list
-  $ byteplan skills installed -p claude-code
-  $ byteplan skills install byteplan-api -p claude-code
-  $ byteplan skills install byteplan-api byteplan-analysis -p claude-code,codex
-  $ byteplan skills install-all -p claude-code,openclaw
-  $ byteplan skills install byteplan-api -d ~/.claude/commands
-  $ byteplan skills install byteplan-api -p claude-code -d /custom/path
+  byteplan skills install -p claude-code
+  byteplan skills install -p claude-code,codex,openclaw
+  byteplan skills list
 `);
 
-// skills list 子命令
+// skills install 子命令 - 安装全部
 skillsCmd
-  .command('list')
-  .description('List all available BytePlan skills')
-  .action(() => {
-    try {
-      const skills = getAvailableSkills();
-
-      printJSON({
-        skills: skills.map(s => ({
-          name: s.name,
-          description: s.description,
-        })),
-        total: skills.length,
-        sourceDir: getSkillsSourceDir(),
-      });
-    } catch (error) {
-      printError(error);
-    }
-  });
+  .command('install')
+  .description('Install all BytePlan skills to target platform(s)')
+  .addHelpText('after', `
+Options (from parent):
+  -p, --platform   Target platform(s): claude-code, codex, openclaw
+  -d, --dir        Custom target directory
 
-// skills installed 子命令
-skillsCmd
-  .command('installed')
-  .description('List installed BytePlan skills in target directory')
+Examples:
+  byteplan skills install -p claude-code
+  byteplan skills install -p claude-code,codex
+  byteplan skills install -d ~/.claude/commands
+`)
   .action(() => {
     try {
       const parentOptions = skillsCmd.opts();
-      const platformArg = parentOptions.platform;
-      const dirArg = parentOptions.dir;
+      const resolved = resolveTargetDirs(parentOptions.platform, parentOptions.dir);
 
-      const resolved = resolveTargetDirs(platformArg, dirArg);
       if (resolved.error) {
         printJSON(resolved);
         process.exit(1);
       }
 
-      const results = {};
-      for (const target of resolved.targets) {
-        const skills = getInstalledSkills(target.targetDir);
-        results[target.platform] = {
-          targetDir: target.targetDir,
-          skills: skills.map(s => ({
-            name: s.name,
-            description: s.description,
-          })),
-          count: skills.length,
-        };
-      }
+      const { results, totalSkills } = installAllSkills(resolved.targets);
 
       printJSON({
+        success: true,
         platforms: results,
         totalPlatforms: resolved.targets.length,
+        totalSkills: totalSkills,
       });
     } catch (error) {
       printError(error);
     }
   });
 
-// skills install 子命令
+// skills list 子命令
 skillsCmd
-  .command('install [names...]')
-  .description('Install specified skills to target directory')
-  .option('-a, --all', 'Install all BytePlan skills', false)
-  .addHelpText('after', `
-Examples:
-  $ byteplan skills install byteplan-api -p claude-code
-  $ byteplan skills install byteplan-api byteplan-analysis -p claude-code,codex
-  $ byteplan skills install --all -p claude-code
-  $ byteplan skills install byteplan-api -d ~/.claude/commands
-  $ byteplan skills install byteplan-api -p claude-code -d /custom/path
-`)
-  .action(async (names, options) => {
+  .command('list')
+  .description('List all available BytePlan skills')
+  .action(() => {
     try {
-      const parentOptions = skillsCmd.opts();
-      const platformArg = parentOptions.platform;
-      const dirArg = parentOptions.dir;
-
-      const resolved = resolveTargetDirs(platformArg, dirArg);
-      if (resolved.error) {
-        printJSON(resolved);
-        process.exit(1);
-      }
-
-      const sourceDir = getSkillsSourceDir();
-
-      // 获取要安装的 skills
-      let toInstall = names || [];
-      if (options.all || toInstall.length === 0) {
-        const available = getAvailableSkills();
-        toInstall = available.map(s => s.name);
-      }
-
-      // 验证 skills 存在
-      const availableSkills = getAvailableSkills();
-      const availableNames = availableSkills.map(s => s.name);
-
-      const invalid = toInstall.filter(n => !availableNames.includes(n));
-      if (invalid.length > 0) {
-        printJSON({
-          error: true,
-          message: `Unknown skills: ${invalid.join(', ')}`,
-          available: availableNames,
-        });
-        process.exit(1);
-      }
-
-      // 安装到各目标目录
-      const results = {};
-      for (const target of resolved.targets) {
-        const targetDir = target.targetDir;
-
-        // 确保目标目录存在
-        if (!existsSync(targetDir)) {
-          mkdirSync(targetDir, { recursive: true });
-        }
-
-        // 安装 skills
-        const installed = [];
-        for (const skillName of toInstall) {
-          const skillSourcePath = path.join(sourceDir, skillName);
-          const skillTargetPath = path.join(targetDir, skillName);
-
-          // 复制 skill 目录
-          cpSync(skillSourcePath, skillTargetPath, { recursive: true });
-          installed.push(skillName);
-        }
-
-        results[target.platform] = {
-          targetDir: targetDir,
-          installed: installed,
-          count: installed.length,
-        };
-      }
-
+      const skills = getAvailableSkills();
       printJSON({
-        success: true,
-        platforms: results,
-        totalPlatforms: resolved.targets.length,
-        totalSkills: toInstall.length,
+        skills: skills.map(s => ({ name: s.name, description: s.description })),
+        total: skills.length,
       });
     } catch (error) {
       printError(error);
     }
   });
 
-// skills install-all 子命令（快捷方式）
+// skills installed 子命令
 skillsCmd
-  .command('install-all')
-  .description('Install all BytePlan skills to target directory')
-  .action(async () => {
+  .command('installed')
+  .description('List installed BytePlan skills')
+  .addHelpText('after', `
+Options (from parent):
+  -p, --platform   Target platform(s): claude-code, codex, openclaw
+  -d, --dir        Custom target directory
+
+Examples:
+  byteplan skills installed -p claude-code
+  byteplan skills installed -d ~/.claude/commands
+`)
+  .action(() => {
     try {
       const parentOptions = skillsCmd.opts();
-      const platformArg = parentOptions.platform;
-      const dirArg = parentOptions.dir;
+      const resolved = resolveTargetDirs(parentOptions.platform, parentOptions.dir);
 
-      const resolved = resolveTargetDirs(platformArg, dirArg);
       if (resolved.error) {
         printJSON(resolved);
         process.exit(1);
       }
 
-      const sourceDir = getSkillsSourceDir();
-
-      // 获取所有 skills
-      const availableSkills = getAvailableSkills();
-      const toInstall = availableSkills.map(s => s.name);
-
-      // 安装到各目标目录
       const results = {};
       for (const target of resolved.targets) {
-        const targetDir = target.targetDir;
-
-        // 确保目标目录存在
-        if (!existsSync(targetDir)) {
-          mkdirSync(targetDir, { recursive: true });
-        }
-
-        // 安装所有 skills
-        const installed = [];
-        for (const skillName of toInstall) {
-          const skillSourcePath = path.join(sourceDir, skillName);
-          const skillTargetPath = path.join(targetDir, skillName);
-
-          // 复制 skill 目录
-          cpSync(skillSourcePath, skillTargetPath, { recursive: true });
-          installed.push(skillName);
-        }
-
+        const skills = getInstalledSkills(target.targetDir);
         results[target.platform] = {
-          targetDir: targetDir,
-          installed: installed,
-          count: installed.length,
+          targetDir: target.targetDir,
+          skills: skills.map(s => ({ name: s.name, description: s.description })),
+          count: skills.length,
         };
       }
 
       printJSON({
-        success: true,
         platforms: results,
         totalPlatforms: resolved.targets.length,
-        totalSkills: toInstall.length,
       });
     } catch (error) {
       printError(error);