vskill 0.2.27 → 0.2.29

package/dist/commands/__tests__/eval-router.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/commands/__tests__/eval-router.test.js

@@ -0,0 +1,60 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+// ---------------------------------------------------------------------------
+// Mocks
+// ---------------------------------------------------------------------------
+const mocks = vi.hoisted(() => ({
+    runEvalInit: vi.fn(),
+    runEvalRun: vi.fn(),
+    runEvalCoverage: vi.fn(),
+    runEvalGenerateAll: vi.fn(),
+}));
+vi.mock("../eval/init.js", () => ({ runEvalInit: mocks.runEvalInit }));
+vi.mock("../eval/run.js", () => ({ runEvalRun: mocks.runEvalRun }));
+vi.mock("../eval/coverage.js", () => ({
+    runEvalCoverage: mocks.runEvalCoverage,
+}));
+vi.mock("../eval/generate-all.js", () => ({
+    runEvalGenerateAll: mocks.runEvalGenerateAll,
+}));
+// ---------------------------------------------------------------------------
+// Import module under test AFTER mocks
+// ---------------------------------------------------------------------------
+const { evalCommand } = await import("../eval.js");
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+describe("evalCommand router", () => {
+    beforeEach(() => {
+        vi.resetAllMocks();
+    });
+    it("routes init subcommand to runEvalInit", async () => {
+        await evalCommand("init", "marketing/social-media-posting", {
+            root: "/tmp/test",
+        });
+        expect(mocks.runEvalInit).toHaveBeenCalledWith(expect.stringContaining("marketing/skills/social-media-posting"), false);
+    });
+    it("routes run subcommand to runEvalRun", async () => {
+        await evalCommand("run", "marketing/social-media-posting", {
+            root: "/tmp/test",
+        });
+        expect(mocks.runEvalRun).toHaveBeenCalledWith(expect.stringContaining("marketing/skills/social-media-posting"));
+    });
+    it("routes coverage subcommand to runEvalCoverage", async () => {
+        await evalCommand("coverage", undefined, { root: "/tmp/test" });
+        expect(mocks.runEvalCoverage).toHaveBeenCalledWith("/tmp/test");
+    });
+    it("routes generate-all subcommand to runEvalGenerateAll", async () => {
+        await evalCommand("generate-all", undefined, {
+            root: "/tmp/test",
+            force: true,
+        });
+        expect(mocks.runEvalGenerateAll).toHaveBeenCalledWith("/tmp/test", true);
+    });
+    it("prints error for unknown subcommand", async () => {
+        const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => { });
+        await evalCommand("unknown", undefined, { root: "/tmp/test" });
+        expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining("Unknown subcommand"));
+        consoleSpy.mockRestore();
+    });
+});
+//# sourceMappingURL=eval-router.test.js.map

package/dist/commands/__tests__/eval-router.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"eval-router.test.js","sourceRoot":"","sources":["../../../src/commands/__tests__/eval-router.test.ts"],"names":[],"mappings":"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"}

package/dist/commands/add.js

@@ -7,12 +7,12 @@ import { createHash } from "node:crypto";
 import { execSync } from "node:child_process";
 import os from "node:os";
 import { resolveTilde } from "../utils/paths.js";
-import { reportInstall, reportInstallBatch } from "../api/client.js";
+import { reportInstall, reportInstallBatch, submitSkill } from "../api/client.js";
 import { filterAgents } from "../utils/agent-filter.js";
 import { detectInstalledAgents, AGENTS_REGISTRY } from "../agents/agents-registry.js";
-import { ensureLockfile, writeLockfile, readLockfile } from "../lockfile/index.js";
+import { ensureLockfile, writeLockfile, readLockfile, removeSkillFromLock } from "../lockfile/index.js";
 import { runTier1Scan } from "../scanner/index.js";
-import { getAvailablePlugins, getPluginSource, getPluginVersion, hasPlugin } from "../marketplace/index.js";
+import { getAvailablePlugins, getPluginSource, getPluginVersion, hasPlugin, discoverUnregisteredPlugins } from "../marketplace/index.js";
 import { checkInstallSafety } from "../blocklist/blocklist.js";
 import { getSkill } from "../api/client.js";
 import { checkPlatformSecurity } from "../security/index.js";
