eskill 1.2.4 → 1.3.2

package/cli.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import ora from 'ora';
-import { installFromGitUrl, listSkills, removeSkill, linkSkill, cleanupAllSkills, cleanupAll, updateSkill, updateAllSkills } from './lib/installer.js';
+import { installFromGitUrl, listSkills, removeSkill, linkSkill, uploadSkill, cleanupAllSkills, cleanupAll, updateSkill, updateAllSkills } from './lib/installer.js';
 import { AGENTS, getDefaultAgent } from './lib/agent-config.js';
-import { bashCompletionScript, zshCompletionScript, listSkillsForCompletion } from './lib/completion.js';
+import { bashCompletionScript, zshCompletionScript, listSkillsForCompletion, listLocalSkillsForCompletion, listGlobalSkillsForCompletion } from './lib/completion.js';
 import { searchSkills, formatSkillList } from './lib/search.js';
 import { setApiKey, showConfigStatus } from './lib/config.js';
 import readline from 'readline';
@@ -13,7 +13,7 @@ const program = new Command();
 program
   .name('eskill')
   .description('Unified AI Agent Skills Management - Install skills from Git URLs')
-  .version('1.2.4')
+  .version('1.3.2')
   .option('-g, --global', '使用全局技能目录（~/.eskill/skills/），否则使用当前目录（./.claude/skills/）', false);
 
 // 安装命令
@@ -141,6 +141,25 @@ program
     }
   });
 
+// 上传命令
+program
+  .command('upload')
+  .description('上传本地技能到全局仓库')
+  .argument('<name>', '技能名称（支持 name@author 格式）')
+  .action(async (name) => {
+    try {
+      const result = await uploadSkill(name);
+
+      // 如果用户取消上传，正常退出
+      if (result && result.cancelled) {
+        process.exit(0);
+      }
+    } catch (error) {
+      console.error(`\n❌ 上传失败: ${error.message}`);
+      process.exit(1);
+    }
+  });
+
 // 更新命令
 program
   .command('update')
@@ -412,4 +431,20 @@ program
     await listSkillsForCompletion();
   });
 
+// 内部命令：列出本地技能（用于自动补全）
+program
+  .command('_list_local_skills')
+  .description('(内部命令) 列出本地技能名称')
+  .action(async () => {
+    await listLocalSkillsForCompletion();
+  });
+
+// 内部命令：列出全局技能（用于自动补全）
+program
+  .command('_list_global_skills')
+  .description('(内部命令) 列出全局技能名称')
+  .action(async () => {
+    await listGlobalSkillsForCompletion();
+  });
+
 program.parse();

package/lib/completion.js

@@ -5,37 +5,91 @@
  *   eskill completion >> ~/.bashrc
  *   eskill completion >> ~/.zshrc
  */
-import { listSkills } from './installer.js';
+import { listSkills, getSkillsDir } from './installer.js';
+import { existsSync } from 'fs';
 import { getDefaultAgent } from './agent-config.js';
 
 // 获取已安装的技能列表
