feat: enhance plugin command structure to match CodeBuddy/Claude design

zhujian0805 · claude · zhujian0805 · commit da9ed6fae0b4 · 2025-12-01T05:42:36.000Z
- Add marketplace subcommands (add, list, remove, update) matching CodeBuddy/Claude CLI structure - Update marketplace commands to work across all apps by default (--app flag for specific app) - Enhance plugin list to show which app each plugin is installed for - Fix repository type classification (compounding-engineering and superpowers-dev are marketplaces, not plugins) - Improve marketplace list to show all CAM configured marketplaces with descriptions and sources 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/code_assistant_manager/cli/plugin_commands.py b/code_assistant_manager/cli/plugin_commands.py
@@ -22,7 +22,10 @@
     no_args_is_help=True,
 )
 
-# Register commands directly with the main app
+# Register sub-apps as subcommands
+plugin_app.add_typer(plugin_marketplace_commands.marketplace_app, name="marketplace")
+
+# Register individual commands
 # Management commands
 plugin_app.command("list")(plugin_management_commands.list_plugins)
 plugin_app.command("repos")(plugin_management_commands.list_repos)
@@ -41,6 +44,3 @@
 plugin_app.command("view")(plugin_discovery_commands.view_plugin)
 plugin_app.command("fetch")(plugin_discovery_commands.fetch_repo)
 plugin_app.command("status")(plugin_discovery_commands.plugin_status)
-
-# Marketplace commands
-plugin_app.command("marketplace")(plugin_marketplace_commands.marketplace_update)
diff --git a/code_assistant_manager/cli/plugins/plugin_management_commands.py b/code_assistant_manager/cli/plugins/plugin_management_commands.py
@@ -31,39 +31,69 @@ def list_plugins(
         "--all",
         help="Show all plugins from marketplaces (not just enabled)",
     ),
-    app_type: str = typer.Option(
-        "claude",
+    app_type: Optional[str] = typer.Option(
+        None,
         "--app",
         "-a",
-        help=f"App type ({', '.join(VALID_APP_TYPES)})",
+        help=f"App type to show plugins for ({', '.join(VALID_APP_TYPES)}). Shows all apps if not specified.",
     ),
 ):
     """List installed/enabled plugins."""
-    from code_assistant_manager.cli.option_utils import resolve_single_app
-    from code_assistant_manager.plugins import get_handler
+    from code_assistant_manager.plugins import VALID_APP_TYPES, get_handler
 
-    app = resolve_single_app(app_type, VALID_APP_TYPES, default="claude")
-    handler = get_handler(app)
+    if app_type:
+        # Show plugins for specific app (original behavior)
+        if app_type not in VALID_APP_TYPES:
+            typer.echo(
+                f"{Colors.RED}✗ Invalid app type: {app_type}. Valid: {', '.join(VALID_APP_TYPES)}{Colors.RESET}"
+            )
+            raise typer.Exit(1)
 
+        handler = get_handler(app_type)
+        _show_app_plugins(app_type, handler, show_all)
+    else:
+        # Show plugins for all apps
+        typer.echo(f"{Colors.BOLD}Plugin Status Across All Apps:{Colors.RESET}\n")
+
+        apps_with_plugins = []
+        for current_app in VALID_APP_TYPES:
+            handler = get_handler(current_app)
+            enabled_plugins = handler.get_enabled_plugins()
+            if enabled_plugins:
+                apps_with_plugins.append(current_app)
+                _show_app_plugins(current_app, handler, show_all, show_header=False)
+                typer.echo()  # Add spacing between apps
+
+        if not apps_with_plugins:
+            typer.echo(f"{Colors.YELLOW}No plugins installed in any app.{Colors.RESET}")
+            typer.echo(f"Use 'cam plugin install <plugin>' to install one.")
+
+            # Show available built-in repos
+            if BUILTIN_PLUGIN_REPOS:
+                typer.echo(f"\n{Colors.CYAN}Available built-in plugins:{Colors.RESET}")
+                for name, repo in BUILTIN_PLUGIN_REPOS.items():
+                    typer.echo(f"  • {name}: {repo.description or 'No description'}")
+                typer.echo(f"\nInstall with: cam plugin install <name>")
+
+
+def _show_app_plugins(app_name: str, handler, show_all: bool, show_header: bool = True):
+    """Show plugins for a specific app."""
     # Get enabled plugins from settings
     enabled_plugins = handler.get_enabled_plugins()
 
