joyskills-cli 0.3.2 → 0.3.4

package/package.json

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

package/src/commands/install.js

@@ -14,6 +14,22 @@ import chalk from 'chalk';
 // Cache directory for cloned repos
 const CACHE_DIR = process.env.JOYSKILL_CACHE_DIR || path.join(os.homedir(), '.joyskill', 'cache');
 
+/**
+ * Get git commit hash for a directory
+ */
+async function getGitCommit(dirPath) {
+  try {
+    const git = simpleGit(dirPath);
+    const isRepo = await git.checkIsRepo();
+    if (!isRepo) return null;
+    
+    const log = await git.log({ maxCount: 1 });
+    return log.latest?.hash || null;
+  } catch {
+    return null;
+  }
+}
+
 export function installCommand(program) {
   program
     .command('install [skill]')
@@ -252,6 +268,9 @@ async function tryInstallFromRegistryDir(skillName, registryDirPath, targetDir,
       const installInfo = fs.lstatSync(targetPath);
       const installMethod = installInfo.isSymbolicLink() ? 'symlink' : 'copy';
 
+      // Get git commit for the skill source
+      const commitHash = await getGitCommit(sourcePath);
+      
       const lockfileManager = new LockfileManager(projectRoot);
       await lockfileManager.load();
       lockfileManager.updateSkill(skillName, {
@@ -259,6 +278,7 @@ async function tryInstallFromRegistryDir(skillName, registryDirPath, targetDir,
         source: sourceLabel,
         registry: registryManager.getRegistryInfo().registryId,
         installMethod,
+        commit: commitHash,
         installedAt: new Date().toISOString()
       });
       await lockfileManager.save();
@@ -279,11 +299,15 @@ async function tryInstallFromRegistryDir(skillName, registryDirPath, targetDir,
     const targetPath = path.join(targetDir, skillName);
     copyRecursive(skill.path, targetPath);
 
+    // Get git commit for the skill source
+    const commitHash = await getGitCommit(skill.path);
+
     const lockfileManager = new LockfileManager(projectRoot);
     await lockfileManager.load();
     lockfileManager.updateSkill(skillName, {
       version: skill.version || '1.0.0',
       source: sourceLabel,
+      commit: commitHash,
       installedAt: new Date().toISOString()
     });
     await lockfileManager.save();

package/src/commands/update.js

@@ -119,6 +119,22 @@ async function getAllUpdatableSkills(projectRoot) {
   return updatable;
 }
 
+/**
+ * 获取目录的 git commit hash
+ */
+async function getDirCommit(dirPath) {
+  try {
+    const git = simpleGit(dirPath);
+    const isRepo = await git.checkIsRepo();
+    if (!isRepo) return null;
+    
+    const log = await git.log({ maxCount: 1 });
+    return log.latest?.hash || null;
+  } catch {
+    return null;
+  }
+}
+
 /**
  * 更新 team:// 类型的 Skill
  */
@@ -126,7 +142,10 @@ async function updateTeamSkill(skill, projectRoot) {
   const lockfile = new LockfileManager(projectRoot);
   await lockfile.load();
   
-  const updateInfo = await checkTeamSkillUpdate(skill, skill.source);
+  const lockData = lockfile.getSkill(skill.name);
+  const localCommit = lockData?.commit;
+  
+  const updateInfo = await checkTeamSkillUpdate(skill, skill.source, localCommit);
   
   if (!updateInfo.hasUpdate) {
     throw new Error('No update available');
@@ -140,10 +159,14 @@ async function updateTeamSkill(skill, projectRoot) {
   // 复制新版本
   copyRecursive(updateInfo.registrySkillPath, skill.path);
   
+  // 获取新版本的 commit
+  const newCommit = await getDirCommit(updateInfo.registrySkillPath);
+  
   // 更新 lockfile
   lockfile.updateSkill(skill.name, {
     version: updateInfo.latestVersion,
     source: skill.source,
+    commit: newCommit,
     updatedAt: new Date().toISOString(),
   });
   await lockfile.save();
@@ -187,18 +210,27 @@ 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 localCommit = lockData?.commit;
+      const updateInfo = await checkTeamSkillUpdate(skill, teamSource, localCommit);
       if (updateInfo.hasUpdate) {
         skills.push({
           name: skill.name,
           path: skill.path,
           currentVersion: skill.version,
           latestVersion: updateInfo.latestVersion,
-          source: lockData.source,
+          source: teamSource,
           type: 'team',
         });
       }
@@ -230,7 +262,7 @@ async function getSpecifiedSkills(projectRoot, skillNames) {
 /**
  * 检查 team:// 类型的 Skill 是否有更新
  */
-async function checkTeamSkillUpdate(skill, source) {
+async function checkTeamSkillUpdate(skill, source, localCommit = null) {
   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');
@@ -246,7 +278,7 @@ async function checkTeamSkillUpdate(skill, source) {
     return { hasUpdate: false, error: `Registry ${registryName} not found` };
   }
   
-  // 从 registry 查找最新版本
+  // 从 registry 查找 skill
   const { findSkills } = await import('./install.js');
   const registrySkills = await findSkills(reg.path);
   const registrySkill = registrySkills.find(s => s.name === skill.name);
@@ -255,16 +287,56 @@ async function checkTeamSkillUpdate(skill, source) {
     return { hasUpdate: false, error: 'Skill not found in registry' };
   }
   
-  const hasUpdate = registrySkill.version && registrySkill.version !== skill.version;
+  // 获取 registry 中 skill 的 commit
+  const remoteCommit = await getDirCommit(registrySkill.path);
+  
+  // 使用 commit 对比，如果没有 commit 则 fallback 到 version 对比
+  let hasUpdate = false;
+  if (localCommit && remoteCommit) {
+    hasUpdate = localCommit !== remoteCommit;
+  } else {
+    hasUpdate = registrySkill.version && registrySkill.version !== skill.version;
+  }
   
   return {
     hasUpdate,
     latestVersion: registrySkill.version,
+    localCommit,
+    remoteCommit,
     registryPath: reg.path,
     registrySkillPath: registrySkill.path,
   };
 }
 
+/**
+ * 从所有 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 是否有更新
  */
@@ -311,7 +383,8 @@ async function getUpdatableTeamSkills(projectRoot) {
   for (const skill of allSkills) {
     const lockData = lockfile.getSkill(skill.name);
     if (lockData?.source?.startsWith('team:')) {
-      const updateInfo = await checkTeamSkillUpdate(skill, lockData.source);
+      const localCommit = lockData?.commit;
+      const updateInfo = await checkTeamSkillUpdate(skill, lockData.source, localCommit);
       if (updateInfo.hasUpdate) {
         updatable.push({
           name: skill.name,

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,32 @@ export async function checkRemoteUpdate(skillPath, currentCommit) {
 /**
  * 检查单个 Skill
  */
-export async function checkSkill(skill) {
+export async function checkSkill(skill, projectRoot) {
+  // 首先尝试从 lockfile 获取 source 和 commit
+  let teamSource = null;
+  let localCommit = 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;
+      localCommit = lockData.commit;
+    }
+  }
+  
+  // 如果没有 lockfile 记录，尝试从所有 registry 查找
+  if (!teamSource) {
+    teamSource = await findSkillInRegistries(skill.name);
+  }
+  
+  // 如果是 team:// skill，对比 registry commit
+  if (teamSource) {
+    return await checkTeamSkill(skill, teamSource, localCommit);
+  }
+  
+  // Git skill: 对比 commit
   const gitInfo = await getSkillGitInfo(skill.path);
   
   if (!gitInfo) {
@@ -103,6 +130,119 @@ 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;
+}
+
+/**
+ * 获取目录的 git commit hash
+ */
+async function getDirCommit(dirPath) {
+  try {
+    const git = simpleGit(dirPath);
+    const isRepo = await git.checkIsRepo();
+    if (!isRepo) return null;
+    
+    const log = await git.log({ maxCount: 1 });
+    return log.latest?.hash || null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * 检查 team:// skill 更新
+ */
+async function checkTeamSkill(skill, source, localCommit) {
+  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 查找 skill
+  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',
+    };
+  }
+  
+  // 获取 registry 中 skill 的最新 commit
+  const remoteCommit = await getDirCommit(registrySkill.path);
+  
+  // 如果没有 localCommit（旧版本安装的），使用 version 对比作为 fallback
+  let hasUpdate = false;
+  if (localCommit && remoteCommit) {
+    hasUpdate = localCommit !== remoteCommit;
+  } else {
+    hasUpdate = registrySkill.version && registrySkill.version !== skill.version;
+  }
+  
+  return {
+    name: skill.name,
+    hasUpdate,
+    currentVersion: skill.version,
+    localCommit: typeof localCommit === 'string' ? localCommit.slice(0, 7) : 'unknown',
+    remoteCommit: typeof remoteCommit === 'string' ? remoteCommit.slice(0, 7) : 'unknown',
+    commitsBehind: hasUpdate ? 1 : 0,
+    source: `team:${registryName}`,
+  };
+}
+
 /**
  * 检查所有 Skills
  */
@@ -113,7 +253,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);
   }