Merge pull request #32 from zhujian0805/main

zhujian0805 · web-flow · commit d3efb443c166 · 2025-12-30T12:25:39.000+08:00
fix: resolve failing tests in CLI integration and plugin commands
diff --git a/README.md b/README.md
@@ -275,7 +275,6 @@ 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
diff --git a/code_assistant_manager/cli/app.py b/code_assistant_manager/cli/app.py
@@ -309,19 +309,21 @@ def validate_config(
             typer.echo(f"{Colors.RED}✗ Configuration validation failed:{Colors.RESET}")
             for error in errors:
                 typer.echo(f"  - {error}")
-            return 1
+            raise typer.Exit(1)
 
+    except typer.Exit:
+        raise
     except FileNotFoundError as e:
         typer.echo(f"{Colors.RED}✗ Configuration file not found: {e}{Colors.RESET}")
-        return 1
+        raise typer.Exit(1)
     except ValueError as e:
         typer.echo(f"{Colors.RED}✗ Configuration validation failed: {e}{Colors.RESET}")
-        return 1
+        raise typer.Exit(1)
     except Exception as e:
         typer.echo(
             f"{Colors.RED}✗ Unexpected error during validation: {e}{Colors.RESET}"
         )
-        return 1
+        raise typer.Exit(1)
 
 
 @config_app.command("list", short_help="List all configuration file locations")
diff --git a/code_assistant_manager/cli/plugin_commands.py b/code_assistant_manager/cli/plugin_commands.py
@@ -43,6 +43,5 @@
 plugin_app.command("validate")(plugin_install_commands.validate_plugin)
 
 # Discovery commands
-plugin_app.command("browse")(plugin_discovery_commands.browse_marketplace)
 plugin_app.command("view")(plugin_discovery_commands.view_plugin)
 plugin_app.command("status")(plugin_discovery_commands.plugin_status)
diff --git a/code_assistant_manager/cli/plugins/plugin_discovery_commands.py b/code_assistant_manager/cli/plugins/plugin_discovery_commands.py
@@ -160,190 +160,6 @@ def _resolve_from_known_marketplaces(
     return None, None, "main"
 
 
-@plugin_app.command("browse")
-def browse_marketplace(
-    marketplace: Optional[str] = typer.Argument(
-        None,
-        help="Marketplace name to browse (from 'cam plugin repos'). If not specified, shows all plugins from all marketplaces.",
-    ),
-    query: Optional[str] = typer.Option(
-        None,
-        "--query",
-        "-q",
-        help="Filter plugins by name or description",
-    ),
-    category: Optional[str] = typer.Option(
-        None,
-        "--category",
-        "-c",
-        help="Filter plugins by category",
-    ),
-    limit: int = typer.Option(
-        50,
-        "--limit",
-        "-n",
-        help="Maximum number of plugins to show",
-    ),
-    app_type: str = typer.Option(
-        "claude",
-        "--app",
-        "-a",
-        help=f"App type ({', '.join(VALID_APP_TYPES)})",
-    ),
-):
-    """[DEPRECATED] Browse plugins in configured marketplaces or a specific one.
-
-    ⚠️  This command is deprecated. Use 'cam plugin list' instead.
-
-    Without a marketplace name: Shows all plugins from all marketplaces and standalone plugins.
-    With a marketplace name: Fetches the marketplace manifest from GitHub and lists available plugins.
-    Use --query to search by name/description, --category to filter by category.
-    """
-    from code_assistant_manager.cli.option_utils import resolve_single_app
-    from code_assistant_manager.plugins.fetch import fetch_repo_info
-
-    # Show deprecation warning
-    typer.echo(f"{Colors.YELLOW}⚠️  Warning: 'cam plugin browse' is deprecated.{Colors.RESET}")
-    typer.echo(f"{Colors.CYAN}   Use 'cam plugin list' instead to view installed and available plugins.{Colors.RESET}")
-    typer.echo()
-
-    app = resolve_single_app(app_type, VALID_APP_TYPES, default="claude")
-    manager = PluginManager()
-    handler = get_handler(app)
-
-    # If no marketplace specified, show all plugins from all repos
-    if not marketplace:
-        typer.echo(
-            f"{Colors.CYAN}Fetching all plugins from all marketplaces and plugins...{Colors.RESET}\n"
-        )
-
-        all_repos = manager.get_all_repos()
-        if not all_repos:
-            typer.echo(
-                f"{Colors.YELLOW}No plugin repositories configured{Colors.RESET}"
-            )
-            return
-
-        all_plugins = []
-        repo_sources = {}  # Track which repo each plugin comes from
-
-        for repo_name, repo in all_repos.items():
-            if not repo.repo_owner or not repo.repo_name:
-                continue
-
-            # Fetch repo info
-            info = fetch_repo_info(
-                repo.repo_owner, repo.repo_name, repo.repo_branch or "main"
-            )
-            if not info:
-                typer.echo(
-                    f"  {Colors.YELLOW}⊘{Colors.RESET} {repo_name} (failed to fetch)"
-                )
-                continue
-
-            if info.type == "marketplace":
-                # Add plugins from marketplace with their source
-                for plugin in info.plugins:
-                    plugin["marketplace"] = repo_name
-                    repo_sources[f"{plugin.get('name', '')}@{repo_name}"] = repo_name
-                all_plugins.extend(info.plugins)
-            else:
-                # Single plugin repository
-                plugin_name = info.name
-                all_plugins.append(
-                    {
-                        "name": plugin_name,
-                        "version": info.version or "",
-                        "description": info.description or "",
-                        "category": "",
-                        "marketplace": repo_name,
-                    }
-                )
-                repo_sources[f"{plugin_name}@{repo_name}"] = repo_name
-
-        if not all_plugins:
-            typer.echo(
-                f"{Colors.YELLOW}No plugins found in configured repositories{Colors.RESET}"
-            )
-            return
-
-        # Filter and display
-        plugins = _filter_plugins(all_plugins, query, category)
-        total = len(plugins)
-
-        typer.echo(f"{Colors.BOLD}All Available Plugins:{Colors.RESET}")
-        typer.echo(f"Total: {total} plugins\n")
-
-        if query or category:
-            typer.echo(f"Matching: {total}\n")
-
-        # Organize plugins by marketplace
-        plugins_by_marketplace = {}
-        for plugin in plugins:
-            marketplace_name = plugin.get("marketplace", "Unknown")
-            if marketplace_name not in plugins_by_marketplace:
-                plugins_by_marketplace[marketplace_name] = []
-            plugins_by_marketplace[marketplace_name].append(plugin)
-
-        # Display plugins organized by marketplace
-        displayed_count = 0
-        for marketplace_name in sorted(plugins_by_marketplace.keys()):
-            marketplace_plugins = plugins_by_marketplace[marketplace_name]
-            typer.echo(f"\n{Colors.BOLD}{marketplace_name}:{Colors.RESET}\n")
-
-            for plugin in marketplace_plugins:
-                if displayed_count >= limit:
-                    break
-                _display_plugin(plugin)
-                displayed_count += 1
-
-            if displayed_count >= limit:
-                break
-
-        if total > limit:
-            typer.echo(f"\n  ... and {total - limit} more")
-
-        categories = {p.get("category") for p in all_plugins if p.get("category")}
-        if categories:
-            typer.echo(
-                f"\n{Colors.CYAN}Categories:{Colors.RESET} {', '.join(sorted(categories))}"
-            )
-
-        typer.echo(
-            f"\n{Colors.CYAN}Filter by marketplace:{Colors.RESET} cam plugin browse <marketplace-name>"
-        )
-        typer.echo()
-        return
-
-    # Resolve marketplace to repo info
-    repo_owner, repo_name, repo_branch = _resolve_marketplace_repo(
-        manager, handler, marketplace
-    )
-
-    if not repo_owner or not repo_name:
-        _display_marketplace_not_found(manager, handler, marketplace)
-        raise typer.Exit(1)
-
-    # Fetch plugins
-    typer.echo(f"{Colors.CYAN}Fetching plugins from {marketplace}...{Colors.RESET}")
-    info = fetch_repo_info(repo_owner, repo_name, repo_branch)
-
-    if not info or not info.plugins:
-        typer.echo(f"{Colors.RED}✗ Could not fetch plugins from repo.{Colors.RESET}")
-        raise typer.Exit(1)
-
-    # Filter and display
-    plugins = _filter_plugins(info.plugins, query, category)
-    total = len(plugins)
-    plugins = plugins[:limit]
-
-    _display_marketplace_header(info, query, category, total)
-    typer.echo(f"\n{Colors.BOLD}Plugins:{Colors.RESET}\n")
-
-    for plugin in plugins:
-        _display_plugin(plugin)
-
-    _display_marketplace_footer(info, marketplace, total, limit)
 
 
 @plugin_app.command("view")
@@ -431,11 +247,11 @@ def view_plugin(
             f"{Colors.RED}✗ Plugin '{plugin}' not found in configured repositories{Colors.RESET}"
         )
         typer.echo()
-        typer.echo(f"{Colors.CYAN}Try browsing available plugins:{Colors.RESET}")
+        typer.echo(f"{Colors.CYAN}Try listing available plugins:{Colors.RESET}")
         if marketplace_filter:
-            typer.echo(f"  cam plugin browse {marketplace_filter}")
+            typer.echo(f"  cam plugin list {marketplace_filter}")
         else:
-            typer.echo(f"  cam plugin browse")
+            typer.echo(f"  cam plugin list")
         raise typer.Exit(1)
 
     # Display plugin details
diff --git a/code_assistant_manager/cli/plugins/plugin_install_commands.py b/code_assistant_manager/cli/plugins/plugin_install_commands.py
@@ -118,7 +118,7 @@ def _resolve_plugin_conflict(plugin_name: str, app_type: str) -> str:
             typer.echo(f"\n{Colors.YELLOW}Unreachable marketplaces (temporarily unavailable):{Colors.RESET}")
             for unreachable in unreachable_marketplaces:
                 typer.echo(f"  • {unreachable['marketplace']} ({unreachable['source']})")
-        typer.echo(f"\n{Colors.CYAN}Browse plugins:{Colors.RESET} cam plugin browse")
+        typer.echo(f"\n{Colors.CYAN}Browse plugins:{Colors.RESET} cam plugin list")
         raise typer.Exit(1)
 
     elif len(found_in_marketplaces) == 1:
@@ -367,7 +367,7 @@ def install_plugin(
     - marketplace-name:plugin-name (specifies which marketplace to use)
 
     For marketplace management, use 'cam plugin marketplace install <marketplace>'.
-    For browsing available plugins, use 'cam plugin browse'.
+    For browsing available plugins, use 'cam plugin list'.
 
     Examples:
         cam plugin install code-reviewer
diff --git a/code_assistant_manager/cli/plugins/plugin_marketplace_commands.py b/code_assistant_manager/cli/plugins/plugin_marketplace_commands.py
@@ -478,7 +478,7 @@ def marketplace_install(
     to the target AI assistant app(s). 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>'
+    After installation, you can browse plugins with 'cam plugin list <marketplace>'
     and install them with 'cam plugin install <plugin>@<marketplace>'.
 
     Examples:
@@ -578,7 +578,7 @@ def marketplace_install(
     if len(target_apps) == 1:
         if installed_count > 0 or already_installed_count > 0:
             typer.echo(
-                f"\n{Colors.CYAN}Browse plugins with:{Colors.RESET} cam plugin marketplace browse <marketplace>"
+                f"\n{Colors.CYAN}Browse plugins with:{Colors.RESET} cam plugin list <marketplace>"
             )
             typer.echo(
                 f"{Colors.CYAN}Install plugins with:{Colors.RESET} cam plugin install <plugin-name>@<marketplace>"
diff --git a/tests/test_cli_integration_comprehensive.py b/tests/test_cli_integration_comprehensive.py
@@ -160,50 +160,58 @@ def test_config_validate_failure(self, mock_config_class, runner):
         assert "✗ Configuration validation failed" in result.output
 
     def test_config_list_locations(self, runner):
-        """Test config list-locations command."""
-        result = runner.invoke(app, ["config", "list-locations"])
+        """Test config list command."""
+        result = runner.invoke(app, ["config", "list"])
         assert result.exit_code == 0
         assert "Configuration Files" in result.output
 
-    @patch("code_assistant_manager.cli.app.load_app_config")
-    def test_config_show_command(self, mock_load, runner):
+    @patch("code_assistant_manager.configs.get_tool_config")
+    def test_config_show_command(self, mock_get_tool_config, runner):
         """Test config show command."""
-        mock_load.return_value = ({"key": "value"}, "/tmp/config.json")
+        mock_tool_config = MagicMock()
+        mock_tool_config.load_config.return_value = {"user": {"data": {"key": "value"}, "path": "/tmp/config.json"}}
+        mock_get_tool_config.return_value = mock_tool_config
 
         result = runner.invoke(app, ["config", "show"])
         assert result.exit_code == 0
         assert "value" in result.output
 
-    @patch("code_assistant_manager.cli.app.load_app_config")
-    def test_config_show_specific_key(self, runner, mock_load):
+    @patch("code_assistant_manager.configs.get_tool_config")
+    def test_config_show_specific_key(self, mock_get_tool_config, runner):
         """Test config show command with specific key."""
-        mock_load.return_value = ({"app.key": "value"}, "/tmp/config.json")
+        mock_tool_config = MagicMock()
+        mock_tool_config.load_config.return_value = {"user": {"data": {"key": "value"}, "path": "/tmp/config.json"}}
+        mock_get_tool_config.return_value = mock_tool_config
 
-        result = runner.invoke(app, ["config", "show", "app.key"])
+        result = runner.invoke(app, ["config", "show", "claude.key"])
         assert result.exit_code == 0
         assert "value" in result.output
 
-    @patch("code_assistant_manager.cli.app.load_app_config")
-    def test_config_show_wildcard(self, runner, mock_load):
+    @patch("code_assistant_manager.configs.get_tool_config")
+    def test_config_show_wildcard(self, mock_get_tool_config, runner):
         """Test config show command with wildcard."""
-        mock_load.return_value = ({"app.key1": "value1", "app.key2": "value2"}, "/tmp/config.json")
-
-    @patch("code_assistant_manager.config.ConfigManager")
-    def test_config_set_command(self, runner, mock_config_class):
+        mock_tool_config = MagicMock()
+        mock_tool_config.load_config.return_value = {
+            "user": {"data": {"app.key1": "value1", "app.key2": "value2"}, "path": "/tmp/config.json"}
+        }
+        mock_get_tool_config.return_value = mock_tool_config
+
+    @patch("code_assistant_manager.configs.get_tool_config")
+    def test_config_set_command(self, mock_get_tool_config, runner):
         """Test config set command."""
-        mock_config = MagicMock()
-        mock_config.set_value.return_value = None
-        mock_config_class.return_value = mock_config
+        mock_tool_config = MagicMock()
+        mock_tool_config.set_value.return_value = "/tmp/config.json"
+        mock_get_tool_config.return_value = mock_tool_config
 
         result = runner.invoke(app, ["config", "set", "test.key=value"])
         assert result.exit_code == 0
 
-    @patch("code_assistant_manager.config.ConfigManager")
-    def test_config_unset_command(self, runner, mock_config_class):
+    @patch("code_assistant_manager.configs.get_tool_config")
+    def test_config_unset_command(self, mock_get_tool_config, runner):
         """Test config unset command."""
-        mock_config = MagicMock()
-        mock_config.unset_value.return_value = None
-        mock_config_class.return_value = mock_config
+        mock_tool_config = MagicMock()
+        mock_tool_config.unset_value.return_value = True
+        mock_get_tool_config.return_value = mock_tool_config
 
         result = runner.invoke(app, ["config", "unset", "test.key"])
         assert result.exit_code == 0
@@ -285,14 +293,6 @@ def test_plugin_validate(self, runner, mock_validate):
         assert result.exit_code == 0
         mock_validate.assert_called_once()
 
-    @patch("code_assistant_manager.cli.plugins.plugin_discovery_commands.browse_marketplace")
-    def test_plugin_browse(self, runner, mock_browse):
-        """Test plugin browse command."""
-        mock_browse.return_value = []
-
-        result = runner.invoke(app, ["plugin", "browse"])
-        assert result.exit_code == 0
-        mock_browse.assert_called_once()
 
     @patch("code_assistant_manager.cli.plugins.plugin_discovery_commands.view_plugin")
     def test_plugin_view(self, runner, mock_view):
@@ -348,15 +348,6 @@ def test_plugin_disable(self, runner, mock_disable):
         assert result.exit_code == 0
         mock_disable.assert_called_once()
 
-    @patch("code_assistant_manager.cli.plugins.plugin_discovery_commands.browse_marketplace")
-    def test_plugin_marketplace_browse(self, runner, mock_browse):
-        """Test plugin marketplace browse command."""
-        mock_browse.return_value = []
-
-        result = runner.invoke(app, ["plugin", "marketplace", "browse"])
-        assert result.exit_code == 0
-        mock_browse.assert_called_once()
-
 
 class TestAgentCommands:
     """Test agent command subcommands."""
diff --git a/tests/test_plugin_commands_integration.py b/tests/test_plugin_commands_integration.py
