plotext-plus 1.0.9__py3-none-any.whl → 1.0.10__py3-none-any.whl

plotext_plus/mcp_server.py

@@ -1,5 +1,4 @@
 # /usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 """
 Plotext Plus MCP Server - Model Context Protocol Integration
@@ -12,35 +11,221 @@ The server uses chuk-mcp-server for zero-configuration MCP functionality.
 """
 
 try:
-    from chuk_mcp_server import tool, resource, prompt, run
-except ImportError:
+    from chuk_mcp_server import ChukMCPServer
+    from chuk_mcp_server import prompt
+    from chuk_mcp_server import resource
+    from chuk_mcp_server import tool
+except ImportError as e:
     raise ImportError(
         "chuk-mcp-server is required for MCP functionality. "
         "Install it with: uv add --optional mcp plotext_plus"
-    )
+    ) from e
 
-import asyncio
-from typing import List, Optional, Union, Dict, Any
 import json
-import base64
-from io import StringIO
+import logging
 import sys
+from datetime import datetime
+from io import StringIO
+from typing import Any
 
 # Import public plotext_plus APIs
-from . import plotting
+from . import _core
 from . import charts
-from . import themes
+from . import plotting
 from . import utilities
 
 # Keep track of the current plot state
 _current_plot_buffer = StringIO()
 
+# Set up logging
+_logger = logging.getLogger("plotext_plus_mcp")
+_logger.setLevel(logging.INFO)
+
+# Create console handler
+_console_handler = logging.StreamHandler(sys.stderr)
+_console_handler.setLevel(logging.INFO)
+
+# Create formatter
+_formatter = logging.Formatter("[%(asctime)s] %(levelname)s: %(message)s")
+_console_handler.setFormatter(_formatter)
+
+# Add handler to logger
+_logger.addHandler(_console_handler)
+
+
+# ============================================================================
+# Custom MCP Logging Handler (based on chuk-mcp-server example)
+# ============================================================================
+
+
+class MCPLoggingHandler(logging.Handler):
+    """
+    Custom logging handler that sends log messages to MCP clients via notifications.
+
+    This handler converts Python log records into MCP logging notifications
+    and sends them to connected clients.
+    """
+
+    def __init__(self, mcp_server: ChukMCPServer):
+        super().__init__()
+        self.mcp_server = mcp_server
+        self.notification_queue: list[dict[str, Any]] = []
+        self.clients: dict[str, Any] = {}  # Track connected clients
+
+        # Set up formatting
+        formatter = logging.Formatter(
+            "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+        )
+        self.setFormatter(formatter)
+
+    def emit(self, record: logging.LogRecord) -> None:
+        """Emit a log record as an MCP notification."""
+        try:
+            # Format the log message
+            formatted_message = self.format(record)
+
+            # Create MCP logging notification
+            notification = {
+                "jsonrpc": "2.0",
+                "method": "notifications/message",
+                "params": {
+                    "level": self._map_log_level(record.levelno),
+                    "logger": record.name,
+                    "data": {
+                        "message": record.getMessage(),
+                        "timestamp": datetime.fromtimestamp(record.created).isoformat(),
+                        "module": record.module,
+                        "function": record.funcName,
+                        "line": record.lineno,
+                        "formatted": formatted_message,
+                    },
+                },
+            }
+
+            # Add exception info if present
+            if record.exc_info:
+                notification["params"]["data"]["exception"] = self.formatException(
+                    record.exc_info
+                )
+
+            # Queue notification for sending to clients
+            self.notification_queue.append(notification)
+
+            # In a real implementation, you would send this to connected clients
+            # For this example, we'll just print to stderr for demonstration
+            print(f"[MCP LOG NOTIFICATION] {json.dumps(notification)}", file=sys.stderr)
+
+        except Exception:
+            # Don't raise exceptions in logging handler
+            self.handleError(record)
+
+    def _map_log_level(self, python_level: int) -> str:
+        """Map Python logging levels to MCP logging levels."""
+        if python_level >= logging.CRITICAL:
+            return "error"  # MCP doesn't have CRITICAL, map to error
+        elif python_level >= logging.ERROR:
+            return "error"
+        elif python_level >= logging.WARNING:
+            return "warning"
+        elif python_level >= logging.INFO:
+            return "info"
+        else:
+            return "debug"
+
+
+# ============================================================================
+# Enhanced ChukMCPServer with Logging Support
+# ============================================================================
+
+
+class PlotextPlusMCPServer(ChukMCPServer):
+    """
+    Extended ChukMCPServer with integrated MCP logging support.
+
+    This class adds MCP logging capability and automatically sets up
+    a custom logging handler to send log messages to MCP clients.
+    Also implements the logging/setLevel MCP method.
+    """
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        # Enable logging capability - now properly supported in chuk-mcp-server
+        # Fixed empty capability object issue in chuk-mcp-server
+        kwargs.setdefault("logging", True)
+
+        super().__init__(*args, **kwargs)
+
+        # Track server events
+        self.server_events: list[dict[str, Any]] = []
+
+        # Server logger
+        self.server_logger = logging.getLogger(f"{__name__}.{self.__class__.__name__}")
+
+        # Set up custom MCP logging handler
+        self.mcp_logging_handler = MCPLoggingHandler(self)
+        self.setup_logging()
+
+        # Current logging level for MCP clients
+        self.mcp_logging_level = "INFO"
+
+    def setup_logging(self) -> None:
+        """Set up the MCP logging system."""
+        # Get the root logger for the chuk_mcp_server package
+        mcp_logger = logging.getLogger("chuk_mcp_server")
+
+        # Add our custom handler
+        mcp_logger.addHandler(self.mcp_logging_handler)
 
-def _capture_plot_output(func, *args, **kwargs):
+        # Also add to the plotext_plus logger
+        plotext_logger = logging.getLogger(__name__)
+        plotext_logger.addHandler(self.mcp_logging_handler)
+
+        # Add to our global logger
+        _logger.addHandler(self.mcp_logging_handler)
+
+        self.server_logger.info("🔊 MCP Logging system initialized")
+
+    def log_server_event(
+        self, event_type: str, message: str, data: dict[str, Any] | None = None
+    ) -> None:
+        """Log a server event that will be sent to MCP clients."""
+        from datetime import datetime
+
+        event = {
+            "type": event_type,
+            "message": message,
+            "timestamp": datetime.now().isoformat(),
+            "data": data or {},
+        }
+
+        self.server_events.append(event)
+
+        # Log through Python logging system (will trigger MCP notification)
+        self.server_logger.info(
+            f"[{event_type.upper()}] {message}", extra={"mcp_data": data}
+        )
+
+    def get_log_notifications(self) -> list[dict[str, Any]]:
+        """Get queued log notifications (for testing/debugging)."""
+        return self.mcp_logging_handler.notification_queue.copy()
+
+    def run_stdio(self, debug: bool | None = None) -> Any:
+        """Override run_stdio to start the server with logging support."""
+        # logging/setLevel is now natively supported in chuk-mcp-server
+        result = super().run_stdio(debug)
+        return result
+
+    def run(self, host: str | None = None, port: int | None = None, debug: bool | None = None) -> Any:
+        """Override run to start the server with logging support."""
+        # logging/setLevel is now natively supported in chuk-mcp-server
+        result = super().run(host, port, debug)
+        return result
+
+
+def _capture_plot_output(func: Any, *args: Any, **kwargs: Any) -> tuple[Any, str]:
     """Capture plot output and return as string"""
     # Save current stdout
     old_stdout = sys.stdout
-    
+
     try:
         # Redirect stdout to capture plot output
         sys.stdout = _current_plot_buffer
@@ -48,6 +233,20 @@ def _capture_plot_output(func, *args, **kwargs):
         plot_output = _current_plot_buffer.getvalue()
         _current_plot_buffer.truncate(0)
         _current_plot_buffer.seek(0)
+
+        # Fix: Add zero-width space character to preserve formatting in MCP CLI
+        lines = plot_output.split("\n")
+        fixed_lines = []
+        for line in lines:
+            if line.strip():  # Only process non-empty lines
+                # Add a zero-width space (\u200b) at the end to prevent trimming
+                fixed_line = line + "\u200b"
+                fixed_lines.append(fixed_line)
+            else:
+                fixed_lines.append(line)
+
+        plot_output = "\n".join(fixed_lines)
+
         return result, plot_output
     finally:
         # Restore stdout
@@ -56,140 +255,273 @@ def _capture_plot_output(func, *args, **kwargs):
 
 # Core Plotting Tools
 @tool
-async def scatter_plot(x: List[Union[int, float]], y: List[Union[int, float]], 
-                      marker: Optional[str] = None, color: Optional[str] = None,
-                      title: Optional[str] = None) -> str:
+async def scatter_plot(
+    x: list[int | float | str],
+    y: list[int | float | str],
+    marker: str | None = None,
+    color: str | None = None,
+    title: str | None = None,
+    theme_name: str | None = None,
+) -> str:
     """Create a scatter plot with given x and y data points.