@@ -22,7 +22,7 @@ import { parseSkillsShUrl, isCompleteParsed, isIncompleteParsed, } from "../reso
 import { bold, green, red, yellow, dim, cyan, spinner, } from "../utils/output.js";
 import { isTTY, createPrompter } from "../utils/prompts.js";
 import { installSymlink, installCopy } from "../installer/canonical.js";
-import { isClaudeCliAvailable, registerMarketplace, deregisterMarketplace, installNativePlugin, } from "../utils/claude-cli.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
@@ -104,6 +104,24 @@ export async function detectMarketplaceRepo(owner, repo) {
     }
     return { isMarketplace: false };
 }
+/**
+ * Offer to submit a marketplace repo for re-scanning on the platform.
+ * Uses the existing submitSkill() API. Non-throwing — prints fallback URL on failure.
+ */
+async function triggerResubmission(owner, repo) {
+    const repoUrl = `https://github.com/${owner}/${repo}`;
+    try {
+        const result = await submitSkill({ repoUrl });
+        console.log(green("  Submitted for re-scanning!"));
+        if (result.trackingUrl) {
+            console.log(dim(`  Track progress: ${result.trackingUrl}`));
+        }
+    }
+    catch {
+        console.log(yellow("  Could not submit automatically."));
+        console.log(dim(`  Submit manually: https://verified-skill.com/submit?repo=${owner}/${repo}`));
+    }
+}
 /**
  * Install plugins from a Claude Code plugin marketplace repo.
  *
@@ -118,8 +136,20 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
         console.error(red("No plugins found in marketplace.json"));
         process.exit(1);
     }
-    console.log(`\n${bold("Claude Code Plugin Marketplace")} detected: ${cyan(`${owner}/${repo}`)}\n` +
-        dim(`Marketplace: ${marketplaceName || "unknown"} — ${plugins.length} plugin${plugins.length === 1 ? "" : "s"} available\n`));
+    // Discover plugin directories not yet in marketplace.json
+    const unregistered = await discoverUnregisteredPlugins(owner, repo, manifestContent);
+    const headerParts = [
+        `\n${bold("Claude Code Plugin Marketplace")} detected: ${cyan(`${owner}/${repo}`)}\n`,
+        dim(`Marketplace: ${marketplaceName || "unknown"} — ${plugins.length} registered plugin${plugins.length === 1 ? "" : "s"}`),
+    ];
+    if (unregistered.length > 0) {
+        headerParts.push(dim(`, ${unregistered.length} unregistered`));
+    }
+    headerParts.push("\n");
+    if (unregistered.length > 0) {
+        headerParts.push(yellow(`  ${unregistered.length} new plugin${unregistered.length === 1 ? "" : "s"} not yet in marketplace.json\n`));
+    }
+    console.log(headerParts.join(""));
     // Check lockfile for already-installed plugins
     const lockDir = lockfileRoot(opts);
     const lock = readLockfile(lockDir);
@@ -133,6 +163,8 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
     }
     // Select plugins
     let selectedPlugins;
+    let selectedUnregistered = [];
+    let usedInteractiveCheckbox = false;
     if (!isTTY() && !opts.yes && !opts.all) {
         // Non-TTY: list plugins and exit with guidance
         console.log("Available plugins:\n");
@@ -140,6 +172,13 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
             const installed = installedSet.has(p.name) ? dim(" (installed)") : "";
             console.log(`  ${bold(p.name)}${installed}${p.description ? dim(` — ${p.description}`) : ""}`);
         }
+        if (unregistered.length > 0) {
+            console.log("\nUnregistered plugins (not in marketplace.json):\n");
+            for (const u of unregistered) {
+                console.log(`  ${yellow(u.name)} ${dim("(new — not in marketplace.json)")}`);
+            }
+            console.log(dim("\nUse --force --plugin <name> to install unregistered plugins."));
+        }
         console.error(red("\nNon-interactive mode. Use --plugin <name> or --yes to select all."));
         process.exit(1);
     }
@@ -158,9 +197,14 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
             selectedPlugins = plugins;
             console.log(dim(`Auto-selecting all ${plugins.length} plugins (--yes/--all)`));
         }
+        if (unregistered.length > 0) {
+            console.log(dim(`  Skipping ${unregistered.length} unregistered plugin${unregistered.length === 1 ? "" : "s"}: `) +
+                dim(unregistered.map((u) => u.name).join(", ")) +
+                dim(" (use --force to include)"));
+        }
     }
-    else if (plugins.length === 1) {
-        // Single plugin — show details and ask for confirmation
+    else if (plugins.length === 1 && unregistered.length === 0) {
+        // Single plugin, no unregistered — show details and ask for confirmation
         const p = plugins[0];
         const isInstalled = installedSet.has(p.name);
         const versionTag = p.version ? ` v${p.version}` : "";
@@ -185,20 +229,92 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
         selectedPlugins = plugins;
     }
     else {
+        // Build combined picker: registered plugins first, then unregistered
+        const combinedItems = [
+            ...plugins.map((p) => ({
+                label: p.name + (installedSet.has(p.name) ? dim(" (installed)") : ""),
+                description: p.description,
+                checked: preSelected ? preSelected.includes(p.name) : installedSet.has(p.name),
+            })),
+            ...unregistered.map((u) => ({
+                label: u.name + yellow(" (new — not in marketplace.json)"),
+                description: undefined,
+                checked: false,
+            })),
+        ];
         const prompter = createPrompter();
-        const indices = await prompter.promptCheckboxList(plugins.map((p) => ({
-            label: p.name + (installedSet.has(p.name) ? dim(" (installed)") : ""),
-            description: p.description,
-            checked: preSelected ? preSelected.includes(p.name) : installedSet.has(p.name),
-        })), { title: "Select plugins to install" });
+        const indices = await prompter.promptCheckboxList(combinedItems, { title: "Select plugins to install" });
         if (indices.length === 0) {
             console.log(dim("No plugins selected. Aborting."));
             return;
         }
-        selectedPlugins = indices.map((i) => plugins[i]);
+        // Partition selections into registered and unregistered
+        selectedPlugins = [];
+        selectedUnregistered = [];
+        for (const i of indices) {
+            if (i < plugins.length) {
+                selectedPlugins.push(plugins[i]);
+            }
+            else {
+                selectedUnregistered.push(unregistered[i - plugins.length]);
+            }
+        }
+        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));
+    const toUninstall = usedInteractiveCheckbox
+        ? [...installedSet].filter((name) => !selectedNames.has(name))
+        : [];
+    if (toUninstall.length > 0) {
+        console.log(dim(`\nUninstalling ${toUninstall.length} deselected plugin${toUninstall.length === 1 ? "" : "s"}...\n`));
+        const agents = await detectInstalledAgents();
+        for (const skillName of toUninstall) {
+            // Remove skill directories from all agents
+            let removedCount = 0;
+            for (const agent of agents) {
+                const localDir = join(process.cwd(), agent.localSkillsDir, skillName);
+                const globalDir = resolveTilde(join(agent.globalSkillsDir, skillName));
+                for (const dir of [localDir, globalDir]) {
+                    if (existsSync(dir)) {
+                        try {
+                            rmSync(dir, { recursive: true, force: true });
+                            removedCount++;
+                        }
+                        catch { /* ignore removal errors */ }
+                    }
+                }
+            }
+            // 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"})`) : ""));
+        }
+    }
+    // Gate: unregistered plugins require --force
+    if (selectedUnregistered.length > 0 && !opts.force) {
+        console.log(yellow(`\n  ${selectedUnregistered.length} unregistered plugin${selectedUnregistered.length === 1 ? "" : "s"} selected but --force not set.`) + "\n" +
+            dim("  Unregistered plugins have not been scanned or verified.") + "\n" +
+            dim("  Use --force to install them anyway, or submit the repo for re-scanning.") + "\n");
+        // Offer resubmission in interactive mode
+        if (isTTY()) {
+            const prompter = createPrompter();
+            const resubmit = await prompter.promptConfirm(`Submit ${bold(`${owner}/${repo}`)} for re-scanning?`, true);
+            if (resubmit) {
+                await triggerResubmission(owner, repo);
+            }
+        }
+        else {
+            console.log(dim(`  Submit manually: https://verified-skill.com/submit?repo=${owner}/${repo}`));
+        }
+        // Clear unregistered selection — only install registered plugins
+        selectedUnregistered = [];
+    }
     let marketplaceRegistered = false;
     if (hasClaude) {
         // Register marketplace via git URL — Claude Code clones to its own
@@ -220,7 +336,7 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
             }
         }
     }