+    if show_header:
+        typer.echo(f"{Colors.BOLD}{app_name.capitalize()} Plugins:{Colors.RESET}\n")
+
     if not enabled_plugins and not show_all:
         typer.echo(
-            f"{Colors.YELLOW}No plugins installed. "
-            f"Use 'cam plugin install <plugin>' to install one.{Colors.RESET}"
+            f"{Colors.YELLOW}No plugins installed for {app_name}. "
+            f"Use 'cam plugin install <plugin> --app {app_name}' to install one.{Colors.RESET}"
         )
-
-        # Show available built-in repos
-        if BUILTIN_PLUGIN_REPOS:
-            typer.echo(f"\n{Colors.CYAN}Available built-in plugins:{Colors.RESET}")
-            for name, repo in BUILTIN_PLUGIN_REPOS.items():
-                typer.echo(f"  • {name}: {repo.description or 'No description'}")
-            typer.echo(f"\nInstall with: cam plugin install <name>")
         return
 
     if enabled_plugins:
-        typer.echo(f"\n{Colors.BOLD}Enabled Plugins:{Colors.RESET}\n")
+        if not show_header:
+            typer.echo(f"{Colors.BOLD}{app_name.capitalize()}:{Colors.RESET}")
         for plugin_key, enabled in sorted(enabled_plugins.items()):
             # Extract plugin name from key (format: owner/repo:name or name@marketplace)
             if ":" in plugin_key:
@@ -87,7 +117,7 @@ def list_plugins(
         plugins = handler.scan_marketplace_plugins()
         if plugins:
             typer.echo(
-                f"\n{Colors.BOLD}Available Plugins from Marketplaces:{Colors.RESET}\n"
+                f"{Colors.BOLD}Available Plugins from Marketplaces ({app_name}):{Colors.RESET}\n"
             )
             for plugin in sorted(plugins, key=lambda p: p.name):
                 if plugin.installed:
diff --git a/code_assistant_manager/cli/plugins/plugin_marketplace_commands.py b/code_assistant_manager/cli/plugins/plugin_marketplace_commands.py
@@ -29,11 +29,11 @@
 )
 
 