-    
+
     Args:
-        x: List of x-coordinates
-        y: List of y-coordinates  
+        x: List of x-coordinates (numbers, dates, or strings)
+        y: List of y-coordinates (numbers or strings)
         marker: Marker style (optional)
         color: Plot color (optional)
         title: Plot title (optional)
-        
+        theme_name: Theme to apply (optional)
+
     Returns:
         The rendered plot as text
     """
-    # Convert string inputs to float
-    x_numeric = [float(val) if isinstance(val, str) else val for val in x]
-    y_numeric = [float(val) if isinstance(val, str) else val for val in y]
-    
+    # Process x-coordinates - handle dates, numbers, and strings (same logic as line_plot)
+    try:
+        x_processed = []
+        for i, val in enumerate(x):
+            if isinstance(val, str):
+                # Check if it's a date string
+                if "-" in val and len(val) >= 8:  # Basic date format check
+                    # For date strings, use index position as numeric value
+                    x_processed.append(i)
+                else:
+                    # Try to convert to float, fallback to index
+                    try:
+                        x_processed.append(float(val))
+                    except ValueError:
+                        x_processed.append(i)
+            else:
+                x_processed.append(float(val))
+
+        # Convert y values to numeric
+        y_numeric = [float(val) if isinstance(val, str) else val for val in y]
+
+        _logger.debug(
+            f"Processed scatter data: x_range=[{min(x_processed):.2f}..{max(x_processed):.2f}], y_range=[{min(y_numeric):.2f}..{max(y_numeric):.2f}]"
+        )
+    except Exception as e:
+        _logger.error(f"Error processing scatter plot inputs: {e}")
+        raise
+
     plotting.clear_figure()
+
+    # Apply theme if specified
+    if theme_name and theme_name != "default":
+        _core.theme(theme_name)
+        _logger.debug(f"Applied theme: {theme_name}")
+
     if title:
         plotting.title(title)
-    
-    _, output = _capture_plot_output(plotting.scatter, x_numeric, y_numeric, marker=marker, color=color)
+
+    # Set custom x-axis labels for dates if needed (same logic as line_plot)
+    if any(isinstance(val, str) and "-" in val and len(val) >= 8 for val in x):
+        # We have date strings, set them as x-axis labels
+        date_labels = [
+            str(val) if isinstance(val, str) and "-" in val else str(val) for val in x
+        ]
+        _core.xticks(x_processed, date_labels)
+
+    _, output = _capture_plot_output(
+        plotting.scatter, x_processed, y_numeric, marker=marker, color=color
+    )
     _, show_output = _capture_plot_output(plotting.show)
-    
+
     return output + show_output
 
 
 @tool
-async def line_plot(x: List[Union[int, float]], y: List[Union[int, float]], 
-                   color: Optional[str] = None, title: Optional[str] = None) -> str:
+async def line_plot(
+    x: list[int | float | str],
+    y: list[int | float | str],
+    color: str | None = None,
+    title: str | None = None,
+    theme_name: str | None = None,
+) -> str:
     """Create a line plot with given x and y data points.
-    
+
     Args:
-        x: List of x-coordinates
-        y: List of y-coordinates
+        x: List of x-coordinates (numbers, dates, or strings)
+        y: List of y-coordinates (numbers or strings)
         color: Line color (optional)
         title: Plot title (optional)
