rushangle-cli 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rushangle-cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "SkillHub CLI - 数智凯航技能市场命令行工具",
   "bin": {
     "rushangle": "./bin/rushangle.js"
@@ -13,14 +13,17 @@
   "scripts": {
     "start": "node bin/rushangle.js"
   },
-  "keywords": ["rushangle", "skillhub", "cli", "skills"],
+  "keywords": [
+    "rushangle",
+    "skillhub",
+    "cli",
+    "skills"
+  ],
   "license": "MIT",
   "dependencies": {
     "commander": "^12.0.0",
     "chalk": "^4.1.2",
-    "ora": "^8.0.0",
     "open": "^10.0.0",
-    "conf": "^12.0.0",
     "cli-table3": "^0.6.5"
   }
 }

package/src/api.js

@@ -87,4 +87,7 @@ module.exports = {
 
   // Search
   search(query) { return apiCall('GET', `/api/search?q=${encodeURIComponent(query)}`); },
+
+  // Categories (no auth required)
+  getCategories() { return apiCall('GET', '/api/skills/categories'); },
 };

package/src/commands/login.js

@@ -1,6 +1,5 @@
 const { Command } = require('commander');
 const chalk = require('chalk');
-const open = require('open');
 const http = require('http');
 const auth = require('../auth');
 const { SITE_URL } = require('../api');
@@ -65,7 +64,12 @@ p{color:#666;margin:4px 0}
 
       // Open browser to DingTalk OAuth login with CLI callback params
       const loginUrl = `${SITE_URL}/api/auth/dingtalk/login?cli=1&cli_port=${CLI_PORT}`;
-      await open(loginUrl);
+      try {
+        const open = (await import('open')).default;
+        await open(loginUrl);
+      } catch {
+        // open module unavailable, fall through to manual URL prompt
+      }
       console.log(chalk.gray('请在浏览器中完成钉钉授权...'));
       console.log(chalk.yellow('等待授权完成... (如浏览器未打开，请手动访问: ' + loginUrl + ')'));
     });

package/src/commands/publish.js

@@ -2,11 +2,70 @@ const { Command } = require('commander');
 const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
+const readline = require('readline');
 const auth = require('../auth');
 const api = require('../api');
 
 const VALID_TYPES = ['skill', 'mcp', 'code', 'doc'];
 
+async function askQuestion(query) {
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise(resolve => rl.question(query, ans => { rl.close(); resolve(ans.trim()); }));
+}
+
+/**
+ * Fetch preset categories from server and attempt to match/resolve user's category.
+ * @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 t = typeMap[type] || 'skill';
+
+  let serverCategories = [];
+  try {
+    const data = await apiModule.getCategories();
+    serverCategories = data[t] || data.skill || [];
+  } catch {
+    // Server unreachable — just use whatever user provided
+    return { categories: [], resolved: userCategory };
+  }
+
+  if (!serverCategories.length) {
+    return { categories: [], resolved: userCategory };
+  }
+
+  // Case 1: user already specified a category that matches → use it
+  if (userCategory) {
+    const exact = serverCategories.find(c => c.toLowerCase() === userCategory.toLowerCase());
+    if (exact) {
+      console.log(chalk.gray(`  分类: ${exact}`));
+      return { categories: serverCategories, resolved: exact };
+    }
+    // Case 2: user specified but doesn't match → show mismatch, let them pick
+    console.log(chalk.yellow(`  ⚠ 指定的分类 "${userCategory}" 不在预设列表中，请从以下选择：`));
+  }
+
+  // Show numbered list
+  console.log(chalk.cyan(`\n  请选择 ${type} 分类：`));
+  serverCategories.forEach((c, i) => {
+    console.log(chalk.white(`  ${chalk.bold(String(i + 1))}. ${c}`));
+  });
+  console.log(chalk.gray(`  ${serverCategories.length + 1}. 自定义（输入文本）`));
+
+  const answer = await askQuestion(chalk.green('\n  输入编号或分类名: '));
+  const num = parseInt(answer, 10);
+  if (num >= 1 && num <= serverCategories.length) {
+    console.log(chalk.gray(`  分类: ${serverCategories[num - 1]}`));
+    return { categories: serverCategories, resolved: serverCategories[num - 1] };
+  }
+  if (answer) {
+    console.log(chalk.gray(`  分类: ${answer}`));
+    return { categories: serverCategories, resolved: answer };
+  }
+  console.log(chalk.gray(`  分类: ${serverCategories[0]}`));
+  return { categories: serverCategories, resolved: serverCategories[0] };
+}
+
 module.exports = new Command('publish')
   .description('发布技能/MCP配置/代码段/文档到 SkillHub 市场')
   .argument('[dir]', '项目目录路径', '.')
@@ -52,10 +111,12 @@ module.exports = new Command('publish')
     const name = opts.name || meta.name || path.basename(absDir);
     const description = opts.description || meta.description || '';
     const version = opts.version || meta.version || '0.1.0';
-    const category = opts.category || meta.category || '';
     const tags = opts.tags ? opts.tags.split(',').map(t => t.trim()).filter(Boolean)
       : (meta.tags || []);
 
+    // Resolve category via server presets
+    const { resolved: category } = await resolveCategory(type, opts.category || meta.category || '', api);
+
     // Read README if exists
     let readme = '';
     for (const f of ['README.md', 'readme.md', 'README', 'readme']) {