-    // Install each plugin
+    // Install registered plugins
     const results = [];
     for (const plugin of selectedPlugins) {
         if (hasClaude && marketplaceRegistered && marketplaceName) {
@@ -256,15 +372,28 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
             }
         }
     }
+    // Install unregistered plugins via extraction (--force only)
+    for (const unreg of selectedUnregistered) {
+        console.log(yellow(`  Installing unregistered plugin: ${bold(unreg.name)} (--force)`));
+        try {
+            await installRepoPlugin(`${owner}/${repo}`, unreg.name, opts, unreg.source);
+            results.push({ name: unreg.name, installed: true, method: "extraction-unregistered" });
+        }
+        catch (err) {
+            console.error(red(`  ✗ ${unreg.name}: ${err.message}`));
+            results.push({ name: unreg.name, installed: false, method: "failed" });
+        }
+    }
     // Update lockfile
     const lockForWrite = ensureLockfile(lockDir);
     for (const r of results) {
         if (r.installed) {
-            const pluginVersion = getPluginVersion(r.name, manifestContent) || "0.0.0";
+            const isUnregistered = r.method === "extraction-unregistered";
+            const pluginVersion = isUnregistered ? "0.0.0" : (getPluginVersion(r.name, manifestContent) || "0.0.0");
             lockForWrite.skills[r.name] = {
                 version: pluginVersion,
                 sha: "",
-                tier: "VERIFIED",
+                tier: isUnregistered ? "UNSCANNED" : "VERIFIED",
                 installedAt: new Date().toISOString(),
                 source: `marketplace:${owner}/${repo}#${r.name}`,
                 marketplace: marketplaceName || undefined,
@@ -285,9 +414,22 @@ async function installMarketplaceRepo(owner, repo, manifestContent, opts, preSel
     // Summary
     const installed = results.filter((r) => r.installed);
     const failed = results.filter((r) => !r.installed);
-    console.log(`\n${green(bold(`${installed.length} installed`))}` +
-        (failed.length > 0 ? `, ${red(bold(`${failed.length} failed`))}` : "") +
-        ` of ${results.length} plugins`);
+    const parts = [];
+    if (installed.length > 0 || results.length > 0) {
+        parts.push(`${green(bold(`${installed.length} installed`))}`);
+    }
+    if (failed.length > 0) {
+        parts.push(`${red(bold(`${failed.length} failed`))}`);
+    }
+    if (toUninstall.length > 0) {
+        parts.push(`${red(bold(`${toUninstall.length} uninstalled`))}`);
+    }
+    if (parts.length > 0) {
+        console.log(`\n${parts.join(", ")} of ${results.length + toUninstall.length} plugins`);
+    }
+    else {
+        console.log(dim("\nNo changes made."));
+    }
     if (hasClaude && marketplaceRegistered && marketplaceName) {
         console.log(dim(`\nManage: claude plugin list | claude plugin uninstall "<plugin>@${marketplaceName}"`));
     }
@@ -1028,7 +1170,7 @@ async function installAllRepoPlugins(ownerRepo, opts) {
 // ---------------------------------------------------------------------------
 // Remote plugin installation from a GitHub repository with marketplace.json
 // ---------------------------------------------------------------------------
-async function installRepoPlugin(ownerRepo, pluginName, opts) {
+async function installRepoPlugin(ownerRepo, pluginName, opts, overrideSource) {
     const [owner, repo] = ownerRepo.split("/");
     if (!owner || !repo) {
         throw new Error("--repo must be in owner/repo format (e.g. anton-abyzov/vskill)");
@@ -1054,14 +1196,14 @@ async function installRepoPlugin(ownerRepo, pluginName, opts) {
             throw err;
         throw new Error(`Network error: ${err.message}`);
     }
-    // Find the plugin in the marketplace
-    const pluginSource = getPluginSource(pluginName, manifestContent);
+    // Find the plugin in the marketplace (or use override for unregistered plugins)
+    const pluginSource = overrideSource || getPluginSource(pluginName, manifestContent);
     if (!pluginSource) {
         const available = getAvailablePlugins(manifestContent).map((p) => p.name);
         throw new Error(`Plugin "${pluginName}" not found in marketplace.json. ` +
             `Available plugins: ${available.join(", ")}`);
     }
-    const pluginVersion = getPluginVersion(pluginName, manifestContent) || "0.0.0";
+    const pluginVersion = overrideSource ? "0.0.0" : (getPluginVersion(pluginName, manifestContent) || "0.0.0");
     const pluginPath = pluginSource.replace(/^\.\//, "");
     // Blocklist + rejection check BEFORE fetching content
     const safety = await checkInstallSafety(pluginName);