ccproxy-api 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

ccproxy/cli/commands/permission_handler.py

@@ -0,0 +1,553 @@
+"""CLI command for handling confirmation requests via SSE stream."""
+
+import asyncio
+import contextlib
+import json
+import logging
+from collections.abc import AsyncIterator
+from typing import Any
+
+import httpx
+import structlog
+import typer
+from structlog import get_logger
+
+from ccproxy.api.services.permission_service import PermissionRequest
+from ccproxy.api.ui.permission_handler_protocol import ConfirmationHandlerProtocol
+from ccproxy.api.ui.terminal_permission_handler import (
+    TerminalPermissionHandler as TextualPermissionHandler,
+)
+from ccproxy.config.settings import get_settings
+
+
+logger = get_logger(__name__)
+
+app = typer.Typer(
+    name="confirmation-handler",
+    help="Connect to the API server and handle confirmation requests",
+    no_args_is_help=True,
+)
+
+
+class SSEConfirmationHandler:
+    """Handles confirmation requests received via SSE stream."""
+
+    def __init__(
+        self,
+        api_url: str,
+        terminal_handler: ConfirmationHandlerProtocol,
+        ui: bool = True,
+        auth_token: str | None = None,
+        auto_reconnect: bool = True,
+    ):
+        self.api_url = api_url.rstrip("/")
+        self.terminal_handler = terminal_handler
+        self.client: httpx.AsyncClient | None = None
+        self.max_retries = 5
+        self.base_delay = 1.0
+        self.max_delay = 60.0
+        self.ui = ui
+        self.auth_token = auth_token
+        self.auto_reconnect = auto_reconnect
+
+        self._ongoing_requests: dict[str, asyncio.Task[bool]] = {}
+        self._resolved_requests: dict[str, tuple[bool, str]] = {}
+        self._resolved_by_us: set[str] = set()
+
+    async def __aenter__(self) -> "SSEConfirmationHandler":
+        """Async context manager entry."""
+        headers = {}
+        if self.auth_token:
+            headers["Authorization"] = f"Bearer {self.auth_token}"
+
+        self.client = httpx.AsyncClient(timeout=300.0, headers=headers)  # 5 minutes
+        return self
+
+    async def __aexit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: object,
+    ) -> None:
+        """Async context manager exit."""
+        if self.client:
+            await self.client.aclose()
+            self.client = None
+
+    async def handle_event(self, event_type: str, data: dict[str, Any]) -> None:
+        """Handle an SSE event by dispatching to specific handlers.
+
+        Args:
+            event_type: Type of the event
+            data: Event data
+        """
+        if event_type == "ping":
+            return
+
+        from ccproxy.models.permissions import EventType
+
+        handler_map = {
+            EventType.PERMISSION_REQUEST.value: self._handle_permission_request,
+            EventType.PERMISSION_RESOLVED.value: self._handle_permission_resolved,
+        }
+
+        handler = handler_map.get(event_type)
+        if handler:
+            await handler(data)
+        else:
+            logger.warning("unhandled_sse_event", event_type=event_type)
+
+    async def _handle_permission_request(self, data: dict[str, Any]) -> None:
+        """Handle a confirmation request event.
+
+        Args:
+            data: Event data containing request details
+        """
+        request_id = data.get("request_id")
+        if not request_id:
+            logger.warning("permission_request_missing_id", data=data)
+            return
+
+        # Check if this request was already resolved by another handler
+        if request_id in self._resolved_requests:
+            allowed, reason = self._resolved_requests[request_id]
+            logger.info(
+                "permission_already_resolved_by_other_handler",
+                request_id=request_id,
+                allowed=allowed,
+                reason=reason,
+            )
+            logger.info(
+                "permission_already_handled",
+                request_id=request_id[:8],
+                reason=reason,
+            )
+            return
+
+        logger.info(
+            "permission_request_received",
+            request_id=request_id,
+            tool_name=data.get("tool_name"),
+        )
+
+        try:
+            # Map request_id to id field for PermissionRequest model
+            request_data = dict(data)
+            if "request_id" in request_data:
+                request_data["id"] = request_data.pop("request_id")
+            request = PermissionRequest.model_validate(request_data)
+        except Exception as e:
+            logger.error(
+                "permission_request_validation_failed", data=data, error=str(e)
+            )
+            return
+
+        if self.ui and request_id is not None:
+            task = asyncio.create_task(
+                self._handle_permission_with_cancellation(request)
+            )
+            self._ongoing_requests[request_id] = task
+
+    async def _handle_permission_resolved(self, data: dict[str, Any]) -> None:
+        """Handle a confirmation resolved event.
+
+        Args:
+            data: Event data containing resolution details
+        """
+        request_id = data.get("request_id")
+        allowed = data.get("allowed", False)
+
+        if request_id is not None and allowed is not None:
+            reason = (
+                "approved by another handler"
+                if allowed
+                else "denied by another handler"
+            )
+            self._resolved_requests[request_id] = (allowed, reason)
+
+        was_resolved_by_us = (
+            request_id is not None and request_id in self._resolved_by_us
+        )
+
+        if request_id is not None and request_id in self._ongoing_requests:
+            task = self._ongoing_requests[request_id]
+            if not task.done() and not was_resolved_by_us:
+                logger.info(
+                    "cancelling_ongoing_confirmation",
+                    request_id=request_id,
+                    allowed=allowed,
+                )
+
+                status_text = "approved" if allowed else "denied"
+                self.terminal_handler.cancel_confirmation(
+                    request_id, f"{status_text} by another handler"
+                )
+
+                task.cancel()
+
+                with contextlib.suppress(TimeoutError, asyncio.CancelledError):
+                    await asyncio.wait_for(task, timeout=0.1)
+
+                logger.info(
+                    "permission_cancelled_by_other_handler",
+                    request_id=request_id[:8],
+                    status=status_text,
+                )
+
+            if request_id is not None:
+                self._ongoing_requests.pop(request_id, None)
+
+        if request_id is not None:
+            self._resolved_by_us.discard(request_id)
+
+    async def _handle_permission_with_cancellation(
+        self, request: PermissionRequest
+    ) -> bool:
+        """Handle permission with cancellation support.
+
+        Args:
+            request: The permission request to handle
+        """
+        try:
+            allowed = await self.terminal_handler.handle_permission(request)
+
+            if request.id in self._resolved_requests:
+                logger.info(
+                    "permission_resolved_while_processing",
+                    request_id=request.id,
+                    our_result=allowed,
+                )
+                return False
+
+            self._resolved_by_us.add(request.id)
+
+            await self.send_response(request.id, allowed)
+
+            await asyncio.sleep(0.5)
+
+            return allowed
+
+        except asyncio.CancelledError:
+            logger.info(
+                "permission_cancelled",
+                request_id=request.id,
+            )
+            raise
+
+        except Exception as e:
+            logger.error(
+                "permission_handling_error",
+                request_id=request.id,
+                error=str(e),
+                exc_info=True,
+            )
+            # Only send response if not already resolved
+            if request.id not in self._resolved_requests:
+                # If response fails, it might already be resolved
+                with contextlib.suppress(Exception):
+                    await self.send_response(request.id, False)
+            return False
+
+    async def send_response(self, request_id: str, allowed: bool) -> None:
+        """Send a confirmation response to the API.
+
+        Args:
+            request_id: ID of the confirmation request
+            allowed: Whether to allow or deny
+        """
+        if not self.client:
+            logger.error("send_response_no_client", request_id=request_id)
+            return
+
+        try:
+            response = await self.client.post(
+                f"{self.api_url}/permissions/{request_id}/respond",
+                json={"allowed": allowed},
+            )
+
+            if response.status_code == 200:
+                logger.info(
+                    "permission_response_sent",
+                    request_id=request_id,
+                    allowed=allowed,
+                )
+            elif response.status_code == 409:
+                # Already resolved by another handler
+                logger.info(
+                    "permission_already_resolved",
+                    request_id=request_id,
+                    status_code=response.status_code,
+                )
+            else:
+                logger.error(
+                    "permission_response_failed",
+                    request_id=request_id,
+                    status_code=response.status_code,
+                    response=response.text,
+                )
+
+        except Exception as e:
+            logger.error(
+                "permission_response_error",
+                request_id=request_id,
+                error=str(e),
+                exc_info=True,
+            )
+
+    async def parse_sse_stream(
+        self, response: httpx.Response
+    ) -> AsyncIterator[tuple[str, dict[str, Any]]]:
+        """Parse SSE events from the response stream.
+
+        Args:
+            response: The httpx response with streaming content
+
+        Yields:
+            Tuples of (event_type, data)
+        """
+        buffer = ""
+        async for chunk in response.aiter_text():
+            buffer += chunk
+
+            buffer = buffer.replace("\r\n", "\n")
+
+            while "\n\n" in buffer:
+                event_text, buffer = buffer.split("\n\n", 1)
+
+                if not event_text.strip():
+                    continue
+
+                event_type = "message"
+                data_lines = []
+
+                for line in event_text.split("\n"):
+                    line = line.strip()
+                    if line.startswith("event:"):
+                        event_type = line[6:].strip()
+                    elif line.startswith("data:"):
+                        data_lines.append(line[5:].strip())
+
+                if data_lines:
+                    try:
+                        data_json = " ".join(data_lines)
+                        data = json.loads(data_json)
+                        yield event_type, data
+                    except json.JSONDecodeError as e:
+                        logger.error(
+                            "sse_parse_error",
+                            event_type=event_type,
+                            data=" ".join(data_lines),
+                            error=str(e),
+                        )
+
+    async def run(self) -> None:
+        """Run the SSE client with reconnection logic."""
+        if not self.client:
+            logger.error("run_no_client")
+            return
+
+        stream_url = f"{self.api_url}/permissions/stream"
+        retry_count = 0
+
+        logger.info(
+            "connecting_to_permission_stream",
+            url=stream_url,
+        )
+        print(f"Connecting to confirmation stream at {stream_url}...")
+
+        while retry_count <= self.max_retries:
+            try:
+                await self._connect_and_handle_stream(stream_url)
+                # If we get here, connection ended gracefully
+                if self.auto_reconnect:
+                    # Reset retry count and reconnect
+                    retry_count = 0
+                    print("Connection closed. Reconnecting...")
+                    await asyncio.sleep(1.0)  # Brief pause before reconnecting
+                    continue
+                else:
+                    print("Connection closed. Exiting (auto-reconnect disabled).")
+                    break
+
+            except KeyboardInterrupt:
+                logger.info("permission_handler_shutdown_requested")
+                break
+
+            except (
+                httpx.ConnectError,
+                httpx.TimeoutException,
+                httpx.ReadTimeout,
+            ) as e:
+                retry_count += 1
+                if retry_count > self.max_retries:
+                    logger.error(
+                        "connection_failed_max_retries",
+                        max_retries=self.max_retries,
+                    )
+                    raise typer.Exit(1) from None
+
+                # Exponential backoff with jitter
+                delay = min(self.base_delay * (2 ** (retry_count - 1)), self.max_delay)
+
+                logger.warning(
+                    "connection_failed_retrying",
+                    attempt=retry_count,
+                    max_retries=self.max_retries,
+                    retry_delay=delay,
+                    error=str(e),
+                )
+
+                print(
+                    f"Connection failed (attempt {retry_count}/{self.max_retries}). Retrying in {delay}s..."
+                )
+
+                await asyncio.sleep(delay)
+                continue
+
+            except Exception as e:
+                logger.error("sse_client_error", error=str(e), exc_info=True)
+                raise typer.Exit(1) from e
+
+    async def _connect_and_handle_stream(self, stream_url: str) -> None:
+        """Connect to the stream and handle events."""
+        if not self.client:
+            logger.error("connect_no_client")
+            return
+
+        async with self.client.stream("GET", stream_url) as response:
+            if response.status_code != 200:
+                error_text = ""
+                try:
+                    error_bytes = await response.aread()
+                    error_text = error_bytes.decode("utf-8")
+                except Exception:
+                    error_text = "Unable to read error response"
+
+                logger.error(
+                    "sse_connection_failed",
+                    status_code=response.status_code,
+                    response=error_text,
+                )
+
+                if response.status_code in (502, 503, 504):
+                    # Server errors - retry
+                    raise httpx.ConnectError(
+                        f"Server error: HTTP {response.status_code}"
+                    )
+                else:
+                    # Client errors - don't retry
+                    logger.error(
+                        "sse_connection_client_error",
+                        status_code=response.status_code,
+                        response=error_text,
+                    )
+                    raise typer.Exit(1)
+
+            logger.info(
+                "sse_connection_established",
+                url=stream_url,
+                message="Connected to confirmation stream. Waiting for requests...",
+            )
+            print("✓ Connected to confirmation stream. Waiting for requests...")
+
+            async for event_type, data in self.parse_sse_stream(response):
+                try:
+                    await self.handle_event(event_type, data)
+                except Exception as e:
+                    logger.error(
+                        "sse_event_error",
+                        event_type=event_type,
+                        error=str(e),
+                        exc_info=True,
+                    )
+
+
+@app.command()
+def connect(
+    api_url: str | None = typer.Option(
+        None,
+        "--api-url",
+        "-u",
+        help="API server URL (defaults to settings)",
+    ),
+    no_ui: bool = typer.Option(False, "--no-ui", help="Disable UI mode"),
+    verbose: int = typer.Option(
+        0,
+        "-v",
+        "--verbose",
+        count=True,
+        help="Increase verbosity (-v for INFO, -vv for DEBUG)",
+    ),
+    auth_token: str | None = typer.Option(
+        None,
+        "--auth-token",
+        "-t",
+        help="Bearer token for API authentication (overrides config)",
+        envvar="CCPROXY_AUTH_TOKEN",
+    ),
+    no_reconnect: bool = typer.Option(
+        False,
+        "--no-reconnect",
+        help="Disable automatic reconnection when connection is lost",
+    ),
+) -> None:
+    """Connect to the API server and handle confirmation requests.
+
+    This command connects to the CCProxy API server via Server-Sent Events
+    and handles permission confirmation requests in the terminal.
+
+    """
+    # Configure logging level based on verbosity
+    # Handle case where verbose might be OptionInfo (in tests) or int (runtime)
+    verbose_count = verbose if isinstance(verbose, int) else 0
+
+    if verbose_count >= 2:
+        log_level = logging.DEBUG
+    elif verbose_count >= 1:
+        log_level = logging.INFO
+    else:
+        log_level = logging.WARNING
+
+    # Configure root logger level
+    logging.basicConfig(level=log_level)
+
+    # Configure structlog to respect the same log level
+    structlog.configure(
+        wrapper_class=structlog.make_filtering_bound_logger(log_level),
+    )
+
+    settings = get_settings()
+
+    # Use provided URL or default from settings
+    if not api_url:
+        api_url = f"http://{settings.server.host}:{settings.server.port}"
+
+    # Determine auth token: CLI arg > config setting > None
+    token = auth_token or settings.security.auth_token
+
+    # Create handlers based on UI mode selection
+    terminal_handler: ConfirmationHandlerProtocol = TextualPermissionHandler()
+
+    async def run_handler() -> None:
+        """Run the handler with proper resource management."""
+        async with SSEConfirmationHandler(
+            api_url,
+            terminal_handler,
+            not no_ui,
+            auth_token=token,
+            auto_reconnect=not no_reconnect,
+        ) as sse_handler:
+            await sse_handler.run()
+
+    # Run the async handler
+    try:
+        asyncio.run(run_handler())
+    except KeyboardInterrupt:
+        logger.info("permission_handler_stopped")
+    except Exception as e:
+        logger.error("permission_handler_error", error=str(e), exc_info=True)
+        raise typer.Exit(1) from e
+
+
+if __name__ == "__main__":
+    app()

