vskill 0.4.13 → 0.4.15

package/dist/commands/add.js

@@ -23,7 +23,6 @@ import { parseSkillsShUrl, isCompleteParsed, isIncompleteParsed, } from "../reso
 import { bold, green, red, yellow, dim, cyan, spinner, link, formatInstalls, } from "../utils/output.js";
 import { isTTY, createPrompter } from "../utils/prompts.js";
 import { installSymlink, installCopy } from "../installer/canonical.js";
-import { isClaudeCliAvailable, registerMarketplace, deregisterMarketplace, installNativePlugin, uninstallNativePlugin, } from "../utils/claude-cli.js";
 import { getMarketplaceName } from "../marketplace/index.js";
 async function parseManifestFromContentsApi(data) {
     // Prefer download_url for raw content
@@ -109,8 +108,7 @@ export async function detectMarketplaceRepo(owner, repo) {
  * Install plugins from a Claude Code plugin marketplace repo.
  *
  * Shows a checkbox list of available plugins (all unchecked by default),
- * then installs each selected plugin via native `claude plugin` CLI.
- * Falls back to extraction-based install if Claude CLI is unavailable.
+ * then installs each selected plugin via file-system extraction to agent skill dirs.
  */
 async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSelected) {
     const plugins = getAvailablePlugins(manifestContent);
@@ -264,8 +262,6 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
         }
         usedInteractiveCheckbox = true;
     }
-    // Attempt native Claude Code install
-    const hasClaude = !opts.copy && isClaudeCliAvailable();
     // Uninstall plugins that were previously installed but now unchecked
     const selectedNames = new Set([
         ...selectedPlugins.map((p) => p.name),
@@ -293,10 +289,6 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
                     }
                 }
             }
-            // Uninstall from Claude Code native plugin system
-            if (hasClaude && marketplaceName) {
-                uninstallNativePlugin(skillName, marketplaceName);
-            }
             // Remove from lockfile
             removeSkillFromLock(skillName, lockDir);
             console.log(red(`  ✗ ${bold(skillName)} uninstalled`) + (removedCount > 0 ? dim(` (${removedCount} location${removedCount === 1 ? "" : "s"})`) : ""));
@@ -390,48 +382,8 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
             selectedUnregistered = [];
         }
     }
-    // ── Step 1: Optional Claude Code native plugin install ──────────────
-    let marketplaceRegistered = false;
     const results = [];
-    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 {
-            // 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);
-            }
-            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."));
-            }
-        }
-    }
-    // ── Step 2: Agent selection + skill file install (ALWAYS) ──────────
+    // ── Step 1: Agent selection + skill file install ──────────
     const branch = await getDefaultBranch(owner, repo);
     let agents = await detectInstalledAgents();
     const selections = await promptInstallOptions(agents, opts);
@@ -562,9 +514,6 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
     else {
         console.log(dim("\nNo changes made."));
     }
-    if (hasClaude && marketplaceRegistered && marketplaceName) {
-        console.log(dim(`\nManage: claude plugin list | claude plugin uninstall "<plugin>@${marketplaceName}"`));
-    }
 }
 // ---------------------------------------------------------------------------
 // Command file filter (prevents plugin internals leaking as slash commands)
