vskill 0.1.9 → 0.1.11

package/README.md

@@ -3,9 +3,21 @@
 **Secure multi-platform AI skill installer.** Scan before you install.
 
 ```bash
+# npm
 npx vskill find remotion                             # search the registry
 npx vskill install google/remotion                   # install after security scan
-npx vskill install https://github.com/owner/repo     # also accepts full GitHub URLs
+
+# bun
+bunx vskill find remotion
+bunx vskill install google/remotion
+
+# pnpm
+pnpx vskill find remotion
+pnpx vskill install google/remotion
+
+# yarn
+yarn dlx vskill find remotion
+yarn dlx vskill install google/remotion
 ```
 
 ## Why?
@@ -27,6 +39,8 @@ vskill submit <source>       # Submit for verification (owner/repo or GitHub URL
 vskill update                # Update with diff scanning
 ```
 
+> Replace `vskill` with `npx vskill`, `bunx vskill`, `pnpx vskill`, or `yarn dlx vskill` if not installed globally.
+
 ## 39 Agent Platforms
 
 Works across Claude Code, Cursor, GitHub Copilot, Windsurf, Codex, Gemini CLI, Cline, Amp, Roo Code, and 30 more.

package/dist/commands/add-wizard.test.d.ts

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

package/dist/commands/add-wizard.test.js

@@ -0,0 +1,285 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+// ---------------------------------------------------------------------------
+// Mock node:fs
+// ---------------------------------------------------------------------------
+const mockMkdirSync = vi.fn();
+const mockWriteFileSync = vi.fn();
+const mockReadFileSync = vi.fn();
+const mockExistsSync = vi.fn();
+const mockChmodSync = vi.fn();
+const mockReaddirSync = vi.fn();
+const mockStatSync = vi.fn();
+const mockCopyFileSync = vi.fn();
+const mockRmSync = vi.fn();
+vi.mock("node:fs", () => ({
+    mkdirSync: (...args) => mockMkdirSync(...args),
+    writeFileSync: (...args) => mockWriteFileSync(...args),
+    readFileSync: (...args) => mockReadFileSync(...args),
+    existsSync: (...args) => mockExistsSync(...args),
+    chmodSync: (...args) => mockChmodSync(...args),
+    readdirSync: (...args) => mockReaddirSync(...args),
+    statSync: (...args) => mockStatSync(...args),
+    copyFileSync: (...args) => mockCopyFileSync(...args),
+    rmSync: (...args) => mockRmSync(...args),
+}));
+vi.mock("node:path", async () => {
+    const actual = await vi.importActual("node:path");
+    return { ...actual };
+});
+const mockDigest = vi.fn().mockReturnValue("abcdef123456xxxx");
+const mockUpdate = vi.fn().mockReturnValue({ digest: mockDigest });
+vi.mock("node:crypto", () => ({
+    createHash: () => ({ update: mockUpdate }),
+}));
+// ---------------------------------------------------------------------------
+// Mock agents registry
+// ---------------------------------------------------------------------------
+const mockDetectInstalledAgents = vi.fn();
+vi.mock("../agents/agents-registry.js", () => ({
+    detectInstalledAgents: (...args) => mockDetectInstalledAgents(...args),
+}));
+// ---------------------------------------------------------------------------
+// Mock lockfile
+// ---------------------------------------------------------------------------
+const mockEnsureLockfile = vi.fn();
+const mockWriteLockfile = vi.fn();
+vi.mock("../lockfile/index.js", () => ({
+    ensureLockfile: (...args) => mockEnsureLockfile(...args),
+    writeLockfile: (...args) => mockWriteLockfile(...args),
+}));
+// ---------------------------------------------------------------------------
+// Mock scanner, blocklist, security, API client, discovery
+// ---------------------------------------------------------------------------
+const mockRunTier1Scan = vi.fn();
+vi.mock("../scanner/index.js", () => ({
+    runTier1Scan: (...args) => mockRunTier1Scan(...args),
+}));
+const mockCheckBlocklist = vi.fn();
+vi.mock("../blocklist/blocklist.js", () => ({
+    checkBlocklist: (...args) => mockCheckBlocklist(...args),
+}));
+const mockCheckPlatformSecurity = vi.fn();
+vi.mock("../security/index.js", () => ({
+    checkPlatformSecurity: (...args) => mockCheckPlatformSecurity(...args),
+}));
+const mockGetSkill = vi.fn();
+vi.mock("../api/client.js", () => ({
+    getSkill: (...args) => mockGetSkill(...args),
+}));
+const mockDiscoverSkills = vi.fn();
+vi.mock("../discovery/github-tree.js", () => ({
+    discoverSkills: (...args) => mockDiscoverSkills(...args),
+}));
+// ---------------------------------------------------------------------------
+// Mock project root & agent filter
+// ---------------------------------------------------------------------------
+const mockFindProjectRoot = vi.fn();
+vi.mock("../utils/project-root.js", () => ({
+    findProjectRoot: (...args) => mockFindProjectRoot(...args),
+}));
+const mockFilterAgents = vi.fn();
+vi.mock("../utils/agent-filter.js", () => ({
+    filterAgents: (...args) => mockFilterAgents(...args),
+}));
+// ---------------------------------------------------------------------------
+// Mock output (suppress ANSI output)
+// ---------------------------------------------------------------------------
+vi.mock("../utils/output.js", () => ({
+    bold: (s) => s,
+    green: (s) => s,
+    red: (s) => s,
+    yellow: (s) => s,
+    dim: (s) => s,
+    cyan: (s) => s,
+    spinner: () => ({ stop: vi.fn() }),
+}));
+// ---------------------------------------------------------------------------
+// Mock prompts (to test wizard integration without real readline)
+// ---------------------------------------------------------------------------
+const mockPromptCheckboxList = vi.fn();
+const mockPromptChoice = vi.fn();
+const mockPromptConfirm = vi.fn();
+const mockIsTTY = vi.fn();
+vi.mock("../utils/prompts.js", () => ({
+    isTTY: (...args) => mockIsTTY(...args),
+    createPrompter: () => ({
+        promptCheckboxList: (...args) => mockPromptCheckboxList(...args),
+        promptChoice: (...args) => mockPromptChoice(...args),
+        promptConfirm: (...args) => mockPromptConfirm(...args),
+    }),
+}));
+// ---------------------------------------------------------------------------
+// Mock canonical installer
+// ---------------------------------------------------------------------------
+const mockInstallSymlink = vi.fn();
+const mockInstallCopy = vi.fn();
+vi.mock("../installer/canonical.js", () => ({
+    installSymlink: (...args) => mockInstallSymlink(...args),
+    installCopy: (...args) => mockInstallCopy(...args),
+}));
+// ---------------------------------------------------------------------------
+// Import module under test AFTER mocks
+// ---------------------------------------------------------------------------
+const { addCommand } = await import("./add.js");
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function makeScanResult(overrides = {}) {
+    return {
+        verdict: "PASS",
+        findings: [],
+        score: 100,
+        patternsChecked: 37,
+        criticalCount: 0,
+        highCount: 0,
+        mediumCount: 0,
+        lowCount: 0,
+        infoCount: 0,
+        durationMs: 1,
+        ...overrides,
+    };
+}
+function makeAgent(overrides = {}) {
+    return {
+        id: "claude-code",
+        displayName: "Claude Code",
+        localSkillsDir: ".claude/commands",
+        globalSkillsDir: "~/.claude/commands",
+        ...overrides,
+    };
+}
+const originalFetch = globalThis.fetch;
+beforeEach(() => {
+    vi.clearAllMocks();
+    vi.spyOn(console, "log").mockImplementation(() => { });
+    vi.spyOn(console, "error").mockImplementation(() => { });
+    // Default: safe skill content
+    globalThis.fetch = vi.fn().mockResolvedValue({
+        ok: true,
+        text: async () => "# Safe Skill\nNormal content",
+    });
+    mockRunTier1Scan.mockReturnValue(makeScanResult());
+    mockCheckBlocklist.mockResolvedValue(null);
+    mockCheckPlatformSecurity.mockResolvedValue(null);
+    mockEnsureLockfile.mockReturnValue({ skills: {}, agents: [] });
+    mockFindProjectRoot.mockReturnValue("/projects/myapp");
+    mockFilterAgents.mockImplementation((agents) => agents);
+    // Default: TTY
+    mockIsTTY.mockReturnValue(true);
+});
+afterEach(() => {
+    globalThis.fetch = originalFetch;
+});
+// ---------------------------------------------------------------------------
+// Tests: --yes flag and non-interactive mode
+// ---------------------------------------------------------------------------
+describe("wizard integration: --yes flag", () => {
+    it("skips all prompts when --yes is set", async () => {
+        const agents = [makeAgent(), makeAgent({ id: "cursor", localSkillsDir: ".cursor/skills" })];
+        mockDetectInstalledAgents.mockResolvedValue(agents);
+        mockDiscoverSkills.mockResolvedValue([
+            { name: "skill-a", rawUrl: "https://raw.githubusercontent.com/o/r/main/skills/skill-a/SKILL.md" },
+            { name: "skill-b", rawUrl: "https://raw.githubusercontent.com/o/r/main/skills/skill-b/SKILL.md" },
+        ]);
+        await addCommand("owner/repo", { yes: true });
+        // No prompt functions should have been called
+        expect(mockPromptCheckboxList).not.toHaveBeenCalled();
+        expect(mockPromptChoice).not.toHaveBeenCalled();
+        expect(mockPromptConfirm).not.toHaveBeenCalled();
+    });
+});
+describe("wizard integration: non-TTY mode", () => {
+    it("skips prompts when stdin is not a TTY", async () => {
+        mockIsTTY.mockReturnValue(false);
+        const agents = [makeAgent()];
+        mockDetectInstalledAgents.mockResolvedValue(agents);
+        mockDiscoverSkills.mockResolvedValue([
+            { name: "skill-a", rawUrl: "https://raw.githubusercontent.com/o/r/main/skills/skill-a/SKILL.md" },
+            { name: "skill-b", rawUrl: "https://raw.githubusercontent.com/o/r/main/skills/skill-b/SKILL.md" },
+        ]);
+        await addCommand("owner/repo", {});
+        expect(mockPromptCheckboxList).not.toHaveBeenCalled();
+        expect(mockPromptChoice).not.toHaveBeenCalled();
+        expect(mockPromptConfirm).not.toHaveBeenCalled();
+    });
+});
+describe("wizard integration: single skill skips wizard", () => {
+    it("does not show wizard for single-skill repos", async () => {
+        const agents = [makeAgent()];
+        mockDetectInstalledAgents.mockResolvedValue(agents);
+        mockDiscoverSkills.mockResolvedValue([
+            { name: "only-skill", rawUrl: "https://raw.githubusercontent.com/o/r/main/SKILL.md" },
+        ]);
+        await addCommand("owner/repo", {});
+        // Single skill: no wizard
+        expect(mockPromptCheckboxList).not.toHaveBeenCalled();
+        expect(mockPromptChoice).not.toHaveBeenCalled();
+        expect(mockPromptConfirm).not.toHaveBeenCalled();
+    });
+});
+describe("wizard integration: --agent flag skips agent selection", () => {
+    it("does not prompt for agents when --agent is provided", async () => {
+        const agents = [makeAgent()];
+        mockDetectInstalledAgents.mockResolvedValue(agents);
+        mockDiscoverSkills.mockResolvedValue([
+            { name: "skill-a", rawUrl: "https://raw.githubusercontent.com/o/r/main/skills/skill-a/SKILL.md" },
+            { name: "skill-b", rawUrl: "https://raw.githubusercontent.com/o/r/main/skills/skill-b/SKILL.md" },
+        ]);
+        // Wizard prompts: select all skills, skip agent (because --agent), project scope, symlink method, confirm
+        mockPromptCheckboxList.mockResolvedValue([0, 1]); // select all skills
+        mockPromptChoice
+            .mockResolvedValueOnce(0) // scope: project
+            .mockResolvedValueOnce(0); // method: symlink
+        mockPromptConfirm.mockResolvedValue(true);
+        await addCommand("owner/repo", { agent: ["claude-code"] });
+        // Agent checkbox should NOT be called (--agent flag)
+        // Skill checkbox IS called (multi-skill)
+        expect(mockPromptCheckboxList).toHaveBeenCalledTimes(1);
+    });
+});
+describe("wizard integration: --global flag skips scope selection", () => {
+    it("does not prompt for scope when --global is provided", async () => {
+        const agents = [makeAgent()];
+        mockDetectInstalledAgents.mockResolvedValue(agents);
+        mockDiscoverSkills.mockResolvedValue([
+            { name: "skill-a", rawUrl: "https://raw.githubusercontent.com/o/r/main/skills/skill-a/SKILL.md" },
+            { name: "skill-b", rawUrl: "https://raw.githubusercontent.com/o/r/main/skills/skill-b/SKILL.md" },
+        ]);
+        // Wizard: skills, agents, (no scope), method, confirm
+        mockPromptCheckboxList
+            .mockResolvedValueOnce([0, 1]) // skills
+            .mockResolvedValueOnce([0]); // agents
+        mockPromptChoice.mockResolvedValueOnce(0); // method: symlink (no scope prompt)
+        mockPromptConfirm.mockResolvedValue(true);
+        await addCommand("owner/repo", { global: true });
+        // Only 1 promptChoice call (method), not 2 (scope + method)
+        expect(mockPromptChoice).toHaveBeenCalledTimes(1);
+    });
+});
+describe("wizard integration: abort at confirmation", () => {
+    it("exits cleanly when user declines confirmation", async () => {
+        const agents = [makeAgent()];
+        mockDetectInstalledAgents.mockResolvedValue(agents);
+        mockDiscoverSkills.mockResolvedValue([
+            { name: "skill-a", rawUrl: "https://raw.githubusercontent.com/o/r/main/skills/skill-a/SKILL.md" },
+            { name: "skill-b", rawUrl: "https://raw.githubusercontent.com/o/r/main/skills/skill-b/SKILL.md" },
+        ]);
+        mockPromptCheckboxList
+            .mockResolvedValueOnce([0, 1])
+            .mockResolvedValueOnce([0]);
+        mockPromptChoice
+            .mockResolvedValueOnce(0)
+            .mockResolvedValueOnce(0);
+        mockPromptConfirm.mockResolvedValue(false); // user says NO
+        const mockExit = vi.spyOn(process, "exit").mockImplementation(() => {
+            throw new Error("process.exit");
+        });
+        await expect(addCommand("owner/repo", {})).rejects.toThrow("process.exit");
+        mockExit.mockRestore();
+        // No skills should have been installed
+        expect(mockWriteFileSync).not.toHaveBeenCalled();
+        expect(mockInstallSymlink).not.toHaveBeenCalled();
+        expect(mockInstallCopy).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=add-wizard.test.js.map

package/dist/commands/add-wizard.test.js.map

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

package/dist/commands/add.d.ts

@@ -4,6 +4,9 @@ interface AddOptions {
     pluginDir?: string;
     global?: boolean;
     force?: boolean;
+    agent?: string[];
+    cwd?: boolean;
+    yes?: boolean;
 }
 export declare function addCommand(source: string, opts: AddOptions): Promise<void>;
 export {};

package/dist/commands/add.js

@@ -6,6 +6,8 @@ import { join, resolve } from "node:path";
 import { createHash } from "node:crypto";
 import { execSync } from "node:child_process";
 import { resolveTilde } from "../utils/paths.js";
+import { findProjectRoot } from "../utils/project-root.js";
+import { filterAgents } from "../utils/agent-filter.js";
 import { detectInstalledAgents } from "../agents/agents-registry.js";
 import { ensureLockfile, writeLockfile } from "../lockfile/index.js";
 import { runTier1Scan } from "../scanner/index.js";
@@ -14,7 +16,9 @@ import { checkBlocklist } from "../blocklist/blocklist.js";
 import { getSkill } from "../api/client.js";
 import { checkPlatformSecurity } from "../security/index.js";
 import { discoverSkills } from "../discovery/github-tree.js";
+import { parseGitHubSource } from "../utils/validation.js";
 import { bold, green, red, yellow, dim, cyan, spinner, } from "../utils/output.js";
+import { isTTY, createPrompter } from "../utils/prompts.js";
 // ---------------------------------------------------------------------------
 // Command file filter (prevents plugin internals leaking as slash commands)
 // ---------------------------------------------------------------------------
@@ -81,6 +85,32 @@ function cleanPluginCache(pluginName, marketplace) {
     }
     catch { /* ignore - plugin might not be installed via CLI */ }
 }
+/**
+ * Resolve the base directory for local skill installation.
+ *
+ * Priority:
+ * 1. `--global` -> agent's globalSkillsDir
+ * 2. `--cwd`   -> process.cwd() + agent's localSkillsDir
+ * 3. default   -> findProjectRoot(cwd) + agent's localSkillsDir (with fallback warning)
+ */
+function resolveInstallBase(opts, agent) {
+    if (opts.global) {
+        return resolveTilde(agent.globalSkillsDir);
+    }
+    const cwd = process.cwd();
+    if (opts.cwd) {
+        return join(cwd, agent.localSkillsDir);
+    }
+    const projectRoot = findProjectRoot(cwd);
+    if (!projectRoot) {
+        console.log(yellow("No project root found; installing relative to current directory."));
+        return join(cwd, agent.localSkillsDir);
+    }
+    if (projectRoot !== cwd) {
+        console.log(dim(`Project root: ${projectRoot}`));
+    }
+    return join(projectRoot, agent.localSkillsDir);
+}
 async function fetchSkillContent(url) {
     const spin = spinner("Fetching skill");
     try {
@@ -232,14 +262,22 @@ async function installPluginDir(basePath, pluginName, opts) {
     if (scanResult.verdict === "CONCERNS" && opts.force) {
         console.log(yellow("\n--force: installing despite CONCERNS.\n"));
     }
-    // Detect installed agents
-    const agents = await detectInstalledAgents();
+    // Detect installed agents and apply --agent filter
+    let agents = await detectInstalledAgents();
     if (agents.length === 0) {
         console.error(red("No AI agents detected. Run ") +
             cyan("vskill init") +
             red(" first."));
         process.exit(1);
     }
+    try {
+        agents = filterAgents(agents, opts.agent);
+    }
+    catch (e) {
+        console.error(red(e.message));
+        process.exit(1);
+        return;
+    }
     // Read version from marketplace.json
     const marketplacePath = join(basePath, ".claude-plugin", "marketplace.json");
     const marketplaceContent = readFileSync(marketplacePath, "utf-8");
@@ -258,7 +296,7 @@ async function installPluginDir(basePath, pluginName, opts) {
     const sha = createHash("sha256").update(content).digest("hex").slice(0, 12);
     const locations = [];
     for (const agent of agents) {
-        const cacheDir = join(opts.global ? resolveTilde(agent.globalSkillsDir) : join(process.cwd(), agent.localSkillsDir), pluginName);
+        const cacheDir = join(resolveInstallBase(opts, agent), pluginName);
         try {
             // Full clean before copy: removes stale files from older installs
             if (existsSync(cacheDir)) {
@@ -282,7 +320,7 @@ async function installPluginDir(basePath, pluginName, opts) {
         installedAt: new Date().toISOString(),
         source: `local:${basePath}`,
     };
-    lock.agents = agents.map((a) => a.id);
+    lock.agents = [...new Set([...(lock.agents || []), ...agents.map((a) => a.id)])];
     writeLockfile(lock);
     // Print summary
     console.log(green(`\nInstalled ${bold(pluginName)} to ${locations.length} agent${locations.length === 1 ? "" : "s"}:\n`));
@@ -329,9 +367,7 @@ async function installOneGitHubSkill(owner, repo, skillName, rawUrl, opts, agent
     // Install to each agent
     const sha = createHash("sha256").update(content).digest("hex").slice(0, 12);
     for (const agent of agents) {
-        const baseDir = opts.global
-            ? resolveTilde(agent.globalSkillsDir)
-            : join(process.cwd(), agent.localSkillsDir);
+        const baseDir = resolveInstallBase(opts, agent);
         const skillDir = join(baseDir, skillName);
         try {
             mkdirSync(skillDir, { recursive: true });
@@ -349,6 +385,11 @@ export async function addCommand(source, opts) {
     if (opts.pluginDir && opts.plugin) {
         return installPluginDir(opts.pluginDir, opts.plugin, opts);
     }
+    // Normalize full GitHub URLs to owner/repo shorthand
+    const parsed = parseGitHubSource(source);
+    if (parsed) {
+        source = `${parsed.owner}/${parsed.repo}`;
+    }
     // GitHub mode: owner/repo
     const parts = source.split("/");
     if (parts.length !== 2) {
@@ -366,16 +407,81 @@ export async function addCommand(source, opts) {
         // Fallback: discovery returned nothing — try root SKILL.md directly
         return installSingleSkillLegacy(owner, repo, undefined, opts);
     }
-    // Multi-skill install
-    const agents = await detectInstalledAgents();
+    // Detect agents
+    let agents = await detectInstalledAgents();
     if (agents.length === 0) {
         console.error(red("No AI agents detected. Run ") + cyan("vskill init") + red(" first."));
         process.exit(1);
     }
+    try {
+        agents = filterAgents(agents, opts.agent);
+    }
+    catch (e) {
+        console.error(red(e.message));
+        process.exit(1);
+        return;
+    }
+    // Determine selected skills, agents, scope, and method
+    let selectedSkills = discovered;
+    let selectedAgents = agents;
+    let useGlobal = !!opts.global;
+    let method = "symlink";
+    const interactive = discovered.length > 1 && isTTY() && !opts.yes;
+    if (interactive) {
+        const prompter = createPrompter();
+        // Step 1: Skill selection
+        const skillIndices = await prompter.promptCheckboxList(discovered.map((s) => ({ label: s.name, checked: true })), { title: "Select skills to install (space to toggle)" });
+        selectedSkills = skillIndices.map((i) => discovered[i]);
+        if (selectedSkills.length === 0) {
+            console.log(dim("No skills selected. Aborting."));
+            return process.exit(0);
+        }
+        // Step 2: Agent selection (skip if --agent flag provided or only 1 agent)
+        if (!opts.agent?.length && agents.length > 1) {
+            const prompter2 = createPrompter();
+            const agentIndices = await prompter2.promptCheckboxList(agents.map((a) => ({ label: a.displayName, description: a.parentCompany, checked: true })), { title: `Detected ${agents.length} agents` });
+            selectedAgents = agentIndices.map((i) => agents[i]);
+            if (selectedAgents.length === 0) {
+                console.log(dim("No agents selected. Aborting."));
+                return process.exit(0);
+            }
+        }
+        // Step 3: Scope selection (skip if --global flag provided)
+        if (!opts.global) {
+            const prompter3 = createPrompter();
+            const scopeIdx = await prompter3.promptChoice("Installation scope:", [
+                { label: "Project", hint: "Install in current directory (committed with your project)" },
+                { label: "Global", hint: "Install to ~/.<agent>/ directories" },
+            ]);
+            useGlobal = scopeIdx === 1;
+        }
+        // Step 4: Install method
+        const prompter4 = createPrompter();
+        const methodIdx = await prompter4.promptChoice("Installation method:", [
+            { label: "Symlink", hint: "Single source of truth, easy updates" },
+            { label: "Copy", hint: "Independent copies to all agents" },
+        ]);
+        method = methodIdx === 0 ? "symlink" : "copy";
+        // Step 5: Summary and confirmation
+        console.log(dim("\n--- Installation Summary ---"));
+        console.log(`  Skills: ${selectedSkills.map((s) => s.name).join(", ")}`);
+        console.log(`  Agents: ${selectedAgents.map((a) => a.displayName).join(", ")}`);
+        console.log(`  Scope:  ${useGlobal ? "Global" : "Project"}`);
+        console.log(`  Method: ${method}`);
+        const prompter5 = createPrompter();
+        const proceed = await prompter5.promptConfirm("\nProceed?", true);
+        if (!proceed) {
+            return process.exit(0);
+        }
+    }
+    // Override global flag based on wizard choice
+    if (useGlobal)
+        opts.global = true;
+    // Install selected skills
     const results = [];
-    for (const skill of discovered) {
+    for (const skill of selectedSkills) {
         console.log(dim(`\nInstalling skill: ${bold(skill.name)}...`));
-        const result = await installOneGitHubSkill(owner, repo, skill.name, skill.rawUrl, opts, agents);
+        const result = await installOneGitHubSkill(owner, repo, skill.name, skill.rawUrl, opts, selectedAgents);
         results.push(result);
     }
     // Update lockfile with all installed skills
@@ -391,12 +497,10 @@ export async function addCommand(source, opts) {
             };
         }
     }
-    lock.agents = agents.map((a) => a.id);
+    lock.agents = [...new Set([...(lock.agents || []), ...selectedAgents.map((a) => a.id)])];
     writeLockfile(lock);
     // Summary
-    const installed = results.filter((r) => r.installed);
-    const skipped = results.filter((r) => !r.installed);
-    console.log(green(`\nInstalled ${bold(String(installed.length))} of ${results.length} skills:\n`));
+    console.log(green(`\nInstalled ${bold(String(results.filter((r) => r.installed).length))} of ${results.length} skills:\n`));
     for (const r of results) {
         const icon = r.installed ? green("✓") : red("✗");
         const detail = r.installed ? dim(`(${r.verdict})`) : red(`(${r.verdict})`);
@@ -466,19 +570,25 @@ async function installFromRegistry(skillName, opts) {
             dim("Use --force to install anyway."));
         process.exit(1);
     }
-    // Detect installed agents
-    const agents = await detectInstalledAgents();
+    // Detect installed agents and apply --agent filter
+    let agents = await detectInstalledAgents();
     if (agents.length === 0) {
         console.error(red("No AI agents detected. Run ") + cyan("vskill init") + red(" first."));
         process.exit(1);
     }
+    try {
+        agents = filterAgents(agents, opts.agent);
+    }
+    catch (e) {
+        console.error(red(e.message));
+        process.exit(1);
+        return;
+    }
     // Install to each agent
     const sha = createHash("sha256").update(content).digest("hex").slice(0, 12);
     const locations = [];
     for (const agent of agents) {
-        const baseDir = opts.global
-            ? resolveTilde(agent.globalSkillsDir)
-            : join(process.cwd(), agent.localSkillsDir);
+        const baseDir = resolveInstallBase(opts, agent);
         const skillDir = join(baseDir, skillName);
         try {
             mkdirSync(skillDir, { recursive: true });
@@ -499,7 +609,7 @@ async function installFromRegistry(skillName, opts) {
         installedAt: new Date().toISOString(),
         source: `registry:${skillName}`,
     };
-    lock.agents = agents.map((a) => a.id);
+    lock.agents = [...new Set([...(lock.agents || []), ...agents.map((a) => a.id)])];
     writeLockfile(lock);
     console.log(green(`\nInstalled ${bold(skillName)} to ${locations.length} agent${locations.length === 1 ? "" : "s"}:\n`));
     for (const loc of locations) {
@@ -582,21 +692,27 @@ async function installSingleSkillLegacy(owner, repo, skill, opts) {
     if (scanResult.verdict === "CONCERNS" && opts.force) {
         console.log(yellow("\n--force: installing despite CONCERNS.\n"));
     }
-    // Detect installed agents
-    const agents = await detectInstalledAgents();
+    // Detect installed agents and apply --agent filter
+    let agents = await detectInstalledAgents();
     if (agents.length === 0) {
         console.error(red("No AI agents detected. Run ") +
             cyan("vskill init") +
             red(" first."));
         process.exit(1);
     }
+    try {
+        agents = filterAgents(agents, opts.agent);
+    }
+    catch (e) {
+        console.error(red(e.message));
+        process.exit(1);
+        return;
+    }
     // Install to each agent
     const sha = createHash("sha256").update(content).digest("hex").slice(0, 12);
     const locations = [];
     for (const agent of agents) {
-        const baseDir = opts.global
-            ? resolveTilde(agent.globalSkillsDir)
-            : join(process.cwd(), agent.localSkillsDir);
+        const baseDir = resolveInstallBase(opts, agent);
         const skillDir = join(baseDir, skillName);
         try {
             mkdirSync(skillDir, { recursive: true });
@@ -617,7 +733,7 @@ async function installSingleSkillLegacy(owner, repo, skill, opts) {
         installedAt: new Date().toISOString(),
         source: `github:${owner}/${repo}`,
     };
-    lock.agents = agents.map((a) => a.id);
+    lock.agents = [...new Set([...(lock.agents || []), ...agents.map((a) => a.id)])];
     writeLockfile(lock);
     // Print summary
     console.log(green(`\nInstalled ${bold(skillName)} to ${locations.length} agent${locations.length === 1 ? "" : "s"}:\n`));