vskill 0.2.44 → 0.2.46

package/dist/commands/add.js

@@ -297,40 +297,47 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
         for (const unreg of selectedUnregistered) {
             const pluginPath = unreg.source.replace(/^\.\//, "");
             try {
-                // Discover skills in this plugin to submit each one
+                // Discover skills: try nested {pluginPath}/skills/ first, fall back to flat {pluginPath}/SKILL.md
+                const skillsToSubmit = [];
                 const skillsUrl = `https://api.github.com/repos/${owner}/${repo}/contents/${pluginPath}/skills`;
                 const skillsRes = await fetch(skillsUrl, { headers: { "User-Agent": "vskill-cli" } });
-                if (!skillsRes.ok)
-                    continue;
-                const skillDirs = (await skillsRes.json())
-                    .filter((e) => e.type === "dir");
-                for (const sd of skillDirs) {
-                    const skillFilePath = `${pluginPath}/skills/${sd.name}/SKILL.md`;
+                if (skillsRes.ok) {
+                    const skillDirs = (await skillsRes.json())
+                        .filter((e) => e.type === "dir");
+                    for (const sd of skillDirs) {
+                        skillsToSubmit.push({ name: sd.name, path: `${pluginPath}/skills/${sd.name}/SKILL.md` });
+                    }
+                }
+                else {
+                    // Flat layout: SKILL.md at plugin root
+                    skillsToSubmit.push({ name: unreg.name, path: `${pluginPath}/SKILL.md` });
+                }
+                for (const skill of skillsToSubmit) {
                     try {
-                        const sub = await submitSkill({ repoUrl, skillName: sd.name, skillPath: skillFilePath });
+                        const sub = await submitSkill({ repoUrl, skillName: skill.name, skillPath: skill.path });
                         if (sub.alreadyVerified) {
-                            const skillUrl = `https://verified-skill.com/skills/${sd.name}`;
-                            console.log(green(`  ${bold(sd.name)} is already verified.`));
+                            const skillUrl = `https://verified-skill.com/skills/${encodeURIComponent(skill.name)}`;
+                            console.log(green(`  ${bold(skill.name)} is already verified.`));
                             console.log(dim("  View: ") + link(skillUrl, skillUrl));
                         }
                         else if (sub.blocked) {
-                            console.log(red(`  ${bold(sd.name)} is blocked.`));
+                            console.log(red(`  ${bold(skill.name)} is blocked.`));
                         }
                         else {
                             const subId = sub.id ?? sub.submissionId;
                             const trackUrl = `https://verified-skill.com/submit/${subId}`;
                             if (sub.duplicate) {
-                                console.log(yellow(`  ${bold(sd.name)} is already in the queue.`));
+                                console.log(yellow(`  ${bold(skill.name)} is already in the queue.`));
                             }
                             else {
-                                console.log(green(`  Submitted ${bold(sd.name)} for scanning.`));
+                                console.log(green(`  Submitted ${bold(skill.name)} for scanning.`));
                             }
                             console.log(dim("  Track: ") + link(trackUrl, trackUrl));
                         }
                     }
                     catch {
                         const submitUrl = `https://verified-skill.com/submit`;
-                        console.log(yellow(`  Could not submit ${sd.name} automatically.`));
+                        console.log(yellow(`  Could not submit ${skill.name} automatically.`));
                         console.log(dim("  Submit manually: ") + link(submitUrl, submitUrl));
                     }
                 }
@@ -352,95 +359,91 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
             selectedUnregistered = [];
         }
     }
+    // ── Step 1: Optional Claude Code native plugin install ──────────────
     let marketplaceRegistered = false;
-    if (hasClaude) {
-        // Register marketplace via git URL — Claude Code clones to its own
-        // persistent location, avoiding the stale-temp-dir bug.
-        const gitUrl = `https://github.com/${owner}/${repo}`;
-        const regSpin = spinner("Registering marketplace with Claude Code");
-        let regResult = registerMarketplace(gitUrl);
-        // Retry once after deregistering stale entry
-        if (!regResult.success) {
-            deregisterMarketplace(gitUrl);
-            regResult = registerMarketplace(gitUrl);
-        }
-        marketplaceRegistered = regResult.success;
-        regSpin.stop();
-        if (!marketplaceRegistered) {
-            console.log(yellow("  Failed to register marketplace — will use extraction fallback."));
-            if (regResult.stderr) {
-                console.log(dim(`  Reason: ${regResult.stderr}`));
-            }
-        }
-    }
-    // Install registered plugins
     const results = [];
-    for (const plugin of selectedPlugins) {
-        if (hasClaude && marketplaceRegistered && marketplaceName) {
-            // Native install
-            const installSpin = spinner(`Installing ${bold(plugin.name)} via Claude Code plugin system`);
-            const ok = installNativePlugin(plugin.name, marketplaceName, opts.global ? "user" : "project");
-            installSpin.stop();
-            if (ok) {
-                console.log(green(`  ✓ ${bold(plugin.name)}`) + dim(` (${marketplaceName}:${plugin.name})`));
-                results.push({ name: plugin.name, installed: true, method: "native" });
-            }
-            else {
-                console.log(red(`  ✗ ${bold(plugin.name)}`) + dim(" — native install failed, trying extraction..."));
-                // Fallback to extraction
-                try {
-                    await installRepoPlugin(`${owner}/${repo}`, plugin.name, opts);
-                    results.push({ name: plugin.name, installed: true, method: "extraction" });
-                }
-                catch {
-                    results.push({ name: plugin.name, installed: false, method: "failed" });
-                }
-            }
+    if (hasClaude && selectedPlugins.length > 0) {
+        let wantNative = false;
+        if (isTTY() && !opts.yes) {
+            const prompter = createPrompter();
+            wantNative = await prompter.promptConfirm("Claude Code detected. Install selected plugins as native Claude Code plugins?", true);
         }
         else {
-            // No Claude CLI — extraction fallback
-            try {
-                await installRepoPlugin(`${owner}/${repo}`, plugin.name, opts);
-                results.push({ name: plugin.name, installed: true, method: "extraction" });
+            // Non-interactive or --yes: install as native plugin by default
+            wantNative = true;
+        }
+        if (wantNative && marketplaceName) {
+            const gitUrl = `https://github.com/${owner}/${repo}`;
+            const regSpin = spinner("Registering marketplace with Claude Code");
+            let regResult = registerMarketplace(gitUrl);
+            if (!regResult.success) {
+                deregisterMarketplace(gitUrl);
+                regResult = registerMarketplace(gitUrl);
             }
-            catch (err) {
-                console.error(red(`  ✗ ${plugin.name}: ${err.message}`));
-                results.push({ name: plugin.name, installed: false, method: "failed" });
+            marketplaceRegistered = regResult.success;
+            regSpin.stop();
+            if (marketplaceRegistered) {
+                for (const plugin of selectedPlugins) {
+                    const installSpin = spinner(`Installing ${bold(plugin.name)} via Claude Code plugin system`);
+                    const ok = installNativePlugin(plugin.name, marketplaceName, opts.global ? "user" : "project");
+                    installSpin.stop();
+                    if (ok) {
+                        console.log(green(`  ✓ ${bold(plugin.name)}`) + dim(` (${marketplaceName}:${plugin.name})`));
+                    }
+                    else {
+                        console.log(yellow(`  ⚠ ${bold(plugin.name)}`) + dim(" — native install failed"));
+                    }
+                }
+            }
+            else {
+                console.log(yellow("  Failed to register marketplace — skipping native install."));
             }
         }
     }
-    // Install unregistered plugins — fetch skills and copy directly (no nesting)
-    if (selectedUnregistered.length > 0) {
-        const branch = await getDefaultBranch(owner, repo);
-        let agents = await detectInstalledAgents();
-        const selections = await promptInstallOptions(agents, opts);
-        agents = selections.agents;
-        if (selections.global)
-            opts.global = true;
-        if (!selections.symlink)
-            opts.copy = true;
-        for (const unreg of selectedUnregistered) {
-            const pluginPath = unreg.source.replace(/^\.\//, "");
-            const installSpin = spinner(`Installing unverified plugin: ${bold(unreg.name)}`);
-            try {
-                // Discover skills inside the plugin directory
-                const skillsUrl = `https://api.github.com/repos/${owner}/${repo}/contents/${pluginPath}/skills`;
-                const skillsRes = await fetch(skillsUrl, { headers: { "User-Agent": "vskill-cli" } });
-                if (!skillsRes.ok)
-                    throw new Error(`No skills found in ${pluginPath}/skills`);
+    // ── Step 2: Agent selection + skill file install (ALWAYS) ──────────
+    const branch = await getDefaultBranch(owner, repo);
+    let agents = await detectInstalledAgents();
+    const selections = await promptInstallOptions(agents, opts);
+    agents = selections.agents;
+    if (selections.global)
+        opts.global = true;
+    if (!selections.symlink)
+        opts.copy = true;
+    // Combine all selected plugins (registered + unregistered) for skill file install
+    const allPluginsToInstall = [
+        ...selectedPlugins.map((p) => ({
+            name: p.name,
+            source: getPluginSource(p.name, manifestContent || "") || "",
+            isUnregistered: false,
+        })),
+        ...selectedUnregistered.map((u) => ({
+            name: u.name,
+            source: u.source,
+            isUnregistered: true,
+        })),
+    ];
+    for (const plugin of allPluginsToInstall) {
+        const pluginPath = plugin.source.replace(/^\.\//, "");
+        if (!pluginPath) {
+            results.push({ name: plugin.name, installed: false, method: "failed" });
+            continue;
+        }
+        const installSpin = spinner(`Installing skills: ${bold(plugin.name)}`);
+        try {
+            // Discover skills: try {pluginPath}/skills/ first, then fall back to {pluginPath}/SKILL.md
+            const installedSkillNames = [];
+            const skillsUrl = `https://api.github.com/repos/${owner}/${repo}/contents/${pluginPath}/skills`;
+            const skillsRes = await fetch(skillsUrl, { headers: { "User-Agent": "vskill-cli" } });
+            if (skillsRes.ok) {
+                // Nested layout: {pluginPath}/skills/{skillName}/SKILL.md
                 const skillDirs = (await skillsRes.json())
                     .filter((e) => e.type === "dir");
-                if (skillDirs.length === 0)
-                    throw new Error(`No skill directories in ${pluginPath}/skills`);
-                // Fetch each skill's SKILL.md and install directly to agent dirs
-                let installedSkillNames = [];
                 for (const sd of skillDirs) {
                     const rawUrl = `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${pluginPath}/skills/${sd.name}/SKILL.md`;
                     const contentRes = await fetch(rawUrl);
                     if (!contentRes.ok)
                         continue;
                     const content = await contentRes.text();
-                    // Write to each agent's skills dir: {agent-dir}/{skillName}/SKILL.md
                     for (const agent of agents) {
                         const baseDir = resolveInstallBase(opts, agent);
                         const skillDir = join(baseDir, sd.name);
@@ -449,22 +452,38 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
                     }
                     installedSkillNames.push(sd.name);
                 }
-                installSpin.stop();
-                if (installedSkillNames.length > 0) {
-                    console.log(green(`  ✓ ${bold(unreg.name)}`) + dim(` (${installedSkillNames.join(", ")})`));
-                    results.push({ name: unreg.name, installed: true, method: "extraction-unregistered" });
-                }
-                else {
-                    console.log(red(`  ✗ ${bold(unreg.name)}`) + dim(" — no skills found"));
-                    results.push({ name: unreg.name, installed: false, method: "failed" });
+            }
+            else {
+                // Flat layout: {pluginPath}/SKILL.md directly in the plugin root
+                const rawUrl = `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${pluginPath}/SKILL.md`;
+                const contentRes = await fetch(rawUrl);
+                if (contentRes.ok) {
+                    const content = await contentRes.text();
+                    for (const agent of agents) {
+                        const baseDir = resolveInstallBase(opts, agent);
+                        const skillDir = join(baseDir, plugin.name);
+                        mkdirSync(skillDir, { recursive: true });
+                        writeFileSync(join(skillDir, "SKILL.md"), content, "utf-8");
+                    }
+                    installedSkillNames.push(plugin.name);
                 }
             }
-            catch (err) {
-                installSpin.stop();
-                console.error(red(`  ✗ ${unreg.name}: ${err.message}`));
-                results.push({ name: unreg.name, installed: false, method: "failed" });
+            installSpin.stop();
+            if (installedSkillNames.length > 0) {
+                const tier = plugin.isUnregistered ? "unverified" : "verified";
+                console.log(green(`  ✓ ${bold(plugin.name)}`) + dim(` (${installedSkillNames.join(", ")}) [${tier}]`));
+                results.push({ name: plugin.name, installed: true, method: plugin.isUnregistered ? "extraction-unregistered" : "extraction" });
+            }
+            else {
+                console.log(red(`  ✗ ${bold(plugin.name)}`) + dim(" — no SKILL.md found"));
+                results.push({ name: plugin.name, installed: false, method: "failed" });
             }
         }
+        catch (err) {
+            installSpin.stop();
+            console.error(red(`  ✗ ${plugin.name}: ${err.message}`));
+            results.push({ name: plugin.name, installed: false, method: "failed" });
+        }
     }
     // Update lockfile
     const lockForWrite = ensureLockfile(lockDir);
@@ -1305,6 +1324,7 @@ async function installRepoPlugin(ownerRepo, pluginName, opts, overrideSource) {
     // Discover skills via GitHub Contents API
     const discoverSpin = spinner(`Discovering skills in ${pluginName}`);
     let skillEntries = [];
+    let flatLayout = false;
     try {
         const res = await fetch(`https://api.github.com/repos/${owner}/${repo}/contents/${pluginPath}/skills`, { headers: { "User-Agent": "vskill-cli" } });
         if (res.ok) {
@@ -1312,6 +1332,17 @@ async function installRepoPlugin(ownerRepo, pluginName, opts, overrideSource) {
         }
     }
     catch { /* skills dir might not exist */ }
+    // Flat layout fallback: check for SKILL.md directly at plugin root
+    if (skillEntries.length === 0) {
+        try {
+            const res = await fetch(`https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${pluginPath}/SKILL.md`);
+            if (res.ok) {
+                flatLayout = true;
+                skillEntries = [{ name: pluginName, type: "dir" }];
+            }
+        }
+        catch { /* flat layout not available */ }
+    }
     let cmdEntries = [];
     try {
         const res = await fetch(`https://api.github.com/repos/${owner}/${repo}/contents/${pluginPath}/commands`, { headers: { "User-Agent": "vskill-cli" } });
@@ -1337,7 +1368,9 @@ async function installRepoPlugin(ownerRepo, pluginName, opts, overrideSource) {
     const allContent = [];
     const skills = [];
     for (const entry of skillEntries) {
-        const rawUrl = `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${pluginPath}/skills/${entry.name}/SKILL.md`;
+        const rawUrl = flatLayout
+            ? `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${pluginPath}/SKILL.md`
+            : `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${pluginPath}/skills/${entry.name}/SKILL.md`;
         try {
             const res = await fetch(rawUrl);
             if (res.ok) {