joyskills-cli 0.3.6 → 0.3.8

package/package.json

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

package/src/commands/install.js

@@ -236,10 +236,11 @@ async function resolveAndInstall(skillInput, targetDir, projectRoot, options) {
     const pathPart = skillInput.slice(7); // Remove team://
     const parts = pathPart.split('/');
     const registryName = parts[0];
-    const skillName = parts[1];
+    // Support sub-path skills: team://registry/subdir/skill-name
+    const skillName = parts.slice(1).join('/');
     
     if (!registryName || !skillName) {
-      throw new Error(`Invalid team:// URL format: ${skillInput}. Expected: team://<registry>/<skill>`);
+      throw new Error(`Invalid team:// URL format: ${skillInput}. Expected: team://<registry>/<skill> or team://<registry>/<subdir>/<skill>`);
     }
     
     // Get registry path with auto-prompt for missing registries
@@ -386,7 +387,8 @@ async function tryInstallFromRegistryDir(skillName, registryDirPath, targetDir,
     
     if (!skill) return false;
     
-    const targetPath = path.join(targetDir, skillName);
+    // Use skill.name for target path to maintain subdirectory structure
+    const targetPath = path.join(targetDir, skill.name);
     copyRecursive(skill.path, targetPath);
 
     // Get git commit for the skill source
@@ -396,7 +398,7 @@ async function tryInstallFromRegistryDir(skillName, registryDirPath, targetDir,
     if (!options.global) {
       const lockfileManager = new LockfileManager(projectRoot);
       await lockfileManager.load();
-      lockfileManager.updateSkill(skillName, {
+      lockfileManager.updateSkill(skill.name, {
         version: skill.version || '1.0.0',
         source: sourceLabel,
         commit: commitHash,
@@ -405,7 +407,7 @@ async function tryInstallFromRegistryDir(skillName, registryDirPath, targetDir,
       await lockfileManager.save();
     }
 
-    console.log(chalk.green(`✅ Installed ${skillName} v${skill.version || '1.0.0'} from ${sourceLabel}`));
+    console.log(chalk.green(`✅ Installed ${skill.name} v${skill.version || '1.0.0'} from ${sourceLabel}`));
     return true;
   }
 }
@@ -595,7 +597,9 @@ async function installFromGitUrl(gitUrl, targetDir, options, subPath = '') {
   }
 
   for (const skill of selectedSkills) {
-    await installSkillFiles(skill, targetDir);
+    // For Git URL installs with subPath, use the last part of subPath as target name
+    const targetName = subPath ? subPath.split('/').pop() : skill.name;
+    await installSkillFiles(skill, targetDir, targetName);
   }
 
   // Update lockfile only for project-level installation (npm-like behavior)
@@ -603,7 +607,8 @@ async function installFromGitUrl(gitUrl, targetDir, options, subPath = '') {
     const lockfileManager = new LockfileManager(process.cwd());
     await lockfileManager.load();
     for (const skill of selectedSkills) {
-      lockfileManager.updateSkill(skill.name, {
+      const targetName = subPath ? subPath.split('/').pop() : skill.name;
+      lockfileManager.updateSkill(targetName, {
         version: skill.version || '1.0.0',
         source: 'git',
         repository: gitUrl,
@@ -689,7 +694,10 @@ async function installFromGitHub(owner, repo, skillPath, targetDir, options) {
   
   // Install selected skills
   for (const skill of selectedSkills) {
-    await installSkillFiles(skill, targetDir);
+    // 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;
+    await installSkillFiles(skill, targetDir, targetName);
   }
   
   // Update lockfile only for project-level installation (npm-like behavior)
@@ -697,7 +705,9 @@ async function installFromGitHub(owner, repo, skillPath, targetDir, options) {
     const lockfileManager = new LockfileManager(process.cwd());
     await lockfileManager.load();
     for (const skill of selectedSkills) {
-      lockfileManager.updateSkill(skill.name, {
+      // Use the same targetName for lockfile consistency
+      const targetName = skillPath ? skillPath.split('/').pop() : skill.name;
+      lockfileManager.updateSkill(targetName, {
         version: skill.version || '1.0.0',
         source: 'github',
         repository: `${owner}/${repo}`,
@@ -846,7 +856,7 @@ export async function findSkills(basePath) {
       const { name, description, version } = parseSkillMd(skillMdContent);
       
       skills.push({
-        name: relativePath.split('/').pop() || name || path.basename(dir),
+        name: relativePath || name || path.basename(dir),
         path: skillPath,
         relativePath,
         description,
@@ -902,8 +912,8 @@ function formatSize(bytes) {
   return (bytes / (1024 * 1024)).toFixed(1) + 'MB';
 }
 
-async function installSkillFiles(skill, targetDir) {
-  const targetPath = path.join(targetDir, skill.name);
+async function installSkillFiles(skill, targetDir, targetName = null) {
+  const targetPath = path.join(targetDir, targetName || skill.name);
   
   if (fs.existsSync(targetPath)) {
     fs.rmSync(targetPath, { recursive: true, force: true });