eskill 1.0.15 → 1.0.17

package/cli.js

@@ -25,13 +25,18 @@ program
   .option('-l, --link', '使用符号链接而非复制', false)
   .option('-f, --force', '强制覆盖已存在的技能', false)
   .action(async (url, options) => {
-    const spinner = ora('正在安装技能...').start();
-
     try {
-      await installFromGitUrl(url, options);
-      spinner.succeed('技能安装成功');
+      const result = await installFromGitUrl(url, options);
+
+      // 如果用户取消安装，正常退出
+      if (result && result.cancelled) {
+        process.exit(0);
+      }
+
+      // 其他情况显示成功消息
+      console.log('\n✓ 技能安装成功');
     } catch (error) {
-      spinner.fail(`安装失败: ${error.message}`);
+      console.error(`\n❌ 安装失败: ${error.message}`);
       process.exit(1);
     }
   });

package/lib/installer.js

@@ -5,6 +5,8 @@ import { tmpdir } from 'os';
 import { fileURLToPath } from 'url';
 import { parseGitUrl } from './git-url-parser.js';
 import { AGENTS, expandHomePath } from './agent-config.js';
+import { searchSkills, formatSkillList } from './search.js';
+import readline from 'readline';
 
 /**
  * 获取 eskill 包的安装目录
@@ -48,14 +50,106 @@ function getSkillMeta(skillPath) {
   }
 }
 
+/**
+ * 检测并处理 name@author 格式
+ * 返回解析后的 GitHub URL，如果不是该格式则返回原 URL
+ */
+async function handleSkillAtAuthorFormat(input) {
+  // 检测是否为 name@author 格式
+  const match = input.match(/^([^@]+)@([^@]+)$/);
+
+  if (!match) {
+    // 不是该格式，直接返回原 URL
+    return input;
+  }
+
+  const [, skillName, author] = match;
+  console.log(`\n检测到技能名称格式: ${skillName}@${author}`);
+  console.log(`正在搜索 "${skillName}"...\n`);
+
+  try {
+    // 搜索技能
+    const result = await searchSkills(skillName, { limit: 100, sortBy: 'stars' });
+
+    if (result.success === false) {
+      throw new Error(result.error?.message || '搜索失败');
+    }
+
+    const skills = result.data?.skills || result.data || result.skills || result.results || [];
+
+    // 筛选出匹配作者的技能
+    const matchedSkills = skills.filter(skill => {
+      const skillAuthor = skill.author || skill.owner || '';
+      return skillAuthor.toLowerCase() === author.toLowerCase();
+    });
+
+    if (matchedSkills.length === 0) {
+      // 没有找到匹配的作者
+      console.log(`❌ 未找到作者 "${author}" 的技能 "${skillName}"\n`);
+      console.log('搜索结果如下:\n');
+      console.log(formatSkillList(skills));
+      throw new Error(`未找到匹配的技能`);
+    }
+
+    // 找到匹配的技能
+    const matchedSkill = matchedSkills[0];
+    const githubUrl = matchedSkill.githubUrl || matchedSkill.github_url || matchedSkill.url;
+
+    if (!githubUrl) {
+      throw new Error('技能信息中没有 GitHub URL');
+    }
+
+    console.log(`\n✓ 找到匹配的技能:`);
+    console.log(`  名称: ${skillName}@${author}`);
+    console.log(`  Stars: ⭐ ${matchedSkill.stars || 'N/A'}`);
+    console.log(`  GitHub: ${githubUrl}\n`);
+
+    return githubUrl;
+  } catch (error) {
+    if (error.message === '未找到匹配的技能') {
+      throw error;
+    }
+    throw new Error(`搜索失败: ${error.message}`);
+  }
+}
+
+/**
+ * 等待用户确认
+ */
+function confirmAction(message) {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    rl.question(`${message} (y/N): `, (answer) => {
+      rl.close();
+      resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
+    });
+  });
+}
+
 /**
  * 从 Git URL 安装技能
  */
 export async function installFromGitUrl(gitUrl, options = {}) {
   const { agent = 'claude', link = false, force = false } = options;
 
+  // 检测并处理 name@author 格式
+  let actualUrl = await handleSkillAtAuthorFormat(gitUrl);
+
+  // 如果 URL 被转换了（即原来是 name@author 格式），需要确认
+  if (actualUrl !== gitUrl) {
+    const confirmed = await confirmAction('是否安装此技能？');
+    if (!confirmed) {
+      console.log('\n已取消安装');
+      return { success: false, cancelled: true };
+    }
+  }
+
   // 解析 Git URL
-  const parsed = parseGitUrl(gitUrl);
+  const parsed = parseGitUrl(actualUrl);
   console.log(`平台: ${parsed.platform}`);
   console.log(`仓库: ${parsed.owner}/${parsed.repo}`);
   console.log(`分支: ${parsed.branch}`);

package/lib/search.js

@@ -96,8 +96,10 @@ export function formatSkillList(skills, showIndex = true) {
       output += `    Stars: ⭐ ${skill.stars}\n`;
     }
 
-    if (skill.url || skill.github_url) {
-      output += `    ${skill.url || skill.github_url}\n`;
+    // 显示 GitHub URL（支持多种字段名）
+    const githubUrl = skill.githubUrl || skill.github_url || skill.url;
+    if (githubUrl) {
+      output += `    ${githubUrl}\n`;
     }
 
     output += '\n';

package/package.json

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