mcpick 0.0.19 → 0.0.21

package/.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: pnpm/action-setup@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version-file: package.json
+          cache: pnpm
+
+      - run: pnpm install --frozen-lockfile
+
+      - run: pnpm run build
+
+      - run: pnpm run test

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # mcpick
 
+## 0.0.21
+
+### Patch Changes
+
+- 47e40be: chore: reorder TUI menu and update README for agent-first usage
+
+## 0.0.20
+
+### Patch Changes
+
+- 00ea930: chore: add unit tests and CI workflow with GitHub Actions
+- 37a62e1: feat: auto-show help instead of TUI in non-TTY environments for LLM agents
+- fc1db54: fix: replace exec with execFile to eliminate shell injection on all platforms
+
 ## 0.0.19
 
 ### Patch Changes

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Scott Spence
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,366 +1,187 @@
 # McPick
 
-A CLI tool for managing MCP servers, plugins, and plugin caches in
-Claude Code. Toggle servers and plugins on/off, manage stale plugin
-caches, and optimise context usage and performance.
+[![built with vite+](https://img.shields.io/badge/built%20with-Vite+-646CFF?logo=vite&logoColor=white)](https://viteplus.dev)
+[![tested with vitest](https://img.shields.io/badge/tested%20with-Vitest-6E9F18?logo=vitest&logoColor=white)](https://vitest.dev)
 
-## Installation
+Claude Code extension manager — MCP servers, plugins (skills, hooks,
+agents), and marketplaces.
 
-### One-time Usage (recommended)
+## Quick Start
 
-```bash
-pnpx mcpick
-# or
-pnpm dlx mcpick
-# or
-npx mcpick
-```
-
-### Global Installation
+Use mcpick inline in Claude Code sessions. Tell Claude:
 
-```bash
-pnpm install -g mcpick
-# or
-npm install -g mcpick
 ```
-
-## The Problem
-
-Using the Claude Code `/doctor` command you may see something like
-this if you have many MCP servers configured:
-
-```bash
- Context Usage Warnings
- └ ⚠ Large MCP tools context (~66,687 tokens > 25,000)
-   └ MCP servers:
-     └ mcp-omnisearch-testing: 20 tools (~10,494 tokens)
-     └ mcp-omnisearch: 20 tools (~10,454 tokens)
-     └ mcp-sqlite-tools-testing: 19 tools (~9,910 tokens)
-     └ mcp-sqlite-tools: 19 tools (~9,872 tokens)
-     └ playwright: 21 tools (~9,804 tokens)
-     └ (7 more servers)
+Use npx mcpick to add the marketplace at spences10/claude-code-toolkit
 ```
 
-Claude Code loads **all** MCP servers from your `.claude.json` file at
-startup, regardless of whether you need them for your current task.
-This can lead to:
-
-- 🐌 Slower Claude Code startup times
-- 💾 High context token usage
-- 🧠 Cognitive overload from too many available tools
-
-## The Solution
-
-McPick provides an intuitive CLI menu and non-interactive subcommands
-to:
-
-- ✅ **Toggle servers on/off** - Enable only the MCP servers you need
-  for your current task
-- 🔌 **Toggle plugins on/off** - Enable or disable Claude Code
-  marketplace plugins
-- 🗑️ **Manage plugin cache** - Detect stale plugins, clear caches,
-  clean orphaned versions, refresh marketplaces
-- 📁 **Manage server registry** - Keep a database of all your
-  available MCP servers
-- 🔄 **Safe configuration** - Only modifies the `mcpServers` section,
-  preserving other Claude Code settings
-- 💾 **Backup & restore** - Create focused backups of your MCP server
-  configurations
-
-## Features
-
-### Interactive Menu
+```
+Use npx mcpick to list my plugins and disable the ones I'm not using
+```
 
-```bash
-┌  McPick - MCP Server Configuration Manager
-│
-◆  What would you like to do?
-│  ● Enable / Disable MCP servers (Toggle MCP servers on/off)
-│  ○ Enable / Disable plugins (Toggle Claude Code plugins on/off)
-│  ○ Manage plugin cache (View, clear, or refresh plugin caches)
-│  ○ Backup config
-│  ○ Add MCP server
-│  ○ Restore from backup
-│  ○ Load profile
-│  ○ Save profile
-│  ○ Exit
-└
+```
+Use npx mcpick to enable only the mcp-sqlite-tools server
 ```
 
-### Scope Support
+McPick auto-detects non-TTY environments and shows structured help
+instead of launching the interactive TUI — so LLM agents can read
+`npx mcpick --help` and figure out the rest.
 
-MCPick supports the three MCP server scopes used by Claude Code:
+## Concepts
 
-| Scope       | Description                          | Storage Location                              |
-| ----------- | ------------------------------------ | --------------------------------------------- |
-| **Local**   | Project-specific servers (default)   | `~/.claude.json` → `projects[cwd].mcpServers` |
-| **Project** | Shared via `.mcp.json` in repository | `.mcp.json` in project root                   |
-| **User**    | Global servers for all projects      | `~/.claude.json` → `mcpServers`               |
+Marketplaces contain plugins. Plugins contain skills
+(`/slash-commands`), hooks, agents, and MCP servers.
 
-When you select "Enable / Disable MCP servers", MCPick will:
+```
+Marketplace → Plugin → Skills, Hooks, Agents, MCP Servers
+```
 
-1. Ask which scope you want to edit
-2. Show servers already enabled for that scope (pre-checked)
-3. Use `claude mcp add/remove` CLI commands for Local and Project
-   scopes
+## Common Workflows
 
-This integration ensures your changes are correctly applied to the
-right configuration location.
+### Install skills from a marketplace
 
-### Smart Server Management
+```bash
+# 1. Add the marketplace
+npx mcpick marketplace add spences10/claude-code-toolkit
 
-- **Auto-discovery**: Automatically imports servers from your existing
-  `.claude.json`
-- **Registry sync**: Maintains a registry of available servers for
-  quick selection
-- **Selective enabling**: Choose exactly which servers to enable via
-  multiselect
-- **Configuration safety**: Preserves all non-MCP settings in your
-  Claude Code config
+# 2. Install a plugin from it
+npx mcpick plugins install my-plugin@claude-code-toolkit
 
-### Backup System
+# 3. Skills are now available as /slash-commands in Claude Code
+```
 
-- **Focused backups**: Only backs up MCP server configurations (not
-  the entire 30k+ line config)
-- **Automatic cleanup**: Keeps last 10 backups to prevent storage
-  bloat
-- **Easy restoration**: Restore from any previous backup with a simple
-  menu
+Marketplace sources can be:
 
-### Profiles
+- `owner/repo` — GitHub shorthand
+- `https://github.com/owner/repo` — full URL
+- `./local-path` — local directory
 
-Load predefined sets of MCP servers instantly:
+### Toggle MCP servers
 
 ```bash
-# Apply a profile
-mcpick --profile database
-mcpick -p database
-
-# Save current config as a profile
-mcpick --save-profile mysetup
-mcpick -s mysetup
-
-# List available profiles
-mcpick --list-profiles
-mcpick -l
+npx mcpick list                    # List servers and status
+npx mcpick enable <server>        # Enable a server
+npx mcpick disable <server>       # Disable a server
+npx mcpick add --name <n> ...     # Add a new server
+npx mcpick remove <server>        # Remove a server
 ```
 
-Profiles are stored in `~/.claude/mcpick/profiles/`. You can also
-create them manually:
-
-```json
-// ~/.claude/mcpick/profiles/database.json
-{
-	"mcp-sqlite-tools": {
-		"type": "stdio",
-		"command": "npx",
-		"args": ["-y", "mcp-sqlite-tools"]
-	}
-}
+### Manage plugins
+
+```bash
+npx mcpick plugins list            # List plugins and status
+npx mcpick plugins install <key>   # Install from marketplace
+npx mcpick plugins uninstall <key> # Remove plugin
+npx mcpick plugins update <key>    # Update to latest
+npx mcpick plugins enable <key>    # Enable plugin
+npx mcpick plugins disable <key>   # Disable plugin
 ```
 
-Or use full format with `mcpServers` wrapper:
+### Manage marketplaces
 
-```json
-{
-  "mcpServers": {
-    "server-name": { ... }
-  }
-}
+```bash
+npx mcpick marketplace list       # List configured marketplaces
+npx mcpick marketplace add <src>  # Add a marketplace
+npx mcpick marketplace remove <n> # Remove a marketplace
+npx mcpick marketplace update     # Update all marketplaces
 ```
 
-### Plugin Cache Management
+### Manage hooks
 
-Claude Code caches marketplace plugins at `~/.claude/plugins/cache/`.
-When marketplace authors update plugins, your cached versions can go
-stale. McPick detects this and lets you fix it.
+```bash
+npx mcpick hooks list             # List all hooks
+npx mcpick hooks add              # Add a settings hook
+npx mcpick hooks remove           # Remove a hook
+```
 
-#### Interactive
+### Plugin cache
 
-Select "Manage plugin cache" from the main menu to:
+```bash
+npx mcpick cache status           # Show staleness info
+npx mcpick cache clear [key]      # Clear plugin cache
+npx mcpick cache clean-orphaned   # Remove orphaned dirs
+npx mcpick cache refresh          # Git pull marketplaces
+```
 
-- **View cache status** - See all cached plugins with staleness
-  indicators (version mismatch, commits behind, orphaned versions)
-- **Clear plugin caches** - Refreshes the marketplace and clears
-  selected caches so they rebuild with the latest version
-- **Clean orphaned versions** - Remove old version directories marked
-  as orphaned
-- **Refresh marketplaces** - Git pull all marketplace clones to get
-  latest plugin listings
+### Profiles
 
-#### CLI Subcommands
+Switch between server/plugin configurations instantly:
 
 ```bash
-# Show cache status for all plugins
-npx mcpick cache status
-npx mcpick cache status --json
-
-# Clear a specific plugin cache (refreshes marketplace first)
-npx mcpick cache clear plugin-name@marketplace
-npx mcpick cache clear --all
+npx mcpick --profile database     # Apply a profile
+npx mcpick --save-profile mysetup # Save current config
+npx mcpick --list-profiles        # List profiles
+```
 
-# Remove orphaned version directories
-npx mcpick cache clean-orphaned
+### Backups
 
-# Refresh all marketplace clones
-npx mcpick cache refresh
+```bash
+npx mcpick backup                 # Create timestamped backup
+npx mcpick restore [file]         # Restore from backup
 ```
 
-### Plugin Management
+All commands support `--json` for machine-readable output.
 
-Install, update, and toggle Claude Code marketplace plugins:
+## Interactive TUI
 
-```bash
-# List all plugins and their status
-npx mcpick plugins list
-npx mcpick plugins list --json
+Running `npx mcpick` in a terminal (TTY) launches the interactive
+menu for human use:
 
-# Install/uninstall a plugin (wraps claude plugin CLI)
-npx mcpick plugins install plugin-name@marketplace
-npx mcpick plugins uninstall plugin-name@marketplace
+```
+┌  MCPick - Claude Code Extension Manager
+│
+◆  What would you like to do?
+│  ● Enable / Disable MCP servers
+│  ○ Manage plugins
+│  ○ Manage marketplaces
+│  ○ Manage hooks
+│  ○ Manage plugin cache
+│  ○ Backup config
+│  ○ Add MCP server
+│  ○ Restore from backup
+│  ○ Load profile
+│  ○ Save profile
+│  ○ Exit
+└
+```
 
-# Update a plugin to latest version
-npx mcpick plugins update plugin-name@marketplace
+In non-TTY environments (LLM agents, piped output), mcpick
+automatically shows `--help` instead.
 
-# Enable/disable a plugin
-npx mcpick plugins enable plugin-name@marketplace
-npx mcpick plugins disable plugin-name@marketplace
-```
+## The Problem
 
-All plugin commands support `--scope` (user, project, local) and
-`--json` flags.
+Claude Code loads **all** MCP servers at startup. With many servers
+configured, `/doctor` shows:
 
-### CLI Subcommands
+```
+ Context Usage Warnings
+ └ ⚠ Large MCP tools context (~66,687 tokens > 25,000)
+```
 
-McPick supports both an interactive menu (default) and non-interactive
-CLI subcommands for scripting and LLM tool use:
+This means slower startup, wasted context tokens, and cognitive
+overload from too many tools. McPick lets you toggle servers on/off so
+you only load what you need.
 
-```bash
-# MCP server management
-npx mcpick list                    # List servers
-npx mcpick enable <server>         # Enable a server
-npx mcpick disable <server>        # Disable a server
-npx mcpick add --name <n> ...      # Add a server
-npx mcpick remove <server>         # Remove a server
-
-# Backups and profiles
-npx mcpick backup                  # Create backup
-npx mcpick restore [file]          # Restore from backup
-npx mcpick profile list            # List profiles
-npx mcpick profile load <name>     # Load a profile
-npx mcpick profile save <name>     # Save current config
-
-# Plugin management
-npx mcpick plugins list            # List plugins
-npx mcpick plugins enable <key>    # Enable plugin
-npx mcpick plugins disable <key>   # Disable plugin
-npx mcpick plugins install <key>   # Install from marketplace
-npx mcpick plugins uninstall <key> # Remove plugin
-npx mcpick plugins update <key>    # Update to latest version
+## Scope Support
 
-# Cache management
-npx mcpick cache status            # Show staleness info
-npx mcpick cache clear [key]       # Clear plugin cache
-npx mcpick cache clean-orphaned    # Remove orphaned dirs
-npx mcpick cache refresh           # Git pull marketplaces
-```
+| Scope       | Description                        | Storage Location                              |
+| ----------- | ---------------------------------- | --------------------------------------------- |
+| **Local**   | Project-specific servers (default) | `~/.claude.json` → `projects[cwd].mcpServers` |
+| **Project** | Shared via `.mcp.json` in repo     | `.mcp.json` in project root                   |
+| **User**    | Global servers for all projects    | `~/.claude.json` → `mcpServers`               |
 
-All subcommands support `--json` for machine-readable output.
-
-### Typical Workflow
-
-1. **Before a coding session**: Run `mcpick -p <profile>` or use the
-   interactive menu to enable relevant servers
-2. **Launch Claude Code**: Run `claude` to start with your configured
-   servers
-3. **Switch contexts**: Run `mcpick -p <other-profile>` to quickly
-   switch server sets
-
-### Adding New Servers
-
-1. Select "Add MCP server"
-2. Provide server details:
-   - Name (e.g., "mcp-sqlite-tools")
-   - Command (e.g., "npx")
-   - Arguments (e.g., "-y", "mcp-sqlite-tools")
-   - Description (optional)
-   - Environment variables (optional)
-
-## Configuration
-
-MCPick works with the standard Claude Code configuration format:
-
-```json
-{
-	"mcpServers": {
-		"server-name": {
-			"command": "npx",
-			"args": ["-y", "mcp-server-package"],
-			"env": {
-				"API_KEY": "your-key"
-			}
-		}
-	}
-}
-```
+## File Locations
 
-### File Locations
-
-- **Claude Config**: `~/.claude.json` (your main Claude Code
-  configuration)
-- **Project Config**: `.mcp.json` (project-specific shared config,
-  committed to git)
-- **MCPick Registry**: `~/.claude/mcpick/servers.json` (MCPick's
-  server database)
-- **Backups**: `~/.claude/mcpick/backups/` (MCP configuration backups)
-- **Profiles**: `~/.claude/mcpick/profiles/` (predefined server sets)
-- **Plugin Cache**: `~/.claude/plugins/cache/` (cached plugin files)
-- **Installed Plugins**: `~/.claude/plugins/installed_plugins.json`
-  (plugin install registry)
-- **Marketplaces**: `~/.claude/plugins/marketplaces/` (marketplace git
-  clones)
-
-#### MCP Server Storage by Scope
-
-| Scope   | Location                                                     | Use Case                           |
-| ------- | ------------------------------------------------------------ | ---------------------------------- |
-| Local   | `~/.claude.json` → `projects["/path/to/project"].mcpServers` | Personal project config            |
-| Project | `.mcp.json` in project root                                  | Shared team config (commit to git) |
-| User    | `~/.claude.json` → `mcpServers`                              | Global servers for all projects    |
-
-> **Note**: MCPick automatically detects servers in parent
-> directories. If you have local servers configured at
-> `/Users/you/projects` and run MCPick from
-> `/Users/you/projects/myapp`, it will find and display them.
-
-## Safety Features
-
-- **Non-destructive**: Only modifies the `mcpServers` section of your
-  Claude Code config
-- **Backup integration**: Automatically creates backups before major
-  changes
-- **Validation**: Ensures all server configurations are valid before
-  writing
-- **Error handling**: Graceful failure modes with helpful error
-  messages
-
-## Future Features
-
-McPick is actively being developed with new features planned. See the
-[roadmap](./docs/ROADMAP.md) for details on:
-
-- **Settings Validation** - Validate your Claude Code settings files
-  using the
-  [claude-code-settings-schema](https://github.com/spences10/claude-code-settings-schema)
-- **Permissions Management** - Interactive tool permission
-  configuration with presets (Safe Mode, Dev Mode, Review Mode)
-
-Have ideas for other features?
-[Open an issue](https://github.com/spences10/mcpick/issues) or check
-out the [contribution guide](./docs/ROADMAP.md)!
+| File                                       | Purpose                      |
+| ------------------------------------------ | ---------------------------- |
+| `~/.claude.json`                           | Claude Code configuration    |
+| `.mcp.json`                                | Project-specific shared config |
+| `~/.claude/mcpick/servers.json`            | Server registry              |
+| `~/.claude/mcpick/backups/`                | Configuration backups        |
+| `~/.claude/mcpick/profiles/`               | Saved profiles               |
+| `~/.claude/plugins/cache/`                 | Cached plugin files          |
+| `~/.claude/plugins/marketplaces/`          | Marketplace git clones       |
 
 ## Requirements
 
 - Node.js 22+
 - Claude Code installed and configured
-- pnpm (for building from source)

package/dist/{add-B9nVyh8T.js → add-BDyaBew0.js}

@@ -1,6 +1,6 @@
 import { n as validate_mcp_server } from "./validation-xMlbgGCF.js";
 import { t as add_server_to_registry } from "./registry-CfUKT7_C.js";
-import { t as add_mcp_via_cli } from "./claude-cli-BeA-bmoW.js";
+import { t as add_mcp_via_cli } from "./claude-cli-DnmBJrjg.js";
 import { n as output, t as error } from "./output-BchYq0mR.js";
 import { defineCommand } from "citty";
 //#region src/cli/commands/add.ts
@@ -110,4 +110,4 @@ function parse_key_value_pairs(input) {
 //#endregion
 export { add_default as default };
 
-//# sourceMappingURL=add-B9nVyh8T.js.map
+//# sourceMappingURL=add-BDyaBew0.js.map

package/dist/{add-json-CXNDl3al.js → add-json-BjgzdeG-.js}

@@ -1,4 +1,4 @@
-import { u as mcp_add_json_via_cli } from "./claude-cli-BeA-bmoW.js";
+import { u as mcp_add_json_via_cli } from "./claude-cli-DnmBJrjg.js";
 import { n as output, t as error } from "./output-BchYq0mR.js";
 import { defineCommand } from "citty";
 //#region src/cli/commands/add-json.ts
@@ -55,4 +55,4 @@ var add_json_default = defineCommand({
 //#endregion
 export { add_json_default as default };
 
-//# sourceMappingURL=add-json-CXNDl3al.js.map
+//# sourceMappingURL=add-json-BjgzdeG-.js.map

package/dist/{claude-cli-BeA-bmoW.js → claude-cli-DnmBJrjg.js}

@@ -1,58 +1,56 @@
-import { exec } from "node:child_process";
+import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 //#region src/utils/claude-cli.ts
-const execAsync = promisify(exec);
+const exec_file_async = promisify(execFile);
 /**
 * Check if Claude CLI is available
 */
 async function check_claude_cli() {
 	try {
-		await execAsync("claude --version");
+		await exec_file_async("claude", ["--version"]);
 		return true;
 	} catch {
 		return false;
 	}
 }
 /**
-* Escape a string for shell usage
-*/
-function shell_escape(str) {
-	return `'${str.replace(/'/g, "'\\''")}'`;
-}
-/**
-* Validate environment variable key
-* Must start with letter or underscore, contain only alphanumeric and underscores
+* Validate environment variable key.
+* Must start with letter or underscore, contain only alphanumeric and underscores.
 */
 function is_valid_env_key(key) {
 	return /^[A-Za-z_][A-Za-z0-9_]*$/.test(key);
 }
 /**
-* Build the claude mcp add command for a server
+* Build args array for claude mcp add command.
+* Returns raw args — no shell escaping needed since we use execFile.
 */
-function build_add_command(server, scope) {
-	const parts = [
-		"claude",
-		"mcp",
-		"add"
-	];
-	parts.push(shell_escape(server.name));
+function build_add_args(server, scope) {
+	const args = ["mcp", "add"];
+	args.push(server.name);
 	const transport = server.type || "stdio";
-	if (transport !== "stdio") parts.push("--transport", transport);
-	parts.push("--scope", scope);
+	if (transport !== "stdio") args.push("--transport", transport);
+	args.push("--scope", scope);
 	if (transport === "stdio") {
 		if (server.env) {
-			for (const [key, value] of Object.entries(server.env)) if (is_valid_env_key(key)) parts.push("-e", `${key}=${shell_escape(value)}`);
+			for (const [key, value] of Object.entries(server.env)) if (is_valid_env_key(key)) args.push("-e", `${key}=${value}`);
 		}
 		if ("command" in server && server.command) {
-			parts.push("--");
-			parts.push(shell_escape(server.command));
-			if (server.args && server.args.length > 0) parts.push(...server.args.map((arg) => shell_escape(arg)));
+			args.push("--");
+			args.push(server.command);
+			if (server.args && server.args.length > 0) args.push(...server.args);
 		}
 	} else {
-		if ("url" in server && server.url) parts.push(shell_escape(server.url));
-		if ("headers" in server && server.headers) for (const [key, value] of Object.entries(server.headers)) parts.push("-H", shell_escape(`${key}: ${value}`));
+		if ("url" in server && server.url) args.push(server.url);
+		if ("headers" in server && server.headers) for (const [key, value] of Object.entries(server.headers)) args.push("-H", `${key}: ${value}`);
 	}
-	return parts.join(" ");
+	return args;
+}
+/**
+* Run a claude CLI command using execFile (no shell).
+* This avoids all shell escaping issues on every platform.
+*/
+async function run_claude(args) {
+	return exec_file_async("claude", args);
 }
 /**
 * Add an MCP server using Claude CLI
@@ -62,9 +60,8 @@ async function add_mcp_via_cli(server, scope) {
 		success: false,
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
-	const command = build_add_command(server, scope);
 	try {
-		await execAsync(command);
+		await run_claude(build_add_args(server, scope));
 		return { success: true };
 	} catch (error) {
 		return {
@@ -82,7 +79,11 @@ async function remove_mcp_via_cli(name) {
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
 	try {
-		await execAsync(`claude mcp remove ${shell_escape(name)}`);
+		await run_claude([
+			"mcp",
+			"remove",
+			name
+		]);
 		return { success: true };
 	} catch (error) {
 		return {
@@ -100,7 +101,13 @@ async function install_plugin_via_cli(key, scope = "user") {
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
 	try {
-		await execAsync(`claude plugin install ${shell_escape(key)} --scope ${scope}`);
+		await run_claude([
+			"plugin",
+			"install",
+			key,
+			"--scope",
+			scope
+		]);
 		return { success: true };
 	} catch (error) {
 		return {
@@ -118,7 +125,13 @@ async function uninstall_plugin_via_cli(key, scope = "user") {
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
 	try {
-		await execAsync(`claude plugin uninstall ${shell_escape(key)} --scope ${scope}`);
+		await run_claude([
+			"plugin",
+			"uninstall",
+			key,
+			"--scope",
+			scope
+		]);
 		return { success: true };
 	} catch (error) {
 		return {
@@ -136,7 +149,13 @@ async function update_plugin_via_cli(key, scope = "user") {
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
 	try {
-		await execAsync(`claude plugin update ${shell_escape(key)} --scope ${scope}`);
+		await run_claude([
+			"plugin",
+			"update",
+			key,
+			"--scope",
+			scope
+		]);
 		return { success: true };
 	} catch (error) {
 		return {
@@ -146,9 +165,6 @@ async function update_plugin_via_cli(key, scope = "user") {
 	}
 }
 /**
-* Add a marketplace via Claude CLI
-*/
-/**
 * Extract GitHub owner/repo from various source formats.
 * Returns null if not a recognizable GitHub reference.
 */
@@ -203,7 +219,12 @@ async function marketplace_add_via_cli(source) {
 		};
 	}
 	try {
-		await execAsync(`claude plugin marketplace add ${shell_escape(source)}`);
+		await run_claude([
+			"plugin",
+			"marketplace",
+			"add",
+			source
+		]);
 		return { success: true };
 	} catch (error) {
 		const message = error instanceof Error ? error.message : "Unknown error";
@@ -230,7 +251,12 @@ async function marketplace_remove_via_cli(name) {
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
 	try {
-		await execAsync(`claude plugin marketplace remove ${shell_escape(name)}`);
+		await run_claude([
+			"plugin",
+			"marketplace",
+			"remove",
+			name
+		]);
 		return { success: true };
 	} catch (error) {
 		return {
@@ -248,7 +274,13 @@ async function marketplace_update_via_cli(name) {
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
 	try {
-		await execAsync(name ? `claude plugin marketplace update ${shell_escape(name)}` : "claude plugin marketplace update");
+		const args = [
+			"plugin",
+			"marketplace",
+			"update"
+		];
+		if (name) args.push(name);
+		await run_claude(args);
 		return { success: true };
 	} catch (error) {
 		return {
@@ -266,7 +298,11 @@ async function marketplace_list_via_cli() {
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
 	try {
-		const { stdout } = await execAsync("claude plugin marketplace list");
+		const { stdout } = await run_claude([
+			"plugin",
+			"marketplace",
+			"list"
+		]);
 		return {
 			success: true,
 			stdout: stdout.trim()
@@ -297,7 +333,11 @@ async function validate_plugin_via_cli(path) {
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
 	try {
-		const { stdout } = await execAsync(`claude plugin validate ${shell_escape(path)}`);
+		const { stdout } = await run_claude([
+			"plugin",
+			"validate",
+			path
+		]);
 		return {
 			success: true,
 			stdout: stdout.trim()
@@ -318,7 +358,11 @@ async function mcp_get_via_cli(name) {
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
 	try {
-		const { stdout } = await execAsync(`claude mcp get ${shell_escape(name)}`);
+		const { stdout } = await run_claude([
+			"mcp",
+			"get",
+			name
+		]);
 		return {
 			success: true,
 			stdout: stdout.trim()
@@ -339,7 +383,14 @@ async function mcp_add_json_via_cli(name, json, scope = "local") {
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
 	try {
-		await execAsync(`claude mcp add-json ${shell_escape(name)} ${shell_escape(json)} --scope ${scope}`);
+		await run_claude([
+			"mcp",
+			"add-json",
+			name,
+			json,
+			"--scope",
+			scope
+		]);
 		return { success: true };
 	} catch (error) {
 		return {
@@ -357,7 +408,7 @@ async function mcp_reset_project_choices_via_cli() {
 		error: "Claude CLI not found. Please install Claude Code CLI."
 	};
 	try {
-		await execAsync("claude mcp reset-project-choices");
+		await run_claude(["mcp", "reset-project-choices"]);
 		return { success: true };
 	} catch (error) {
 		return {
@@ -391,4 +442,4 @@ function get_scope_options() {
 //#endregion
 export { install_plugin_via_cli as a, marketplace_remove_via_cli as c, mcp_get_via_cli as d, mcp_reset_project_choices_via_cli as f, validate_plugin_via_cli as g, update_plugin_via_cli as h, get_scope_options as i, marketplace_update_via_cli as l, uninstall_plugin_via_cli as m, check_claude_cli as n, marketplace_add_via_cli as o, remove_mcp_via_cli as p, get_scope_description as r, marketplace_list_via_cli as s, add_mcp_via_cli as t, mcp_add_json_via_cli as u };
 
-//# sourceMappingURL=claude-cli-BeA-bmoW.js.map
+//# sourceMappingURL=claude-cli-DnmBJrjg.js.map

package/dist/{cli-DNNZjJYL.js → cli-CsFfnWBo.js}

@@ -7,22 +7,22 @@ const main = defineCommand({
 	},
 	subCommands: {
 		list: () => import("./list-B8YeDWt6.js").then((m) => m.default),
-		enable: () => import("./enable-Bdnnn_Cq.js").then((m) => m.default),
-		disable: () => import("./disable-BA8tXPJN.js").then((m) => m.default),
-		remove: () => import("./remove-DIPWYMpk.js").then((m) => m.default),
-		add: () => import("./add-B9nVyh8T.js").then((m) => m.default),
-		"add-json": () => import("./add-json-CXNDl3al.js").then((m) => m.default),
-		clone: () => import("./clone-DLFLewBY.js").then((m) => m.default),
-		get: () => import("./get-BPjMXTMc.js").then((m) => m.default),
-		"reset-project-choices": () => import("./reset-project-choices-DRM5KByw.js").then((m) => m.default),
+		enable: () => import("./enable-RrpcN6la.js").then((m) => m.default),
+		disable: () => import("./disable-xJXZfUR_.js").then((m) => m.default),
+		remove: () => import("./remove-D1owHLhG.js").then((m) => m.default),
+		add: () => import("./add-BDyaBew0.js").then((m) => m.default),
+		"add-json": () => import("./add-json-BjgzdeG-.js").then((m) => m.default),
+		clone: () => import("./clone-DYKPEsar.js").then((m) => m.default),
+		get: () => import("./get-Bb1eOOIZ.js").then((m) => m.default),
+		"reset-project-choices": () => import("./reset-project-choices-BfRSNN3m.js").then((m) => m.default),
 		backup: () => import("./backup-DSDhHI5f.js").then((m) => m.default),
 		restore: () => import("./restore-DdMfUljI.js").then((m) => m.default),
 		profile: () => import("./profile-CX97sMGp.js").then((m) => m.default),
-		plugins: () => import("./plugins-DHYJF5CP.js").then((m) => m.default),
+		plugins: () => import("./plugins-Dc7DN6R_.js").then((m) => m.default),
 		hooks: () => import("./hooks-Bmn7pUZa.js").then((m) => m.default),
 		cache: () => import("./cache-D6kd7qE8.js").then((m) => m.default),
 		dev: () => import("./dev-DRJRNp7y.js").then((m) => m.default),
-		marketplace: () => import("./marketplace-Br89Tg-Z.js").then((m) => m.default),
+		marketplace: () => import("./marketplace-DcKk5dc1.js").then((m) => m.default),
 		reload: () => import("./reload-CYDhkCVZ.js").then((m) => m.default)
 	}
 });
@@ -81,4 +81,4 @@ const run = () => runMain(main, { showUsage: show_usage_with_examples });
 //#endregion
 export { run };
 
-//# sourceMappingURL=cli-DNNZjJYL.js.map
+//# sourceMappingURL=cli-CsFfnWBo.js.map

package/dist/{clone-DLFLewBY.js → clone-DYKPEsar.js}

@@ -1,6 +1,6 @@
 import { n as validate_mcp_server } from "./validation-xMlbgGCF.js";
 import { t as add_server_to_registry } from "./registry-CfUKT7_C.js";
-import { t as add_mcp_via_cli } from "./claude-cli-BeA-bmoW.js";
+import { t as add_mcp_via_cli } from "./claude-cli-DnmBJrjg.js";
 import { i as find_server_in_scope, r as detect_server_scope } from "./config-DijVdEFn.js";
 import { n as output, t as error } from "./output-BchYq0mR.js";
 import { t as redact_server } from "./redact-O35tjnRD.js";
@@ -85,4 +85,4 @@ var clone_default = defineCommand({
 //#endregion
 export { clone_default as default };
 
-//# sourceMappingURL=clone-DLFLewBY.js.map
+//# sourceMappingURL=clone-DYKPEsar.js.map

package/dist/{disable-BA8tXPJN.js → disable-xJXZfUR_.js}

@@ -1,5 +1,5 @@
 import { n as get_all_available_servers } from "./registry-CfUKT7_C.js";
-import { p as remove_mcp_via_cli } from "./claude-cli-BeA-bmoW.js";
+import { p as remove_mcp_via_cli } from "./claude-cli-DnmBJrjg.js";
 import { t as error } from "./output-BchYq0mR.js";
 import { defineCommand } from "citty";
 //#region src/cli/commands/disable.ts
@@ -36,4 +36,4 @@ var disable_default = defineCommand({
 //#endregion
 export { disable_default as default };
 
-//# sourceMappingURL=disable-BA8tXPJN.js.map
+//# sourceMappingURL=disable-xJXZfUR_.js.map

package/dist/{enable-Bdnnn_Cq.js → enable-RrpcN6la.js}

@@ -1,5 +1,5 @@
 import { n as get_all_available_servers } from "./registry-CfUKT7_C.js";
-import { t as add_mcp_via_cli } from "./claude-cli-BeA-bmoW.js";
+import { t as add_mcp_via_cli } from "./claude-cli-DnmBJrjg.js";
 import { t as error } from "./output-BchYq0mR.js";
 import { defineCommand } from "citty";
 //#region src/cli/commands/enable.ts
@@ -37,4 +37,4 @@ var enable_default = defineCommand({
 //#endregion
 export { enable_default as default };
 
-//# sourceMappingURL=enable-Bdnnn_Cq.js.map
+//# sourceMappingURL=enable-RrpcN6la.js.map

package/dist/{get-BPjMXTMc.js → get-Bb1eOOIZ.js}

@@ -1,4 +1,4 @@
-import { d as mcp_get_via_cli } from "./claude-cli-BeA-bmoW.js";
+import { d as mcp_get_via_cli } from "./claude-cli-DnmBJrjg.js";
 import { n as output, t as error } from "./output-BchYq0mR.js";
 import { defineCommand } from "citty";
 //#region src/cli/commands/get.ts
@@ -38,4 +38,4 @@ var get_default = defineCommand({
 //#endregion
 export { get_default as default };
 
-//# sourceMappingURL=get-BPjMXTMc.js.map
+//# sourceMappingURL=get-Bb1eOOIZ.js.map

package/dist/index.js

@@ -2,7 +2,7 @@
 import { m as get_plugin_backup_filename, n as get_backup_filename, r as get_backups_dir, t as ensure_directory_exists } from "./paths-BPISiJi4.js";
 import { n as validate_mcp_server } from "./validation-xMlbgGCF.js";
 import { i as list_plugin_backups, n as get_all_available_servers, o as sync_servers_to_registry, r as list_backups, t as add_server_to_registry } from "./registry-CfUKT7_C.js";
-import { a as install_plugin_via_cli, c as marketplace_remove_via_cli, h as update_plugin_via_cli, i as get_scope_options, l as marketplace_update_via_cli, m as uninstall_plugin_via_cli, n as check_claude_cli, o as marketplace_add_via_cli, p as remove_mcp_via_cli, r as get_scope_description, t as add_mcp_via_cli } from "./claude-cli-BeA-bmoW.js";
+import { a as install_plugin_via_cli, c as marketplace_remove_via_cli, h as update_plugin_via_cli, i as get_scope_options, l as marketplace_update_via_cli, m as uninstall_plugin_via_cli, n as check_claude_cli, o as marketplace_add_via_cli, p as remove_mcp_via_cli, r as get_scope_description, t as add_mcp_via_cli } from "./claude-cli-DnmBJrjg.js";
 import { a as get_enabled_servers, c as write_claude_config, n as create_config_from_servers, o as get_enabled_servers_for_scope, s as read_claude_config } from "./config-DijVdEFn.js";
 import { a as read_claude_settings, i as get_all_plugins, n as build_enabled_plugins, r as get_all_hooks, s as write_claude_settings } from "./settings-DEcWtzLE.js";
 import { d as refresh_all_marketplaces, l as read_known_marketplaces, n as clear_plugin_caches, r as get_cached_plugins_info, t as clean_orphaned_versions, u as read_marketplace_manifest } from "./plugin-cache-Bby9Dxm9.js";
@@ -1108,14 +1108,19 @@ async function main() {
 					hint: "Toggle MCP servers on/off"
 				},
 				{
-					value: "edit-plugins",
-					label: "Manage plugins",
-					hint: "Toggle, install, uninstall, or update plugins"
+					value: "add-server",
+					label: "Add MCP server",
+					hint: "Register a new MCP server"
 				},
 				{
 					value: "manage-marketplace",
 					label: "Manage marketplaces",
-					hint: "Add, remove, or update plugin marketplaces"
+					hint: "Add a marketplace, then install plugins from it"
+				},
+				{
+					value: "edit-plugins",
+					label: "Manage plugins",
+					hint: "Toggle, install, uninstall, or update plugins"
 				},
 				{
 					value: "manage-hooks",
@@ -1127,21 +1132,6 @@ async function main() {
 					label: "Manage plugin cache",
 					hint: "View, clear, or refresh plugin caches"
 				},
-				{
-					value: "backup",
-					label: "Backup config",
-					hint: "Create a timestamped backup"
-				},
-				{
-					value: "add-server",
-					label: "Add MCP server",
-					hint: "Register a new MCP server"
-				},
-				{
-					value: "restore",
-					label: "Restore from backup",
-					hint: "Restore from a previous backup"
-				},
 				{
 					value: "load-profile",
 					label: "Load profile",
@@ -1152,6 +1142,16 @@ async function main() {
 					label: "Save profile",
 					hint: "Save current config as profile"
 				},
+				{
+					value: "backup",
+					label: "Backup config",
+					hint: "Create a timestamped backup"
+				},
+				{
+					value: "restore",
+					label: "Restore from backup",
+					hint: "Restore from a previous backup"
+				},
 				{
 					value: "exit",
 					label: "Exit",
@@ -1238,8 +1238,10 @@ const SUBCOMMANDS = new Set([
 	"reload"
 ]);
 const arg = process.argv[2];
-if (arg && SUBCOMMANDS.has(arg) || arg === "--help" || arg === "-h") import("./cli-DNNZjJYL.js").then((m) => m.run());
-else main().catch((error) => {
+if (arg && SUBCOMMANDS.has(arg) || arg === "--help" || arg === "-h" || !process.stdout.isTTY) {
+	if (!arg && !process.stdout.isTTY) process.argv.push("--help");
+	import("./cli-CsFfnWBo.js").then((m) => m.run());
+} else main().catch((error) => {
 	console.error("Fatal error:", error);
 	process.exit(1);
 });

package/dist/{marketplace-Br89Tg-Z.js → marketplace-DcKk5dc1.js}

@@ -1,4 +1,4 @@
-import { c as marketplace_remove_via_cli, l as marketplace_update_via_cli, o as marketplace_add_via_cli, s as marketplace_list_via_cli } from "./claude-cli-BeA-bmoW.js";
+import { c as marketplace_remove_via_cli, l as marketplace_update_via_cli, o as marketplace_add_via_cli, s as marketplace_list_via_cli } from "./claude-cli-DnmBJrjg.js";
 import { u as read_marketplace_manifest } from "./plugin-cache-Bby9Dxm9.js";
 import { a as redisable_restored_hooks, t as check_restored_hooks } from "./hook-state-Di8lUsPr.js";
 import { n as output, t as error } from "./output-BchYq0mR.js";
@@ -165,4 +165,4 @@ var marketplace_default = defineCommand({
 //#endregion
 export { marketplace_default as default };
 
-//# sourceMappingURL=marketplace-Br89Tg-Z.js.map
+//# sourceMappingURL=marketplace-DcKk5dc1.js.map

package/dist/{plugins-DHYJF5CP.js → plugins-Dc7DN6R_.js}

@@ -1,4 +1,4 @@
-import { a as install_plugin_via_cli, g as validate_plugin_via_cli, h as update_plugin_via_cli, m as uninstall_plugin_via_cli } from "./claude-cli-BeA-bmoW.js";
+import { a as install_plugin_via_cli, g as validate_plugin_via_cli, h as update_plugin_via_cli, m as uninstall_plugin_via_cli } from "./claude-cli-DnmBJrjg.js";
 import { a as read_claude_settings, i as get_all_plugins, n as build_enabled_plugins, s as write_claude_settings } from "./settings-DEcWtzLE.js";
 import { l as read_known_marketplaces, o as parse_plugin_key } from "./plugin-cache-Bby9Dxm9.js";
 import { n as output, t as error } from "./output-BchYq0mR.js";
@@ -209,4 +209,4 @@ var plugins_default = defineCommand({
 //#endregion
 export { plugins_default as default };
 
-//# sourceMappingURL=plugins-DHYJF5CP.js.map
+//# sourceMappingURL=plugins-Dc7DN6R_.js.map

package/dist/{remove-DIPWYMpk.js → remove-D1owHLhG.js}

@@ -1,5 +1,5 @@
 import { a as read_server_registry, n as get_all_available_servers, s as write_server_registry } from "./registry-CfUKT7_C.js";
-import { p as remove_mcp_via_cli } from "./claude-cli-BeA-bmoW.js";
+import { p as remove_mcp_via_cli } from "./claude-cli-DnmBJrjg.js";
 import { t as error } from "./output-BchYq0mR.js";
 import { defineCommand } from "citty";
 //#region src/cli/commands/remove.ts
@@ -28,4 +28,4 @@ var remove_default = defineCommand({
 //#endregion
 export { remove_default as default };
 
-//# sourceMappingURL=remove-DIPWYMpk.js.map
+//# sourceMappingURL=remove-D1owHLhG.js.map

package/dist/{reset-project-choices-DRM5KByw.js → reset-project-choices-BfRSNN3m.js}

@@ -1,4 +1,4 @@
-import { f as mcp_reset_project_choices_via_cli } from "./claude-cli-BeA-bmoW.js";
+import { f as mcp_reset_project_choices_via_cli } from "./claude-cli-DnmBJrjg.js";
 import { n as output, t as error } from "./output-BchYq0mR.js";
 import { defineCommand } from "citty";
 //#region src/cli/commands/reset-project-choices.ts
@@ -25,4 +25,4 @@ var reset_project_choices_default = defineCommand({
 //#endregion
 export { reset_project_choices_default as default };
 
-//# sourceMappingURL=reset-project-choices-DRM5KByw.js.map
+//# sourceMappingURL=reset-project-choices-BfRSNN3m.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcpick",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "Claude Code extension manager — MCP servers, plugins (skills, hooks, agents), and marketplaces",
   "keywords": [
     "claude",
@@ -17,15 +17,15 @@
   "type": "module",
   "main": "./dist/index.js",
   "dependencies": {
-    "@clack/prompts": "^1.1.0",
-    "citty": "^0.2.1",
+    "@clack/prompts": "^1.2.0",
+    "citty": "^0.2.2",
     "valibot": "^1.3.1"
   },
   "devDependencies": {
     "@changesets/cli": "^2.30.0",
-    "@types/node": "^25.5.0",
-    "vite-plus": "^0.1.15",
-    "vitest": "^4.1.2"
+    "@types/node": "^25.6.0",
+    "vite-plus": "^0.1.16",
+    "vitest": "^4.1.4"
   },
   "engines": {
     "node": ">=22.0.0"