-        
+        theme_name: Theme to apply (optional)
+
     Returns:
         The rendered plot as text
     """
-    import sys
-    print(f"DEBUG: line_plot called with x={x}, y={y}, title={title}", file=sys.stderr)
-    
-    # Convert string inputs to float
+    _logger.info(
+        f"Creating line plot with {len(x)} data points, title='{title}', color='{color}'"
+    )
+
+    # Process x-coordinates - handle dates, numbers, and strings
     try:
-        x_numeric = [float(val) if isinstance(val, str) else val for val in x]
+        x_processed = []
+        for i, val in enumerate(x):
+            if isinstance(val, str):
+                # Check if it's a date string
+                if "-" in val and len(val) >= 8:  # Basic date format check
+                    # For date strings, use index position as numeric value
+                    x_processed.append(i)
+                else:
+                    # Try to convert to float, fallback to index
+                    try:
+                        x_processed.append(float(val))
+                    except ValueError:
+                        x_processed.append(i)
+            else:
+                x_processed.append(float(val))
+
+        # Convert y values to numeric
         y_numeric = [float(val) if isinstance(val, str) else val for val in y]
-        print(f"DEBUG: Converted to x_numeric={x_numeric}, y_numeric={y_numeric}", file=sys.stderr)
+
+        _logger.debug(
+            f"Processed data: x_range=[{min(x_processed):.2f}..{max(x_processed):.2f}], y_range=[{min(y_numeric):.2f}..{max(y_numeric):.2f}]"
+        )
     except Exception as e:
-        print(f"DEBUG: Error converting inputs: {e}", file=sys.stderr)
+        _logger.error(f"Error processing inputs: {e}")
         raise
-    
+
     try:
         plotting.clear_figure()
-        print("DEBUG: Cleared figure", file=sys.stderr)
-        
+        _logger.debug("Cleared figure")
+
+        # Apply theme if specified
+        if theme_name and theme_name != "default":
+            _core.theme(theme_name)
+            _logger.debug(f"Applied theme: {theme_name}")
+
         if title:
             plotting.title(title)
-            print(f"DEBUG: Set title: {title}", file=sys.stderr)
-        
-        _, output = _capture_plot_output(plotting.plot, x_numeric, y_numeric, color=color)
-        print(f"DEBUG: Generated plot output, length: {len(output)}", file=sys.stderr)
-        
+            _logger.debug(f"Set plot title: {title}")
+
+        # Set custom x-axis labels for dates if needed
+        if any(isinstance(val, str) and "-" in val and len(val) >= 8 for val in x):
+            # We have date strings, set them as x-axis labels
+            date_labels = [
+                str(val) if isinstance(val, str) and "-" in val else str(val)
+                for val in x
+            ]
+            _core.xticks(x_processed, date_labels)
+
+        _, output = _capture_plot_output(
+            plotting.plot, x_processed, y_numeric, color=color
+        )
+        _logger.debug(f"Generated plot output ({len(output)} characters)")
+
         _, show_output = _capture_plot_output(plotting.show)
-        print(f"DEBUG: Generated show output, length: {len(show_output)}", file=sys.stderr)
-        
+        _logger.debug(f"Generated show output ({len(show_output)} characters)")
+
         result = output + show_output
-        print(f"DEBUG: Returning result, total length: {len(result)}", file=sys.stderr)
+
+        # Fix: Add zero-width space character to preserve formatting in MCP CLI
+        # This prevents MCP CLI from stripping trailing spaces/borders
+        lines = result.split("\n")
+        fixed_lines = []
+        for line in lines:
+            if line.strip():  # Only process non-empty lines
+                # Add a zero-width space (\u200b) at the end to prevent trimming
+                fixed_line = line + "\u200b"
+                fixed_lines.append(fixed_line)
+            else:
+                fixed_lines.append(line)
+
+        result = "\n".join(fixed_lines)
+        _logger.debug(
+            f"Applied formatting fix, final result ({len(result)} characters)"
+        )
+        _logger.info("Line plot created successfully")
+
         return result
-        
+
     except Exception as e:
-        print(f"DEBUG: Error during plotting: {e}", file=sys.stderr)
+        _logger.error(f"Error during line plot creation: {e}")
         import traceback
-        traceback.print_exc(file=sys.stderr)
+
+        _logger.debug(f"Stack trace: {traceback.format_exc()}")
         raise
 
 
 @tool
-async def bar_chart(labels: List[str], values: List[Union[int, float]], 
-                   color: Optional[str] = None, title: Optional[str] = None) -> str:
+async def bar_chart(
+    labels: list[str],
+    values: list[int | float],
+    color: str | None = None,
+    title: str | None = None,
+    theme_name: str | None = None,
+) -> str:
     """Create a bar chart with given labels and values.
-    
+
     Args:
         labels: List of bar labels
         values: List of bar values
         color: Bar color (optional)
         title: Plot title (optional)
-        
+        theme_name: Theme to apply (optional)
+
     Returns:
         The rendered plot as text
     """
     # Convert string inputs to float
     values_numeric = [float(val) if isinstance(val, str) else val for val in values]
-    
+
     plotting.clear_figure()
+
+    # Apply theme if specified
+    if theme_name and theme_name != "default":
+        plotting.theme(theme_name)
+
     if title:
         plotting.title(title)
-    
+
     _, output = _capture_plot_output(plotting.bar, labels, values_numeric, color=color)
     _, show_output = _capture_plot_output(plotting.show)
-    
+
     return output + show_output
 
 
 @tool
-async def matrix_plot(data: List[List[Union[int, float]]], title: Optional[str] = None) -> str:
+async def matrix_plot(
+    data: list[list[int | float]],
+    title: str | None = None,
+    theme_name: str | None = None,
+) -> str:
     """Create a matrix/heatmap plot from 2D data.
-    
+
     Args:
         data: 2D list representing matrix data
         title: Plot title (optional)
-        
+        theme_name: Theme to apply (optional)
+
     Returns:
         The rendered plot as text
     """
     plotting.clear_figure()
+
+    # Apply theme if specified
+    if theme_name and theme_name != "default":
+        plotting.theme(theme_name)
+
     if title:
         plotting.title(title)
-    
+
     _, output = _capture_plot_output(plotting.matrix_plot, data)
     _, show_output = _capture_plot_output(plotting.show)
-    
+
     return output + show_output
 
 
 @tool
-async def image_plot(image_path: str, title: Optional[str] = None, 
-                    marker: Optional[str] = None, style: Optional[str] = None, 
-                    fast: bool = False, grayscale: bool = False) -> str:
+async def image_plot(
+    image_path: str,
+    title: str | None = None,
+    marker: str | None = None,
+    style: str | None = None,
+    fast: bool = False,
+    grayscale: bool = False,
+) -> str:
     """Display an image in the terminal using ASCII art.
-    
+
     Args:
         image_path: Path to the image file to display
         title: Plot title (optional)
