ccproxy-api 0.1.6__py3-none-any.whl → 0.2.0__py3-none-any.whl

ccproxy/cli/commands/serve.py

@@ -1,48 +1,20 @@
 """Serve command for CCProxy API server - consolidates server-related commands."""
 
-import json
-import os
 from pathlib import Path
 from typing import Annotated, Any
 
 import typer
 import uvicorn
 from click import get_current_context
-from structlog import get_logger
+from rich.console import Console
+from rich.syntax import Syntax
 
-from ccproxy._version import __version__
-from ccproxy.cli.helpers import (
-    get_rich_toolkit,
-    is_running_in_docker,
-    warning,
-)
-from ccproxy.config.settings import (
-    ConfigurationError,
-    Settings,
-    config_manager,
-)
-from ccproxy.core.async_utils import get_root_package_name
-from ccproxy.docker import (
-    create_docker_adapter,
-)
+from ccproxy.cli.helpers import get_rich_toolkit
+from ccproxy.config.settings import ConfigurationError, Settings
+from ccproxy.core.logging import get_logger, setup_logging
 
-from ..docker import (
-    _create_docker_adapter_from_settings,
-)
-from ..options.claude_options import (
-    ClaudeOptions,
-    validate_claude_cli_path,
-    validate_cwd,
-    validate_max_thinking_tokens,
-    validate_max_turns,
-    validate_permission_mode,
-    validate_pool_size,
-    validate_sdk_message_mode,
-    validate_system_prompt_injection_mode,
-)
-from ..options.security_options import SecurityOptions, validate_auth_token
+from ..options.security_options import validate_auth_token
 from ..options.server_options import (
-    ServerOptions,
     validate_log_level,
     validate_port,
 )
@@ -56,203 +28,42 @@ def get_config_path_from_context() -> Path | None:
             config_path = ctx.obj["config_path"]
             return config_path if config_path is None else Path(config_path)
     except RuntimeError:
-        # No active click context (e.g., in tests)
         pass
     return None
 
 
 def _show_api_usage_info(toolkit: Any, settings: Settings) -> None:
     """Show API usage information when auth token is configured."""
-    from rich.console import Console
-    from rich.syntax import Syntax
 
     toolkit.print_title("API Client Configuration", tag="config")
 
-    # Determine the base URLs
-    anthropic_base_url = f"http://{settings.server.host}:{settings.server.port}"
-    openai_base_url = f"http://{settings.server.host}:{settings.server.port}/openai"
+    anthropic_base_url = f"http://{settings.server.host}:{settings.server.port}/claude"
+    openai_base_url = f"http://{settings.server.host}:{settings.server.port}/codex"
 
-    # Show environment variable exports using code blocks
     toolkit.print("Environment Variables for API Clients:", tag="info")
     toolkit.print_line()
 
-    # Use rich console for code blocks
     console = Console()
 
-    exports = f"""export ANTHROPIC_API_KEY={settings.security.auth_token}
+    auth_token = "YOUR_AUTH_TOKEN" if settings.security.auth_token else "NOT_SET"
+    exports = f"""export ANTHROPIC_API_KEY={auth_token}
 export ANTHROPIC_BASE_URL={anthropic_base_url}
