rushangle-cli 0.2.5 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rushangle-cli",
-  "version": "0.2.5",
+  "version": "0.4.0",
   "description": "SkillHub CLI - 数智凯航技能市场命令行工具",
   "bin": {
     "rushangle": "./bin/rushangle.js"

package/src/api.js

@@ -87,6 +87,63 @@ module.exports = {
   deleteDoc(id) { return apiCall('DELETE', `/api/docs/${encodeURIComponent(id)}`); },
   myDocs() { return apiCall('GET', '/api/docs/my'); },
 
+  // CLI Tools
+  listCli(params = {}) {
+    const qs = new URLSearchParams(params).toString();
+    return apiCall('GET', `/api/cli${qs ? '?' + qs : ''}`);
+  },
+  getCli(id) { return apiCall('GET', `/api/cli/${encodeURIComponent(id)}`); },
+  publishCli(data) { return apiCall('POST', '/api/cli', data); },
+  updateCli(id, data) { return apiCall('PUT', `/api/cli/${encodeURIComponent(id)}`, data); },
+  deleteCli(id) { return apiCall('DELETE', `/api/cli/${encodeURIComponent(id)}`); },
+  installCli(id) { return apiCall('POST', `/api/cli/${encodeURIComponent(id)}/install`); },
+  installedCli() { return apiCall('GET', '/api/cli/installed'); },
+  myCli() { return apiCall('GET', '/api/cli/my'); },
+
+  // CLI file upload
+  async uploadCliFiles(cliId, files) {
+    const token = auth.getToken();
+    const FormData = require('form-data');
+    const form = new FormData();
+    for (const { fieldName, filePath } of files) {
+      form.append(fieldName, fs.createReadStream(filePath), path.basename(filePath));
+    }
+
+    const res = await fetch(`${SITE_URL}/api/cli/${encodeURIComponent(cliId)}/files`, {
+      method: 'POST',
+      headers: { ...form.getHeaders(), 'Authorization': `Bearer ${token}` },
+      body: form,
+    });
+
+    const data = await res.json();
+    if (!res.ok) {
+      const err = new Error(data.error || 'Upload failed');
+      err.status = res.status;
+      err.data = data;
+      throw err;
+    }
+    return data;
+  },
+
+  // CLI file download
+  async downloadCliFiles(cliId) {
+    const token = auth.getToken();
+    const res = await fetch(`${SITE_URL}/api/cli/${encodeURIComponent(cliId)}/download`, {
+      headers: { 'Authorization': `Bearer ${token}` },
+    });
+
+    if (!res.ok) {
+      const data = await res.json().catch(() => ({ error: `HTTP ${res.status}` }));
+      const err = new Error(data.error || 'Download failed');
+      err.status = res.status;
+      throw err;
+    }
+
+    const contentType = res.headers.get('content-type') || '';
+    const arrayBuffer = await res.arrayBuffer();
+    return { buffer: Buffer.from(arrayBuffer), contentType };
+  },
+
   // Search
   search(query) { return apiCall('GET', `/api/search?q=${encodeURIComponent(query)}`); },
 

package/src/commands/config.js

@@ -0,0 +1,49 @@
+const { Command } = require('commander');
+const chalk = require('chalk');
+const { getConfig, setConfig, listConfig } = require('../config');
+
+module.exports = new Command('config')
+  .description('管理 CLI 配置')
+  .argument('<action>', 'get | set | delete | list')
+  .argument('[key]', '配置键名')
+  .argument('[value]', '配置值（set 时需要）')
+  .action((action, key, value) => {
+    switch (action) {
+      case 'list':
+        listConfig();
+        break;
+      case 'get': {
+        if (!key) {
+          console.log(chalk.yellow('用法: rushangle config get <key>'));
+          return;
+        }
+        const cfg = getConfig();
+        if (cfg[key] !== undefined) {
+          console.log(cfg[key]);
+        } else {
+          console.log(chalk.gray('(未设置)'));
+        }
+        break;
+      }
+      case 'set': {
+        if (!key || value === undefined) {
+          console.log(chalk.yellow('用法: rushangle config set <key> <value>'));
+          return;
+        }
+        setConfig(key, value);
+        console.log(chalk.green(`✓ ${key} = ${value}`));
+        break;
+      }
+      case 'delete': {
+        if (!key) {
+          console.log(chalk.yellow('用法: rushangle config delete <key>'));
+          return;
+        }
+        setConfig(key, null);
+        console.log(chalk.green(`✓ 已删除 ${key}`));
+        break;
+      }
+      default:
+        console.log(chalk.red(`未知操作: ${action}。支持: get | set | delete | list`));
+    }
+  });

package/src/commands/install.js

@@ -5,16 +5,28 @@ const path = require('path');
 const os = require('os');
 const auth = require('../auth');
 const api = require('../api');
+const { getConfig } = require('../config');
 
-const INSTALL_DIR = path.join(os.homedir(), '.workbuddy', 'skills');
+// SkillHub 自己的地盘，平台中立
+const DEFAULT_INSTALL_DIR = path.join(os.homedir(), '.rushangle', 'skills');
+
+function resolveInstallDir(opts) {
+  // 优先级: --dir > config installDir > 默认 ~/.rushangle/skills/
+  if (opts.dir) return opts.dir;
+  const config = getConfig();
+  if (config.installDir) return config.installDir;
+  return DEFAULT_INSTALL_DIR;
+}
 
 module.exports = new Command('install')
   .description('安装技能/MCP/代码段')
   .argument('[skill]', '技能名称或 ID')
-  .option('-t, --type <type>', '类型: skill | mcp | code | doc', 'skill')
+  .option('-t, --type <type>', '类型: skill | mcp | code | doc | cli', 'skill')
   .option('-g, --global', '全局安装（默认）', true)
+  .option('-d, --dir <dir>', '自定义安装目录（覆盖 config 和默认值）')
   .option('--register-only', '仅注册到服务器，不写入本地文件（适用于受限环境）')
   .action(async (nameOrId, opts) => {
+    const skillDirBase = resolveInstallDir(opts);
     const token = auth.getToken();
     if (!token) {
       console.log(chalk.red('请先登录: rushangle login'));
@@ -67,7 +79,7 @@ module.exports = new Command('install')
               const { buffer } = await api.downloadSkillFiles(item.id);
               const AdmZip = require('adm-zip');
               const zip = new AdmZip(buffer);
-              const skillDir = path.join(INSTALL_DIR, item.name);
+              const skillDir = path.join(skillDirBase, item.name);
               zip.extractAllTo(skillDir, true);
               console.log(chalk.green(`✓ 安装成功: ${item.name}@${item.version}`));
               console.log(chalk.gray(`  本地目录: ${skillDir}`));
@@ -83,8 +95,7 @@ module.exports = new Command('install')
 
             // Fallback: create SKILL.md from metadata if no files were downloaded
             if (!extracted) {
-              const skillDir = path.join(INSTALL_DIR, item.name);
-              fs.mkdirSync(skillDir, { recursive: true });
+              const skillDir = path.join(skillDirBase, item.name);
 
               // Generate SKILL.md with frontmatter from server metadata
               const frontmatter = [
@@ -146,7 +157,7 @@ module.exports = new Command('install')
         let installDir = '';
         if (!opts.registerOnly) {
           try {
-            installDir = path.join(INSTALL_DIR, 'mcp', item.id);
+            installDir = path.join(skillDirBase, 'mcp', item.id);
             fs.mkdirSync(installDir, { recursive: true });
             if (item.code) {
               const ext = item.language === 'python' || item.language === 'py' ? '.py'
@@ -203,7 +214,7 @@ module.exports = new Command('install')
         let installDir = '';
         if (!opts.registerOnly) {
           try {
-            installDir = path.join(INSTALL_DIR, 'code', item.id);
+            installDir = path.join(skillDirBase, 'code', item.id);
             fs.mkdirSync(installDir, { recursive: true });
             if (item.code) {
               const extMap = { python: '.py', py: '.py', javascript: '.js', typescript: '.ts', go: '.go', rust: '.rs', java: '.java', c: '.c', cpp: '.cpp', shell: '.sh', bash: '.sh', json: '.json', yaml: '.yml', toml: '.toml', sql: '.sql', ruby: '.rb', php: '.php', swift: '.swift', kotlin: '.kt', scala: '.scala', r: '.r' };
@@ -254,7 +265,7 @@ module.exports = new Command('install')
         let installDir = '';
         if (!opts.registerOnly) {
           try {
-            installDir = path.join(INSTALL_DIR, 'docs', item.id);
+            installDir = path.join(skillDirBase, 'docs', item.id);
             fs.mkdirSync(installDir, { recursive: true });
             // Write document content as markdown
             if (item.content) {
@@ -284,6 +295,73 @@ module.exports = new Command('install')
         console.log(chalk.green(`✓ 安装成功: ${item.name}`));
         if (showLocalPath) console.log(chalk.gray(`  本地目录: ${installDir}`));
 
+      } else if (type === 'cli') {
+        // Try by ID first, then search by name
+        try {
+          item = await api.getCli(nameOrId);
+        } catch {
+          // Search by name
+          const data = await api.listCli({ search: nameOrId });
+          const items = data.items || [];
+          if (items.length > 0) {
+            const match = items.find(
+              i => i.name.toLowerCase() === nameOrId.toLowerCase() || i.id === nameOrId
+            ) || items[0];
+            if (match) {
+              item = await api.getCli(match.id);
+            }
+          }
+        }
+
+        if (!item) {
+          console.log(chalk.red(`未找到 CLI 工具: ${nameOrId}`));
+          return;
+        }
+
+        // Register install on server
+        try { await api.installCli(item.id); } catch { /* non-critical */ }
+
+        // Download and extract files
+        let showLocalPath = false;
+        let installDir = '';
+        if (!opts.registerOnly) {
+          try {
+            installDir = path.join(skillDirBase, 'cli', item.id);
+            fs.mkdirSync(installDir, { recursive: true });
+
+            // Download the CLI package
+            const { buffer, contentType } = await api.downloadCliFiles(item.id);
+            if (contentType.includes('zip') && buffer.length > 10) {
+              const AdmZip = require('adm-zip');
+              const zip = new AdmZip(buffer);
+              zip.extractAllTo(installDir, true);
+              console.log(chalk.gray(`  从 ZIP 解压 ${zip.getEntryCount()} 个文件`));
+            }
+
+            // Write rushangle.json metadata
+            fs.writeFileSync(
+              path.join(installDir, 'rushangle.json'),
+              JSON.stringify({ type: 'cli', ...item, installedAt: new Date().toISOString() }, null, 2)
+            );
+
+            showLocalPath = true;
+
+            // Show install command hint
+            if (item.install) {
+              console.log(chalk.gray(`  安装命令: ${item.install}`));
+            }
+            if (item.bin && Object.keys(item.bin).length > 0) {
+              const binNames = Object.keys(item.bin);
+              console.log(chalk.gray(`  入口: ${binNames.join(', ')}`));
+            }
+          } catch (fileErr) {
+            console.log(chalk.yellow(`  本地文件写入跳过（${fileErr.code || fileErr.message}）`));
+          }
+        }
+
+        console.log(chalk.green(`✓ 安装成功: ${item.name}`));
+        if (showLocalPath) console.log(chalk.gray(`  本地目录: ${installDir}`));
+
       } else {
         console.log(chalk.red(`不支持的类型: ${type}`));
       }

package/src/commands/link.js

@@ -0,0 +1,67 @@
+const { Command } = require('commander');
+const chalk = require('chalk');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const { getConfig } = require('../config');
+
+const DEFAULT_INSTALL_DIR = path.join(os.homedir(), '.rushangle', 'skills');
+
+function resolveInstallDir() {
+  const config = getConfig();
+  return config.installDir || DEFAULT_INSTALL_DIR;
+}
+
+module.exports = new Command('link')
+  .description('将已安装的技能链接到目标目录（创建符号链接）')
+  .argument('<name>', '技能名称')
+  .argument('<target>', '目标目录路径')
+  .option('-t, --type <type>', '类型: skill | mcp | code | doc', 'skill')
+  .action((name, target, opts) => {
+    const installDir = resolveInstallDir();
+
+    let srcDir;
+    if (opts.type === 'skill') {
+      srcDir = path.join(installDir, name);
+    } else if (opts.type === 'mcp') {
+      srcDir = path.join(installDir, 'mcp', name);
+    } else if (opts.type === 'code') {
+      srcDir = path.join(installDir, 'code', name);
+    } else if (opts.type === 'doc') {
+      srcDir = path.join(installDir, 'docs', name);
+    } else {
+      srcDir = path.join(installDir, name);
+    }
+
+    if (!fs.existsSync(srcDir)) {
+      console.log(chalk.red(`未找到已安装的 ${opts.type}: ${name}`));
+      console.log(chalk.gray(`  源目录: ${srcDir}`));
+      console.log(chalk.gray(`  提示: 先用 rushangle install ${name} 安装`));
+      return;
+    }
+
+    // Resolve target to absolute path
+    const absTarget = path.resolve(target.replace(/^~/, os.homedir()));
+    if (!fs.existsSync(absTarget)) {
+      fs.mkdirSync(absTarget, { recursive: true });
+    }
+
+    const destDir = path.join(absTarget, name);
+    if (fs.existsSync(destDir)) {
+      const stat = fs.lstatSync(destDir);
+      if (stat.isSymbolicLink()) {
+        console.log(chalk.yellow(`链接已存在: ${destDir} → ${fs.readlinkSync(destDir)}`));
+        return;
+      }
+      console.log(chalk.yellow(`目标已存在（非符号链接），跳过: ${destDir}`));
+      return;
+    }
+
+    try {
+      fs.symlinkSync(srcDir, destDir, 'dir');
+      console.log(chalk.green(`✓ 链接成功`));
+      console.log(chalk.gray(`  ${srcDir} → ${destDir}`));
+    } catch (e) {
+      console.log(chalk.red(`链接失败: ${e.message}`));
+    }
+  });

package/src/commands/list.js

@@ -2,7 +2,7 @@ const { Command } = require('commander');
 const chalk = require('chalk');
 const Table = require('cli-table3');
 const auth = require('../auth');
-const { listSkills, mySkills, installedSkills, listMcp, myMcp, listCode, myCode, listDocs, myDocs } = require('../api');
+const { listSkills, mySkills, installedSkills, listMcp, myMcp, listCode, myCode, listDocs, myDocs, listCli, myCli, installedCli } = require('../api');
 
 function table(rows) {
   if (rows.length === 0) return '';
@@ -17,8 +17,8 @@ function table(rows) {
 }
 
 module.exports = new Command('list')
-  .description('列出技能/MCP/代码/文档')
-  .option('-t, --type <type>', '类型: skills | mcp | code | docs', 'skills')
+  .description('列出技能/MCP/代码/文档/CLI工具')
+  .option('-t, --type <type>', '类型: skills | mcp | code | docs | cli', 'skills')
   .option('-i, --installed', '已安装')
   .option('-p, --published', '我发布的')
   .option('-s, --search <query>', '搜索')
@@ -107,6 +107,27 @@ module.exports = new Command('list')
         } else {
           console.log(table(items));
         }
+
+      } else if (type === 'cli') {
+        let data;
+        if (opts.published) {
+          data = await myCli();
+          console.log(chalk.bold.cyan(`\n  我发布的 CLI 工具 (${data.total || data.items?.length || 0})`));
+        } else if (opts.installed) {
+          data = await installedCli();
+          console.log(chalk.bold.cyan(`\n  已安装的 CLI 工具 (${data.total || data.items?.length || 0})`));
+        } else {
+          const params = {};
+          if (opts.search) params.search = opts.search;
+          data = await listCli(params);
+          console.log(chalk.bold.cyan(`\n  SkillHub CLI 工具市场 (${data.total || data.items?.length || 0})`));
+        }
+        const items = data.items || [];
+        if (items.length === 0) {
+          console.log('  ' + chalk.gray('暂无 CLI 工具'));
+        } else {
+          console.log(table(items));
+        }
       }
 
       // Tips

package/src/commands/publish.js

@@ -6,7 +6,7 @@ const readline = require('readline');
 const auth = require('../auth');
 const api = require('../api');
 
-const VALID_TYPES = ['skill', 'mcp', 'code', 'doc'];
+const VALID_TYPES = ['skill', 'mcp', 'code', 'doc', 'cli'];
 
 /**
  * Simple YAML frontmatter parser for SKILL.md.
@@ -58,7 +58,7 @@ async function askQuestion(query) {
  * @returns {{ categories: string[], resolved: string }} - resolved is the final category to use
  */
 async function resolveCategory(type, userCategory, apiModule) {
-  const typeMap = { skill: 'skill', mcp: 'mcp', code: 'code', doc: 'doc' };
+  const typeMap = { skill: 'skill', mcp: 'mcp', code: 'code', doc: 'doc', cli: 'cli' };
   const t = typeMap[type] || 'skill';
 
   let serverCategories = [];
@@ -107,9 +107,9 @@ async function resolveCategory(type, userCategory, apiModule) {
 }
 
 module.exports = new Command('publish')
-  .description('发布技能/MCP配置/代码段/文档到 SkillHub 市场')
+  .description('发布技能/MCP配置/代码段/文档/CLI工具到 SkillHub 市场')
   .argument('[dir]', '项目目录路径', '.')
-  .option('-t, --type <type>', '类型: skill | mcp | code | doc', 'skill')
+  .option('-t, --type <type>', '类型: skill | mcp | code | doc | cli', 'skill')
   .option('-n, --name <name>', '名称')
   .option('-d, --description <desc>', '描述')
   .option('-v, --version <ver>', '版本号')
@@ -269,12 +269,69 @@ module.exports = new Command('publish')
           format: opts.format,
           tags,
         });
+      } else if (type === 'cli') {
+        // Read package.json for metadata
+        let pkg = {};
+        const pkgPath = path.join(absDir, 'package.json');
+        if (fs.existsSync(pkgPath)) {
+          try { pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8')); }
+          catch { /* ignore */ }
+        }
+
+        const bin = pkg.bin || meta.bin || {};
+        const dependencies = { ...(pkg.dependencies || {}), ...(meta.dependencies || {}) };
+        const platforms = meta.platforms || [];
+        const installCmd = meta.install || (pkg.name ? `npm install -g ${pkg.name}` : '');
+
+        result = await api.publishCli({
+          name: name || pkg.name,
+          version: version || pkg.version,
+          description: description || pkg.description || '',
+          category, tags,
+          bin, dependencies, platforms,
+          install: installCmd,
+          readme,
+        });
+
+        // Upload CLI package (zip the directory)
+        try {
+          const uploadFiles = [];
+
+          // Look for README.md
+          for (const f of ['README.md', 'readme.md']) {
+            const fp = path.join(absDir, f);
+            if (fs.existsSync(fp)) {
+              uploadFiles.push({ fieldName: 'readme_md', filePath: fp });
+              break;
+            }
+          }
+
+          // Look for bin files
+          const binDir = path.join(absDir, 'bin');
+          if (fs.existsSync(binDir) && fs.statSync(binDir).isDirectory()) {
+            const entries = fs.readdirSync(binDir);
+            for (const entry of entries) {
+              const fp = path.join(binDir, entry);
+              if (fs.statSync(fp).isFile()) {
+                uploadFiles.push({ fieldName: 'bin_files', filePath: fp });
+              }
+            }
+          }
+
+          if (uploadFiles.length > 0) {
+            console.log(chalk.gray(`  上传 ${uploadFiles.length} 个文件...`));
+            await api.uploadCliFiles(result.id, uploadFiles);
+            console.log(chalk.green(`  ✓ 文件上传完成`));
+          }
+        } catch (uploadErr) {
+          console.log(chalk.yellow(`  ⚠ 文件上传失败: ${uploadErr.message}`));
+        }
       }
 
       console.log(chalk.green(`✓ 发布成功: ${result.name || result.id}`));
       console.log(chalk.gray(`  ID: ${result.id}`));
       if (result.language) console.log(chalk.gray(`  语言: ${result.language}`));
-      console.log(chalk.gray(`  链接: ${api.SITE_URL}/${type === 'doc' ? 'docs' : type === 'code' ? 'code' : type === 'mcp' ? 'mcp' : 'skills'}/${result.id}`));
+      console.log(chalk.gray(`  链接: ${api.SITE_URL}/${type === 'doc' ? 'docs' : type === 'code' ? 'code' : type === 'mcp' ? 'mcp' : type === 'cli' ? 'cli' : 'skills'}/${result.id}`));
     } catch (e) {
       console.log(chalk.red(`发布失败: ${e.message}`));
       if (e.data) console.log(chalk.gray(JSON.stringify(e.data)));

package/src/commands/unpublish.js

@@ -4,7 +4,7 @@ const readline = require('readline');
 const auth = require('../auth');
 const api = require('../api');
 
-const VALID_TYPES = ['skill', 'mcp', 'code', 'doc'];
+const VALID_TYPES = ['skill', 'mcp', 'code', 'doc', 'cli'];
 
 async function askConfirm(query) {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -16,13 +16,14 @@ const TYPE_MAP = {
   mcp:   { label: 'MCP代码段', my: 'myMcp', get: 'getMcp', del: 'deleteMcp', search: 'listMcp', field: 'items' },
   code:  { label: '代码段', my: 'myCode', get: 'getCode', del: 'deleteCode', search: 'listCode', field: 'items' },
   doc:   { label: '文档', my: 'myDocs', get: 'getDoc', del: 'deleteDoc', search: 'listDocs', field: 'items' },
+  cli:   { label: 'CLI工具', my: 'myCli', get: 'getCli', del: 'deleteCli', search: 'listCli', field: 'items' },
 };
 
 module.exports = new Command('unpublish')
   .alias('rm')
   .description('从 SkillHub 下架已发布的内容（仅限自己发布的）')
   .argument('<name-or-id>', '名称或 ID')
-  .option('-t, --type <type>', '类型: skill | mcp | code | doc', 'skill')
+  .option('-t, --type <type>', '类型: skill | mcp | code | doc | cli', 'skill')
   .option('-y, --yes', '跳过确认，直接删除')
   .action(async (nameOrId, opts) => {
     const type = opts.type.toLowerCase();

package/src/config.js

@@ -0,0 +1,42 @@
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+const CONFIG_DIR = path.join(os.homedir(), '.rushangle');
+const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
+
+function getConfig() {
+  try {
+    if (fs.existsSync(CONFIG_FILE)) {
+      return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf-8'));
+    }
+  } catch { /* ignore corrupt config */ }
+  return {};
+}
+
+function setConfig(key, value) {
+  const config = getConfig();
+  if (value == null) {
+    delete config[key];
+  } else {
+    config[key] = value;
+  }
+  if (!fs.existsSync(CONFIG_DIR)) {
+    fs.mkdirSync(CONFIG_DIR, { recursive: true });
+  }
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
+}
+
+function listConfig() {
+  const config = getConfig();
+  const keys = Object.keys(config);
+  if (keys.length === 0) {
+    console.log('(无配置)');
+    return;
+  }
+  for (const k of keys) {
+    console.log(`${k} = ${config[k]}`);
+  }
+}
+
+module.exports = { getConfig, setConfig, listConfig, CONFIG_FILE };

package/src/index.js

@@ -18,6 +18,8 @@ program.addCommand(require('./commands/logout'));
 program.addCommand(require('./commands/publish'));
 program.addCommand(require('./commands/unpublish'));
 program.addCommand(require('./commands/install'));
+program.addCommand(require('./commands/link'));
+program.addCommand(require('./commands/config'));
 program.addCommand(require('./commands/list'));
 program.addCommand(require('./commands/search'));
 program.addCommand(require('./commands/mcp'));