feat: separate marketplace and plugin installation commands

zhujian0805 · claude · zhujian0805 · commit a71d60a7df46 · 2025-12-01T07:47:12.000Z
- Add new 'cam plugin marketplace install' command for installing marketplaces to apps - Refactor 'cam plugin install' to handle only plugins (not marketplaces) - Update README with comprehensive plugin command documentation - Add comprehensive tests for marketplace install command (6 test cases) - Improve help messages throughout plugin command system with better context and examples - Create clear separation between config operations (add/remove/list) and app operations (install/update) This resolves confusion where the overloaded 'install' command handled both marketplace and plugin installation. Now: - Marketplace config: cam plugin marketplace add/remove/list - Marketplace app installation: cam plugin marketplace install/update - Plugin installation: cam plugin install 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/README.md b/README.md
@@ -200,6 +200,42 @@ cam skill install <skill>        # Install a skill
 cam skill fetch                  # Fetch skills from configured repos
 ```
 
+### Plugin Subcommands
+
+CAM supports plugin management for compatible assistants (currently Claude and CodeBuddy). Plugins are organized into marketplaces that can be browsed and installed.
+
+#### Marketplace Management (Configuration)
+
+```bash
+cam plugin marketplace add <source>       # Add marketplace to CAM config
+cam plugin marketplace list               # List configured marketplaces
+cam plugin marketplace remove <name>      # Remove marketplace from CAM config
+```
+
+#### Marketplace Management (App Installation)
+
+```bash
+cam plugin marketplace install <name>     # Install marketplace to Claude/CodeBuddy
+cam plugin marketplace update [name]      # Update installed marketplaces in apps
+```
+
+#### Plugin Management
+
+```bash
+cam plugin list                           # List installed/enabled plugins
+cam plugin repos                          # List available plugin repositories
+cam plugin add-repo <owner>/<repo>         # Add plugin repository to CAM config
+cam plugin remove-repo <name>              # Remove plugin repository from CAM config
+cam plugin install <plugin>[@marketplace]  # Install a plugin from marketplace
+cam plugin uninstall <plugin>              # Uninstall a plugin
+cam plugin enable <plugin>                 # Enable a disabled plugin
+cam plugin disable <plugin>                # Disable an enabled plugin
+cam plugin browse [marketplace]            # Browse plugins in marketplaces
+cam plugin view <plugin>                   # View detailed plugin information
+cam plugin status                          # Show plugin system status
+cam plugin validate <path>                 # Validate plugin/marketplace manifest
+```
+
 ## Architecture Overview
 
 CAM implements industry-standard design patterns for maintainability and extensibility:
diff --git a/code_assistant_manager/cli/plugin_commands.py b/code_assistant_manager/cli/plugin_commands.py
@@ -18,7 +18,10 @@
 
 # Combine all plugin subcommands into the main plugin app
 plugin_app = typer.Typer(
-    help="Manage plugins and marketplaces for AI assistants (Claude, CodeBuddy)",
+    help="Manage plugins and marketplaces for AI assistants (Claude, CodeBuddy).\n\n"
+    "CAM supports plugin management for compatible assistants. Plugins are distributed\n"
+    "through marketplaces that can be browsed and installed. Use 'cam plugin marketplace'\n"
+    "subcommands to manage marketplaces themselves, and 'cam plugin install' for plugins.",
     no_args_is_help=True,
 )
 
diff --git a/code_assistant_manager/cli/plugins/plugin_install_commands.py b/code_assistant_manager/cli/plugins/plugin_install_commands.py
@@ -100,7 +100,7 @@ def _set_plugin_enabled(handler, plugin: str, enabled: bool) -> bool:
 def install_plugin(
     plugin: str = typer.Argument(
         ...,
-        help="Plugin name, plugin@marketplace, or marketplace name",
+        help="Plugin name or plugin@marketplace. Examples: 'code-reviewer' or 'code-reviewer@awesome-plugins'",
     ),
     marketplace: Optional[str] = typer.Option(
         None,
@@ -115,63 +115,24 @@ def install_plugin(
         help=f"App type to install to ({', '.join(VALID_APP_TYPES)})",
     ),
 ):
-    """Install a plugin from available marketplaces or add a built-in marketplace."""
+    """Install a plugin from available marketplaces.
+
+    Installs a plugin to Claude or CodeBuddy from configured marketplaces.
+    The plugin can be specified as:
+    - plugin-name (searches all configured marketplaces)
+    - plugin-name@marketplace-name (specifies which marketplace to use)
+
+    For marketplace management, use 'cam plugin marketplace install <marketplace>'.
+    For browsing available plugins, use 'cam plugin browse'.
+
+    Examples:
+        cam plugin install code-reviewer
+        cam plugin install code-reviewer@awesome-plugins
+        cam plugin install --marketplace awesome-plugins code-reviewer
+    """
     app = resolve_single_app(app_type, VALID_APP_TYPES, default="claude")
     _check_app_cli(app)
     handler = _get_handler(app)
-    manager = PluginManager()
-
-    # Check if it's a configured repo (user repos take precedence over builtin)
-    configured_repo = manager.get_repo(plugin)
-    repo_url = None
-    if configured_repo and configured_repo.repo_owner and configured_repo.repo_name:
-        repo_url = f"https://github.com/{configured_repo.repo_owner}/{configured_repo.repo_name}"
-
-        # Handle marketplace type - just add the marketplace
-        if configured_repo.type == "marketplace":
-            typer.echo(f"{Colors.CYAN}Adding marketplace: {plugin}...{Colors.RESET}")
-            success, msg = handler.marketplace_add(repo_url)
-            if success:
-                typer.echo(f"{Colors.GREEN}✓ Marketplace added: {plugin}{Colors.RESET}")
-                typer.echo(
-                    f"\n{Colors.CYAN}Browse plugins with:{Colors.RESET} cam plugin browse {plugin}"
-                )
-                typer.echo(
-                    f"{Colors.CYAN}Install plugins with:{Colors.RESET} cam plugin install <plugin-name>@{plugin}"
-                )
-            elif "already installed" in msg.lower():
-                typer.echo(
-                    f"{Colors.YELLOW}Marketplace '{plugin}' is already installed.{Colors.RESET}"
-                )
-                typer.echo(
-                    f"\n{Colors.CYAN}Browse plugins with:{Colors.RESET} cam plugin browse {plugin}"
-                )
-            else:
-                typer.echo(
-                    f"{Colors.RED}✗ Failed to add marketplace: {msg}{Colors.RESET}"
-                )
-                raise typer.Exit(1)
-            return  # Exit after handling marketplace
-
-    # Handle plugin type - add marketplace first if needed, then install plugin
-    if configured_repo and configured_repo.type == "plugin" and repo_url:
-        known_marketplaces = handler.get_known_marketplaces()
-        marketplace_exists = any(
-            configured_repo.repo_owner.lower() in name.lower()
-            or configured_repo.repo_name.lower() in name.lower()
-            for name in known_marketplaces
-        )
-
-        if not marketplace_exists:
-            typer.echo(
-                f"{Colors.CYAN}Adding marketplace for plugin: {plugin}...{Colors.RESET}"
-            )
-            success, msg = handler.marketplace_add(repo_url)
-            if not success and "already installed" not in msg.lower():
-                typer.echo(
-                    f"{Colors.RED}✗ Failed to add marketplace: {msg}{Colors.RESET}"
-                )
-                raise typer.Exit(1)
 
     plugin_ref = f"{plugin}@{marketplace}" if marketplace else plugin
     typer.echo(f"{Colors.CYAN}Installing plugin: {plugin_ref}...{Colors.RESET}")
diff --git a/code_assistant_manager/cli/plugins/plugin_marketplace_commands.py b/code_assistant_manager/cli/plugins/plugin_marketplace_commands.py
@@ -24,7 +24,10 @@
 # ==================== Marketplace Subcommand ====================
 
 marketplace_app = typer.Typer(
-    help="Manage installed marketplaces",
+    help="Manage marketplaces for AI assistant plugins.\n\n"
+    "Marketplaces are collections of plugins that can be installed to Claude or CodeBuddy.\n"
+    "Use 'add' to configure new marketplaces, 'install' to add them to your app,\n"
+    "'update' to refresh from source, and 'list'/'remove' for management.",
     no_args_is_help=True,
 )
 
@@ -50,6 +53,9 @@ def marketplace_add(
 ):
     """Add a marketplace from a URL, path, or GitHub repo, or fetch and add from GitHub.
 
+    This adds a marketplace to CAM's configuration. After adding, use
+    'cam plugin marketplace install <name>' to install it to Claude/CodeBuddy.
+
     Examples:
         cam plugin marketplace add https://github.com/owner/repo
         cam plugin marketplace add owner/repo --save
@@ -156,7 +162,7 @@ def marketplace_add(
         # Show next steps
         if info.type == "marketplace":
             typer.echo(
-                f"\n{Colors.CYAN}Next:{Colors.RESET} cam plugin install {info.name}"
+                f"\n{Colors.CYAN}Next:{Colors.RESET} cam plugin marketplace install {info.name}"
             )
         else:
             typer.echo(
@@ -408,7 +414,86 @@ def marketplace_update(
 plugin_app.add_typer(marketplace_app, name="marketplace")
 
 
-# ==================== Add shortcuts ====================
-plugin_app.command(name="ls", hidden=True)(list_plugins)
-plugin_app.command(name="i", hidden=True)(install_plugin)
-plugin_app.command(name="rm", hidden=True)(uninstall_plugin)
+@marketplace_app.command("install")
+def marketplace_install(
+    marketplace: str = typer.Argument(
+        ...,
+        help="Marketplace name to install (must be configured with 'cam plugin marketplace add' first)",
+    ),
+    app_type: str = typer.Option(
+        "claude",
+        "--app",
+        "-a",
+        help=f"App type to install marketplace to ({', '.join(VALID_APP_TYPES)})",
+    ),
+):
+    """Install a configured marketplace to Claude or CodeBuddy.
+
+    This installs a marketplace that has been previously configured in CAM
+    to the target AI assistant app. The marketplace must already be configured
+    using 'cam plugin marketplace add' before it can be installed.
+
+    After installation, you can browse plugins with 'cam plugin browse <marketplace>'
+    and install them with 'cam plugin install <plugin>@<marketplace>'.
+
+    Examples:
+        cam plugin marketplace install awesome-claude-code-plugins
+        cam plugin marketplace install my-marketplace --app codebuddy
+    """
+    from code_assistant_manager.cli.option_utils import resolve_single_app
+    from code_assistant_manager.plugins import PluginManager
+
+    app = resolve_single_app(app_type, VALID_APP_TYPES, default="claude")
+    handler = get_handler(app)
+    manager = PluginManager()
+
+    # Check if marketplace is configured
+    configured_repo = manager.get_repo(marketplace)
+    if not configured_repo:
+        typer.echo(
+            f"{Colors.RED}✗ Marketplace '{marketplace}' not found in CAM configuration.{Colors.RESET}"
+        )
+        typer.echo(
+            f"{Colors.YELLOW}Use 'cam plugin add-repo --type marketplace <owner>/<repo>' to add it first.{Colors.RESET}"
+        )
+        raise typer.Exit(1)
+
+    if configured_repo.type != "marketplace":
+        typer.echo(
+            f"{Colors.RED}✗ '{marketplace}' is not a marketplace (type: {configured_repo.type}).{Colors.RESET}"
+        )
+        raise typer.Exit(1)
+
+    if not configured_repo.repo_owner or not configured_repo.repo_name:
+        typer.echo(
+            f"{Colors.RED}✗ Marketplace '{marketplace}' has no GitHub source configured.{Colors.RESET}"
+        )
+        raise typer.Exit(1)
+
+    repo_url = (
+        f"https://github.com/{configured_repo.repo_owner}/{configured_repo.repo_name}"
+    )
+
+    typer.echo(f"{Colors.CYAN}Installing marketplace: {marketplace}...{Colors.RESET}")
+    success, msg = handler.marketplace_add(repo_url)
+
+    if success:
+        typer.echo(
+            f"{Colors.GREEN}✓ Marketplace installed: {marketplace}{Colors.RESET}"
+        )
+        typer.echo(
+            f"\n{Colors.CYAN}Browse plugins with:{Colors.RESET} cam plugin browse {marketplace}"
+        )
+        typer.echo(
+            f"{Colors.CYAN}Install plugins with:{Colors.RESET} cam plugin install <plugin-name>@{marketplace}"
+        )
+    elif "already installed" in msg.lower():
+        typer.echo(
+            f"{Colors.YELLOW}Marketplace '{marketplace}' is already installed.{Colors.RESET}"
+        )
+        typer.echo(
+            f"\n{Colors.CYAN}Browse plugins with:{Colors.RESET} cam plugin browse {marketplace}"
+        )
+    else:
+        typer.echo(f"{Colors.RED}✗ Failed to install marketplace: {msg}{Colors.RESET}")
+        raise typer.Exit(1)
diff --git a/tests/unit/test_plugin_commands.py b/tests/unit/test_plugin_commands.py
