eskill 1.0.25 → 1.0.28

package/cli.js

@@ -13,7 +13,8 @@ const program = new Command();
 program
   .name('eskill')
   .description('Unified AI Agent Skills Management - Install skills from Git URLs')
-  .version('1.0.25');
+  .version('1.0.28')
+  .option('-g, --global', '使用全局技能目录（~/.eskill/skills/），否则使用当前目录（./.claude/skills/）', false);
 
 // 安装命令
 program
@@ -26,7 +27,11 @@ program
   .option('-f, --force', '强制覆盖已存在的技能', false)
   .action(async (url, options) => {
     try {
-      const result = await installFromGitUrl(url, options);
+      // 获取全局选项
+      const globalOptions = program.opts();
+      const fullOptions = { ...options, global: globalOptions.global };
+
+      const result = await installFromGitUrl(url, fullOptions);
 
       // 如果用户取消安装，正常退出
       if (result && result.cancelled) {
@@ -49,14 +54,19 @@ program
   .option('-a, --agent <name>', '目标 agent', getDefaultAgent())
   .action(async (options) => {
     try {
-      const skills = await listSkills(options.agent);
+      // 获取全局选项
+      const globalOptions = program.opts();
+      const global = globalOptions.global;
+
+      const skills = await listSkills(options.agent, global);
 
       if (skills.length === 0) {
         console.log('未安装任何技能');
         return;
       }
 
-      console.log(`\n已安装的技能:\n`);
+      const location = global ? '~/.eskill/skills/' : './.claude/skills/';
+      console.log(`\n已安装的技能 (${location}):\n`);
       skills.forEach(skill => {
         const displayName = skill.author ? `${skill.name}@${skill.author}` : skill.name;
         const versionInfo = skill.version || (skill.commitHash ? `#${skill.commitHash.substring(0, 7)}` : '');
@@ -84,7 +94,11 @@ program
   .option('-a, --agent <name>', '目标 agent', getDefaultAgent())
   .action(async (name, options) => {
     try {
-      removeSkill(name, options.agent);
+      // 获取全局选项
+      const globalOptions = program.opts();
+      const global = globalOptions.global;
+
+      removeSkill(name, options.agent, global);
     } catch (error) {
       console.error(`错误: ${error.message}`);
       process.exit(1);
@@ -95,14 +109,22 @@ program
 program
   .command('update')
   .description('更新技能')
-  .argument('[name]', '技能名称（不指定则更新所有）')
+  .argument('[name]', '技能名称（不指定或 "all" 则更新所有）')
   .option('-f, --force', '强制更新（即使版本相同）', false)
   .action(async (name, options) => {
     try {
-      if (name) {
+      // 获取全局选项
+      const globalOptions = program.opts();
+      const fullOptions = { ...options, global: globalOptions.global };
+
+      // 支持显式使用 "all" 参数
+      if (name === 'all' || name === 'All' || name === 'ALL') {
+        // 更新所有技能
+        await updateAllSkills(fullOptions);
+      } else if (name) {
         // 更新单个技能
         console.log(`\n检查技能: ${name}`);
-        const result = await updateSkill(name, options);
+        const result = await updateSkill(name, fullOptions);
 
         if (result.local) {
           console.log('\n⚠️  本地技能无法自动更新，请手动更新\n');
@@ -114,8 +136,8 @@ program
           console.log(`  新版本: ${result.newVersion}\n`);
         }
       } else {
-        // 更新所有技能
-        await updateAllSkills(options);
+        // 更新所有技能（不指定参数时）
+        await updateAllSkills(fullOptions);
       }
     } catch (error) {
       console.error(`\n❌ 更新失败: ${error.message}\n`);
@@ -285,6 +307,10 @@ program
   .option('-a, --all', '清理所有数据（包括配置和技能）', false)
   .action(async (options) => {
     try {
+      // 获取全局选项
+      const globalOptions = program.opts();
+      const global = globalOptions.global;
+
       if (options.all) {
         console.log('\n⚠️  警告：这将删除所有 eskill 数据（包括 API Key 配置和已安装的技能）');
 
@@ -302,8 +328,9 @@ program
           }
         });
       } else {
-        console.log('\n清理所有已安装的技能（保留配置）...\n');
-        cleanupAllSkills();
+        const location = global ? '~/.eskill/skills/' : './.claude/skills/';
+        console.log(`\n清理 ${location} 中的所有技能...\n`);
+        cleanupAllSkills(global);
       }
     } catch (error) {
       console.error(`\n❌ 清理失败: ${error.message}\n`);

package/lib/installer.js

@@ -58,21 +58,29 @@ function getEskillPackageDir() {
 }
 
 /**
- * 获取技能存储目录（用户主目录下，不受 npm 更新影响）
+ * 获取技能存储目录
+ * @param {boolean} global - 是否使用全局目录（~/.eskill/skills/），否则使用当前目录（./.claude/skills/）
  */
-function getSkillsStorageDir() {
-  return join(homedir(), '.eskill', 'skills');
+function getSkillsStorageDir(global = false) {
+  if (global) {
+    // 全局模式：使用 ~/.eskill/skills/
+    return join(homedir(), '.eskill', 'skills');
+  } else {
+    // 本地模式：使用当前目录的 .claude/skills/
+    return join(process.cwd(), '.claude', 'skills');
+  }
 }
 
 /**
  * 迁移旧位置的技能到新位置
+ * @param {boolean} global - 是否全局模式
  */
-function migrateOldSkills() {
+function migrateOldSkills(global = false) {
   const __filename = fileURLToPath(import.meta.url);
   const __dirname = dirname(__filename);
   const pkgDir = dirname(__dirname);
   const oldDir = join(pkgDir, 'skills-storage');
-  const newDir = getSkillsStorageDir();
+  const newDir = getSkillsStorageDir(global);
 
   // 如果旧位置不存在，无需迁移
   if (!existsSync(oldDir)) {
@@ -84,6 +92,11 @@ function migrateOldSkills() {
     return;
   }
 
+  // 只在全局模式下迁移
+  if (!global) {
+    return;
+  }
+
   try {
     // 创建新目录
     mkdirSync(newDir, { recursive: true });
@@ -119,9 +132,10 @@ function migrateOldSkills() {
 
 /**
  * 读取所有技能元数据
+ * @param {boolean} global - 是否全局模式
  */
-function getAllSkillsMeta() {
-  const skillDir = getSkillsStorageDir();
+function getAllSkillsMeta(global = false) {
+  const skillDir = getSkillsStorageDir(global);
   const metaPath = join(skillDir, '.eskill-meta.json');
 
   if (!existsSync(metaPath)) {
@@ -138,9 +152,11 @@ function getAllSkillsMeta() {
 
 /**
  * 保存所有技能元数据
+ * @param {metaArray} metaArray - 元数据数组
+ * @param {boolean} global - 是否全局模式
  */
-function saveAllSkillsMeta(metaArray) {
-  const skillDir = getSkillsStorageDir();
+function saveAllSkillsMeta(metaArray, global = false) {
+  const skillDir = getSkillsStorageDir(global);
 
   // 确保目录存在
   if (!existsSync(skillDir)) {
@@ -153,9 +169,12 @@ function saveAllSkillsMeta(metaArray) {
 
 /**
  * 保存单个技能元数据
+ * @param {string} skillName - 技能名称
+ * @param {object} meta - 元数据
+ * @param {boolean} global - 是否全局模式
  */
-function saveSkillMeta(skillName, meta) {
-  const allMeta = getAllSkillsMeta();
+function saveSkillMeta(skillName, meta, global = false) {
+  const allMeta = getAllSkillsMeta(global);
 
   // 查找并更新或添加
   const index = allMeta.findIndex(m => m.name === skillName);
@@ -165,24 +184,28 @@ function saveSkillMeta(skillName, meta) {
     allMeta.push(meta);
   }
 
-  saveAllSkillsMeta(allMeta);
+  saveAllSkillsMeta(allMeta, global);
 }
 
 /**
  * 读取单个技能元数据
+ * @param {string} skillName - 技能名称
+ * @param {boolean} global - 是否全局模式
  */
-function getSkillMeta(skillName) {
-  const allMeta = getAllSkillsMeta();
+function getSkillMeta(skillName, global = false) {
+  const allMeta = getAllSkillsMeta(global);
   return allMeta.find(m => m.name === skillName) || null;
 }
 
 /**
  * 删除技能元数据
+ * @param {string} skillName - 技能名称
+ * @param {boolean} global - 是否全局模式
  */
-function removeSkillMeta(skillName) {
-  const allMeta = getAllSkillsMeta();
+function removeSkillMeta(skillName, global = false) {
+  const allMeta = getAllSkillsMeta(global);
   const newMeta = allMeta.filter(m => m.name !== skillName);
-  saveAllSkillsMeta(newMeta);
+  saveAllSkillsMeta(newMeta, global);
 }
 
 /**
@@ -280,7 +303,7 @@ function confirmAction(message) {
  * 从 Git URL 安装技能
  */
 export async function installFromGitUrl(gitUrl, options = {}) {
-  const { agent = 'claude', link = false, force = false } = options;
+  const { agent = 'claude', link = false, force = false, global = false } = options;
 
   // 检测并处理 name@author 格式
   let actualUrl = await handleSkillAtAuthorFormat(gitUrl);
@@ -304,7 +327,7 @@ export async function installFromGitUrl(gitUrl, options = {}) {
   }
 
   // 获取技能存储目录
-  const skillDir = getSkillsStorageDir();
+  const skillDir = getSkillsStorageDir(global);
 
   // 确保技能目录存在
   if (!existsSync(skillDir)) {
@@ -385,7 +408,7 @@ export async function installFromGitUrl(gitUrl, options = {}) {
       version,
       installedAt: new Date().toISOString(),
       updatedAt: new Date().toISOString()
-    });
+    }, global);
 
     return { success: true, path: targetPath };
   } finally {
@@ -400,11 +423,11 @@ export async function installFromGitUrl(gitUrl, options = {}) {
 /**
  * 列出已安装的技能
  */
-export function listSkills(agent = 'claude') {
+export function listSkills(agent = 'claude', global = false) {
   // 自动迁移旧位置的技能
-  migrateOldSkills();
+  migrateOldSkills(global);
 
-  const skillDir = getSkillsStorageDir();
+  const skillDir = getSkillsStorageDir(global);
 
   if (!existsSync(skillDir)) {
     return [];
@@ -415,7 +438,7 @@ export function listSkills(agent = 'claude') {
     .filter(dirent => dirent.isDirectory());
 
   // 读取所有元数据
-  const allMeta = getAllSkillsMeta();
+  const allMeta = getAllSkillsMeta(global);
 
   return skillDirs.map(dirent => {
     const skillPath = join(skillDir, dirent.name);
@@ -435,8 +458,8 @@ export function listSkills(agent = 'claude') {
 /**
  * 删除技能
  */
-export function removeSkill(skillName, agent = 'claude') {
-  const skillDir = getSkillsStorageDir();
+export function removeSkill(skillName, agent = 'claude', global = false) {
+  const skillDir = getSkillsStorageDir(global);
   const targetPath = join(skillDir, skillName);
 
   if (!existsSync(targetPath)) {
@@ -444,15 +467,15 @@ export function removeSkill(skillName, agent = 'claude') {
   }
 
   rmSync(targetPath, { recursive: true, force: true });
-  removeSkillMeta(skillName);
+  removeSkillMeta(skillName, global);
   console.log(`✓ 已删除技能: ${skillName}`);
 }
 
 /**
  * 清理所有技能（用于卸载）
  */
-export function cleanupAllSkills() {
-  const skillDir = getSkillsStorageDir();
+export function cleanupAllSkills(global = false) {
+  const skillDir = getSkillsStorageDir(global);
 
   if (!existsSync(skillDir)) {
     console.log('没有需要清理的技能');
@@ -491,16 +514,33 @@ export function cleanupAll() {
 /**
  * 获取技能存储目录路径
  */
-export function getSkillsDir() {
-  return getSkillsStorageDir();
+export function getSkillsDir(global = false) {
+  return getSkillsStorageDir(global);
+}
+
+/**
+ * 获取远程仓库的 commit hash（不克隆）
+ */
+function getRemoteCommitHash(gitUrl, branch) {
+  try {
+    const result = execSync(
+      `git ls-remote "${gitUrl}" refs/heads/${branch}`,
+      { encoding: 'utf-8' }
+    );
+    // 输出格式: "commitHash\trefs/heads/branch"
+    const match = result.trim().split('\t');
+    return match[0] || null;
+  } catch (error) {
+    return null;
+  }
 }
 
 /**
  * 更新单个技能
  */
 export async function updateSkill(skillName, options = {}) {
-  const { force = false } = options;
-  const skillDir = getSkillsStorageDir();
+  const { force = false, global = false } = options;
+  const skillDir = getSkillsStorageDir(global);
   const targetPath = join(skillDir, skillName);
 
   // 检查技能是否存在
@@ -509,7 +549,7 @@ export async function updateSkill(skillName, options = {}) {
   }
 
   // 读取元数据
-  const meta = getSkillMeta(skillName);
+  const meta = getSkillMeta(skillName, global);
 
   // 如果没有 gitUrl，说明是本地技能，无法更新
   if (!meta || !meta.gitUrl) {
@@ -518,83 +558,84 @@ export async function updateSkill(skillName, options = {}) {
 
   const currentVersion = meta.version || meta.commitHash?.substring(0, 7) || 'unknown';
 
-  // 重新安装技能（使用内部的 installFromGitUrl，但不打印）
-  try {
-    const parsed = parseGitUrl(meta.gitUrl);
+  // 解析 Git URL
+  const parsed = parseGitUrl(meta.gitUrl);
 
-    // 确定技能名称
-    const skillNameFromUrl = parsed.path ? basename(parsed.path) : parsed.repo;
+  // 先检查远程 commit hash（不下载）
+  console.log(`  检查远程版本...`);
+  const remoteCommitHash = getRemoteCommitHash(parsed.cloneUrl, parsed.branch);
 
-    // 创建临时目录
-    const tempDir = join(tmpdir(), `eskill-update-${Date.now()}`);
+  if (!remoteCommitHash) {
+    throw new Error('无法获取远程版本信息');
+  }
 
-    try {
-      // 克隆仓库（静默模式）
-      const cloneUrl = parsed.cloneUrl;
-      execSync(
-        `git clone --depth 1 --branch ${parsed.branch} --single-branch "${cloneUrl}" "${tempDir}"`,
-        { stdio: 'inherit' }
-      );
-
-      // 确定源路径
-      const sourcePath = parsed.path ? join(tempDir, parsed.path) : tempDir;
-
-      // 验证源路径存在
-      if (!existsSync(sourcePath)) {
-        throw new Error(`路径不存在: ${sourcePath}`);
-      }
+  // 检查是否有更新
+  if (!force && remoteCommitHash === meta.commitHash) {
+    return { success: true, skill: skillName, updated: false, currentVersion };
+  }
 
-      // 检查 SKILL.md 是否存在
-      const skillManifestPath = join(sourcePath, 'SKILL.md');
-      if (!existsSync(skillManifestPath)) {
-        throw new Error(`无效的技能包：未找到 SKILL.md 文件`);
-      }
+  // 有更新或强制更新，才下载代码
+  console.log(`  发现更新，正在下载...`);
 
-      // 获取新版本信息
-      const newCommitHash = getGitCommitHash(sourcePath);
-      const newVersion = getGitVersion(sourcePath);
-      const newVersionDisplay = newVersion || newCommitHash?.substring(0, 7) || 'unknown';
+  // 创建临时目录
+  const tempDir = join(tmpdir(), `eskill-update-${Date.now()}`);
 
-      // 检查是否有更新
-      if (!force && newCommitHash === meta.commitHash) {
-        // 删除临时目录
-        rmSync(tempDir, { recursive: true, force: true });
-        return { success: true, skill: skillName, updated: false, currentVersion };
-      }
+  try {
+    // 克隆仓库（静默模式）
+    execSync(
+      `git clone --depth 1 --branch ${parsed.branch} --single-branch "${parsed.cloneUrl}" "${tempDir}"`,
+      { stdio: 'inherit' }
+    );
 
-      // 删除旧技能
-      rmSync(targetPath, { recursive: true, force: true });
+    // 确定源路径
+    const sourcePath = parsed.path ? join(tempDir, parsed.path) : tempDir;
 
-      // 复制新技能
-      if (process.platform === 'win32') {
-        execSync(`xcopy "${sourcePath}" "${targetPath}" /E /I /H /Y`, { stdio: 'inherit' });
-      } else {
-        execSync(`cp -r "${sourcePath}" "${targetPath}"`, { stdio: 'inherit' });
-      }
+    // 验证源路径存在
+    if (!existsSync(sourcePath)) {
+      throw new Error(`路径不存在: ${sourcePath}`);
+    }
 
-      // 更新元数据
-      saveSkillMeta(skillName, {
-        ...meta,
-        commitHash: newCommitHash,
-        version: newVersion,
-        updatedAt: new Date().toISOString()
-      });
+    // 检查 SKILL.md 是否存在
+    const skillManifestPath = join(sourcePath, 'SKILL.md');
+    if (!existsSync(skillManifestPath)) {
+      throw new Error(`无效的技能包：未找到 SKILL.md 文件`);
+    }
 
-      return {
-        success: true,
-        skill: skillName,
-        updated: true,
-        currentVersion,
-        newVersion: newVersionDisplay
-      };
-    } finally {
-      // 清理临时目录
-      if (existsSync(tempDir)) {
-        rmSync(tempDir, { recursive: true, force: true });
-      }
+    // 获取新版本信息
+    const newCommitHash = getGitCommitHash(sourcePath);
+    const newVersion = getGitVersion(sourcePath);
+    const newVersionDisplay = newVersion || newCommitHash?.substring(0, 7) || 'unknown';
+
+    // 删除旧技能
+    rmSync(targetPath, { recursive: true, force: true });
+
+    // 复制新技能
+    if (process.platform === 'win32') {
+      execSync(`xcopy "${sourcePath}" "${targetPath}" /E /I /H /Y`, { stdio: 'inherit' });
+    } else {
+      execSync(`cp -r "${sourcePath}" "${targetPath}"`, { stdio: 'inherit' });
+    }
+
+    // 更新元数据
+    saveSkillMeta(skillName, {
+      ...meta,
+      commitHash: newCommitHash,
+      version: newVersion,
+      updatedAt: new Date().toISOString()
+    }, global);
+
+    return {
+      success: true,
+      skill: skillName,
+      updated: true,
+      currentVersion,
+      newVersion: newVersionDisplay
+    };
+  } finally {
+    // 清理临时目录
+    if (existsSync(tempDir)) {
+      rmSync(tempDir, { recursive: true, force: true });
     }
-  } catch (error) {
-    throw new Error(`更新失败: ${error.message}`);
   }
 }
 
@@ -602,12 +643,12 @@ export async function updateSkill(skillName, options = {}) {
  * 更新所有技能
  */
 export async function updateAllSkills(options = {}) {
-  const { force = false } = options;
+  const { force = false, global = false } = options;
 
   // 自动迁移旧位置的技能
-  migrateOldSkills();
+  migrateOldSkills(global);
 
-  const skillDir = getSkillsStorageDir();
+  const skillDir = getSkillsStorageDir(global);
 
   if (!existsSync(skillDir)) {
     console.log('未安装任何技能');
@@ -619,7 +660,7 @@ export async function updateAllSkills(options = {}) {
     .filter(dirent => dirent.isDirectory())
     .map(dirent => {
       const skillPath = join(skillDir, dirent.name);
-      const meta = getSkillMeta(dirent.name);
+      const meta = getSkillMeta(dirent.name, global);
       return {
         name: dirent.name,
         path: skillPath,
@@ -650,7 +691,7 @@ export async function updateAllSkills(options = {}) {
       }
 
       // 更新技能
-      const result = await updateSkill(skill.name, { force });
+      const result = await updateSkill(skill.name, { force, global });
 
       if (result.success && result.updated) {
         console.log(`✓ ${skill.name} - ${result.currentVersion} → ${result.newVersion}`);

package/package.json

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