eskill 1.0.23 → 1.0.27

package/cli.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.23');
+  .version('1.0.27');
 
 // 安装命令
 program
@@ -95,11 +95,15 @@ program
 program
   .command('update')
   .description('更新技能')
-  .argument('[name]', '技能名称（不指定则更新所有）')
+  .argument('[name]', '技能名称（不指定或 "all" 则更新所有）')
   .option('-f, --force', '强制更新（即使版本相同）', false)
   .action(async (name, options) => {
     try {
-      if (name) {
+      // 支持显式使用 "all" 参数
+      if (name === 'all' || name === 'All' || name === 'ALL') {
+        // 更新所有技能
+        await updateAllSkills(options);
+      } else if (name) {
         // 更新单个技能
         console.log(`\n检查技能: ${name}`);
         const result = await updateSkill(name, options);
@@ -114,7 +118,7 @@ program
           console.log(`  新版本: ${result.newVersion}\n`);
         }
       } else {
-        // 更新所有技能
+        // 更新所有技能（不指定参数时）
         await updateAllSkills(options);
       }
     } catch (error) {
@@ -160,9 +164,9 @@ program
       }
 
       // 从 API 返回的数据结构中提取技能和分页信息
-      const skills = result.data?.skills || result.data || result.skills || result.results || [];
-      const pagination = result.data?.pagination || result.pagination || {};
-      const total = pagination.total || result.total || skills.length;
+      let skills = result.data?.skills || result.data || result.skills || result.results || [];
+      let pagination = result.data?.pagination || result.pagination || {};
+      let total = pagination.total || result.total || skills.length;
 
       // 确保 skills 是数组
       if (!Array.isArray(skills)) {
@@ -171,6 +175,43 @@ program
         process.exit(1);
       }
 
+      // 智能搜索：如果没有结果且是 name@author 格式
+      if (skills.length === 0) {
+        const match = query.match(/^([^@]+)@([^@]+)$/);
+        if (match) {
+          const [, skillName, author] = match;
+          console.log(`\n💡 未找到 "${query}"，尝试按技能名 "${skillName}" 和作者 "${author}" 搜索...\n`);
+
+          // 重新搜索技能名
+          const newResult = await searchSkills(skillName, {
+            page: 1,
+            limit: 100,
+            sortBy: options.sort,
+            ai: options.ai
+          });
+
+          const allSkills = newResult.data?.skills || newResult.data || newResult.skills || newResult.results || [];
+
+          // 筛选匹配作者的技能（不区分大小写）
+          skills = allSkills.filter(skill => {
+            const skillAuthor = (skill.author || skill.owner || '').toLowerCase();
+            return skillAuthor === author.toLowerCase();
+          });
+
+          total = skills.length;
+
+          if (skills.length > 0) {
+            console.log(`✓ 找到 ${total} 个匹配的技能\n`);
+          } else {
+            console.log(`❌ 仍然未找到匹配的技能\n`);
+            console.log('提示:');
+            console.log(`  - 尝试只搜索技能名: eskill search ${skillName}`);
+            console.log(`  - 尝试只搜索作者: eskill search ${author}\n`);
+            process.exit(0);
+          }
+        }
+      }
+
       console.log(formatSkillList(skills));
 
       // 显示分页信息和提示

package/lib/installer.js

@@ -200,7 +200,7 @@ async function handleSkillAtAuthorFormat(input) {
 
   const [, skillName, author] = match;
   console.log(`\n检测到技能名称格式: ${skillName}@${author}`);
-  console.log(`正在搜索 "${skillName}"...\n`);
+  console.log(`正在搜索 "${skillName}" 和作者 "${author}"...\n`);
 
   try {
     // 搜索技能
@@ -212,17 +212,28 @@ async function handleSkillAtAuthorFormat(input) {
 
     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();
+      const skillAuthor = (skill.author || skill.owner || '').toLowerCase();
+      return skillAuthor === author.toLowerCase();
     });
 
     if (matchedSkills.length === 0) {
       // 没有找到匹配的作者
       console.log(`❌ 未找到作者 "${author}" 的技能 "${skillName}"\n`);
-      console.log('搜索结果如下:\n');
-      console.log(formatSkillList(skills));
+
+      // 显示找到的同名技能（如果有）
+      if (skills.length > 0) {
+        console.log(`找到 ${skills.length} 个名为 "${skillName}" 的技能，但作者不匹配:\n`);
+        console.log(formatSkillList(skills));
+      }
+
+      // 给出建议
+      console.log(`💡 建议:`);
+      console.log(`  - 尝试搜索其他作者: eskill search ${skillName}`);
+      console.log(`  - 尝试搜索该作者的其他技能: eskill search ${author}`);
+      console.log(`  - 或直接使用 GitHub URL 安装\n`);
+
       throw new Error(`未找到匹配的技能`);
     }
 
@@ -234,7 +245,7 @@ async function handleSkillAtAuthorFormat(input) {
       throw new Error('技能信息中没有 GitHub URL');
     }
 
-    console.log(`\n✓ 找到匹配的技能:`);
+    console.log(`✓ 找到匹配的技能:`);
     console.log(`  名称: ${skillName}@${author}`);
     console.log(`  Stars: ⭐ ${matchedSkill.stars || 'N/A'}`);
     console.log(`  GitHub: ${githubUrl}\n`);
@@ -484,6 +495,23 @@ export function getSkillsDir() {
   return getSkillsStorageDir();
 }
 
+/**
+ * 获取远程仓库的 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;
+  }
+}
+
 /**
  * 更新单个技能
  */
@@ -507,83 +535,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()
+    });
+
+    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}`);
   }
 }
 

package/package.json

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