@@ -622,97 +571,17 @@ function copyPluginFiltered(sourceDir, targetDir, relBase = "") {
 // Plugin cache cleanup
 // ---------------------------------------------------------------------------
 /**
- * Remove a plugin installed via Claude Code's plugin system.
- * The cache at ~/.claude/plugins/cache/ contains ALL files without filtering,
- * causing internal .md files to leak as ghost slash commands.
- *
- * Uses `claude plugin uninstall` CLI to properly remove the plugin through
- * Claude Code's own API rather than directly manipulating internal files.
+ * Remove stale plugin cache from ~/.claude/plugins/cache/.
+ * Previous native installs may have left cached files that leak as ghost slash commands.
  */
 function cleanPluginCache(pluginName, marketplace) {
-    const pluginKey = `${pluginName}@${marketplace}`;
+    const cacheDir = join(resolveTilde("~/.claude/plugins/cache"), marketplace, pluginName);
     try {
-        execSync(`claude plugin uninstall "${pluginKey}"`, { stdio: "ignore", timeout: 10_000 });
-    }
-    catch { /* ignore - plugin might not be installed via CLI */ }
-}
-// ---------------------------------------------------------------------------
-// Native Claude Code plugin install
-// ---------------------------------------------------------------------------
-/**
- * Check if a path is inside the OS temp directory (e.g. /var/folders/.../T/).
- * Temp dirs get cleaned up, making registered marketplace paths stale.
- */
-function isTempPath(p) {
-    const tmpDir = os.tmpdir();
-    return p.startsWith(tmpDir);
-}
-/**
- * Attempt to install a plugin via Claude Code's native plugin system.
- *
- * Returns true if native install succeeded (Claude Code should be excluded
- * from the extraction agent list). Returns false if native install was
- * skipped or failed (fall back to extraction).
- *
- * Conditions for native install:
- * - `claude` CLI is available on PATH
- * - --copy flag is NOT set
- * - User opts in (interactive prompt) OR --yes flag is set
- */
-async function tryNativeClaudeInstall(marketplacePath, marketplaceContent, pluginName, opts, gitUrl) {
-    if (opts.copy)
-        return false;
-    if (!isClaudeCliAvailable())
-        return false;
-    const marketplaceName = getMarketplaceName(marketplaceContent);
-    if (!marketplaceName)
-        return false;
-    // Guard: refuse to register temp dirs (they get deleted after install)
-    if (!gitUrl && isTempPath(marketplacePath)) {
-        console.log(yellow("  Cannot register temp directory as marketplace — falling back to extraction."));
-        return false;
-    }
-    // Prompt user unless --yes
-    if (isTTY() && !opts.yes) {
-        const prompter = createPrompter();
-        const choice = await prompter.promptChoice("Claude Code plugin install method:", [
-            { label: "Native plugin install", hint: `recommended — enables ${marketplaceName}:${pluginName} namespacing` },
-            { label: "Extract skills individually", hint: "copies files to .claude/skills/ directory" },
-        ]);
-        if (choice !== 0)
-            return false;
-    }
-    // Register marketplace — prefer git URL (persistent) over local path
-    const registrationSource = gitUrl || marketplacePath;
-    const regSpin = spinner("Registering marketplace with Claude Code");
-    let regResult = registerMarketplace(registrationSource);
-    // Retry once after deregistering stale entry
-    if (!regResult.success) {
-        deregisterMarketplace(registrationSource);
-        regResult = registerMarketplace(registrationSource);
-    }
-    if (!regResult.success) {
-        regSpin.stop();
-        console.log(yellow("  Failed to register marketplace — falling back to extraction."));
-        if (regResult.stderr) {
-            console.log(dim(`  Reason: ${regResult.stderr}`));
+        if (existsSync(cacheDir)) {
+            rmSync(cacheDir, { recursive: true, force: true });
         }
-        return false;
     }
-    regSpin.stop();
-    // Install plugin
-    const installSpin = spinner(`Installing ${pluginName} via Claude Code plugin system`);
-    const installed = installNativePlugin(pluginName, marketplaceName, opts.global ? "user" : "project");
-    if (!installed) {
-        installSpin.stop();
-        console.log(yellow("  Native install failed — falling back to extraction."));
-        return false;
-    }
-    installSpin.stop();
-    console.log(green(`  ${bold(pluginName)} installed as native Claude Code plugin`));
-    console.log(dim(`  Namespace: ${marketplaceName}:${pluginName}`));
-    console.log(dim(`  Manage: claude plugin list | claude plugin uninstall "${pluginName}@${marketplaceName}"`));
-    return true;
+    catch { /* ignore - cache dir might not exist */ }
 }
 /**
  * Resolve the project root for skill installation, with a HOME-directory guard.
@@ -1061,40 +930,25 @@ async function installPluginDir(basePath, pluginName, opts) {
     const mktPath = join(basePath, ".claude-plugin", "marketplace.json");
     const mktContent = readFileSync(mktPath, "utf-8");
     const version = getPluginVersion(pluginName, mktContent) || "0.0.0";
-    // Native Claude Code plugin install
-    // Extract git remote URL (used for both native Claude install and install tracking)
+    // Extract git remote URL for install tracking
     let gitUrl;
     try {
         gitUrl = execSync("git remote get-url origin", { cwd: resolve(basePath), stdio: ["pipe", "pipe", "ignore"], timeout: 5_000 })
             .toString().trim() || undefined;
     }
     catch { /* not a git repo or no remote — use local path */ }
-    const hasClaude = selectedAgents.some((a) => a.id === "claude-code");
-    let claudeNativeSuccess = false;
-    if (hasClaude) {
-        claudeNativeSuccess = await tryNativeClaudeInstall(resolve(basePath), mktContent, pluginName, opts, gitUrl);
-    }
-    // Filter Claude Code out of extraction if native install succeeded
-    const extractionAgents = claudeNativeSuccess
-        ? selectedAgents.filter((a) => a.id !== "claude-code")
-        : selectedAgents;
-    // Clean stale plugin cache only when NOT using native install
-    if (!claudeNativeSuccess) {
-        try {
-            const marketplaceName = JSON.parse(mktContent).name;
-            if (marketplaceName) {
-                cleanPluginCache(pluginName, marketplaceName);
-            }
+    // Clean stale plugin cache
+    try {
+        const marketplaceName = JSON.parse(mktContent).name;
+        if (marketplaceName) {
+            cleanPluginCache(pluginName, marketplaceName);
         }
-        catch { /* ignore parse errors */ }
     }
+    catch { /* ignore parse errors */ }
     // Install: recursively copy plugin directory to each agent
     const sha = createHash("sha256").update(content).digest("hex").slice(0, 12);
     const locations = [];
-    if (claudeNativeSuccess) {
-        locations.push("Claude Code: native plugin");
-    }
-    for (const agent of extractionAgents) {
+    for (const agent of selectedAgents) {
         const cacheDir = join(resolveInstallBase(opts, agent), pluginName);
         try {
             // Full clean before copy: removes stale files from older installs
@@ -1461,13 +1315,6 @@ async function installRepoPlugin(ownerRepo, pluginName, opts, overrideSource) {
         opts.global = true;
     if (!selections.symlink)
         opts.copy = true;
-    // Native Claude Code plugin install is only available for local plugins.
-    // Remote plugins require marketplace registration with a local path.
-    const hasClaude = selectedAgents.some((a) => a.id === "claude-code");
-    if (hasClaude && !opts.copy) {
-        console.log(dim("\n  Note: Native Claude Code plugin install requires a local path.") +
-            dim("\n  Use --plugin-dir for native install. Extracting skills for Claude Code.\n"));
-    }
     // Compute project root for consistent lockfile + skill locations
     const projectRoot = safeProjectRoot(opts);
     // Install skills and commands with namespace prefix