eskill 1.0.33 → 1.2.0

package/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import ora from 'ora';
-import { installFromGitUrl, listSkills, removeSkill, cleanupAllSkills, cleanupAll, updateSkill, updateAllSkills } from './lib/installer.js';
+import { installFromGitUrl, listSkills, removeSkill, linkSkill, 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 { searchSkills, formatSkillList } from './lib/search.js';
@@ -13,7 +13,7 @@ const program = new Command();
 program
   .name('eskill')
   .description('Unified AI Agent Skills Management - Install skills from Git URLs')
-  .version('1.0.33')
+  .version('1.2.0')
   .option('-g, --global', '使用全局技能目录（~/.eskill/skills/），否则使用当前目录（./.claude/skills/）', false);
 
 // 安装命令
@@ -105,6 +105,25 @@ program
     }
   });
 
+// 链接命令
+program
+  .command('link')
+  .description('将全局技能软链接到本地')
+  .argument('<name>', '技能名称（不需要 @作者）')
+  .action(async (name) => {
+    try {
+      const result = await linkSkill(name);
+
+      // 如果用户取消链接，正常退出
+      if (result && result.cancelled) {
+        process.exit(0);
+      }
+    } catch (error) {
+      console.error(`\n❌ 链接失败: ${error.message}`);
+      process.exit(1);
+    }
+  });
+
 // 更新命令
 program
   .command('update')

package/lib/installer.js