-async function getSkillList() {
+async function getSkillList(global = false) {
   try {
     const agent = getDefaultAgent();
-    const skills = await listSkills(agent);
+    const skills = await listSkills(agent, global);
     return skills.map(s => s.name);
   } catch {
     return [];
   }
 }
 
+// 获取本地技能列表
+async function getLocalSkills() {
+  return await getSkillList(false);
+}
+
+// 获取全局技能列表
+async function getGlobalSkills() {
+  return await getSkillList(true);
+}
+
 // Bash 补全脚本
 export function bashCompletionScript() {
   return '\n_eskill_completion() {\n' +
     '  local cur prev words cword\n' +
     '  _init_completion || return\n\n' +
+    '  # 检测是否使用了 -g/--global 选项\n' +
+    '  local global_mode=""\n' +
+    '  for word in "${words[@]}"; do\n' +
+    '    if [[ "$word" == "-g" || "$word" == "--global" ]]; then\n' +
+    '      global_mode="-g"\n' +
+    '      break\n' +
+    '    fi\n' +
+    '  done\n\n' +
     '  case ${prev} in\n' +
     '    remove|rm|uninstall)\n' +
-    '      local skills=$(eskill _list_skills 2>/dev/null)\n' +
+    '      local skills=$(eskill _list_skills ${global_mode} 2>/dev/null)\n' +
+    '      COMPREPLY=($(compgen -W "${skills}" -- "${cur}"))\n' +
+    '      return\n' +
+    '      ;;\n' +
+    '    link)\n' +
+    '      local skills=$(eskill _list_global_skills 2>/dev/null)\n' +
     '      COMPREPLY=($(compgen -W "${skills}" -- "${cur}"))\n' +
+    '      return\n' +
+    '      ;;\n' +
+    '    upload)\n' +
+    '      local skills=$(eskill _list_local_skills 2>/dev/null)\n' +
+    '      COMPREPLY=($(compgen -W "${skills}" -- "${cur}"))\n' +
+    '      return\n' +
+    '      ;;\n' +
+    '    update)\n' +
+    '      local skills=$(eskill _list_skills ${global_mode} 2>/dev/null)\n' +
+    '      local all="all"\n' +
+    '      COMPREPLY=($(compgen -W "${skills} ${all}" -- "${cur}"))\n' +
+    '      return\n' +
+    '      ;;\n' +
+    '    cleanup)\n' +
+    '      COMPREPLY=($(compgen -W "--all -a" -- "${cur}"))\n' +
+    '      return\n' +
+    '      ;;\n' +
+    '    search)\n' +
+    '      COMPREPLY=($(compgen -W "--page --limit --sort --ai -p -l -s" -- "${cur}"))\n' +
+    '      return\n' +
+    '      ;;\n' +
+    '    config)\n' +
+    '      COMPREPLY=($(compgen -W "set-api-key status" -- "${cur}"))\n' +
+    '      return\n' +
+    '      ;;\n' +
+    '    completion)\n' +
+    '      COMPREPLY=($(compgen -W "--shell -s" -- "${cur}"))\n' +
+    '      return\n' +
     '      ;;\n' +
     '    *)\n' +
     '      case ${cur} in\n' +
     '        -*)\n' +
-    '          COMPREPLY=($(compgen -W "-a --agent -l --link -f --force -h --help -V --version" -- "${cur}"))\n' +
+    '          COMPREPLY=($(compgen -W "-g --global -h --help -V --version" -- "${cur}"))\n' +
+    '          return\n' +
     '          ;;\n' +
     '        *)\n' +
-    '          COMPREPLY=($(compgen -W "install add list ls remove rm uninstall agents list-agents help" -- "${cur}"))\n' +
+    '          COMPREPLY=($(compgen -W "install add remove rm uninstall update list ls link upload search cleanup config agents completion help" -- "${cur}"))\n' +
+    '          return\n' +
     '          ;;\n' +
     '      esac\n' +
     '      ;;\n' +
@@ -50,29 +104,125 @@ export function zshCompletionScript() {
     '_eskill() {\n' +
     '  local -a commands\n' +
     '  commands=(\n' +
-    '    \'install:从 Git URL 安装技能\'\n' +
-    '    \'add:从 Git URL 安装技能（别名）\'\n' +
-    '    \'list:列出已安装的技能\'\n' +
-    '    \'ls:列出已安装的技能（别名）\'\n' +
+    '    \'install:从 Git URL 或名称安装技能\'\n' +
+    '    \'add:安装技能（别名）\'\n' +
     '    \'remove:删除已安装的技能\'\n' +
-    '    \'rm:删除已安装的技能（别名）\'\n' +
-    '    \'uninstall:删除已安装的技能（别名）\'\n' +
+    '    \'rm:删除技能（别名）\'\n' +
+    '    \'uninstall:删除技能（别名）\'\n' +
+    '    \'update:更新技能\'\n' +
+    '    \'list:列出已安装的技能\'\n' +
+    '    \'ls:列出技能（别名）\'\n' +
+    '    \'link:将全局技能软链接到本地\'\n' +
+    '    \'upload:上传本地技能到全局仓库\'\n' +
+    '    \'search:搜索技能\'\n' +
+    '    \'cleanup:清理技能数据\'\n' +
+    '    \'config:配置管理\'\n' +
     '    \'agents:列出支持的 agents\'\n' +
-    '    \'list-agents:列出支持的 agents（别名）\'\n' +
+    '    \'completion:生成自动补全脚本\'\n' +
     '    \'help:显示帮助信息\'\n' +
     '  )\n\n' +
-    '  if [[ ${words[(I)(remove|rm|uninstall)]} -gt 0 ]]; then\n' +
-    '    local skills=($(eskill _list_skills 2>/dev/null))\n' +
-    '    _describe \'skills\' skills\n' +
-    '  else\n' +
-    '    _describe \'command\' commands\n' +
-    '  fi\n' +
+    '  local -a link_commands\n' +
+    '  link_commands=(\n' +
+    '    \'--global:使用全局技能目录\'\n' +
+    '    \'--help:显示帮助信息\'\n' +
+    '  )\n\n' +
+    '  local -a update_commands\n' +
+    '  update_commands=(\n' +
+    '    \'--force:强制更新\'\n' +
+    '    \'all:更新所有技能\'\n' +
+    '  )\n\n' +
+    '  local -a search_commands\n' +
+    '  search_commands=(\n' +
+    '    \'--page:页码\'\n' +
+    '    \'--limit:每页数量\'\n' +
+    '    \'--sort:排序方式\'\n' +
+    '    \'--ai:AI 语义搜索\'\n' +
+    '  )\n\n' +
+    '  local -a cleanup_commands\n' +
+    '  cleanup_commands=(\n' +
+    '    \'--all:清理所有数据\'\n' +
+    '  )\n\n' +
+    '  local -a config_commands\n' +
+    '  config_commands=(\n' +
+    '    \'set-api-key:设置 API Key\'\n' +
+    '    \'status:查看配置状态\'\n' +
+    '  )\n\n' +
+    '  _arguments -C \\\n' +
+    '    \'(-g --global)'{-g,--global}\'[使用全局技能目录] \\\n' +
+    '    \'1: :_eskill_commands\' \\\n' +
+    '    \'*::arg:->args\'\n\n' +
+    '  case $words[1] in\n' +
+    '    remove|rm|uninstall)\n' +
+    '      local skills=($(eskill _list_skills -g 2>/dev/null))\n' +
+    '      _describe \'skills\' skills\n' +
+    '      ;;\n' +
+    '    link)\n' +
+    '      local skills=($(eskill _list_global_skills 2>/dev/null))\n' +
+    '      _describe \'global skills\' skills\n' +
+    '      ;;\n' +
+    '    upload)\n' +
+    '      local skills=($(eskill _list_local_skills 2>/dev/null))\n' +
+    '      _describe \'local skills\' skills\n' +
+    '      ;;\n' +
+    '    update)\n' +
+    '      local skills=($(eskill _list_skills -g 2>/dev/null))\n' +
+    '      _values "skills" ${skills} "all"\n' +
+    '      ;;\n' +
+    '    search)\n' +
+    '      _describe \'options\' search_commands\n' +
+    '      ;;\n' +
+    '    cleanup)\n' +
+    '      _describe \'options\' cleanup_commands\n' +
+    '      ;;\n' +
+    '    config)\n' +
+    '      _describe \'actions\' config_commands\n' +
+    '      ;;\n' +
+    '    *)\n' +
+    '      _describe \'command\' commands\n' +
+    '      ;;\n' +
+    '  esac\n' +
+    '}\n\n' +
+    '_eskill_commands() {\n' +
+    '  local -a commands\n' +
+    '  commands=(\n' +
+    '    \'install:从 Git URL 或名称安装技能\'\n' +
+    '    \'add:安装技能（别名）\'\n' +
+    '    \'remove:删除已安装的技能\'\n' +
+    '    \'rm:删除技能（别名）\'\n' +
+    '    \'uninstall:删除技能（别名）\'\n' +
+    '    \'update:更新技能\'\n' +
+    '    \'list:列出已安装的技能\'\n' +
+    '    \'ls:列出技能（别名）\'\n' +
+    '    \'link:将全局技能软链接到本地\'\n' +
+    '    \'upload:上传本地技能到全局仓库\'\n' +
+    '    \'search:搜索技能\'\n' +
+    '    \'cleanup:清理技能数据\'\n' +
+    '    \'config:配置管理\'\n' +
+    '    \'agents:列出支持的 agents\'\n' +
+    '    \'completion:生成自动补全脚本\'\n' +
+    '    \'help:显示帮助信息\'\n' +
+    '  )\n' +
+    '  _describe \'command\' commands\n' +
     '}\n\n' +
     '_eskill "$@"\n';
 }
 
-// 列出技能的内部命令
+// 列出本地技能的内部命令
+export async function listLocalSkillsForCompletion() {
+  const skills = await getLocalSkills();
+  console.log(skills.join(' '));
+}
+
+// 列出全局技能的内部命令
+export async function listGlobalSkillsForCompletion() {
+  const skills = await getGlobalSkills();
+  console.log(skills.join(' '));
+}
+
+// 列出技能的内部命令（支持 -g 参数）
 export async function listSkillsForCompletion() {
-  const skills = await getSkillList();
+  const args = process.argv.slice(2);
+  const global = args.includes('-g') || args.includes('--global');
+  const skills = await getSkillList(global);
   console.log(skills.join(' '));
 }

package/lib/installer.js

@@ -842,6 +842,116 @@ export async function linkSkill(skillName) {
   }
 }
 
+/**
+ * 上传本地技能到全局仓库
+ */
+export async function uploadSkill(skillName) {
+  // 解析 skill-name@author 格式，提取实际技能名
+  let actualSkillName = skillName;
+  const match = skillName.match(/^([^@]+)@([^@]+)$/);
+  if (match) {
+    actualSkillName = match[1];
+  }
+
+  const localSkillsDir = getSkillsDir(false);
+  const globalSkillsDir = getSkillsDir(true);
+
+  const localSkillPath = join(localSkillsDir, actualSkillName);
+  const globalSkillPath = join(globalSkillsDir, actualSkillName);
+
+  // 检查本地是否存在该技能
+  if (!existsSync(localSkillPath)) {
+    console.log(`\n❌ 本地不存在技能: ${actualSkillName}`);
+    console.log(`   位置: ${localSkillPath}\n`);
+    console.log(`💡 提示:`);
+    console.log(`   - 使用 "eskill list" 查看本地已安装的技能`);
+    console.log(`   - 使用 "eskill install" 先安装技能到本地\n`);
+    throw new Error(`本地不存在技能: ${actualSkillName}`);
+  }
+
+  // 检查是否为符号链接
+  try {
+    const stat = lstatSync(localSkillPath);
+    if (stat.isSymbolicLink()) {
+      console.log(`\n❌ 无法上传软链接技能: ${actualSkillName}`);
+      console.log(`   软链接指向全局仓库，无法上传\n`);
+      console.log(`💡 提示:`);
+      console.log(`   - 软链接技能已经存在于全局仓库`);
+      console.log(`   - 如需更新全局技能，请直接在全局仓库中使用 eskill update\n`);
+      throw new Error(`无法上传软链接技能`);
+    }
+  } catch (error) {
+    console.error(`检测技能类型失败: ${error.message}`);
+    throw error;
+  }
+
+  // 确保全局技能目录存在
+  if (!existsSync(globalSkillsDir)) {
+    mkdirSync(globalSkillsDir, { recursive: true });
+  }
+
+  // 检查全局是否已存在同名技能
+  if (existsSync(globalSkillPath)) {
+    console.log(`\n⚠️  全局仓库已存在同名技能: ${actualSkillName}`);
+    console.log(`  位置: ${globalSkillPath}\n`);
+
+    const overwrite = await confirmAction('是否覆盖全局仓库中的技能？');
+    if (!overwrite) {
+      console.log('\n已取消上传\n');
+      return { success: false, cancelled: true };
+    }
+
+    console.log(`删除全局仓库中已存在的技能: ${globalSkillPath}`);
+    rmSync(globalSkillPath, { recursive: true, force: true });
+  }
+
+  // 复制技能到全局仓库
+  console.log(`\n上传技能到全局仓库: ${actualSkillName}`);
+  console.log(`  源: ${localSkillPath}`);
+  console.log(`  目标: ${globalSkillPath}\n`);
+
+  // 使用 -L 选项解引用符号链接
+  if (process.platform === 'win32') {
+    execSync(`xcopy "${localSkillPath}" "${globalSkillPath}" /E /I /H /Y`, { stdio: 'inherit' });
+  } else {
+    execSync(`cp -rL "${localSkillPath}" "${globalSkillPath}"`, { stdio: 'inherit' });
+  }
+
+  // 读取本地元数据
+  const localMeta = getSkillMeta(actualSkillName, false);
+
+  // 确定上传后的来源类型
+  let uploadSource = 'local'; // 默认为本地创建
+  if (localMeta?.source) {
+    // 保留原有的来源类型，但 'copied-from-global' 在全局仓库中改为 'github'
+    uploadSource = localMeta.source === 'copied-from-global' ? 'github' : localMeta.source;
+  }
+
+  // 保存/更新全局元数据
+  if (localMeta) {
+    saveSkillMeta(actualSkillName, {
+      ...localMeta,
+      source: uploadSource,
+      updatedAt: new Date().toISOString()
+    }, true);
+  } else {
+    // 如果本地没有元数据，创建基础元数据
+    saveSkillMeta(actualSkillName, {
+      name: actualSkillName,
+      source: uploadSource,
+      installedAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString()
+    }, true);
+  }
+
+  console.log(`\n✓ 技能已上传到全局仓库`);
+  console.log(`  技能: ${actualSkillName}`);
+  console.log(`  全局位置: ${globalSkillPath}`);
+  console.log(`  说明: 技现已可在全局仓库中使用\n`);
+
+  return { success: true, path: globalSkillPath };
+}
+
 /**
  * 清理所有技能（用于卸载）
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eskill",
-  "version": "1.2.4",
+  "version": "1.3.2",
   "description": "Unified AI Agent Skills Management - Install skills from Git URLs",
   "main": "index.js",
   "type": "module",