@@ -197,114 +529,234 @@ async def image_plot(image_path: str, title: Optional[str] = None,
         style: Style for image rendering (optional)
         fast: Enable fast rendering mode for better performance (optional)
         grayscale: Render image in grayscale (optional)
-        
+
     Returns:
         The rendered image plot as text
     """
     plotting.clear_figure()
     if title:
         plotting.title(title)
-    
-    _, output = _capture_plot_output(plotting.image_plot, image_path, 
-                                   marker=marker, style=style, 
-                                   fast=fast, grayscale=grayscale)
+
+    _, output = _capture_plot_output(
+        plotting.image_plot,
+        image_path,
+        marker=marker,
+        style=style,
+        fast=fast,
+        grayscale=grayscale,
+    )
     _, show_output = _capture_plot_output(plotting.show)
-    
+
     return output + show_output
 
 
 @tool
 async def play_gif(gif_path: str) -> str:
     """Play a GIF animation in the terminal.
-    
+
     Args:
         gif_path: Path to the GIF file to play
-        
+
     Returns:
         Confirmation message (GIF plays automatically)
     """
     plotting.clear_figure()
-    
+
     # play_gif handles its own output and doesn't need show()
     plotting.play_gif(gif_path)
-    
+
     return f"Playing GIF: {gif_path}"
 
 
 # Chart Class Tools
 @tool
-async def quick_scatter(x: List[Union[int, float]], y: List[Union[int, float]], 
-                       title: Optional[str] = None, theme_name: Optional[str] = None) -> str:
+async def quick_scatter(
+    x: list[int | float | str],
+    y: list[int | float | str],
+    title: str | None = None,
+    theme_name: str | None = None,
+) -> str:
     """Create a quick scatter chart using the chart classes API.
-    
+
     Args:
-        x: List of x-coordinates
-        y: List of y-coordinates
+        x: List of x-coordinates (numbers, dates, or strings)
+        y: List of y-coordinates (numbers or strings)
         title: Chart title (optional)
         theme_name: Theme to apply (optional)
-        
+
     Returns:
         The rendered chart as text
     """
-    # Convert string inputs to float
-    x_numeric = [float(val) if isinstance(val, str) else val for val in x]
-    y_numeric = [float(val) if isinstance(val, str) else val for val in y]
-    
-    _, output = _capture_plot_output(charts.quick_scatter, x_numeric, y_numeric, title=title, theme=theme_name)
-    return output
+    # Process x-coordinates - handle dates, numbers, and strings (same logic as line_plot)
+    try:
+        x_processed = []
+        for i, val in enumerate(x):
+            if isinstance(val, str):
+                # Check if it's a date string
+                if "-" in val and len(val) >= 8:  # Basic date format check
+                    # For date strings, use index position as numeric value
+                    x_processed.append(i)
+                else:
+                    # Try to convert to float, fallback to index
+                    try:
+                        x_processed.append(float(val))
+                    except ValueError:
+                        x_processed.append(i)
+            else:
+                x_processed.append(float(val))
+
+        # Convert y values to numeric
+        y_processed = []
+        for val in y:
+            if isinstance(val, str):
+                try:
+                    y_processed.append(float(val))
+                except ValueError as e:
+                    # If string can't be converted to number, skip this point
+                    raise ValueError(
+                        f"Y-coordinate '{val}' cannot be converted to a number"
+                    ) from e
+            else:
+                y_processed.append(float(val))
+
+        _, output = _capture_plot_output(
+            charts.quick_scatter,
+            x_processed,
+            y_processed,
+            title=title,
+            theme_name=theme_name,
+        )
+        return output
+
+    except Exception as e:
+        _logger.error(f"Error during quick_scatter creation: {e}")
+        import traceback
+
+        _logger.debug(f"Stack trace: {traceback.format_exc()}")
+        raise
 
 
 @tool
-async def quick_line(x: List[Union[int, float]], y: List[Union[int, float]], 
-                    title: Optional[str] = None, theme_name: Optional[str] = None) -> str:
+async def quick_line(
+    x: list[int | float | str],
+    y: list[int | float | str],
+    title: str | None = None,
+    theme_name: str | None = None,
+) -> str:
     """Create a quick line chart using the chart classes API.
-    
+
     Args:
-        x: List of x-coordinates
-        y: List of y-coordinates
+        x: List of x-coordinates (numbers, dates, or strings)
+        y: List of y-coordinates (numbers or strings)
         title: Chart title (optional)
         theme_name: Theme to apply (optional)
-        
+
     Returns:
         The rendered chart as text
     """
-    # Convert string inputs to float
-    x_numeric = [float(val) if isinstance(val, str) else val for val in x]
-    y_numeric = [float(val) if isinstance(val, str) else val for val in y]
-    
-    _, output = _capture_plot_output(charts.quick_line, x_numeric, y_numeric, title=title, theme=theme_name)
+    # Process x-coordinates - handle dates, numbers, and strings (same logic as line_plot)
+    try:
+        x_processed = []
+        for i, val in enumerate(x):
+            if isinstance(val, str):
+                # Check if it's a date string
+                if "-" in val and len(val) >= 8:  # Basic date format check
+                    # For date strings, use index position as numeric value
+                    x_processed.append(i)
+                else:
+                    # Try to convert to float, fallback to index
+                    try:
+                        x_processed.append(float(val))
+                    except ValueError:
+                        x_processed.append(i)
+            else:
+                x_processed.append(float(val))
+
+        # Convert y values to numeric
+        y_numeric = [float(val) if isinstance(val, str) else val for val in y]
+
+        _logger.debug(
+            f"Processed quick_line data: x_range=[{min(x_processed):.2f}..{max(x_processed):.2f}], y_range=[{min(y_numeric):.2f}..{max(y_numeric):.2f}]"
+        )
+    except Exception as e:
+        _logger.error(f"Error processing quick_line inputs: {e}")
+        raise
+
+    _, output = _capture_plot_output(
+        charts.quick_line, x_processed, y_numeric, title=title, theme_name=theme_name
+    )
     return output
 
 
 @tool
-async def quick_bar(labels: List[str], values: List[Union[int, float]], 
-                   title: Optional[str] = None, theme_name: Optional[str] = None) -> str:
+async def quick_bar(
+    labels: list[str],
+    values: list[int | float],
+    title: str | None = None,
+    horizontal: bool = False,
+    theme_name: str | None = None,
+) -> str:
     """Create a quick bar chart using the chart classes API.
-    
+
     Args:
         labels: List of bar labels
         values: List of bar values
         title: Chart title (optional)
+        horizontal: Create horizontal bars if True (optional, default False)
         theme_name: Theme to apply (optional)
-        
+
     Returns:
         The rendered chart as text
     """
+    _logger.info(
+        f"Creating quick bar chart with {len(labels)} labels, title='{title}', horizontal={horizontal}"
+    )
+
     # Convert string inputs to float
-    values_numeric = [float(val) if isinstance(val, str) else val for val in values]
-    
-    _, output = _capture_plot_output(charts.quick_bar, labels, values_numeric, title=title, theme=theme_name)
-    return output
+    try:
+        values_numeric = [float(val) if isinstance(val, str) else val for val in values]
+        _logger.debug(
+            f"Converted values: {len(values_numeric)} numeric values, range=[{min(values_numeric):.2f}..{max(values_numeric):.2f}]"
+        )
+    except Exception as e:
+        _logger.error(f"Error converting values to numeric: {e}")
+        raise
+
+    try:
+        _, output = _capture_plot_output(
+            charts.quick_bar,
+            labels,
+            values_numeric,
+            title=title,
+            horizontal=horizontal,
+            theme_name=theme_name,
+        )
+        _logger.debug(f"Generated quick bar chart output ({len(output)} characters)")
+        _logger.info("Quick bar chart created successfully")
+        return output
+    except Exception as e:
+        _logger.error(f"Error during quick bar chart creation: {e}")
+        import traceback
+
+        _logger.debug(f"Stack trace: {traceback.format_exc()}")
+        raise
 
 
 @tool
-async def quick_pie(labels: List[str], values: List[Union[int, float]], 
-                   colors: Optional[List[str]] = None, title: Optional[str] = None, 
-                   show_values: bool = True, show_percentages: bool = True,
-                   show_values_on_slices: bool = False, donut: bool = False,
-                   remaining_color: Optional[str] = None) -> str:
+async def quick_pie(
+    labels: list[str],
+    values: list[int | float],
+    colors: list[str] | None = None,
+    title: str | None = None,
+    show_values: bool = True,
+    show_percentages: bool = True,
+    show_values_on_slices: bool = False,
+    donut: bool = False,
+    remaining_color: str | None = None,
+    theme_name: str | None = None,
+) -> str:
     """Create a quick pie chart using the chart classes API.
-    
+
     Args:
         labels: List of pie segment labels
         values: List of pie segment values
@@ -315,29 +767,44 @@ async def quick_pie(labels: List[str], values: List[Union[int, float]],
         show_values_on_slices: Show values directly on pie slices (optional, default False)
         donut: Create doughnut chart with hollow center (optional, default False)
         remaining_color: Color for remaining slice in single-value charts (optional)
-        
+        theme_name: Theme to apply (optional)
+
     Returns:
         The rendered pie chart as text
     """
     # Convert string inputs to float
     values_numeric = [float(val) if isinstance(val, str) else val for val in values]
-    
-    _, output = _capture_plot_output(charts.quick_pie, labels, values_numeric, colors=colors, 
-                                   title=title, show_values=show_values, 
-                                   show_percentages=show_percentages,
-                                   show_values_on_slices=show_values_on_slices,
-                                   donut=donut, remaining_color=remaining_color)
+
+    _, output = _capture_plot_output(
+        charts.quick_pie,
+        labels,
+        values_numeric,
+        colors=colors,
+        title=title,
+        show_values=show_values,
+        show_percentages=show_percentages,
+        show_values_on_slices=show_values_on_slices,
+        donut=donut,
+        remaining_color=remaining_color,
+        theme_name=theme_name,
+    )
     return output
 
 
 @tool
-async def quick_donut(labels: List[str], values: List[Union[int, float]], 
-                     colors: Optional[List[str]] = None, title: Optional[str] = None, 
-                     show_values: bool = True, show_percentages: bool = True,
-                     show_values_on_slices: bool = False,
-                     remaining_color: Optional[str] = None) -> str:
+async def quick_donut(
+    labels: list[str],
+    values: list[int | float],
+    colors: list[str] | None = None,
+    title: str | None = None,
+    show_values: bool = True,
+    show_percentages: bool = True,
+    show_values_on_slices: bool = False,
+    remaining_color: str | None = None,
+    theme_name: str | None = None,
+) -> str:
     """Create a quick doughnut chart (pie chart with hollow center) using the chart classes API.
-    
+
     Args:
         labels: List of pie segment labels
         values: List of pie segment values
@@ -347,45 +814,56 @@ async def quick_donut(labels: List[str], values: List[Union[int, float]],
         show_percentages: Show percentages in legend (optional, default True)
         show_values_on_slices: Show values directly on pie slices (optional, default False)
         remaining_color: Color for remaining slice in single-value charts (optional)
-        
+        theme_name: Theme to apply (optional)
+
     Returns:
         The rendered doughnut chart as text
     """
     # Convert string inputs to float
     values_numeric = [float(val) if isinstance(val, str) else val for val in values]
-    
-    _, output = _capture_plot_output(charts.quick_donut, labels, values_numeric, colors=colors, 
-                                   title=title, show_values=show_values, 
-                                   show_percentages=show_percentages,
-                                   show_values_on_slices=show_values_on_slices,
-                                   remaining_color=remaining_color)
+
+    _, output = _capture_plot_output(
+        charts.quick_donut,
+        labels,
+        values_numeric,
+        colors=colors,
+        title=title,
+        show_values=show_values,
+        show_percentages=show_percentages,
+        show_values_on_slices=show_values_on_slices,
+        remaining_color=remaining_color,
+        theme_name=theme_name,
+    )
     return output
 
 
 # Theme Tools
 @tool
-async def get_available_themes() -> Dict[str, Any]:
+async def get_available_themes() -> dict[str, Any]:
     """Get information about available themes.
-    
+
     Returns:
         Dictionary containing theme information
     """
     from .themes import get_theme_info
+
     return get_theme_info()
 
 
 @tool
 async def apply_plot_theme(theme_name: str) -> str:
     """Apply a theme to the current plot.
-    
+
     Args:
         theme_name: Name of the theme to apply
-        
+
     Returns:
         Confirmation message
     """
+    _logger.info(f"Applying plot theme: {theme_name}")
     plotting.clear_figure()
     plotting.theme(theme_name)
+    _logger.debug(f"Theme '{theme_name}' applied successfully")
     return f"Applied theme: {theme_name}"
 
 
@@ -393,7 +871,7 @@ async def apply_plot_theme(theme_name: str) -> str:
 @tool
 async def get_terminal_width() -> int:
     """Get the current terminal width.
-    
+
     Returns:
         Terminal width in characters
     """
@@ -403,11 +881,11 @@ async def get_terminal_width() -> int:
 @tool
 async def colorize_text(text: str, color: str) -> str:
     """Apply color formatting to text.
-    
+
     Args:
         text: Text to colorize
         color: Color name or code
-        
+
     Returns:
         Colorized text
     """
@@ -417,10 +895,10 @@ async def colorize_text(text: str, color: str) -> str:
 @tool
 async def log_info(message: str) -> str:
     """Log an informational message.
-    
+
     Args:
         message: Message to log
-        
+
     Returns:
         Formatted log message
     """
@@ -431,10 +909,10 @@ async def log_info(message: str) -> str:
 @tool
 async def log_success(message: str) -> str:
     """Log a success message.
-    
+
     Args:
         message: Message to log
-        
+
     Returns:
         Formatted log message
     """
@@ -445,10 +923,10 @@ async def log_success(message: str) -> str:
 @tool
 async def log_warning(message: str) -> str:
     """Log a warning message.
-    
+
     Args:
         message: Message to log
-        
+
     Returns:
         Formatted log message
     """
@@ -459,10 +937,10 @@ async def log_warning(message: str) -> str:
 @tool
 async def log_error(message: str) -> str:
     """Log an error message.
-    
+
     Args:
         message: Message to log
-        
+
     Returns:
         Formatted log message
     """
@@ -474,40 +952,106 @@ async def log_error(message: str) -> str:
 @tool
 async def set_plot_size(width: int, height: int) -> str:
     """Set the plot size.
-    
+
     Args:
         width: Plot width
         height: Plot height
-        
+
     Returns:
         Confirmation message
     """
-    plotting.plotsize(width, height)
-    return f"Plot size set to {width}x{height}"
+    try:
+        # Avoid potential logging issues during STDIO mode
+        if _logger.level <= logging.INFO:
+            _logger.info(f"Setting plot size to {width}x{height}")
+
+        # Input validation
+        if width <= 0 or height <= 0:
+            raise ValueError(
+                f"Width and height must be positive integers. Got width={width}, height={height}"
+            )
+
+        if width > 1000 or height > 1000 and _logger.level <= logging.WARNING:
+            _logger.warning(f"Large plot size requested: {width}x{height}")
+
+        # Check if plotting.plotsize is available
+        if not hasattr(plotting, "plotsize"):
+            raise AttributeError("plotting.plotsize function is not available")
+
+        # Call the function directly (it's fast and shouldn't cause issues)
+        plotting.plotsize(width, height)
+
+        if _logger.level <= logging.DEBUG:
+            _logger.debug(f"Plot size successfully set to {width}x{height}")
+
+        # Ensure immediate return
+        result = f"Plot size set to {width}x{height}"
+        sys.stdout.flush()  # Force flush stdout
+        return result
+    except Exception as e:
+        if _logger.level <= logging.ERROR:
+            _logger.error(f"Error setting plot size: {e}")
+        import traceback
+
+        if _logger.level <= logging.DEBUG:
+            _logger.debug(f"Stack trace: {traceback.format_exc()}")
+        raise
 
 
 @tool
-async def enable_banner_mode(enabled: bool = True, title: Optional[str] = None, 
-                           subtitle: Optional[str] = None) -> str:
+async def enable_banner_mode(
+    enabled: bool = True, title: str | None = None, subtitle: str | None = None
+) -> str:
     """Enable or disable banner mode.
-    
+
     Args:
         enabled: Whether to enable banner mode
         title: Banner title (optional)
-        subtitle: Banner subtitle (optional)
-        
+        subtitle: Banner subtitle (optional, will be appended to title)
+
     Returns:
         Confirmation message
     """
-    plotting.banner_mode(enabled, title=title, subtitle=subtitle)
-    status = "enabled" if enabled else "disabled"
-    return f"Banner mode {status}"
+    try:
+        # Avoid potential logging issues during STDIO mode
+        if _logger.level <= logging.INFO:
+            _logger.info(
+                f"Setting banner mode: enabled={enabled}, title='{title}', subtitle='{subtitle}'"
+            )
+
+        # Combine title and subtitle since banner_mode only accepts title parameter
+        combined_title = title
+        if subtitle:
+            combined_title = f"{title} - {subtitle}" if title else subtitle
+
+        # Call the function directly (it's fast and shouldn't cause issues)
+        plotting.banner_mode(enabled, title=combined_title)
+
+        status = "enabled" if enabled else "disabled"
+        response = f"Banner mode {status}"
+        if combined_title:
+            response += f" with title: '{combined_title}'"
+
+        if _logger.level <= logging.DEBUG:
+            _logger.debug(f"Banner mode successfully {status}")
+
+        # Ensure immediate return
+        sys.stdout.flush()  # Force flush stdout
+        return response
+    except Exception as e:
+        if _logger.level <= logging.ERROR:
+            _logger.error(f"Error setting banner mode: {e}")
+        import traceback
+
+        if _logger.level <= logging.DEBUG:
+            _logger.debug(f"Stack trace: {traceback.format_exc()}")
+        raise
 
 
 @tool
 async def clear_plot() -> str:
     """Clear the current plot.
-    
+
     Returns:
         Confirmation message
     """
@@ -517,65 +1061,89 @@ async def clear_plot() -> str:
 
 # Resource for plot configuration
 @resource("config://plotext")
-async def get_plot_config() -> Dict[str, Any]:
+async def get_plot_config() -> dict[str, Any]:
     """Get current plot configuration."""
     from .themes import get_theme_info
+
     return {
         "terminal_width": utilities.terminal_width(),
         "available_themes": get_theme_info(),
         "library_version": "plotext_plus",
-        "mcp_enabled": True
+        "mcp_enabled": True,
+        "logging_enabled": True,
+    }
+
+
+# Resource for logging information
+@resource("logs://recent")
+async def get_recent_logs() -> dict[str, Any]:
+    """Get recent server events and log notifications (requires custom server)."""
+    # This would work if we had access to the server instance
+    # For now, return basic logging info
+    return {
+        "logging_enabled": True,
+        "log_levels": ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
+        "mcp_notifications": "enabled",
+        "timestamp": datetime.now().isoformat(),
     }
 
 
 # Resource for tool documentation/info
 @resource("info://plotext")
-async def get_tool_info() -> Dict[str, Any]:
+async def get_tool_info() -> dict[str, Any]:
     """Get comprehensive information about all available plotting tools."""
     return {
         "server_info": {
             "name": "Plotext Plus MCP Server",
             "description": "Model Context Protocol server for plotext_plus terminal plotting library",
             "version": "1.0.0",
-            "capabilities": ["plotting", "theming", "multimedia", "charts"]
+            "capabilities": ["plotting", "theming", "multimedia", "charts"],
         },
         "plotting_tools": {
             "scatter_plot": "Create scatter plots with x/y data points",
-            "line_plot": "Create line plots for time series and continuous data", 
+            "line_plot": "Create line plots for time series and continuous data",
             "bar_chart": "Create bar charts for categorical data",
             "matrix_plot": "Create heatmaps from 2D matrix data",
             "image_plot": "Display images in terminal using ASCII art",
-            "play_gif": "Play animated GIFs in the terminal"
+            "play_gif": "Play animated GIFs in the terminal",
         },
         "quick_chart_tools": {
             "quick_scatter": "Quickly create scatter charts with theming",
             "quick_line": "Quickly create line charts with theming",
-            "quick_bar": "Quickly create bar charts with theming", 
+            "quick_bar": "Quickly create bar charts with theming",
             "quick_pie": "Quickly create pie charts with custom colors, donut mode, and remaining_color options",
-            "quick_donut": "Quickly create doughnut charts (hollow center pie charts)"
+            "quick_donut": "Quickly create doughnut charts (hollow center pie charts)",
         },
         "theme_tools": {
             "get_available_themes": "List all available color themes",
-            "apply_plot_theme": "Apply a theme to plots"
+            "apply_plot_theme": "Apply a theme to plots",
         },
         "utility_tools": {
             "get_terminal_width": "Get current terminal width",
             "colorize_text": "Apply colors to text output",
             "log_info": "Output informational messages",
-            "log_success": "Output success messages", 
+            "log_success": "Output success messages",
             "log_warning": "Output warning messages",
-            "log_error": "Output error messages"
+            "log_error": "Output error messages",
         },
         "configuration_tools": {
             "set_plot_size": "Set plot dimensions",
             "enable_banner_mode": "Enable/disable banner mode",
-            "clear_plot": "Clear current plot"
+            "clear_plot": "Clear current plot",
         },
         "supported_formats": {
             "image_formats": ["PNG", "JPG", "JPEG", "BMP", "GIF (static)"],
             "gif_formats": ["GIF (animated)"],
-            "chart_types": ["scatter", "line", "bar", "pie", "doughnut", "matrix/heatmap", "image"],
-            "themes": "20+ built-in themes including solarized, dracula, cyberpunk"
+            "chart_types": [
+                "scatter",
+                "line",
+                "bar",
+                "pie",
+                "doughnut",
+                "matrix/heatmap",
+                "image",
+            ],
+            "themes": "20+ built-in themes including solarized, dracula, cyberpunk",
         },
         "usage_tips": {
             "pie_charts": "Best for 3-7 categories, use full terminal dimensions",
@@ -583,8 +1151,8 @@ async def get_tool_info() -> Dict[str, Any]:
             "single_value_charts": "Perfect for progress/completion rates: ['Complete', 'Remaining'] with 'default' color",
             "images": "Use fast=True for better performance with large images",
             "themes": "Apply themes before creating plots for consistent styling",
-            "banners": "Enable banner mode for professional-looking outputs"
-        }
+            "banners": "Enable banner mode for professional-looking outputs",
+        },
     }
 
 
@@ -660,7 +1228,7 @@ async def colorized_output_prompt() -> str:
 @prompt("regional_sales_analysis")
 async def regional_sales_analysis_prompt() -> str:
     """Data analysis workflow example"""
-    return """I have sales data by region: East=[100,120,110], West=[80,95,105], North=[60,75,85], South=[90,100,115] over 3 quarters. 
+    return """I have sales data by region: East=[100,120,110], West=[80,95,105], North=[60,75,85], South=[90,100,115] over 3 quarters.
 
 Please:
 1. Create individual plots for each region
@@ -673,7 +1241,7 @@ Please:
 async def comparative_visualization_prompt() -> str:
     """Comparative visualization example"""
     return """Compare two datasets using multiple visualization types:
-- Dataset 1: [5,10,15,20,25]  
+- Dataset 1: [5,10,15,20,25]
 - Dataset 2: [3,8,18,22,28]
 - Show both as scatter plot and line plot
 - Use different colors and add meaningful titles"""
@@ -684,7 +1252,7 @@ async def error_handling_test_prompt() -> str:
     """Error handling example"""
     return """Try to create plots with various data scenarios and show how the system handles edge cases:
 - Empty datasets
-- Mismatched array lengths  
+- Mismatched array lengths
 - Invalid color names
 - Non-existent themes"""
 
@@ -756,7 +1324,7 @@ async def multimedia_showcase_prompt() -> str:
 async def basic_pie_chart_prompt() -> str:
     """Basic pie chart example"""
     return """Create a simple pie chart showing market share data:
-- Categories: ['iOS', 'Android', 'Windows', 'Other']  
+- Categories: ['iOS', 'Android', 'Windows', 'Other']
 - Values: [35, 45, 15, 5]
 - Use colors: ['blue', 'green', 'orange', 'gray']
 - Add title 'Mobile OS Market Share'
@@ -768,7 +1336,7 @@ async def pie_chart_styling_prompt() -> str:
     """Advanced pie chart styling example"""
     return """Create a styled pie chart with advanced features:
 1. Use quick_pie with show_values_on_slices=True
-2. Data: Budget categories ['Housing', 'Food', 'Transport', 'Entertainment'] 
+2. Data: Budget categories ['Housing', 'Food', 'Transport', 'Entertainment']
 3. Values: [1200, 400, 300, 200] (monthly budget)
 4. Custom colors for each category
 5. Add meaningful title and ensure full terminal usage"""
@@ -779,7 +1347,7 @@ async def pie_chart_comparison_prompt() -> str:
     """Pie chart comparison example"""
     return """Create multiple pie charts for comparison:
 1. Q1 Sales: ['Product A', 'Product B', 'Product C'] = [30, 45, 25]
-2. Q2 Sales: ['Product A', 'Product B', 'Product C'] = [25, 50, 25] 
+2. Q2 Sales: ['Product A', 'Product B', 'Product C'] = [25, 50, 25]
 3. Show both charts with different colors
 4. Use appropriate titles ('Q1 Sales Distribution', 'Q2 Sales Distribution')
 5. Discuss the trends visible in the comparison"""
@@ -791,7 +1359,7 @@ async def pie_chart_best_practices_prompt() -> str:
     return """Demonstrate pie chart best practices:
 1. Start with many categories: ['A', 'B', 'C', 'D', 'E', 'F', 'G'] = [5, 8, 12, 15, 25, 20, 15]
 2. Show why this is problematic (too many small segments)
-3. Combine small categories: ['A+B+C', 'D', 'E', 'F', 'G'] = [25, 15, 25, 20, 15] 
+3. Combine small categories: ['A+B+C', 'D', 'E', 'F', 'G'] = [25, 15, 25, 20, 15]
 4. Create the improved version with title 'Improved: Combined Small Categories'
 5. Explain the improvement in readability"""
 
@@ -801,7 +1369,7 @@ async def single_value_pie_chart_prompt() -> str:
     """Single-value pie chart for progress indicators"""
     return """Create single-value pie charts perfect for progress indicators:
 1. Basic progress chart: ['Complete', 'Remaining'] = [75, 25], colors=['green', 'default']
-2. Title: 'Project Progress: 75%'  
+2. Title: 'Project Progress: 75%'
 3. Show only percentages (show_values=False, show_percentages=True)
 4. Note: Remaining area appears as spaces, legend only shows 'Complete' entry
 5. Perfect for dashboards, completion meters, utilization rates"""
@@ -823,7 +1391,7 @@ async def doughnut_chart_basic_prompt() -> str:
     """Basic doughnut chart with hollow center"""
     return """Create a doughnut chart with hollow center:
 1. Data: ['Sales', 'Marketing', 'Support', 'Development'] = [40, 25, 15, 20]
-2. Colors: ['blue', 'orange', 'green', 'red']  
+2. Colors: ['blue', 'orange', 'green', 'red']
 3. Add donut=True parameter to create hollow center
 4. Title: 'Department Budget - Doughnut Chart'
 5. Note: Inner radius automatically set to 1/3 of outer radius, center remains empty"""
@@ -834,7 +1402,7 @@ async def doughnut_progress_indicator_prompt() -> str:
     """Doughnut chart as progress indicator"""
     return """Create a doughnut chart progress indicator:
 1. Single-value data: ['Completed', 'Remaining'] = [85, 15]
-2. Colors: ['cyan', 'default'] 
+2. Colors: ['cyan', 'default']
 3. Use both donut=True and show only percentages
 4. Title: 'Project Progress - 85% Complete'
 5. Perfect for modern dashboards - combines hollow center with progress visualization"""
@@ -852,155 +1420,68 @@ async def quick_donut_convenience_prompt() -> str:
 
 
 # Main server entry point
-def start_server():
-    """Start the MCP server."""
-    import sys
+def start_server(stdio_mode: bool = False) -> None:
+    """Start the MCP server.
+
+    Args:
+        stdio_mode: If True, use STDIO transport mode
+    """
     import os
-    
-    # Check if we're being run in STDIO mode (by MCP CLI)
-    # Force HTTP mode if MCP_HTTP_MODE is set, otherwise detect based on stdin
-    force_http = os.getenv('MCP_HTTP_MODE', '').lower() == 'true'
-    force_stdio = os.getenv('MCP_STDIO_MODE', '').lower() == 'true'
-    
-    if force_http:
+
+    # Detect mode automatically if not explicitly specified
+    force_http = os.getenv("MCP_HTTP_MODE", "").lower() == "true"
+    force_stdio = os.getenv("MCP_STDIO_MODE", "").lower() == "true" or stdio_mode
+
+    if force_http and not stdio_mode:
         is_stdio_mode = False
-    elif force_stdio:
+    elif force_stdio or stdio_mode:
         is_stdio_mode = True
     else:
-        # Auto-detect: STDIO mode when stdin is not a terminal (pipes/redirects)
+        # Auto-detect based on stdin
         is_stdio_mode = not sys.stdin.isatty()
-    
+
     if is_stdio_mode:
-        # STDIO mode for MCP CLI - simple JSON-RPC implementation
-        import json
-        import asyncio
-        
-        async def handle_stdio():
-            try:
-                for line in sys.stdin:
-                    if not line.strip():
-                        continue
-                    
-                    try:
-                        request = json.loads(line)
-                        method = request.get('method')
-                        request_id = request.get('id')
-                        
-                        if method == 'initialize':
-                            response = {
-                                "jsonrpc": "2.0",
-                                "id": request_id,
-                                "result": {
-                                    "protocolVersion": "2024-11-05",
-                                    "capabilities": {
-                                        "tools": {},
-                                        "prompts": {},
-                                        "resources": {}
-                                    },
-                                    "serverInfo": {
-                                        "name": "Plotext Plus MCP Server",
-                                        "version": "1.0.0"
-                                    }
-                                }
-                            }
-                        elif method == 'tools/list':
-                            response = {
-                                "jsonrpc": "2.0",
-                                "id": request_id,
-                                "result": {
-                                    "tools": [
-                                        {
-                                            "name": "line_plot",
-                                            "description": "Create a line plot with given x and y data points",
-                                            "inputSchema": {
-                                                "type": "object",
-                                                "properties": {
-                                                    "x": {"type": "array", "items": {"type": "number"}},
-                                                    "y": {"type": "array", "items": {"type": "number"}},
-                                                    "title": {"type": "string"}
-                                                },
-                                                "required": ["x", "y"]
-                                            }
-                                        }
-                                    ]
-                                }
-                            }
-                        elif method == 'tools/call':
-                            tool_name = request['params']['name']
-                            arguments = request['params']['arguments']
-                            
-                            if tool_name == 'line_plot':
-                                try:
-                                    result = await line_plot(**arguments)
-                                    response = {
-                                        "jsonrpc": "2.0",
-                                        "id": request_id,
-                                        "result": {
-                                            "content": [
-                                                {
-                                                    "type": "text",
-                                                    "text": result
-                                                }
-                                            ]
-                                        }
-                                    }
-                                except Exception as e:
-                                    response = {
-                                        "jsonrpc": "2.0",
-                                        "id": request_id,
-                                        "error": {
-                                            "code": -32000,
-                                            "message": str(e)
-                                        }
-                                    }
-                            else:
-                                response = {
-                                    "jsonrpc": "2.0",
-                                    "id": request_id,
-                                    "error": {
-                                        "code": -32601,
-                                        "message": f"Unknown tool: {tool_name}"
-                                    }
-                                }
-                        else:
-                            response = {
-                                "jsonrpc": "2.0",
-                                "id": request_id,
-                                "error": {
-                                    "code": -32601,
-                                    "message": f"Unknown method: {method}"
-                                }
-                            }
-                        
-                        print(json.dumps(response), flush=True)
-                        
-                    except Exception as e:
-                        error_response = {
-                            "jsonrpc": "2.0",
-                            "id": request.get('id') if 'request' in locals() else None,
-                            "error": {
-                                "code": -32700,
-                                "message": f"Parse error: {str(e)}"
-                            }
-                        }
-                        print(json.dumps(error_response), flush=True)
-                        
-            except Exception as e:
-                print(f"STDIO handler error: {e}", file=sys.stderr)
-        
-        asyncio.run(handle_stdio())
+        print("Starting Plotext Plus MCP Server (STDIO mode)...", file=sys.stderr)
+        sys.stderr.flush()  # Ensure stderr is flushed
+        _logger.info("Starting Plotext Plus MCP Server in STDIO mode")
+        server_kwargs = {
+            "name": "Plotext Plus MCP Server",
+            "version": "1.0.0",
+            "prompts": True,
+            "transport": "stdio",  # Use STDIO transport
+            "debug": False,  # Disable debug mode to prevent hanging
+        }
     else:
-        # HTTP server mode (default)
-        print("Starting Plotext Plus MCP Server...")
-        from chuk_mcp_server import ChukMCPServer
-        server = ChukMCPServer(
-            name="Plotext Plus MCP Server", 
-            version="1.0.0",
-            prompts=True,  # Enable prompts capability
-            logging=True   # Enable logging capability for MCP clients
-        )
-        server.run()
+        print("Starting Plotext Plus MCP Server (HTTP mode)...", file=sys.stderr)
+        _logger.info("Starting Plotext Plus MCP Server in HTTP mode")
+        server_kwargs = {
+            "name": "Plotext Plus MCP Server",
+            "version": "1.0.0",
+            "prompts": True,  # Enable prompts capability
+        }
+
+    # Use custom server with proper logging support
+    server = PlotextPlusMCPServer(**server_kwargs)
+    server.log_server_event(
+        "SERVER_START",
+        "Plotext Plus MCP Server starting up",
+        {
+            "capabilities": ["tools", "resources", "prompts", "logging"],
+            "mode": "stdio" if is_stdio_mode else "http",
+            "logging_methods": ["logging/setLevel"],
+            "custom_features": ["mcp_notifications", "structured_logging"],
+        },
+    )
+    server.run()
 
 
 if __name__ == "__main__":
-    start_server()
+    import argparse
+    import sys
+
+    # Parse command line arguments
+    parser = argparse.ArgumentParser(description="Plotext Plus MCP Server")
+    parser.add_argument("--stdio", action="store_true", help="Use STDIO transport mode")
+    args = parser.parse_args()
+
+    start_server(stdio_mode=args.stdio)