@@ -250,9 +250,25 @@ async function handleSkillAtAuthorFormat(input, global = false) {
       const globalSkillPath = join(globalSkillsDir, skillName);
 
       if (existsSync(globalSkillPath)) {
-        // 全局仓库中找到，直接复制
+        // 全局仓库中找到，检查本地是否已存在
         console.log(`✓ 在全局仓库中找到技能: ${skillName}`);
-        console.log(`  位置: ~/.eskill/skills/${skillName}\n`);
+        console.log(`  位置: ~/.eskill/skills/${skillName}`);
+
+        const localSkillsDir = getSkillsDir(false);
+        const localSkillPath = join(localSkillsDir, skillName);
+
+        if (existsSync(localSkillPath)) {
+          console.log(`\n⚠️  本地已存在同名技能: ${skillName}`);
+          console.log(`  位置: ${localSkillPath}\n`);
+
+          const overwrite = await confirmAction('是否覆盖本地已存在的技能？');
+          if (!overwrite) {
+            console.log('\n已取消安装\n');
+            throw new Error('用户取消安装');
+          }
+        }
+
+        console.log();
 
         // 返回特殊标记，表示需要从全局复制
         return `GLOBAL:${skillName}`;
@@ -284,9 +300,25 @@ async function handleSkillAtAuthorFormat(input, global = false) {
     const globalSkillPath = join(globalSkillsDir, skillName);
 
     if (existsSync(globalSkillPath)) {
-      // 全局仓库中找到，直接复制
+      // 全局仓库中找到，检查本地是否已存在
       console.log(`✓ 在全局仓库中找到技能: ${skillName}`);
-      console.log(`  位置: ~/.eskill/skills/${skillName}\n`);
+      console.log(`  位置: ~/.eskill/skills/${skillName}`);
+
+      const localSkillsDir = getSkillsDir(false);
+      const localSkillPath = join(localSkillsDir, skillName);
+
+      if (existsSync(localSkillPath)) {
+        console.log(`\n⚠️  本地已存在同名技能: ${skillName}`);
+        console.log(`  位置: ${localSkillPath}\n`);
+
+        const overwrite = await confirmAction('是否覆盖本地已存在的技能？');
+        if (!overwrite) {
+          console.log('\n已取消安装\n');
+          throw new Error('用户取消安装');
+        }
+      }
+
+      console.log();
 
       // 返回特殊标记，表示需要从全局复制
       return `GLOBAL:${skillName}`;
@@ -366,10 +398,17 @@ async function copyFromGlobal(skillName, options = {}) {
   const sourcePath = join(globalSkillsDir, skillName);
   const targetPath = join(localSkillsDir, skillName);
 
-  // 检查本地是否已存在
+  // 检查本地是否已存在同名技能
   if (existsSync(targetPath)) {
     if (!force) {
-      throw new Error(`本地已存在技能: ${skillName}\n使用 --force 选项强制覆盖`);
+      console.log(`\n⚠️  本地已存在技能: ${skillName}`);
+      console.log(`  位置: ${targetPath}\n`);
+
+      const overwrite = await confirmAction('是否强制覆盖已存在的技能？');
+      if (!overwrite) {
+        console.log('\n已取消安装\n');
+        return { success: false, cancelled: true };
+      }
     }
     console.log(`删除本地已存在的技能: ${targetPath}`);
     rmSync(targetPath, { recursive: true, force: true });
@@ -418,13 +457,21 @@ function confirmAction(message) {
 export async function installFromGitUrl(gitUrl, options = {}) {
   const { agent = 'claude', link = false, force = false, global = false } = options;
 
-  // 检测并处理 name@author 格式
-  let actualUrl = await handleSkillAtAuthorFormat(gitUrl, global);
+  try {
+    // 检测并处理 name@author 格式
+    let actualUrl = await handleSkillAtAuthorFormat(gitUrl, global);
 
-  // 如果是从全局复制
-  if (actualUrl.startsWith('GLOBAL:')) {
-    const skillName = actualUrl.replace('GLOBAL:', '');
-    return await copyFromGlobal(skillName, options);
+    // 如果是从全局复制
+    if (actualUrl.startsWith('GLOBAL:')) {
+      const skillName = actualUrl.replace('GLOBAL:', '');
+      return await copyFromGlobal(skillName, options);
+    }
+  } catch (error) {
+    // 用户取消安装
+    if (error.message === '用户取消安装') {
+      return { success: false, cancelled: true };
+    }
+    throw error;
   }
 
   // 解析 Git URL
@@ -462,10 +509,17 @@ export async function installFromGitUrl(gitUrl, options = {}) {
     mkdirSync(skillsDir, { recursive: true });
   }
 
-  // 检查是否已存在
+  // 检查是否已存在同名技能
   if (existsSync(targetPath)) {
     if (!force) {
-      throw new Error(`技能已存在: ${skillName}\n使用 --force 选项强制覆盖`);
+      console.log(`\n⚠️  技能已存在: ${skillName}`);
+      console.log(`  位置: ${targetPath}\n`);
+
+      const overwrite = await confirmAction('是否强制覆盖已存在的技能？');
+      if (!overwrite) {
+        console.log('\n已取消安装\n');
+        return { success: false, cancelled: true };
+      }
     }
     console.log(`删除已存在的技能: ${targetPath}`);
     rmSync(targetPath, { recursive: true, force: true });
@@ -596,6 +650,66 @@ export function removeSkill(skillName, agent = 'claude', global = false) {
   console.log(`✓ 已删除技能: ${skillName}`);
 }
 
+/**
+ * 链接全局技能到本地
+ */
+export async function linkSkill(skillName) {
+  const globalSkillsDir = getSkillsDir(true);
+  const localSkillsDir = getSkillsDir(false);
+
+  const globalSkillPath = join(globalSkillsDir, skillName);
+  const localSkillPath = join(localSkillsDir, skillName);
+
+  // 检查全局是否存在该技能
+  if (!existsSync(globalSkillPath)) {
+    console.log(`\n❌ 全局仓库中不存在技能: ${skillName}`);
+    console.log(`   位置: ~/.eskill/skills/${skillName}\n`);
+    console.log(`💡 提示:`);
+    console.log(`   - 使用 "eskill install -g ${skillName}" 先安装到全局仓库`);
+    console.log(`   - 或使用 "eskill install" 直接安装到本地\n`);
+    throw new Error(`全局仓库中不存在技能: ${skillName}`);
+  }
+
+  // 确保本地技能目录存在
+  if (!existsSync(localSkillsDir)) {
+    mkdirSync(localSkillsDir, { recursive: true });
+  }
+
+  // 检查本地是否已存在同名技能
+  if (existsSync(localSkillPath)) {
+    console.log(`\n⚠️  本地已存在同名技能: ${skillName}`);
+    console.log(`  位置: ${localSkillPath}\n`);
+
+    const overwrite = await confirmAction('是否删除本地技能并创建软链接？');
+    if (!overwrite) {
+      console.log('\n已取消链接\n');
+      return { success: false, cancelled: true };
+    }
+
+    console.log(`删除本地已存在的技能: ${localSkillPath}`);
+    rmSync(localSkillPath, { recursive: true, force: true });
+  }
+
+  // 创建软链接
+  console.log(`\n创建软链接:`);
+  console.log(`  源: ${globalSkillPath}`);
+  console.log(`  目标: ${localSkillPath}\n`);
+
+  try {
+    symlinkSync(globalSkillPath, localSkillPath, 'dir');
+
+    console.log(`✓ 软链接创建成功`);
+    console.log(`  技能: ${skillName}`);
+    console.log(`  本地路径: ${localSkillPath}`);
+    console.log(`  全局路径: ${globalSkillPath}`);
+    console.log(`  说明: 本地技能指向全局仓库，全局更新会自动同步\n`);
+
+    return { success: true, path: localSkillPath };
+  } catch (error) {
+    throw new Error(`创建软链接失败: ${error.message}`);
+  }
+}
+
 /**
  * 清理所有技能（用于卸载）
  */

package/package.json

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