joyskills-cli 0.2.10 → 0.3.1

package/src/commands/install.js

@@ -2,6 +2,8 @@ import { Command } from 'commander';
 import { LocalManager } from '../local.js';
 import { LockfileManager } from '../lockfile.js';
 import { RegistryManager } from '../registry.js';
+import { getAgent, getAgentProjectPath, getAgentGlobalPath, detectAgents } from '../agents.js';
+import { installSkill, InstallMethod } from '../installer.js';
 import simpleGit from 'simple-git';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -15,25 +17,22 @@ const CACHE_DIR = process.env.JOYSKILL_CACHE_DIR || path.join(os.homedir(), '.jo
 export function installCommand(program) {
   program
     .command('install [skill]')
+    .alias('add')
     .description('Install a skill from registry or GitHub')
     .option('-v, --version <version>', 'Specify version to install')
     .option('-r, --registry <name>', 'Install from specific registry')
-    .option('-g, --global', 'Install globally to ~/.claude/skills')
-    .option('--universal', 'Install to .agent/skills/ (multi-agent compatible)')
+    .option('-g, --global', 'Install to user-level directory (~/.joycode/skills/)')
+    .option('-a, --agent <agent>', 'Target specific agent (joycode, claude-code, cursor, etc.)')
+    .option('-d, --dir <path>', 'Install to custom directory')
+    .option('--copy', 'Copy files instead of symlinking')
     .option('--force', 'Force installation even if version is not recommended')
     .option('-y, --yes', 'Skip all prompts (CI mode)')
     .action(async (skillInput, options) => {
       try {
         const projectRoot = process.cwd();
-        // Directory resolution (matches openskill priority)
-        // --global  → ~/.claude/skills
-        // --universal → .agent/skills/
-        // default   → .claude/skills/
-        const targetDir = options.global
-          ? path.join(os.homedir(), '.claude', 'skills')
-          : options.universal
-            ? path.join(projectRoot, '.agent', 'skills')
-            : path.join(projectRoot, '.claude', 'skills');
+        
+        // 解析目标目录
+        const targetDir = resolveTargetDir(projectRoot, options);
         
         if (!fs.existsSync(targetDir)) {
           fs.mkdirSync(targetDir, { recursive: true });
@@ -54,6 +53,35 @@ export function installCommand(program) {
     });
 }
 
+/**
+ * 解析目标目录
+ * 优先级: --dir > --agent > --global > 默认(joycode)
+ */
+function resolveTargetDir(projectRoot, options) {
+  // 1. 自定义目录最高优先级
+  if (options.dir) {
+    return path.resolve(options.dir);
+  }
+
+  // 2. 指定 Agent
+  if (options.agent) {
+    const agent = getAgent(options.agent);
+    if (options.global) {
+      return getAgentGlobalPath(agent.id);
+    }
+    return getAgentProjectPath(agent.id, projectRoot);
+  }
+
+  // 3. 仅 --global，使用 joycode 用户级目录
+  if (options.global) {
+    return getAgentGlobalPath('joycode');
+  }
+
+  // 4. 默认: 始终使用 joycode 项目级目录
+  // 这是 JoyCode 的品牌策略，不随检测到的其他 Agent 改变
+  return getAgentProjectPath('joycode', projectRoot);
+}
+
 /**
  * Priority resolution chain:
  * 1. Local absolute/relative path
@@ -65,10 +93,24 @@ async function resolveAndInstall(skillInput, targetDir, projectRoot, options) {
   const JOYSKILL_CONFIG_DIR = process.env.JOYSKILL_CONFIG_DIR || path.join(os.homedir(), '.joyskill');
 
   // ── Step 0: Direct Git URL (git@xxx or https://github.com/...) ─────────
+  // Support: git@host:org/repo.git or git@host:org/repo.git/subpath
   if (skillInput.startsWith('git@') || skillInput.startsWith('https://') || skillInput.startsWith('http://')) {
-    // Normalize: ensure URL ends with .git for cloning
-    const gitUrl = skillInput.endsWith('.git') ? skillInput : skillInput + '.git';
-    await installFromGitUrl(gitUrl, targetDir, options);
+    // Parse URL and optional subpath
+    // Format: git@host:org/repo.git/subpath/to/skill
+    let gitUrl = skillInput;
+    let subPath = '';
+    
+    // Check for subpath after .git
+    const gitExtMatch = skillInput.match(/^(.+?\.git)(\/.*)$/);
+    if (gitExtMatch) {
+      gitUrl = gitExtMatch[1];
+      subPath = gitExtMatch[2].replace(/^\//, ''); // Remove leading slash
+    } else if (!skillInput.endsWith('.git')) {
+      // No .git extension, treat entire input as URL
+      gitUrl = skillInput;
+    }
+    
+    await installFromGitUrl(gitUrl, targetDir, options, subPath);
     return;
   }
 
@@ -151,13 +193,26 @@ async function resolveAndInstall(skillInput, targetDir, projectRoot, options) {
 
   // ── Fallback: create template ────────────────────────────────────
   console.log(chalk.yellow(`⚠️  "${skillInput}" not found in any registry, creating template...`));
-  const localManager = new LocalManager(projectRoot);
+  
+  // 使用 targetDir 安装模板
+  const skillPath = path.join(targetDir, skillInput);
+  if (!fs.existsSync(skillPath)) {
+    fs.mkdirSync(skillPath, { recursive: true });
+  }
+  
+  const skillMdPath = path.join(skillPath, 'SKILL.md');
+  fs.writeFileSync(skillMdPath, generateSkillTemplate(skillInput));
+  
   const lockfileManager = new LockfileManager(projectRoot);
-  localManager.installSkill(skillInput, generateSkillTemplate(skillInput));
   await lockfileManager.load();
-  lockfileManager.updateSkill(skillInput, { version: '1.0.0', source: 'template', installedAt: new Date().toISOString() });
+  lockfileManager.updateSkill(skillInput, { 
+    version: '1.0.0', 
+    source: 'template', 
+    path: skillPath,
+    installedAt: new Date().toISOString() 
+  });
   await lockfileManager.save();
-  console.log(chalk.green(`✅ Created template for ${skillInput}`));
+  console.log(chalk.green(`✅ Created template for ${skillInput} in ${targetDir}`));
 }
 
 /**
@@ -188,7 +243,14 @@ async function tryInstallFromRegistryDir(skillName, registryDirPath, targetDir,
       if (!fs.existsSync(sourcePath)) return false;
 
       const targetPath = path.join(targetDir, skillName);
-      copyRecursive(sourcePath, targetPath);
+      
+      // 使用新的 installer 模块，支持 symlink/copy
+      const method = options.copy ? InstallMethod.COPY : InstallMethod.SYMLINK;
+      installSkill(sourcePath, targetPath, method);
+      
+      // 获取安装方式信息
+      const installInfo = fs.lstatSync(targetPath);
+      const installMethod = installInfo.isSymbolicLink() ? 'symlink' : 'copy';
 
       const lockfileManager = new LockfileManager(projectRoot);
       await lockfileManager.load();
@@ -196,11 +258,13 @@ async function tryInstallFromRegistryDir(skillName, registryDirPath, targetDir,
         version,
         source: sourceLabel,
         registry: registryManager.getRegistryInfo().registryId,
+        installMethod,
         installedAt: new Date().toISOString()
       });
       await lockfileManager.save();
 
-      console.log(chalk.green(`✅ Installed ${skillName} v${version} from ${sourceLabel}`));
+      const methodLabel = installMethod === 'symlink' ? chalk.gray('(symlink)') : chalk.gray('(copy)');
+      console.log(chalk.green(`✅ Installed ${skillName} v${version} from ${sourceLabel}`) + ' ' + methodLabel);
       return true;
     } catch (e) {
       return false;
@@ -346,7 +410,7 @@ async function installFromLocalPath(localPath, targetDir, options) {
   }
 }
 
-async function installFromGitUrl(gitUrl, targetDir, options) {
+async function installFromGitUrl(gitUrl, targetDir, options, subPath = '') {
   // Derive cache key from URL
   const cacheKey = gitUrl
     .replace(/^git@/, '')
@@ -355,8 +419,12 @@ async function installFromGitUrl(gitUrl, targetDir, options) {
     .replace(/[:/]/g, '-');
 
   const cachePath = path.join(CACHE_DIR, cacheKey);
+  const sourcePath = subPath ? path.join(cachePath, subPath) : cachePath;
 
   console.log(chalk.blue(`📦 Installing from: ${gitUrl}`));
+  if (subPath) {
+    console.log(chalk.gray(`   Subpath: ${subPath}`));
+  }
 
   // Check if cache is valid (non-empty)
   const cacheValid = fs.existsSync(cachePath) && fs.readdirSync(cachePath).length > 0;
@@ -387,7 +455,7 @@ async function installFromGitUrl(gitUrl, targetDir, options) {
     }
   }
 
-  const skills = await findSkills(cachePath);
+  const skills = await findSkills(sourcePath);
   if (skills.length === 0) throw new Error('No skills found in repository');
 
   console.log(chalk.green(`   Found ${skills.length} skill(s)`));
@@ -620,7 +688,7 @@ async function installFromLockfile(targetDir, projectRoot) {
   console.log(chalk.green(`\n✅ All skills installed`));
 }
 
-async function findSkills(basePath) {
+export async function findSkills(basePath) {
   const skills = [];
   
   async function scan(dir, relativePath = '') {

package/src/commands/list.js

@@ -1,149 +1,91 @@
-import { RegistryManager } from '../registry.js';
-import { LockfileManager } from '../lockfile.js';
-import * as path from 'path';
-import * as fs from 'fs';
-import * as os from 'os';
+import { SkillLoader } from '../skill-loader.js';
 import chalk from 'chalk';
 
-/** Scan all standard skill directories and return unique skill names */
-function scanAllSkillDirs(projectRoot) {
-  const dirs = [
-    path.join(projectRoot, '.agent', 'skills'),
-    path.join(projectRoot, '.claude', 'skills'),
-    path.join(os.homedir(), '.agent', 'skills'),
-    path.join(os.homedir(), '.claude', 'skills'),
-    path.join(projectRoot, 'skills'), // legacy
-  ];
-  const seen = new Set();
-  const skills = [];
-  for (const dir of dirs) {
-    if (!fs.existsSync(dir)) continue;
-    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-      if (entry.isDirectory() && !seen.has(entry.name)) {
-        seen.add(entry.name);
-        const skillMd = path.join(dir, entry.name, 'SKILL.md');
-        let description = '', version = '';
-        if (fs.existsSync(skillMd)) {
-          const content = fs.readFileSync(skillMd, 'utf-8');
-          description = (content.match(/description:\s*(.+)/) || [])[1]?.trim() || '';
-          version = (content.match(/version:\s*(.+)/) || [])[1]?.trim() || '';
-        }
-        skills.push({ name: entry.name, dir, description, version });
-      }
-    }
-  }
-  return skills;
-}
-
 export function listCommand(program) {
   program
     .command('list')
-    .description('List available skills')
-    .option('-a, --all-versions', 'Show all versions of each skill')
-    .option('-c, --category <category>', 'Filter by category')
+    .alias('ls')
+    .description('List installed skills')
+    .option('-a, --agent <agent>', 'Filter by agent (joycode, claude-code, cursor, etc.)')
+    .option('-g, --global', 'Show only global (user-level) skills')
+    .option('-p, --project', 'Show only project-level skills')
     .option('-s, --search <query>', 'Search skills by name or description')
-    .option('-i, --installed', 'Show only installed skills')
-    .option('-l, --local', 'Show only local skills')
-    .option('-r, --registry <name>', 'Show skills from specific registry')
+    .option('--stats', 'Show statistics')
     .action(async (options) => {
       const projectRoot = process.cwd();
-      const lockfileManager = new LockfileManager(projectRoot);
-
-      console.log(chalk.blue('Available Skills:'));
-      console.log(chalk.gray('================='));
+      const loader = new SkillLoader(projectRoot);
 
       try {
-        await lockfileManager.load();
-        const installedSkills = lockfileManager.lockData.skills;
-
-        // Scan all skill directories
-        const localSkills = scanAllSkillDirs(projectRoot);
-
-        if (!options.registry) {
-          if (localSkills.length > 0) {
-            console.log(chalk.blue('\nInstalled Skills:'));
-            let filtered = localSkills;
-            if (options.search) {
-              const q = options.search.toLowerCase();
-              filtered = filtered.filter(s => s.name.toLowerCase().includes(q) || s.description.toLowerCase().includes(q));
-            }
-            if (filtered.length > 0) {
-              filtered.forEach(skill => {
-                const lock = installedSkills[skill.name];
-                const ver = lock ? chalk.gray(`v${lock.version}`) : (skill.version ? chalk.gray(`v${skill.version}`) : '');
-                const src = lock ? chalk.gray(`[${lock.source}]`) : '';
-                console.log(`  ✅ ${chalk.bold(skill.name)} ${ver} ${src}`);
-                if (skill.description) console.log(`     ${chalk.gray(skill.description)}`);
-              });
-            } else {
-              console.log('  No matching skills found.');
-            }
-          } else {
-            console.log(chalk.yellow('\n  No skills installed.'));
-            console.log(chalk.gray('  Run: joySkills install <skill>'));
-          }
+        // 加载 skills
+        let skills = [];
+        if (options.global) {
+          skills = loader.loadGlobalSkills(options.agent);
+        } else if (options.project) {
+          skills = loader.loadProjectSkills(options.agent);
+        } else {
+          skills = loader.loadAllSkills(options.agent);
         }
 
-        // Check for registry
-        const registryPath = path.join(projectRoot, '.joyskill/registry');
-        if (fs.existsSync(registryPath) && !options.local) {
-          try {
-            const registryManager = new RegistryManager(registryPath);
-            await registryManager.load();
+        // 搜索过滤
+        if (options.search) {
+          const q = options.search.toLowerCase();
+          skills = skills.filter(s => 
+            s.name.toLowerCase().includes(q) || 
+            s.description.toLowerCase().includes(q)
+          );
+        }
 
-            console.log('\nRegistry Skills:');
+        // 统计模式
+        if (options.stats) {
+          const stats = loader.getStats(options.agent);
+          console.log(chalk.blue('\nSkill Statistics:'));
+          console.log(chalk.gray('=================='));
+          console.log(`  Total: ${stats.total}`);
+          console.log(`  Project-level: ${stats.project}`);
+          console.log(`  Global: ${stats.global}`);
+          console.log(`  Agents: ${stats.agents.join(', ')}`);
+          return;
+        }
 
-            let skills = registryManager.getAllSkills();
+        // 显示 skills
+        console.log(chalk.blue('\nInstalled Skills:'));
+        console.log(chalk.gray('=================='));
 
-            // Apply filters
-            if (options.category) {
-              skills = registryManager.getSkillsByCategory(options.category);
-            }
+        if (skills.length === 0) {
+          console.log(chalk.yellow('  No skills found.'));
+          console.log(chalk.gray('  Run: joySkills install <skill>'));
+          return;
+        }
 
-            if (options.search) {
-              skills = registryManager.searchSkills(options.search);
-            }
+        // 按 scope 分组显示
+        const projectSkills = skills.filter(s => s.scope === 'project');
+        const globalSkills = skills.filter(s => s.scope === 'global');
 
-            if (options.installed) {
-              skills = skills.filter(skill => installedSkills[skill.id]);
+        if (projectSkills.length > 0 && !options.global) {
+          console.log(chalk.cyan('\n  📁 Project-level:'));
+          projectSkills.forEach(skill => {
+            const scopeLabel = skill.agent === 'joycode' ? '' : chalk.gray(`[${skill.agent}]`);
+            console.log(`    ✅ ${chalk.bold(skill.name)} ${chalk.gray(`v${skill.version}`)} ${scopeLabel}`);
+            if (skill.description) {
+              console.log(`       ${chalk.gray(skill.description)}`);
             }
+          });
+        }
 
-            if (skills.length > 0) {
-              skills.forEach(skill => {
-                const isInstalled = installedSkills[skill.id] ? '✅' : '  ';
-                const installedVersion = installedSkills[skill.id]?.version;
-
-                // Get recommended version
-                const recommended = registryManager.getRecommendedVersion(skill.id);
-                const recommendedVersion = recommended ? recommended.version : 'N/A';
-
-                console.log(`  ${isInstalled} ${skill.name || skill.id} (${skill.id})`);
-                if (options.allVersions) {
-                  skill.versions.forEach(v => {
-                    const marker = v.recommended ? '⭐' : '  ';
-                    const state = v.state === 'approved' ? '✓' : v.state;
-                    console.log(`      ${marker} v${v.version} [${state}]`);
-                  });
-                } else {
-                  console.log(`      Recommended: v${recommendedVersion}`);
-                  if (installedVersion) {
-                    console.log(`      Installed: v${installedVersion}`);
-                  }
-                }
-                if (skill.description) {
-                  console.log(`      ${skill.description}`);
-                }
-                console.log('');
-              });
-            } else {
-              console.log('  No matching registry skills found.');
+        if (globalSkills.length > 0 && !options.project) {
+          console.log(chalk.cyan('\n  🏠 Global (user-level):'));
+          globalSkills.forEach(skill => {
+            const scopeLabel = skill.agent === 'joycode' ? '' : chalk.gray(`[${skill.agent}]`);
+            console.log(`    ✅ ${chalk.bold(skill.name)} ${chalk.gray(`v${skill.version}`)} ${scopeLabel}`);
+            if (skill.description) {
+              console.log(`       ${chalk.gray(skill.description)}`);
             }
-          } catch (error) {
-            console.error('Error loading registry:', error.message);
-          }
+          });
         }
+
+        console.log(chalk.gray(`\n  Total: ${skills.length} skill(s)`));
       } catch (error) {
-        console.error('Error listing skills:', error);
+        console.error(chalk.red('Error listing skills:'), error.message);
       }
     });
 }

package/src/commands/remove.js

@@ -5,12 +5,21 @@ import * as os from 'os';
 import chalk from 'chalk';
 
 function findSkillOnDisk(skillName, projectRoot) {
+  // v2.0: Support all agent directories, joycode first
   const dirs = [
+    // Project-level
+    path.join(projectRoot, '.joycode', 'skills'),
     path.join(projectRoot, '.agent', 'skills'),
     path.join(projectRoot, '.claude', 'skills'),
+    path.join(projectRoot, '.cursor', 'skills'),
+    path.join(projectRoot, '.qoder', 'skills'),
+    path.join(projectRoot, 'skills'),
+    // Global
+    path.join(os.homedir(), '.joycode', 'skills'),
     path.join(os.homedir(), '.agent', 'skills'),
     path.join(os.homedir(), '.claude', 'skills'),
-    path.join(projectRoot, 'skills'),
+    path.join(os.homedir(), '.cursor', 'skills'),
+    path.join(os.homedir(), '.qoder', 'skills'),
   ];
   for (const d of dirs) {
     const p = path.join(d, skillName);

package/src/commands/sync.js

@@ -20,12 +20,18 @@ export function syncCommand(program) {
 
         console.log(chalk.blue('🔍 Scanning skills...'));
 
-        // Scan all skill directories (openskill priority order)
+        // Scan project-level skill directories only (v2.0)
+        // AGENTS.md should only reference project-level skills
         const skillDirs = [
+          // JoyCode (default, highest priority)
+          { path: path.join(projectRoot, '.joycode', 'skills'), label: 'joycode' },
+          // Universal (multi-agent compatible)
           { path: path.join(projectRoot, '.agent', 'skills'), label: 'universal' },
-          { path: path.join(projectRoot, '.claude', 'skills'), label: 'project' },
-          { path: path.join(os.homedir(), '.agent', 'skills'), label: 'global-universal' },
-          { path: path.join(os.homedir(), '.claude', 'skills'), label: 'global' },
+          // Claude Code
+          { path: path.join(projectRoot, '.claude', 'skills'), label: 'claude' },
+          // Other agents
+          { path: path.join(projectRoot, '.cursor', 'skills'), label: 'cursor' },
+          { path: path.join(projectRoot, '.qoder', 'skills'), label: 'qoder' },
           // legacy
           { path: path.join(projectRoot, 'skills'), label: 'legacy' },
         ];