-@marketplace_app.command("update")
-def marketplace_update(
-    name: Optional[str] = typer.Argument(
-        None,
-        help="Marketplace name to update (updates all if not specified)",
+@marketplace_app.command("add")
+def marketplace_add(
+    source: str = typer.Argument(
+        ...,
+        help="Marketplace source (URL, path, or GitHub repo)",
     ),
     app_type: str = typer.Option(
         "claude",
@@ -42,27 +42,133 @@ def marketplace_update(
         help=f"App type ({', '.join(VALID_APP_TYPES)})",
     ),
 ):
-    """Update installed marketplace(s) from their source.
+    """Add a marketplace from a URL, path, or GitHub repo."""
+    from code_assistant_manager.cli.option_utils import resolve_single_app
 
-    This command updates installed marketplaces by pulling the latest changes
-    from their source repositories. If no name is specified, all marketplaces
-    are updated.
+    app = resolve_single_app(app_type, VALID_APP_TYPES, default="claude")
+    handler = get_handler(app)
 
-    Examples:
-        cam plugin marketplace update                    # Update all marketplaces
-        cam plugin marketplace update my-marketplace     # Update specific marketplace
+    typer.echo(f"{Colors.CYAN}Adding marketplace: {source}...{Colors.RESET}")
+    success, msg = handler.marketplace_add(source)
+
+    if success:
+        typer.echo(f"{Colors.GREEN}✓ {msg}{Colors.RESET}")
+    else:
+        typer.echo(f"{Colors.RED}✗ {msg}{Colors.RESET}")
+        raise typer.Exit(1)
+
+
+@marketplace_app.command("list")
+def marketplace_list(
+    app_type: str = typer.Option(
+        "claude",
+        "--app",
+        "-a",
+        help=f"App type ({', '.join(VALID_APP_TYPES)})",
+    ),
+    show_installed: bool = typer.Option(
+        False,
+        "--installed",
+        help="Show only marketplaces installed in the app (not configured in CAM)",
+    ),
+):
+    """List all configured marketplaces.
+
+    By default, shows marketplaces configured in CAM. Use --installed to show
+    marketplaces actually installed in the target app.
     """
     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)
 
-    if name:
-        typer.echo(f"{Colors.CYAN}Updating marketplace: {name}...{Colors.RESET}")
+    if show_installed:
+        # Show marketplaces installed in the app
+        handler = get_handler(app)
+        success, output = handler.marketplace_list()
+        if success:
+            typer.echo(output)
+        else:
+            typer.echo(f"{Colors.RED}✗ {output}{Colors.RESET}")
+            raise typer.Exit(1)
     else:
-        typer.echo(f"{Colors.CYAN}Updating all marketplaces...{Colors.RESET}")
+        # Show CAM configured marketplaces
+        manager = PluginManager()
+        all_repos = manager.get_all_repos()
+        configured_marketplaces = {
+            k: v for k, v in all_repos.items() if v.type == "marketplace"
+        }
+
+        if not configured_marketplaces:
+            typer.echo(
+                f"{Colors.YELLOW}No marketplaces configured in CAM.{Colors.RESET}"
+            )
+            typer.echo(
+                f"Use 'cam plugin add-repo --type marketplace <owner>/<repo>' to add one."
+            )
+            return
+
+        typer.echo("Configured marketplaces:")
+        typer.echo()
+
+        for name, repo in sorted(configured_marketplaces.items()):
+            # Show status indicator
+            status = (
+                f"{Colors.GREEN}✓{Colors.RESET}"
+                if repo.enabled
+                else f"{Colors.RED}✗{Colors.RESET}"
+            )
+            typer.echo(f"  {status} {name}")
 
-    success, msg = handler.marketplace_update(name)
+            # Show aliases if any
+            if hasattr(repo, "aliases") and repo.aliases:
+                aliases_str = ", ".join(repo.aliases)
+                typer.echo(f"    Aliases: {aliases_str}")
+
+            # Show description
+            if repo.description:
+                typer.echo(f"    {repo.description}")
+
+            # Show source
+            if repo.repo_owner and repo.repo_name:
+                source_url = (
+                    f"https://github.com/{repo.repo_owner}/{repo.repo_name}.git"
+                )
+                typer.echo(f"    Source: Git ({source_url})")
+            else:
+                typer.echo(
+                    f"    Source: {Colors.YELLOW}No GitHub source configured{Colors.RESET}"
+                )
+
+            typer.echo()
+
+
+@marketplace_app.command("remove")
+@marketplace_app.command("rm", hidden=True)
+def marketplace_remove(
+    name: str = typer.Argument(
+        ...,
+        help="Marketplace name to remove",
+    ),
+    force: bool = typer.Option(False, "--force", "-f", help="Skip confirmation"),
+    app_type: str = typer.Option(
+        "claude",
+        "--app",
+        "-a",
+        help=f"App type ({', '.join(VALID_APP_TYPES)})",
+    ),
+):
+    """Remove a configured marketplace."""
+    from code_assistant_manager.cli.option_utils import resolve_single_app
+
+    app = resolve_single_app(app_type, VALID_APP_TYPES, default="claude")
+    handler = get_handler(app)
+
+    if not force:
+        typer.confirm(f"Remove marketplace '{name}'?", abort=True)
+
+    typer.echo(f"{Colors.CYAN}Removing marketplace: {name}...{Colors.RESET}")
+    success, msg = handler.marketplace_remove(name)
 
     if success:
         typer.echo(f"{Colors.GREEN}✓ {msg}{Colors.RESET}")
@@ -71,6 +177,114 @@ def marketplace_update(
         raise typer.Exit(1)
 
 
+@marketplace_app.command("update")
+def marketplace_update(
+    name: Optional[str] = typer.Argument(
+        None,
+        help="Marketplace name to update (updates all if not specified)",
+    ),
+    app_type: Optional[str] = typer.Option(
+        None,
+        "--app",
+        "-a",
+        help=f"App type to update marketplaces for ({', '.join(VALID_APP_TYPES)}). Updates all apps if not specified.",
+    ),
+):
+    """Update installed marketplace(s) from their source.
+
+    This command updates installed marketplaces by pulling the latest changes
+    from their source repositories. If no name is specified, all marketplaces
+    are updated. If no app is specified, marketplaces are updated for all apps.
+
+    Examples:
+        cam plugin marketplace update                    # Update all marketplaces for all apps
+        cam plugin marketplace update my-marketplace     # Update specific marketplace for all apps
+        cam plugin marketplace update --app claude       # Update all marketplaces for Claude
+        cam plugin marketplace update my-marketplace --app claude  # Update specific marketplace for Claude
+    """
+    from code_assistant_manager.plugins import VALID_APP_TYPES, get_handler
+
+    if app_type:
+        # Update for specific app
+        if app_type not in VALID_APP_TYPES:
+            typer.echo(
+                f"{Colors.RED}✗ Invalid app type: {app_type}. Valid: {', '.join(VALID_APP_TYPES)}{Colors.RESET}"
+            )
+            raise typer.Exit(1)
+
+        handler = get_handler(app_type)
+
+        if name:
+            typer.echo(
+                f"{Colors.CYAN}Updating marketplace '{name}' for {app_type}...{Colors.RESET}"
+            )
+        else:
+            typer.echo(
+                f"{Colors.CYAN}Updating all marketplaces for {app_type}...{Colors.RESET}"
+            )
+
+        success, msg = handler.marketplace_update(name)
+
+        if success:
+            typer.echo(f"{Colors.GREEN}✓ {msg}{Colors.RESET}")
+        else:
+            typer.echo(f"{Colors.RED}✗ {msg}{Colors.RESET}")
+            raise typer.Exit(1)
+    else:
+        # Update for all apps
+        if name:
+            typer.echo(
+                f"{Colors.CYAN}Updating marketplace '{name}' for all apps...{Colors.RESET}"
+            )
+        else:
+            typer.echo(
+                f"{Colors.CYAN}Updating all marketplaces for all apps...{Colors.RESET}"
+            )
+
+        all_success = True
+        results = []
+
+        for current_app in VALID_APP_TYPES:
+            try:
+                handler = get_handler(current_app)
+
+                if name:
+                    typer.echo(
+                        f"  {Colors.CYAN}Updating '{name}' for {current_app}...{Colors.RESET}"
+                    )
+                else:
+                    typer.echo(
+                        f"  {Colors.CYAN}Updating all marketplaces for {current_app}...{Colors.RESET}"
+                    )
+
+                success, msg = handler.marketplace_update(name)
+
+                if success:
+                    typer.echo(f"  {Colors.GREEN}✓ {current_app}: {msg}{Colors.RESET}")
+                    results.append(f"{current_app}: {msg}")
+                else:
+                    typer.echo(f"  {Colors.RED}✗ {current_app}: {msg}{Colors.RESET}")
+                    results.append(f"{current_app}: {msg}")
+                    all_success = False
+
+            except Exception as e:
+                error_msg = f"Failed to update {current_app}: {e}"
+                typer.echo(f"  {Colors.RED}✗ {error_msg}{Colors.RESET}")
+                results.append(error_msg)
+                all_success = False
+
+        if all_success:
+            typer.echo(
+                f"\n{Colors.GREEN}✓ All marketplace updates completed successfully{Colors.RESET}"
+            )
+        else:
+            typer.echo(
+                f"\n{Colors.YELLOW}⚠ Some marketplace updates failed{Colors.RESET}"
+            )
+            if not all_success:
+                raise typer.Exit(1)
+
+
 # Add marketplace subcommand to plugin app
 plugin_app.add_typer(marketplace_app, name="marketplace")
 
diff --git a/code_assistant_manager/plugin_repos.json b/code_assistant_manager/plugin_repos.json
