joyskills-cli 0.3.1 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joyskills-cli",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "JoySkills CLI v2.0 - Multi-agent skill management with JoyCode native support",
   "main": "src/index.js",
   "bin": {

package/src/commands/team.js

@@ -50,11 +50,12 @@ export function teamCommand(program) {
         const registryYamlPath = path.join(registryCachePath, 'registry.yaml');
         const hasRegistryYaml = fs.existsSync(registryYamlPath);
 
-        // Count skill directories (dirs with SKILL.md)
-        const entries = fs.readdirSync(registryCachePath, { withFileTypes: true });
-        const skillDirs = entries.filter(e => e.isDirectory() && fs.existsSync(path.join(registryCachePath, e.name, 'SKILL.md')));
+        // Count skills using findSkills (supports nested directories)
+        const { findSkills } = await import('./install.js');
+        const foundSkills = await findSkills(registryCachePath);
+        const skillCount = foundSkills.length;
 
-        if (!hasRegistryYaml && skillDirs.length === 0) {
+        if (!hasRegistryYaml && skillCount === 0) {
           throw new Error('Invalid registry: no registry.yaml and no skill directories found');
         }
 
@@ -66,14 +67,14 @@ export function teamCommand(program) {
         }
 
         let registryId = name;
-        let skillCount = skillDirs.length;
+        let finalSkillCount = skillCount;
 
         if (hasRegistryYaml) {
           const registryManager = new RegistryManager(registryCachePath);
           await registryManager.load();
           const info = registryManager.getRegistryInfo();
           registryId = info.registryId;
-          skillCount = registryManager.getAllSkills().length;
+          finalSkillCount = registryManager.getAllSkills().length;
         }
 
         config.registries[name] = {
@@ -88,7 +89,7 @@ export function teamCommand(program) {
 
         console.log(chalk.green(`✅ Successfully added registry: ${name}`));
         console.log(chalk.gray(`   Registry ID: ${registryId}`));
-        console.log(chalk.gray(`   Skills: ${skillCount}${hasRegistryYaml ? '' : ' (no registry.yaml, direct scan)'}`));
+        console.log(chalk.gray(`   Skills: ${finalSkillCount}${hasRegistryYaml ? '' : ' (no registry.yaml, direct scan)'}`));
         
       } catch (error) {
         console.error(chalk.red(`❌ Failed to add registry: ${error.message}`));

package/src/commands/update.js

@@ -187,18 +187,26 @@ async function getSpecifiedSkills(projectRoot, skillNames) {
       continue;
     }
     
+    let teamSource = null;
     const lockData = lockfile.getSkill(name);
     
     if (lockData?.source?.startsWith('team:')) {
+      teamSource = lockData.source;
+    } else {
+      // 尝试从所有 registry 查找
+      teamSource = await findSkillInRegistries(name);
+    }
+    
+    if (teamSource) {
       // team:// 类型
-      const updateInfo = await checkTeamSkillUpdate(skill, lockData.source);
+      const updateInfo = await checkTeamSkillUpdate(skill, teamSource);
       if (updateInfo.hasUpdate) {
         skills.push({
           name: skill.name,
           path: skill.path,
           currentVersion: skill.version,
           latestVersion: updateInfo.latestVersion,
-          source: lockData.source,
+          source: teamSource,
           type: 'team',
         });
       }
@@ -265,6 +273,35 @@ async function checkTeamSkillUpdate(skill, source) {
   };
 }
 
+/**
+ * 从所有 registry 中查找 skill
+ */
+async function findSkillInRegistries(skillName) {
+  const JOYSKILL_CONFIG_DIR = process.env.JOYSKILL_CONFIG_DIR || path.join(os.homedir(), '.joyskill');
+  const configPath = path.join(JOYSKILL_CONFIG_DIR, 'config.json');
+  
+  if (!fs.existsSync(configPath)) {
+    return null;
+  }
+  
+  const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+  const registries = config.registries || {};
+  
+  for (const [name, reg] of Object.entries(registries)) {
+    if (!reg.path || !fs.existsSync(reg.path)) continue;
+    
+    const { findSkills } = await import('./install.js');
+    const skills = await findSkills(reg.path);
+    const found = skills.find(s => s.name === skillName);
+    
+    if (found) {
+      return `team:${name}`;
+    }
+  }
+  
+  return null;
+}
+
 /**
  * 检查 Git 类型的 Skill 是否有更新
  */
@@ -276,14 +313,24 @@ async function checkGitSkillUpdate(skill) {
     return { hasUpdate: false, error: 'Not a git repository' };
   }
   
+  // 获取当前 commit
+  const currentLog = await git.log({ maxCount: 1 });
+  const currentCommit = currentLog.latest?.hash;
+  
+  // Fetch 远程最新
   await git.fetch(['--depth', '1']);
-  const log = await git.log({ maxCount: 1 });
-  const latestCommit = log.latest;
   
-  // 简化：如果有 fetch 成功，认为可能有更新
+  // 获取远程最新 commit
+  const remoteLog = await git.log({ maxCount: 1 });
+  const remoteCommit = remoteLog.latest?.hash;
+  
+  // 比较 commit
+  const hasUpdate = remoteCommit !== currentCommit;
+  
   return {
-    hasUpdate: true,
-    latestVersion: latestCommit?.hash?.slice(0, 7) || 'latest',
+    hasUpdate,
+    latestVersion: remoteCommit?.slice(0, 7) || 'latest',
+    currentVersion: currentCommit?.slice(0, 7),
   };
 }
 

package/src/version-checker.js

@@ -5,8 +5,10 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
+import * as os from 'os';
 import simpleGit from 'simple-git';
 import { SkillLoader } from './skill-loader.js';
+import { LockfileManager } from './lockfile.js';
 
 /**
  * 获取 Skill 的 Git 信息
@@ -77,7 +79,30 @@ export async function checkRemoteUpdate(skillPath, currentCommit) {
 /**
  * 检查单个 Skill
  */
-export async function checkSkill(skill) {
+export async function checkSkill(skill, projectRoot) {
+  // 首先尝试从 lockfile 获取 source
+  let teamSource = null;
+  
+  if (projectRoot) {
+    const lockfile = new LockfileManager(projectRoot);
+    await lockfile.load();
+    const lockData = lockfile.getSkill(skill.name);
+    if (lockData?.source?.startsWith('team:')) {
+      teamSource = lockData.source;
+    }
+  }
+  
+  // 如果没有 lockfile 记录，尝试从所有 registry 查找
+  if (!teamSource) {
+    teamSource = await findSkillInRegistries(skill.name);
+  }
+  
+  // 如果是 team:// skill，对比 registry 版本
+  if (teamSource) {
+    return await checkTeamSkill(skill, teamSource);
+  }
+  
+  // Git skill: 对比 commit
   const gitInfo = await getSkillGitInfo(skill.path);
   
   if (!gitInfo) {
@@ -103,6 +128,93 @@ export async function checkSkill(skill) {
   };
 }
 
+/**
+ * 从所有 registry 中查找 skill
+ */
+async function findSkillInRegistries(skillName) {
+  const JOYSKILL_CONFIG_DIR = process.env.JOYSKILL_CONFIG_DIR || path.join(os.homedir(), '.joyskill');
+  const configPath = path.join(JOYSKILL_CONFIG_DIR, 'config.json');
+  
+  if (!fs.existsSync(configPath)) {
+    return null;
+  }
+  
+  const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+  const registries = config.registries || {};
+  
+  for (const [name, reg] of Object.entries(registries)) {
+    if (!reg.path || !fs.existsSync(reg.path)) continue;
+    
+    const { findSkills } = await import('./commands/install.js');
+    const skills = await findSkills(reg.path);
+    const found = skills.find(s => s.name === skillName);
+    
+    if (found) {
+      return `team:${name}`;
+    }
+  }
+  
+  return null;
+}
+
+/**
+ * 检查 team:// skill 更新
+ */
+async function checkTeamSkill(skill, source) {
+  const registryName = source.replace('team:', '');
+  const JOYSKILL_CONFIG_DIR = process.env.JOYSKILL_CONFIG_DIR || path.join(os.homedir(), '.joyskill');
+  const configPath = path.join(JOYSKILL_CONFIG_DIR, 'config.json');
+  
+  if (!fs.existsSync(configPath)) {
+    return {
+      name: skill.name,
+      hasUpdate: false,
+      currentVersion: skill.version,
+      source: 'team',
+      error: 'No registry config',
+    };
+  }
+  
+  const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+  const reg = config.registries?.[registryName];
+  
+  if (!reg?.path || !fs.existsSync(reg.path)) {
+    return {
+      name: skill.name,
+      hasUpdate: false,
+      currentVersion: skill.version,
+      source: 'team',
+      error: `Registry ${registryName} not found`,
+    };
+  }
+  
+  // 从 registry 查找最新版本
+  const { findSkills } = await import('./commands/install.js');
+  const registrySkills = await findSkills(reg.path);
+  const registrySkill = registrySkills.find(s => s.name === skill.name);
+  
+  if (!registrySkill) {
+    return {
+      name: skill.name,
+      hasUpdate: false,
+      currentVersion: skill.version,
+      source: 'team',
+      error: 'Skill not found in registry',
+    };
+  }
+  
+  const hasUpdate = registrySkill.version && registrySkill.version !== skill.version;
+  
+  return {
+    name: skill.name,
+    hasUpdate,
+    currentVersion: skill.version,
+    latestVersion: registrySkill.version,
+    commitsBehind: hasUpdate ? 1 : 0,  // 版本不同即视为有更新
+    source: `team:${registryName}`,
+  };
+}
+
 /**
  * 检查所有 Skills
  */
@@ -113,7 +225,7 @@ export async function checkAllSkills(projectRoot) {
   const results = [];
   
   for (const skill of skills) {
-    const result = await checkSkill(skill);
+    const result = await checkSkill(skill, projectRoot);
     results.push(result);
   }