rushangle-cli 0.1.5 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rushangle-cli",
-  "version": "0.1.5",
+  "version": "0.2.1",
   "description": "SkillHub CLI - 数智凯航技能市场命令行工具",
   "bin": {
     "rushangle": "./bin/rushangle.js"
@@ -24,6 +24,7 @@
     "commander": "^12.0.0",
     "chalk": "^4.1.2",
     "open": "^10.0.0",
-    "cli-table3": "^0.6.5"
+    "cli-table3": "^0.6.5",
+    "adm-zip": "^0.5.16"
   }
 }

package/src/api.js

@@ -1,4 +1,6 @@
 const auth = require('./auth');
+const fs = require('fs');
+const path = require('path');
 
 const SITE_URL = process.env.RUSHANGLE_API || 'https://rushangle.cn';
 
@@ -90,4 +92,58 @@ module.exports = {
 
   // Categories (no auth required)
   getCategories() { return apiCall('GET', '/api/skills/categories'); },
+
+  // ─── File upload (multipart) ───
+  /**
+   * Upload skill files via multipart/form-data.
+   * @param {string} skillId
+   * @param {{fieldName: string, filePath: string}[]} files
+   */
+  async uploadSkillFiles(skillId, files) {
+    const token = auth.getToken();
+    const form = new FormData();
+    for (const { fieldName, filePath } of files) {
+      const content = fs.readFileSync(filePath);
+      const blob = new Blob([content], { type: 'application/octet-stream' });
+      form.append(fieldName, blob, path.basename(filePath));
+    }
+
+    const res = await fetch(`${SITE_URL}/api/skills/${encodeURIComponent(skillId)}/files`, {
+      method: 'POST',
+      headers: { '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;
+  },
+
+  /**
+   * Download skill files as a Buffer (zip).
+   * @param {string} skillId
+   * @returns {Promise<{buffer: Buffer, contentType: string}>}
+   */
+  async downloadSkillFiles(skillId) {
+    const token = auth.getToken();
+    const res = await fetch(`${SITE_URL}/api/skills/${encodeURIComponent(skillId)}/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 };
+  },
 };

package/src/commands/install.js

@@ -6,7 +6,7 @@ const os = require('os');
 const auth = require('../auth');
 const api = require('../api');
 
-const INSTALL_DIR = path.join(os.homedir(), '.rushangle', 'installed');
+const INSTALL_DIR = path.join(os.homedir(), '.workbuddy', 'skills');
 
 module.exports = new Command('install')
   .description('安装技能/MCP/代码段')
@@ -43,7 +43,10 @@ module.exports = new Command('install')
             const match = listData.skills.find(
               s => s.name === nameOrId || s.id === nameOrId
             );
-            if (match) item = match;
+            if (match) {
+              // Re-fetch full data (list data is sanitized)
+              item = await api.getSkill(match.id);
+            }
           }
         }
 
@@ -52,25 +55,60 @@ module.exports = new Command('install')
           return;
         }
 
-        // Register install on server FIRST (survives EPERM in sandbox)
+        // Register install on server FIRST
         await api.installSkill(item.id);
 
-        // Local file install (best-effort, skip in restricted environments)
+        // Download and extract skill files to local skills directory
         if (!opts.registerOnly) {
           try {
-            const installDir = path.join(INSTALL_DIR, 'skills', item.id);
-            fs.mkdirSync(installDir, { recursive: true });
-            fs.writeFileSync(
-              path.join(installDir, 'rushangle.json'),
-              JSON.stringify({ type: 'skill', ...item, installedAt: new Date().toISOString() }, null, 2)
-            );
-            if (item.readme) {
-              fs.writeFileSync(path.join(installDir, 'README.md'), item.readme);
+            // Try to download skill package from server
+            let extracted = false;
+            try {
+              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);
+              zip.extractAllTo(skillDir, true);
+              console.log(chalk.green(`✓ 安装成功: ${item.name}@${item.version}`));
+              console.log(chalk.gray(`  本地目录: ${skillDir}`));
+              extracted = true;
+            } catch (downloadErr) {
+              // Download failed — fall back to metadata-only install
+              if (downloadErr.status === 404) {
+                console.log(chalk.yellow(`  该技能暂无文件包，使用元数据模式`));
+              } else {
+                console.log(chalk.yellow(`  下载文件包失败 (${downloadErr.message})，使用元数据模式`));
+              }
+            }
+
+            // 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 });
+
+              // Generate SKILL.md with frontmatter from server metadata
+              const frontmatter = [
+                '---',
+                `name: ${item.name}`,
+                `version: ${item.version}`,
+                `description: ${item.description || ''}`,
+                `category: ${item.category || '其他'}`,
+                `tags: [${(item.tags || []).join(', ')}]`,
+                `author: ${item.authorName || ''}`,
+                `source: ${api.SITE_URL}/skills/${item.id}`,
+                '---',
+                '',
+                item.readme || `# ${item.name}\n\n${item.description || ''}`,
+              ].join('\n');
+              fs.writeFileSync(path.join(skillDir, 'SKILL.md'), frontmatter);
+              fs.writeFileSync(
+                path.join(skillDir, 'skill.json'),
+                JSON.stringify({ ...item, installedAt: new Date().toISOString() }, null, 2)
+              );
+              console.log(chalk.green(`✓ 安装成功: ${item.name}@${item.version}`));
+              console.log(chalk.gray(`  本地目录: ${skillDir}`));
             }
-            console.log(chalk.green(`✓ 安装成功: ${item.name}@${item.version}`));
-            console.log(chalk.gray(`  本地目录: ${installDir}`));
           } catch (fileErr) {
-            // EPERM or other file errors in sandbox — server registration already succeeded
             console.log(chalk.green(`✓ 服务器注册成功: ${item.name}@${item.version}`));
             console.log(chalk.yellow(`  本地文件写入跳过（${fileErr.code || fileErr.message}）`));
             if (fileErr.code === 'EPERM' || fileErr.code === 'EACCES') {
@@ -91,7 +129,10 @@ module.exports = new Command('install')
             const match = listData.items.find(
               s => s.name === nameOrId || s.id === nameOrId
             );
-            if (match) item = match;
+            if (match) {
+              // Re-fetch full data (list data is sanitized)
+              item = await api.getMcp(match.id);
+            }
           }
         }
 
@@ -145,7 +186,10 @@ module.exports = new Command('install')
             const match = listData.items.find(
               s => s.name === nameOrId || s.id === nameOrId
             );
-            if (match) item = match;
+            if (match) {
+              // Re-fetch full data (list data is sanitized)
+              item = await api.getCode(match.id);
+            }
           }
         }
 

package/src/commands/publish.js

@@ -133,6 +133,41 @@ module.exports = new Command('publish')
         result = await api.publishSkill({
           name, version, description, category, tags, readme,
         });
+
+        // Upload skill files (SKILL.md + scripts)
+        try {
+          const uploadFiles = [];
+
+          // Look for SKILL.md
+          for (const f of ['SKILL.md', 'skill.md', 'Skill.md']) {
+            const fp = path.join(absDir, f);
+            if (fs.existsSync(fp)) {
+              uploadFiles.push({ fieldName: 'skill_md', filePath: fp });
+              break;
+            }
+          }
+
+          // Look for script files in scripts/ directory
+          const scriptsDir = path.join(absDir, 'scripts');
+          if (fs.existsSync(scriptsDir) && fs.statSync(scriptsDir).isDirectory()) {
+            const scriptEntries = fs.readdirSync(scriptsDir);
+            for (const entry of scriptEntries) {
+              const fp = path.join(scriptsDir, entry);
+              if (fs.statSync(fp).isFile()) {
+                uploadFiles.push({ fieldName: 'scripts', filePath: fp });
+              }
+            }
+          }
+
+          if (uploadFiles.length > 0) {
+            console.log(chalk.gray(`  上传 ${uploadFiles.length} 个文件...`));
+            await api.uploadSkillFiles(result.id, uploadFiles);
+            console.log(chalk.green(`  ✓ 文件上传完成`));
+          }
+        } catch (uploadErr) {
+          console.log(chalk.yellow(`  ⚠ 文件上传失败: ${uploadErr.message}`));
+          console.log(chalk.gray(`  技能元数据已发布，可通过 rushangle publish --skip-files 跳过文件上传`));
+        }
       } else if (type === 'mcp') {
         let code = '';
         let config = null;