joyskills-cli 0.3.8 → 0.3.9

package/README.md

@@ -32,7 +32,7 @@ joySkills install pdf
 
 ## 文档
 
-- [📖 完整文档](./docs/yuanshi.md) - 原理、使用场景、最佳实践
+- [📖 完整文档](yuanshi.md) - 原理、使用场景、最佳实践
 - [📋 详细说明](./docs/详细说明.md) - 所有命令和选项
 
 ## License

package/package.json

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

package/src/commands/install.js

@@ -387,8 +387,9 @@ async function tryInstallFromRegistryDir(skillName, registryDirPath, targetDir,
     
     if (!skill) return false;
     
-    // Use skill.name for target path to maintain subdirectory structure
-    const targetPath = path.join(targetDir, skill.name);
+    // Use the last segment of relativePath as target name
+    const targetName = skill.relativePath ? skill.relativePath.split('/').pop() : skill.name;
+    const targetPath = path.join(targetDir, targetName);
     copyRecursive(skill.path, targetPath);
 
     // Get git commit for the skill source
@@ -398,7 +399,7 @@ async function tryInstallFromRegistryDir(skillName, registryDirPath, targetDir,
     if (!options.global) {
       const lockfileManager = new LockfileManager(projectRoot);
       await lockfileManager.load();
-      lockfileManager.updateSkill(skill.name, {
+      lockfileManager.updateSkill(targetName, {
         version: skill.version || '1.0.0',
         source: sourceLabel,
         commit: commitHash,
@@ -407,7 +408,7 @@ async function tryInstallFromRegistryDir(skillName, registryDirPath, targetDir,
       await lockfileManager.save();
     }
 
-    console.log(chalk.green(`✅ Installed ${skill.name} v${skill.version || '1.0.0'} from ${sourceLabel}`));
+    console.log(chalk.green(`✅ Installed ${targetName} v${skill.version || '1.0.0'} from ${sourceLabel}`));
     return true;
   }
 }
@@ -598,7 +599,7 @@ async function installFromGitUrl(gitUrl, targetDir, options, subPath = '') {
 
   for (const skill of selectedSkills) {
     // For Git URL installs with subPath, use the last part of subPath as target name
-    const targetName = subPath ? subPath.split('/').pop() : skill.name;
+    const targetName = skill.relativePath ? skill.relativePath.split('/').pop() : skill.name;
     await installSkillFiles(skill, targetDir, targetName);
   }
 
@@ -607,7 +608,7 @@ async function installFromGitUrl(gitUrl, targetDir, options, subPath = '') {
     const lockfileManager = new LockfileManager(process.cwd());
     await lockfileManager.load();
     for (const skill of selectedSkills) {
-      const targetName = subPath ? subPath.split('/').pop() : skill.name;
+      const targetName = skill.relativePath ? skill.relativePath.split('/').pop() : skill.name;
       lockfileManager.updateSkill(targetName, {
         version: skill.version || '1.0.0',
         source: 'git',
@@ -694,9 +695,9 @@ async function installFromGitHub(owner, repo, skillPath, targetDir, options) {
   
   // Install selected skills
   for (const skill of selectedSkills) {
-    // For GitHub installs, use the last part of skillPath as target name
-    // e.g., "anthropics/skills/pdf" -> install as "pdf", not "skills/pdf"
-    const targetName = skillPath ? skillPath.split('/').pop() : skill.name;
+    // Always use the last segment of relativePath as target name
+    // e.g., "skills/pdf" -> "pdf", "anthropics/skills/pdf" -> "pdf"
+    const targetName = skill.relativePath ? skill.relativePath.split('/').pop() : skill.name;
     await installSkillFiles(skill, targetDir, targetName);
   }
   
@@ -706,7 +707,7 @@ async function installFromGitHub(owner, repo, skillPath, targetDir, options) {
     await lockfileManager.load();
     for (const skill of selectedSkills) {
       // Use the same targetName for lockfile consistency
-      const targetName = skillPath ? skillPath.split('/').pop() : skill.name;
+      const targetName = skill.relativePath ? skill.relativePath.split('/').pop() : skill.name;
       lockfileManager.updateSkill(targetName, {
         version: skill.version || '1.0.0',
         source: 'github',

package/src/commands/upgrade.js

@@ -328,7 +328,8 @@ async function upgradeFromGitHub(skill, skillsDir) {
   }
   
   // Remove old version
-  const targetPath = path.join(skillsDir, skill.name);
+  const targetName = skillInfo.relativePath ? skillInfo.relativePath.split('/').pop() : skill.name;
+  const targetPath = path.join(skillsDir, targetName);
   if (fs.existsSync(targetPath)) {
     fs.rmSync(targetPath, { recursive: true, force: true });
   }
@@ -373,7 +374,8 @@ async function upgradeFromRegistry(skill, skillsDir) {
   }
   
   // Remove old version
-  const targetPath = path.join(skillsDir, skill.name);
+  const targetName = skillInfo.relativePath ? skillInfo.relativePath.split('/').pop() : skill.name;
+  const targetPath = path.join(skillsDir, targetName);
   if (fs.existsSync(targetPath)) {
     fs.rmSync(targetPath, { recursive: true, force: true });
   }