-export OPENAI_API_KEY={settings.security.auth_token}
+export OPENAI_API_KEY={auth_token}
 export OPENAI_BASE_URL={openai_base_url}"""
 
     console.print(Syntax(exports, "bash", theme="monokai", background_color="default"))
     toolkit.print_line()
 
 
-def _run_docker_server(
-    settings: Settings,
-    docker_image: str | None = None,
-    docker_env: list[str] | None = None,
-    docker_volume: list[str] | None = None,
-    docker_arg: list[str] | None = None,
-    docker_home: str | None = None,
-    docker_workspace: str | None = None,
-    user_mapping_enabled: bool | None = None,
-    user_uid: int | None = None,
-    user_gid: int | None = None,
-) -> None:
-    """Run the server using Docker."""
-    toolkit = get_rich_toolkit()
-    logger = get_logger(__name__)
-
-    docker_env = docker_env or []
-    docker_volume = docker_volume or []
-    docker_arg = docker_arg or []
-
-    docker_env_dict = {}
-    for env_var in docker_env:
-        if "=" in env_var:
-            key, value = env_var.split("=", 1)
-            docker_env_dict[key] = value
-
-    # Add server configuration to Docker environment
-    if settings.server.reload:
-        docker_env_dict["RELOAD"] = "true"
-    docker_env_dict["PORT"] = str(settings.server.port)
-    docker_env_dict["HOST"] = "0.0.0.0"
-
-    # Display startup information
-    # toolkit.print_title(
-    #     "Starting CCProxy API server with Docker", tag="docker"
-    # )
-    # toolkit.print(
-    #     f"Server will be available at: http://{settings.server.host}:{settings.server.port}",
-    #     tag="info",
-    # )
-    toolkit.print_line()
-
-    # Show Docker configuration summary
-    toolkit.print_title("Docker Configuration Summary", tag="config")
-
-    # Determine effective directories for volume mapping
-    home_dir = docker_home or settings.docker.docker_home_directory
-    workspace_dir = docker_workspace or settings.docker.docker_workspace_directory
-
-    # Show volume information
-    toolkit.print("Volumes:", tag="config")
-    if home_dir:
-        toolkit.print(f"  Home: {home_dir} → /data/home", tag="volume")
-    if workspace_dir:
-        toolkit.print(f"  Workspace: {workspace_dir} → /data/workspace", tag="volume")
-    if docker_volume:
-        for vol in docker_volume:
-            toolkit.print(f"  Additional: {vol}", tag="volume")
-    toolkit.print_line()
-
-    # Show environment information
-    toolkit.print("Environment Variables:", tag="config")
-    key_env_vars = {
-        "CLAUDE_HOME": "/data/home",
-        "CLAUDE_WORKSPACE": "/data/workspace",
-        "PORT": str(settings.server.port),
-        "HOST": "0.0.0.0",
-    }
-    if settings.server.reload:
-        key_env_vars["RELOAD"] = "true"
-
-    for key, value in key_env_vars.items():
-        toolkit.print(f"  {key}={value}", tag="env")
-
-    # Show additional environment variables from CLI
-    for env_var in docker_env:
-        toolkit.print(f"  {env_var}", tag="env")
-
-    # Show debug environment information if log level is DEBUG
-    if settings.server.log_level == "DEBUG":
-        toolkit.print_line()
-        toolkit.print_title("Debug: All Environment Variables", tag="debug")
-        all_env = {**docker_env_dict}
-        for key, value in sorted(all_env.items()):
-            toolkit.print(f"  {key}={value}", tag="debug")
-
-    toolkit.print_line()
-
-    toolkit.print_line()
-
-    # Show API usage information if auth token is configured
-    if settings.security.auth_token:
-        _show_api_usage_info(toolkit, settings)
-
-    # Execute using the new Docker adapter
-    image, volumes, environment, command, user_context, additional_args = (
-        _create_docker_adapter_from_settings(
-            settings,
-            command=["ccproxy", "serve"],
-            docker_image=docker_image,
-            docker_env=[f"{k}={v}" for k, v in docker_env_dict.items()],
-            docker_volume=docker_volume,
-            docker_arg=docker_arg,
-            docker_home=docker_home,
-            docker_workspace=docker_workspace,
-            user_mapping_enabled=user_mapping_enabled,
-            user_uid=user_uid,
-            user_gid=user_gid,
-        )
-    )
-
-    logger.info(
-        "docker_server_config",
-        configured_image=settings.docker.docker_image,
-        effective_image=image,
-    )
-
-    # Add port mapping
-    ports = [f"{settings.server.port}:{settings.server.port}"]
-
-    # Create Docker adapter and execute
-    adapter = create_docker_adapter()
-    adapter.exec_container(
-        image=image,
-        volumes=volumes,
-        environment=environment,
-        command=command,
-        user_context=user_context,
-        ports=ports,
-    )
-
-
-def _run_local_server(settings: Settings, cli_overrides: dict[str, Any]) -> None:
+def _run_local_server(settings: Settings) -> None:
     """Run the server locally."""
-    in_docker = is_running_in_docker()
+    # in_docker = is_running_in_docker()
     toolkit = get_rich_toolkit()
     logger = get_logger(__name__)
 
-    if in_docker:
-        toolkit.print_title(
-            f"Starting CCProxy API server in {warning('docker')}",
-            tag="docker",
-        )
-        toolkit.print(
-            f"uid={warning(str(os.getuid()))} gid={warning(str(os.getgid()))}"
-        )
-        toolkit.print(f"HOME={os.environ['HOME']}")
-    # else:
-    #     toolkit.print_title("Starting CCProxy API server", tag="local")
-
-    # toolkit.print(
-    #     f"Server will be available at: http://{settings.server.host}:{settings.server.port}",
-    #     tag="info",
-    # )
-
-    # toolkit.print_line()
-
-    # Show API usage information if auth token is configured
     if settings.security.auth_token:
         _show_api_usage_info(toolkit, settings)
 
-    # Set environment variables for server to access CLI overrides
-    if cli_overrides:
-        os.environ["CCPROXY_CONFIG_OVERRIDES"] = json.dumps(cli_overrides)
-
     logger.debug(
         "server_starting",
         host=settings.server.host,
@@ -262,26 +73,27 @@ def _run_local_server(settings: Settings, cli_overrides: dict[str, Any]) -> None
 
     reload_includes = None
     if settings.server.reload:
-        reload_includes = ["ccproxy", "pyproject.toml", "uv.lock"]
+        reload_includes = ["ccproxy", "pyproject.toml", "uv.lock", "plugins"]
+
+    # container = create_service_container(settings)
 
-    # Run uvicorn with our already configured logging
     uvicorn.run(
-        app=f"{get_root_package_name()}.api.app:create_app",
+        # app=create_app(container),
+        app="ccproxy.api.app:create_app",
         factory=True,
         host=settings.server.host,
         port=settings.server.port,
         reload=settings.server.reload,
-        workers=None,  # ,settings.workers,
+        workers=settings.server.workers,
         log_config=None,
-        access_log=False,  # Disable uvicorn's default access logs
-        server_header=False,  # Disable uvicorn's server header to preserve upstream headers
+        access_log=False,
+        server_header=False,
+        date_header=False,
         reload_includes=reload_includes,
-        # log_config=get_uvicorn_log_config(),
     )
 
 
 def api(
-    # Configuration
     config: Annotated[
         Path | None,
         typer.Option(
@@ -295,7 +107,6 @@ def api(
             rich_help_panel="Configuration",
         ),
     ] = None,
-    # Server options
     port: Annotated[
         int | None,
         typer.Option(
@@ -340,15 +151,6 @@ def api(
             rich_help_panel="Server Settings",
         ),
     ] = None,
-    use_terminal_permission_handler: Annotated[
-        bool,
-        typer.Option(
-            "--terminal-permission-handler",
-            help="Enable terminal permission terminal handler",
-            rich_help_panel="Server Settings",
-        ),
-    ] = False,
-    # Security options
     auth_token: Annotated[
         str | None,
         typer.Option(
@@ -358,629 +160,92 @@ def api(
             rich_help_panel="Security Settings",
         ),
     ] = None,
-    # Claude options
-    max_thinking_tokens: Annotated[
-        int | None,
-        typer.Option(
-            "--max-thinking-tokens",
-            help="Maximum thinking tokens for Claude Code",
-            callback=validate_max_thinking_tokens,
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    allowed_tools: Annotated[
-        str | None,
-        typer.Option(
-            "--allowed-tools",
-            help="List of allowed tools (comma-separated)",
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    disallowed_tools: Annotated[
-        str | None,
-        typer.Option(
-            "--disallowed-tools",
-            help="List of disallowed tools (comma-separated)",
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    claude_cli_path: Annotated[
-        str | None,
-        typer.Option(
-            "--claude-cli-path",
-            help="Path to Claude CLI executable",
-            callback=validate_claude_cli_path,
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    append_system_prompt: Annotated[
-        str | None,
-        typer.Option(
-            "--append-system-prompt",
-            help="Additional system prompt to append",
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    permission_mode: Annotated[
-        str | None,
-        typer.Option(
-            "--permission-mode",
-            help="Permission mode: default, acceptEdits, or bypassPermissions",
-            callback=validate_permission_mode,
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    max_turns: Annotated[
-        int | None,
-        typer.Option(
-            "--max-turns",
-            help="Maximum conversation turns",
-            callback=validate_max_turns,
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    cwd: Annotated[
-        str | None,
-        typer.Option(
-            "--cwd",
-            help="Working directory path",
-            callback=validate_cwd,
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    permission_prompt_tool_name: Annotated[
-        str | None,
-        typer.Option(
-            "--permission-prompt-tool-name",
-            help="Permission prompt tool name",
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    sdk_message_mode: Annotated[
-        str | None,
-        typer.Option(
-            "--sdk-message-mode",
-            help="SDK message handling mode: forward (direct SDK blocks), ignore (skip blocks), formatted (XML tags with JSON data)",
-            callback=validate_sdk_message_mode,
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    sdk_pool: Annotated[
-        bool,
-        typer.Option(
-            "--sdk-pool/--no-sdk-pool",
-            help="Enable/disable general Claude SDK client connection pooling",
-            rich_help_panel="Claude Settings",
-        ),
-    ] = False,
-    sdk_pool_size: Annotated[
-        int | None,
-        typer.Option(
-            "--sdk-pool-size",
-            help="Number of clients to maintain in the general pool (1-20)",
-            callback=validate_pool_size,
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    sdk_session_pool: Annotated[
-        bool,
-        typer.Option(
-            "--sdk-session-pool/--no-sdk-session-pool",
-            help="Enable/disable session-aware Claude SDK client pooling",
-            rich_help_panel="Claude Settings",
-        ),
-    ] = False,
-    system_prompt_injection_mode: Annotated[
-        str | None,
-        typer.Option(
-            "--system-prompt-injection-mode",
-            help="System prompt injection mode: minimal (Claude Code ID only), full (all detected system messages)",
-            callback=validate_system_prompt_injection_mode,
-            rich_help_panel="Claude Settings",
-        ),
-    ] = None,
-    builtin_permissions: Annotated[
-        bool,
-        typer.Option(
-            "--builtin-permissions/--no-builtin-permissions",
-            help="Enable built-in permission handling infrastructure (MCP server and SSE endpoints). When disabled, users can configure custom MCP servers and permission tools.",
-            rich_help_panel="Claude Settings",
-        ),
-    ] = True,
-    # Core settings
-    docker: Annotated[
-        bool,
-        typer.Option(
-            "--docker",
-            "-d",
-            help="Run API server using Docker instead of local execution",
-        ),
-    ] = False,
-    # Docker settings using shared parameters
-    docker_image: Annotated[
-        str | None,
-        typer.Option(
-            "--docker-image",
-            help="Docker image to use (overrides configuration)",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    docker_env: Annotated[
-        list[str] | None,
-        typer.Option(
-            "--docker-env",
-            "-e",
-            help="Environment variables to pass to Docker container",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    docker_volume: Annotated[
+    enable_plugin: Annotated[
         list[str] | None,
         typer.Option(
-            "--docker-volume",
-            "-v",
-            help="Volume mounts for Docker container",
-            rich_help_panel="Docker Settings",
+            "--enable-plugin",
+            help="Enable a plugin by name (repeatable)",
+            rich_help_panel="Plugin Settings",
         ),
     ] = None,
-    docker_arg: Annotated[
+    disable_plugin: Annotated[
         list[str] | None,
         typer.Option(
-            "--docker-arg",
-            help="Additional arguments to pass to docker run",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    docker_home: Annotated[
-        str | None,
-        typer.Option(
-            "--docker-home",
-            help="Override the home directory for Docker",
-            rich_help_panel="Docker Settings",
+            "--disable-plugin",
+            help="Disable a plugin by name (repeatable)",
+            rich_help_panel="Plugin Settings",
         ),
     ] = None,
-    docker_workspace: Annotated[
-        str | None,
-        typer.Option(
-            "--docker-workspace",
-            help="Override the workspace directory for Docker",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    user_mapping_enabled: Annotated[
-        bool | None,
-        typer.Option(
-            "--user-mapping/--no-user-mapping",
-            help="Enable user mapping for Docker",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    user_uid: Annotated[
-        int | None,
-        typer.Option(
-            "--user-uid",
-            help="User UID for Docker user mapping",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    user_gid: Annotated[
-        int | None,
-        typer.Option(
-            "--user-gid",
-            help="User GID for Docker user mapping",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    # Network control flags
-    no_network_calls: Annotated[
-        bool,
-        typer.Option(
-            "--no-network-calls",
-            help="Disable all network calls (version checks and pricing updates)",
-            rich_help_panel="Privacy Settings",
-        ),
-    ] = False,
-    disable_version_check: Annotated[
-        bool,
-        typer.Option(
-            "--disable-version-check",
-            help="Disable version update checks (prevents calls to GitHub API)",
-            rich_help_panel="Privacy Settings",
-        ),
-    ] = False,
-    disable_pricing_updates: Annotated[
-        bool,
-        typer.Option(
-            "--disable-pricing-updates",
-            help="Disable pricing data updates (prevents downloads from GitHub)",
-            rich_help_panel="Privacy Settings",
-        ),
-    ] = False,
+    # Removed unused flags: plugin_setting, no_network_calls,
+    # disable_version_check, disable_pricing_updates
 ) -> None:
-    """
-    Start the CCProxy API server.
-
-    This command starts the API server either locally or in Docker.
-    The server provides both Anthropic and OpenAI-compatible endpoints.
-
-    All configuration options can be provided via CLI parameters,
-    which override values from configuration files and environment variables.
-
-    Examples:
-        ccproxy serve
-        ccproxy serve --port 8080 --reload
-        ccproxy serve --docker
-        ccproxy serve --docker --docker-image custom:latest --port 8080
-        ccproxy serve --max-thinking-tokens 10000 --allowed-tools Read,Write,Bash
-        ccproxy serve --port 8080 --workers 4
-    """
+    """Start the CCProxy API server."""
     try:
-        # Early logging - use basic print until logging is configured
-        # We'll log this properly after logging is configured
-
-        # Get config path from context if not provided directly
         if config is None:
             config = get_config_path_from_context()
 
-        # Create option containers for better organization
-        server_options = ServerOptions(
-            port=port,
-            host=host,
-            reload=reload,
-            log_level=log_level,
-            log_file=log_file,
-            use_terminal_confirmation_handler=use_terminal_permission_handler,
-        )
-
-        claude_options = ClaudeOptions(
-            max_thinking_tokens=max_thinking_tokens,
-            allowed_tools=allowed_tools,
-            disallowed_tools=disallowed_tools,
-            claude_cli_path=claude_cli_path,
-            append_system_prompt=append_system_prompt,
-            permission_mode=permission_mode,
-            max_turns=max_turns,
-            cwd=cwd,
-            permission_prompt_tool_name=permission_prompt_tool_name,
-            sdk_message_mode=sdk_message_mode,
-            sdk_pool=sdk_pool,
-            sdk_pool_size=sdk_pool_size,
-            sdk_session_pool=sdk_session_pool,
-            system_prompt_injection_mode=system_prompt_injection_mode,
-            builtin_permissions=builtin_permissions,
-        )
-
-        security_options = SecurityOptions(auth_token=auth_token)
-
-        # Handle network control flags
-        scheduler_overrides = {}
-        if no_network_calls:
-            # Disable both network features
-            scheduler_overrides["pricing_update_enabled"] = False
-            scheduler_overrides["version_check_enabled"] = False
-        else:
-            # Handle individual flags
-            if disable_pricing_updates:
-                scheduler_overrides["pricing_update_enabled"] = False
-            if disable_version_check:
-                scheduler_overrides["version_check_enabled"] = False
-
-        # Extract CLI overrides from structured option containers
-        cli_overrides = config_manager.get_cli_overrides_from_args(
-            # Server options
-            host=server_options.host,
-            port=server_options.port,
-            reload=server_options.reload,
-            log_level=server_options.log_level,
-            log_file=server_options.log_file,
-            use_terminal_confirmation_handler=server_options.use_terminal_confirmation_handler,
-            # Security options
-            auth_token=security_options.auth_token,
-            # Claude options
-            claude_cli_path=claude_options.claude_cli_path,
-            max_thinking_tokens=claude_options.max_thinking_tokens,
-            allowed_tools=claude_options.allowed_tools,
-            disallowed_tools=claude_options.disallowed_tools,
-            append_system_prompt=claude_options.append_system_prompt,
-            permission_mode=claude_options.permission_mode,
-            max_turns=claude_options.max_turns,
-            permission_prompt_tool_name=claude_options.permission_prompt_tool_name,
-            cwd=claude_options.cwd,
-            sdk_message_mode=claude_options.sdk_message_mode,
-            sdk_pool=claude_options.sdk_pool,
-            sdk_pool_size=claude_options.sdk_pool_size,
-            sdk_session_pool=claude_options.sdk_session_pool,
-            system_prompt_injection_mode=claude_options.system_prompt_injection_mode,
-            builtin_permissions=claude_options.builtin_permissions,
-        )
-
-        # Add scheduler overrides if any
-        if scheduler_overrides:
-            cli_overrides["scheduler"] = scheduler_overrides
-
-        # Load settings with CLI overrides
-        settings = config_manager.load_settings(
-            config_path=config, cli_overrides=cli_overrides
-        )
+        # Base CLI context; plugin-injected args merged below
+        cli_context = {
+            "port": port,
+            "host": host,
+            "reload": reload,
+            "log_level": log_level,
+            "log_file": log_file,
+            "auth_token": auth_token,
+            "enabled_plugins": enable_plugin,
+            "disabled_plugins": disable_plugin,
+        }
+
+        # Merge plugin-provided CLI args via helper
+        try:
+            from ccproxy.cli.helpers import get_plugin_cli_args
+
+            plugin_args = get_plugin_cli_args()
+            if plugin_args:
+                cli_context.update(plugin_args)
+        except Exception:
+            pass
+
+        # Pass CLI context to settings creation
+        settings = Settings.from_config(config_path=config, cli_context=cli_context)
 
-        # Set up logging once with the effective log level
-        # Import here to avoid circular import
-
-        from ccproxy.core.logging import setup_logging
-
-        # Always reconfigure logging to ensure log level changes are picked up
-        # Use JSON logs if explicitly requested via env var
         setup_logging(
-            json_logs=settings.server.log_format == "json",
-            log_level_name=settings.server.log_level,
-            log_file=settings.server.log_file,
+            json_logs=settings.logging.format == "json",
+            log_level_name=settings.logging.level,
+            log_file=settings.logging.file,
         )
 
-        # Re-get logger after logging is configured
         logger = get_logger(__name__)
 
-        # Test debug logging
-        logger.debug(
-            "Debug logging is enabled",
-            effective_log_level=server_options.log_level or settings.server.log_level,
-        )
-
-        # Log CLI command that was deferred
-        logger.info(
-            "cli_command_starting",
-            command="serve",
-            version=__version__,
-            docker=docker,
-            port=server_options.port,
-            host=server_options.host,
-            config_path=str(config) if config else None,
-        )
-
-        # Log effective configuration
         logger.debug(
             "configuration_loaded",
             host=settings.server.host,
             port=settings.server.port,
-            log_level=settings.server.log_level,
-            log_file=settings.server.log_file,
-            docker_mode=docker,
-            docker_image=settings.docker.docker_image if docker else None,
+            log_level=settings.logging.level,
+            log_file=settings.logging.file,
             auth_enabled=bool(settings.security.auth_token),
-            duckdb_enabled=settings.observability.duckdb_enabled,
-            duckdb_path=settings.observability.duckdb_path
-            if settings.observability.duckdb_enabled
-            else None,
-            claude_cli_path=settings.claude.cli_path,
+            duckdb_enabled=bool(
+                (settings.plugins.get("duckdb_storage") or {}).get("enabled", False)
+            ),
         )
 
-        if docker:
-            _run_docker_server(
-                settings,
-                docker_image=docker_image,
-                docker_env=docker_env,
-                docker_volume=docker_volume,
-                docker_arg=docker_arg,
-                docker_home=docker_home,
-                docker_workspace=docker_workspace,
-                user_mapping_enabled=user_mapping_enabled,
-                user_uid=user_uid,
-                user_gid=user_gid,
-            )
-        else:
-            _run_local_server(settings, cli_overrides)
+        _run_local_server(settings)
 
     except ConfigurationError as e:
         toolkit = get_rich_toolkit()
         toolkit.print(f"Configuration error: {e}", tag="error")
         raise typer.Exit(1) from e
-    except Exception as e:
+    except OSError as e:
         toolkit = get_rich_toolkit()
-        toolkit.print(f"Error starting server: {e}", tag="error")
-        raise typer.Exit(1) from e
-
-
-def claude(
-    args: Annotated[
-        list[str] | None,
-        typer.Argument(
-            help="Arguments to pass to claude CLI (e.g. --version, doctor, config)",
-        ),
-    ] = None,
-    docker: Annotated[
-        bool,
-        typer.Option(
-            "--docker",
-            "-d",
-            help="Run claude command from docker image instead of local CLI",
-        ),
-    ] = False,
-    # Docker settings using shared parameters
-    docker_image: Annotated[
-        str | None,
-        typer.Option(
-            "--docker-image",
-            help="Docker image to use (overrides configuration)",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    docker_env: Annotated[
-        list[str] | None,
-        typer.Option(
-            "--docker-env",
-            "-e",
-            help="Environment variables to pass to Docker container",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    docker_volume: Annotated[
-        list[str] | None,
-        typer.Option(
-            "--docker-volume",
-            "-v",
-            help="Volume mounts for Docker container",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    docker_arg: Annotated[
-        list[str] | None,
-        typer.Option(
-            "--docker-arg",
-            help="Additional arguments to pass to docker run",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    docker_home: Annotated[
-        str | None,
-        typer.Option(
-            "--docker-home",
-            help="Override the home directory for Docker",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    docker_workspace: Annotated[
-        str | None,
-        typer.Option(
-            "--docker-workspace",
-            help="Override the workspace directory for Docker",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    user_mapping_enabled: Annotated[
-        bool | None,
-        typer.Option(
-            "--user-mapping/--no-user-mapping",
-            help="Enable user mapping for Docker",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    user_uid: Annotated[
-        int | None,
-        typer.Option(
-            "--user-uid",
-            help="User UID for Docker user mapping",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-    user_gid: Annotated[
-        int | None,
-        typer.Option(
-            "--user-gid",
-            help="User GID for Docker user mapping",
-            rich_help_panel="Docker Settings",
-        ),
-    ] = None,
-) -> None:
-    """
-    Execute claude CLI commands directly.
-
-    This is a simple pass-through to the claude CLI executable
-    found by the settings system or run from docker image.
-
-    Examples:
-        ccproxy claude -- --version
-        ccproxy claude -- doctor
-        ccproxy claude -- config
-        ccproxy claude --docker -- --version
-        ccproxy claude --docker --docker-image custom:latest -- --version
-        ccproxy claude --docker --docker-env API_KEY=sk-... --docker-volume ./data:/data -- chat
-    """
-    # Handle None args case
-    if args is None:
-        args = []
-
-    toolkit = get_rich_toolkit()
-
-    try:
-        # Logger will be configured by configuration manager
-        logger = get_logger(__name__)
-        # Log CLI command execution start
-        logger.info(
-            "cli_command_starting",
-            command="claude",
-            version=__version__,
-            docker=docker,
-            args=args if args else [],
-        )
-
-        # Load settings using configuration manager
-        settings = config_manager.load_settings(
-            config_path=get_config_path_from_context()
+        toolkit.print(
+            f"Server startup failed (port/permission issue): {e}", tag="error"
         )
-
-        if docker:
-            # Prepare Docker execution using new adapter
-
-            toolkit.print_title(f"image {settings.docker.docker_image}", tag="docker")
-            image, volumes, environment, command, user_context, additional_args = (
-                _create_docker_adapter_from_settings(
-                    settings,
-                    docker_image=docker_image,
-                    docker_env=docker_env,
-                    docker_volume=docker_volume,
-                    docker_arg=docker_arg,
-                    docker_home=docker_home,
-                    docker_workspace=docker_workspace,
-                    user_mapping_enabled=user_mapping_enabled,
-                    user_uid=user_uid,
-                    user_gid=user_gid,
-                    command=["claude"],
-                    cmd_args=args,
-                )
-            )
-
-            cmd_str = " ".join(command or [])
-            logger.info(
-                "docker_execution",
-                image=image,
-                command=" ".join(command or []),
-                volumes_count=len(volumes),
-                env_vars_count=len(environment),
-            )
-            toolkit.print(f"Executing: docker run ... {image} {cmd_str}", tag="docker")
-            toolkit.print_line()
-
-            # Execute using the new Docker adapter
-            adapter = create_docker_adapter()
-            adapter.exec_container(
-                image=image,
-                volumes=volumes,
-                environment=environment,
-                command=command,
-                user_context=user_context,
-            )
-        else:
-            # Get claude path from settings
-            claude_path = settings.claude.cli_path
-            if not claude_path:
-                toolkit.print("Error: Claude CLI not found.", tag="error")
-                toolkit.print(
-                    "Please install Claude CLI or configure claude_cli_path.",
-                    tag="error",
-                )
-                raise typer.Exit(1)
-
-            # Resolve to absolute path
-            if not Path(claude_path).is_absolute():
-                claude_path = str(Path(claude_path).resolve())
-
-            logger.info("local_claude_execution", claude_path=claude_path, args=args)
-            toolkit.print(f"Executing: {claude_path} {' '.join(args)}", tag="claude")
-            toolkit.print_line()
-
-            # Execute command directly
-            try:
-                # Use os.execvp to replace current process with claude
-                # This hands over full control to claude, including signal handling
-                os.execvp(claude_path, [claude_path] + args)
-            except OSError as e:
-                toolkit.print(f"Failed to execute command: {e}", tag="error")
-                raise typer.Exit(1) from e
-
-    except ConfigurationError as e:
-        logger.error("cli_configuration_error", error=str(e), command="claude")
-        toolkit.print(f"Configuration error: {e}", tag="error")
+        raise typer.Exit(1) from e
+    except ImportError as e:
+        toolkit = get_rich_toolkit()
+        toolkit.print(f"Import error during server startup: {e}", tag="error")
         raise typer.Exit(1) from e
     except Exception as e:
-        logger.error("cli_unexpected_error", error=str(e), command="claude")
-        toolkit.print(f"Error executing claude command: {e}", tag="error")
+        toolkit = get_rich_toolkit()
+        toolkit.print(f"Error starting server: {e}", tag="error")
         raise typer.Exit(1) from e