ccproxy/cli/commands/serve.py

@@ -10,7 +10,6 @@ import uvicorn
 from click import get_current_context
 from structlog import get_logger
 
-from ccproxy._version import __version__
 from ccproxy.cli.helpers import (
     get_rich_toolkit,
     is_running_in_docker,
@@ -36,6 +35,7 @@ from ..options.claude_options import (
     validate_max_thinking_tokens,
     validate_max_turns,
     validate_permission_mode,
+    validate_sdk_message_mode,
 )
 from ..options.security_options import SecurityOptions, validate_auth_token
 from ..options.server_options import (
@@ -45,10 +45,6 @@ from ..options.server_options import (
 )
 
 
-# Logger will be configured by configuration manager
-logger = get_logger(__name__)
-
-
 def get_config_path_from_context() -> Path | None:
     """Get config path from typer context if available."""
     try:
@@ -328,7 +324,7 @@ def api(
         str | None,
         typer.Option(
             "--log-level",
-            help="Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)",
+            help="Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL). Use WARNING for minimal output.",
             callback=validate_log_level,
             rich_help_panel="Server Settings",
         ),
@@ -341,6 +337,14 @@ 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,
@@ -429,6 +433,15 @@ def api(
             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,
     # Core settings
     docker: Annotated[
         bool,
@@ -546,6 +559,7 @@ def api(
             reload=reload,
             log_level=log_level,
             log_file=log_file,
+            use_terminal_confirmation_handler=use_terminal_permission_handler,
         )
 
         claude_options = ClaudeOptions(
@@ -558,6 +572,7 @@ def api(
             max_turns=max_turns,
             cwd=cwd,
             permission_prompt_tool_name=permission_prompt_tool_name,
+            sdk_message_mode=sdk_message_mode,
         )
 
         security_options = SecurityOptions(auth_token=auth_token)
@@ -570,6 +585,7 @@ def api(
             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
@@ -582,6 +598,7 @@ def api(
             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,
         )
 
         # Load settings with CLI overrides
@@ -591,17 +608,16 @@ def api(
 
         # Set up logging once with the effective log level
         # Import here to avoid circular import
-        import structlog
 
         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
-        json_logs = os.environ.get("CCPROXY_JSON_LOGS", "").lower() == "true"
+        print(f"{settings.server.log_level} {settings.server.log_file}")
         setup_logging(
-            json_logs=json_logs,
-            log_level=server_options.log_level or settings.server.log_level,
-            log_file=server_options.log_file or settings.server.log_file,
+            json_logs=settings.server.log_format == "json",
+            log_level_name=settings.server.log_level,
+            log_file=settings.server.log_file,
         )
 
         # Re-get logger after logging is configured
@@ -624,7 +640,7 @@ def api(
         )
 
         # Log effective configuration
-        logger.info(
+        logger.debug(
             "configuration_loaded",
             host=settings.server.host,
             port=settings.server.port,
@@ -778,6 +794,8 @@ def claude(
     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",

ccproxy/cli/docker/params.py

@@ -82,8 +82,6 @@ def validate_docker_home(
     if value is None:
         return None
 
-    from pathlib import Path
-
     from ccproxy.config.docker_settings import validate_host_path
 
     try:
@@ -116,8 +114,6 @@ def validate_docker_workspace(
     if value is None:
         return None
 
-    from pathlib import Path
-
     from ccproxy.config.docker_settings import validate_host_path
 
     try: