feat: restructure plugin command architecture

- Move fetch functionality from 'cam plugin fetch' to 'cam plugin marketplace add --save'
- Remove deprecated fetch command from plugin commands
- Add numbering to marketplace list output for better usability
- Update integration tests to reflect command changes

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: zhujian0805

code_assistant_manager/cli/plugin_commands.py

@@ -42,5 +42,4 @@
 # Discovery commands
 plugin_app.command("browse")(plugin_discovery_commands.browse_marketplace)
 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)

code_assistant_manager/cli/plugins/plugin_discovery_commands.py

@@ -463,175 +463,178 @@ def view_plugin(
     typer.echo()
 
 
-@plugin_app.command("fetch")
-def fetch_repo(
-    url: Optional[str] = typer.Argument(
+@plugin_app.command("status")
+def plugin_status(
+    app_type: Optional[str] = typer.Option(
         None,
-        help="GitHub URL or owner/repo (e.g., https://github.com/owner/repo or owner/repo)",
-    ),
-    save: bool = typer.Option(
-        False,
-        "--save",
-        "-s",
-        help="Save the fetched repo to user config (only used with URL argument)",
+        "--app",
+        "-a",
+        help=f"App type ({', '.join(VALID_APP_TYPES)}). If not specified, shows status for all apps.",
     ),
 ):
-    """Fetch plugin repos from configured repositories or a specific GitHub URL.
+    """Show plugin system status for an app, or all apps if none specified."""
+    from code_assistant_manager.cli.option_utils import resolve_single_app
 
-    Without URL: Re-fetches info from all configured plugin repositories.
-    With URL: Analyzes a GitHub repository to determine if it's a single plugin
-    or a marketplace with multiple plugins, then optionally saves it.
+    # If no app specified, show status for all apps
+    if app_type is None:
+        typer.echo(f"\n{Colors.BOLD}Plugin System Status (All Apps):{Colors.RESET}\n")
 
-    Examples:
-        cam plugin fetch                     # Fetch from all configured repos
-        cam plugin fetch owner/repo --save   # Fetch and save a new repo
-        cam plugin fetch https://github.com/owner/repo --save
-    """
-    manager = PluginManager()
+        # Show common CAM configuration
+        manager = PluginManager()
+        all_repos = manager.get_all_repos()
+        configured_marketplaces = {
+            k: v for k, v in all_repos.items() if v.type == "marketplace"
+        }
+        configured_plugins = {k: v for k, v in all_repos.items() if v.type == "plugin"}
 
-    # If no URL provided, fetch from all configured repos
-    if not url:
         typer.echo(
-            f"{Colors.CYAN}Fetching plugin repos from all configured repositories...{Colors.RESET}"
+            f"{Colors.CYAN}Configured Marketplaces (CAM):{Colors.RESET} {len(configured_marketplaces)}"
         )
+        for name, repo in sorted(configured_marketplaces.items()):
+            if repo.repo_owner and repo.repo_name:
+                typer.echo(f"  • {name} ({repo.repo_owner}/{repo.repo_name})")
+            else:
+                typer.echo(f"  • {name}")
 
-        all_repos = manager.get_all_repos()
-        if not all_repos:
+        if configured_plugins:
             typer.echo(
-                f"{Colors.YELLOW}No plugin repositories configured{Colors.RESET}"
+                f"\n{Colors.CYAN}Configured Plugins (CAM):{Colors.RESET} {len(configured_plugins)}"
             )
-            return
+            for name, repo in sorted(configured_plugins.items()):
+                if repo.repo_owner and repo.repo_name:
+                    typer.echo(f"  • {name} ({repo.repo_owner}/{repo.repo_name})")
+                else:
+                    typer.echo(f"  • {name}")
 
-        success_count = 0
-        for repo_name, repo in all_repos.items():
-            if not repo.enabled:
-                typer.echo(f"  {Colors.YELLOW}⊘{Colors.RESET} {repo_name} (disabled)")
-                continue
+        typer.echo(f"\n{Colors.CYAN}{'='*50}{Colors.RESET}\n")
 
-            if not repo.repo_owner or not repo.repo_name:
-                typer.echo(
-                    f"  {Colors.YELLOW}⊘{Colors.RESET} {repo_name} (no GitHub info)"
-                )
-                continue
+        for app in VALID_APP_TYPES:
+            show_app_info(app, show_cam_config=False)
+            if app != VALID_APP_TYPES[-1]:  # Don't add separator after last app
+                typer.echo(f"\n{Colors.CYAN}{'='*50}{Colors.RESET}\n")
+        return
 
-            # Fetch repo info
-            from code_assistant_manager.plugins import fetch_repo_info
+    # Show info for specific app
+    app = resolve_single_app(app_type, VALID_APP_TYPES, default="claude")
+    show_app_info(app)
 
-            info = fetch_repo_info(
-                repo.repo_owner, repo.repo_name, repo.repo_branch or "main"
-            )
 
-            if info:
-                plugin_info = (
-                    f"{info.plugin_count} plugins"
-                    if info.type == "marketplace"
-                    else "plugin"
-                )
-                typer.echo(
-                    f"  {Colors.GREEN}✓{Colors.RESET} {repo_name} ({info.type}: {plugin_info})"
-                )
-                success_count += 1
-            else:
-                typer.echo(
-                    f"  {Colors.RED}✗{Colors.RESET} {repo_name} (failed to fetch)"
-                )
+def show_app_info(app: str, show_cam_config: bool = True):
+    """Show plugin system information for a specific app."""
+    handler = get_handler(app)
+    manager = PluginManager()
 
-        typer.echo(
-            f"\n{Colors.GREEN}✓ Fetched {success_count}/{len(all_repos)} repositories{Colors.RESET}"
-        )
-        typer.echo(
-            f"\n{Colors.CYAN}Run 'cam plugin repos' to see all configured repos{Colors.RESET}"
-        )
-        return
+    typer.echo(f"\n{Colors.BOLD}{app.capitalize()} Plugin System:{Colors.RESET}\n")
 
-    typer.echo(f"{Colors.CYAN}Fetching repository info...{Colors.RESET}")
+    # Show paths
+    typer.echo(f"{Colors.CYAN}Configuration:{Colors.RESET}")
+    typer.echo(f"  Home: {handler.home_dir}")
+    typer.echo(f"  Plugins: {handler.user_plugins_dir}")
+    typer.echo(f"  Marketplaces: {handler.marketplaces_dir}")
+    typer.echo(f"  Settings: {handler.settings_file}")
 
-    # Parse and validate URL
-    parsed = parse_github_url(url)
-    if not parsed:
-        typer.echo(f"{Colors.RED}✗ Invalid GitHub URL: {url}{Colors.RESET}")
-        raise typer.Exit(1)
+    # Check status
+    typer.echo(f"\n{Colors.CYAN}Status:{Colors.RESET}")
 
-    owner, repo, branch = parsed
-    typer.echo(f"  Repository: {Colors.BOLD}{owner}/{repo}{Colors.RESET}")
+    home_exists = handler.home_dir.exists()
+    status = (
+        f"{Colors.GREEN}✓{Colors.RESET}"
+        if home_exists
+        else f"{Colors.RED}✗{Colors.RESET}"
+    )
+    typer.echo(f"  {status} Home directory exists")
 
-    # Fetch repo info
-    info = fetch_repo_info_from_url(url)
-    if not info:
-        typer.echo(
-            f"{Colors.RED}✗ Could not fetch repository info. "
-            f"Make sure the repo has .claude-plugin/marketplace.json{Colors.RESET}"
-        )
-        raise typer.Exit(1)
+    plugins_exists = handler.user_plugins_dir.exists()
+    status = (
+        f"{Colors.GREEN}✓{Colors.RESET}"
+        if plugins_exists
+        else f"{Colors.RED}✗{Colors.RESET}"
+    )
+    typer.echo(f"  {status} Plugins directory exists")
 
-    # Display results
-    typer.echo(f"\n{Colors.BOLD}Repository Information:{Colors.RESET}\n")
-    typer.echo(f"  {Colors.CYAN}Name:{Colors.RESET} {info.name}")
-    typer.echo(f"  {Colors.CYAN}Type:{Colors.RESET} {info.type}")
-    typer.echo(f"  {Colors.CYAN}Description:{Colors.RESET} {info.description or 'N/A'}")
-    typer.echo(f"  {Colors.CYAN}Branch:{Colors.RESET} {info.branch}")
+    cli_path = handler.get_cli_path()
+    status = (
+        f"{Colors.GREEN}✓{Colors.RESET}" if cli_path else f"{Colors.RED}✗{Colors.RESET}"
+    )
+    typer.echo(f"  {status} {app.capitalize()} CLI: {cli_path or 'Not found'}")
 
-    if info.version:
-        typer.echo(f"  {Colors.CYAN}Version:{Colors.RESET} {info.version}")
-
-    if info.type == "marketplace":
-        typer.echo(f"  {Colors.CYAN}Plugin Count:{Colors.RESET} {info.plugin_count}")
-        if info.plugins and len(info.plugins) <= 10:
-            typer.echo(f"\n  {Colors.CYAN}Plugins:{Colors.RESET}")
-            for p in info.plugins[:10]:
-                typer.echo(f"    • {p.get('name', 'unknown')}")
-        elif info.plugins:
-            typer.echo(f"\n  {Colors.CYAN}Plugins:{Colors.RESET} (showing first 10)")
-            for p in info.plugins[:10]:
-                typer.echo(f"    • {p.get('name', 'unknown')}")
-            typer.echo(f"    ... and {len(info.plugins) - 10} more")
-    else:
-        if info.plugin_path:
-            typer.echo(f"  {Colors.CYAN}Plugin Path:{Colors.RESET} {info.plugin_path}")
-
-    # Save if requested
-    if save:
-        # Check if already exists
-        existing = manager.get_repo(info.name)
-        if existing:
-            typer.echo(
-                f"\n{Colors.YELLOW}Repository '{info.name}' already exists in config.{Colors.RESET}"
-            )
-            if not typer.confirm("Overwrite?"):
-                raise typer.Exit(0)
-
-        # Create PluginRepo and save
-        from code_assistant_manager.plugins.models import PluginRepo
-
-        plugin_repo = PluginRepo(
-            name=info.name,
-            description=info.description,
-            repo_owner=info.owner,
-            repo_name=info.repo,
-            repo_branch=info.branch,
-            plugin_path=info.plugin_path,
-            type=info.type,
-            enabled=True,
-        )
-        manager.add_user_repo(plugin_repo)
+    # Get configured repos from CAM (only show once for all apps)
+    all_repos = manager.get_all_repos()
+    configured_marketplaces = {
+        k: v for k, v in all_repos.items() if v.type == "marketplace"
+    }
+    configured_plugins = {k: v for k, v in all_repos.items() if v.type == "plugin"}
+
+    # Show configured marketplaces (from CAM) - only when requested
+    if show_cam_config and app == VALID_APP_TYPES[0]:  # Only show global config once
         typer.echo(
-            f"\n{Colors.GREEN}✓ Saved '{info.name}' to user config as {info.type}{Colors.RESET}"
+            f"\n{Colors.CYAN}Configured Marketplaces (CAM):{Colors.RESET} {len(configured_marketplaces)}"
         )
-        typer.echo(f"  Config file: {manager.plugin_repos_file}")
+        for name, repo in sorted(configured_marketplaces.items()):
+            if repo.repo_owner and repo.repo_name:
+                typer.echo(f"  • {name} ({repo.repo_owner}/{repo.repo_name})")
+            else:
+                typer.echo(f"  • {name}")
 
-        # Show next steps
-        if info.type == "marketplace":
+        # Show configured plugins (from CAM)
+        if configured_plugins:
             typer.echo(
-                f"\n{Colors.CYAN}Next:{Colors.RESET} cam plugin install {info.name}"
+                f"\n{Colors.CYAN}Configured Plugins (CAM):{Colors.RESET} {len(configured_plugins)}"
             )
-        else:
-            typer.echo(
-                f"\n{Colors.CYAN}Next:{Colors.RESET} cam plugin install {info.name}"
+            for name, repo in sorted(configured_plugins.items()):
+                if repo.repo_owner and repo.repo_name:
+                    typer.echo(f"  • {name} ({repo.repo_owner}/{repo.repo_name})")
+                else:
+                    typer.echo(f"  • {name}")
+
+    # Show installed marketplaces (from app)
+    installed_marketplaces = handler.get_known_marketplaces()
+    typer.echo(
+        f"\n{Colors.CYAN}Installed Marketplaces ({app.capitalize()}):{Colors.RESET} {len(installed_marketplaces)}"
+    )
+    for name, info in sorted(installed_marketplaces.items()):
+        source = info.get("source", {})
+        source_url = source.get("url", "")
+        # Extract repo from URL like https://github.com/owner/repo.git
+        if "github.com" in source_url:
+            repo_part = source_url.replace("https://github.com/", "").replace(
+                ".git", ""
             )
-    else:
-        typer.echo(
-            f"\n{Colors.CYAN}To save:{Colors.RESET} cam plugin fetch '{url}' --save"
-        )
+            typer.echo(f"  • {name} ({repo_part})")
+        else:
+            typer.echo(f"  • {name}")
+
+    # Show installed/enabled plugins with details
+    enabled = handler.get_enabled_plugins()
+    enabled_plugins = {k: v for k, v in enabled.items() if v}
+    disabled_plugins = {k: v for k, v in enabled.items() if not v}
+
+    typer.echo(
+        f"\n{Colors.CYAN}Installed Plugins ({app.capitalize()}):{Colors.RESET} {len(enabled_plugins)} enabled, {len(disabled_plugins)} disabled"
+    )
+
+    if enabled_plugins:
+        typer.echo(f"\n  {Colors.GREEN}Enabled:{Colors.RESET}")
+        for plugin_key in sorted(enabled_plugins.keys()):
+            # Parse plugin key (format: plugin-name@marketplace or just plugin-name)
+            if "@" in plugin_key:
+                plugin_name, marketplace = plugin_key.split("@", 1)
+                typer.echo(
+                    f"    {Colors.GREEN}✓{Colors.RESET} {plugin_name} ({marketplace})"
+                )
+            else:
+                typer.echo(f"    {Colors.GREEN}✓{Colors.RESET} {plugin_key}")
+
+    if disabled_plugins:
+        typer.echo(f"\n  {Colors.RED}Disabled:{Colors.RESET}")
+        for plugin_key in sorted(disabled_plugins.keys()):
+            if "@" in plugin_key:
+                plugin_name, marketplace = plugin_key.split("@", 1)
+                typer.echo(
+                    f"    {Colors.RED}✗{Colors.RESET} {plugin_name} ({marketplace})"
+                )
+            else:
+                typer.echo(f"    {Colors.RED}✗{Colors.RESET} {plugin_key}")
 
     typer.echo()