code-puppy 0.0.302__py3-none-any.whl → 0.0.335__py3-none-any.whl

code_puppy/command_line/mcp/logs_command.py

@@ -1,14 +1,21 @@
 """
-MCP Logs Command - Shows recent events/logs for a server.
+MCP Logs Command - Shows server logs from persistent log files.
 """
 
 import logging
-from datetime import datetime
 from typing import List, Optional
 
-from rich.table import Table
+from rich.panel import Panel
+from rich.syntax import Syntax
 from rich.text import Text
 
+from code_puppy.mcp_.mcp_logs import (
+    clear_logs,
+    get_log_file_path,
+    get_log_stats,
+    list_servers_with_logs,
+    read_logs,
+)
 from code_puppy.messaging import emit_error, emit_info
 
 from .base import MCPCommandBase
@@ -22,105 +29,207 @@ class LogsCommand(MCPCommandBase):
     """
     Command handler for showing MCP server logs.
 
-    Shows recent events/logs for a specific MCP server with configurable limit.
+    Shows logs from persistent log files stored in ~/.code_puppy/mcp_logs/.
     """
 
     def execute(self, args: List[str], group_id: Optional[str] = None) -> None:
         """
-        Show recent events/logs for a server.
+        Show logs for a server.
+
+        Usage:
+            /mcp logs                    - List servers with logs
+            /mcp logs <server_name>      - Show last 50 lines
+            /mcp logs <server_name> 100  - Show last 100 lines
+            /mcp logs <server_name> all  - Show all logs
+            /mcp logs <server_name> --clear - Clear logs for server
 
         Args:
-            args: Command arguments, expects [server_name] and optional [limit]
+            args: Command arguments
             group_id: Optional message group ID for grouping related messages
         """
         if group_id is None:
             group_id = self.generate_group_id()
 
+        # No args - list servers with logs
         if not args:
-            emit_info("Usage: /mcp logs <server_name> [limit]", message_group=group_id)
+            self._list_servers_with_logs(group_id)
             return
 
         server_name = args[0]
-        limit = 10  # Default limit
+
+        # Check for --clear flag
+        if len(args) > 1 and args[1] == "--clear":
+            self._clear_logs(server_name, group_id)
+            return
+
+        # Determine number of lines
+        lines = 50  # Default
+        show_all = False
 
         if len(args) > 1:
-            try:
-                limit = int(args[1])
-                if limit <= 0 or limit > 100:
+            if args[1].lower() == "all":
+                show_all = True
+            else:
+                try:
+                    lines = int(args[1])
+                    if lines <= 0:
+                        emit_info(
+                            "Lines must be positive, using default: 50",
+                            message_group=group_id,
+                        )
+                        lines = 50
+                except ValueError:
                     emit_info(
-                        "Limit must be between 1 and 100, using default: 10",
+                        f"Invalid number '{args[1]}', using default: 50",
                         message_group=group_id,
                     )
-                    limit = 10
-            except ValueError:
-                emit_info(
-                    f"Invalid limit '{args[1]}', using default: 10",
-                    message_group=group_id,
-                )
 
+        self._show_logs(server_name, lines if not show_all else None, group_id)
+
+    def _list_servers_with_logs(self, group_id: str) -> None:
+        """List all servers that have log files."""
+        servers = list_servers_with_logs()
+
+        if not servers:
+            emit_info(
+                "📋 No MCP server logs found.\n"
+                "Logs are created when servers are started.",
+                message_group=group_id,
+            )
+            return
+
+        lines = ["📋 **Servers with logs:**\n"]
+
+        for server in servers:
+            stats = get_log_stats(server)
+            size_kb = stats["total_size_bytes"] / 1024
+            size_str = (
+                f"{size_kb:.1f} KB" if size_kb < 1024 else f"{size_kb / 1024:.1f} MB"
+            )
+            rotated = (
+                f" (+{stats['rotated_count']} rotated)"
+                if stats["rotated_count"]
+                else ""
+            )
+            lines.append(
+                f"  • **{server}** - {stats['line_count']} lines, {size_str}{rotated}"
+            )
+
+        lines.append("\n**Usage:** `/mcp logs <server_name> [lines|all]`")
+
+        emit_info("\n".join(lines), message_group=group_id)
+
+    def _show_logs(self, server_name: str, lines: Optional[int], group_id: str) -> None:
+        """
+        Show logs for a specific server.
+
+        Args:
+            server_name: Name of the server
+            lines: Number of lines to show, or None for all
+            group_id: Message group ID
+        """
         try:
-            # Find server by name
+            # Verify server exists in manager
             server_id = find_server_id_by_name(self.manager, server_name)
             if not server_id:
-                emit_info(f"Server '{server_name}' not found", message_group=group_id)
-                suggest_similar_servers(self.manager, server_name, group_id=group_id)
-                return
+                # Server not configured, but might have logs from before
+                stats = get_log_stats(server_name)
+                if not stats["exists"]:
+                    emit_info(
+                        f"Server '{server_name}' not found and has no logs.",
+                        message_group=group_id,
+                    )
+                    suggest_similar_servers(
+                        self.manager, server_name, group_id=group_id
+                    )
+                    return
 
-            # Get server status which includes recent events
-            status = self.manager.get_server_status(server_id)
+            # Read logs
+            log_lines = read_logs(server_name, lines=lines)
 
-            if not status.get("exists", True):
+            if not log_lines:
                 emit_info(
-                    f"Server '{server_name}' status not available",
+                    f"📋 No logs found for server: **{server_name}**\n"
+                    f"Log file: `{get_log_file_path(server_name)}`",
                     message_group=group_id,
                 )
                 return
 
-            recent_events = status.get("recent_events", [])
-
-            if not recent_events:
-                emit_info(
-                    f"No recent events for server: {server_name}",
-                    message_group=group_id,
+            # Get stats for header
+            stats = get_log_stats(server_name)
+            total_lines = stats["line_count"]
+            showing = len(log_lines)
+
+            # Format header
+            if lines is None:
+                header = f"📋 Logs for {server_name} (all {total_lines} lines)"
+            else:
+                header = (
+                    f"📋 Logs for {server_name} (last {showing} of {total_lines} lines)"
                 )
-                return
 
-            # Show events in a table
-            table = Table(title=f"📋 Recent Events for {server_name} (last {limit})")
-            table.add_column("Time", style="dim", no_wrap=True)
-            table.add_column("Event", style="cyan")
-            table.add_column("Details", style="dim")
+            # Format log content with syntax highlighting
+            log_content = "\n".join(log_lines)
+
+            # Create a panel with the logs
+            syntax = Syntax(
+                log_content,
+                "log",
+                theme="monokai",
+                word_wrap=True,
+                line_numbers=False,
+            )
 
-            # Take only the requested number of events
-            events_to_show = (
-                recent_events[-limit:] if len(recent_events) > limit else recent_events
+            panel = Panel(
+                syntax,
+                title=header,
+                subtitle=f"Log file: {get_log_file_path(server_name)}",
+                border_style="dim",
             )
 
-            for event in reversed(events_to_show):  # Show newest first
-                timestamp = datetime.fromisoformat(event["timestamp"])
-                time_str = timestamp.strftime("%H:%M:%S")
-                event_type = event["event_type"]
-
-                # Format details
-                details = event.get("details", {})
-                details_str = details.get("message", "")
-                if not details_str and "error" in details:
-                    details_str = str(details["error"])
-
-                # Color code event types
-                event_style = "cyan"
-                if "error" in event_type.lower():
-                    event_style = "red"
-                elif event_type in ["started", "enabled", "registered"]:
-                    event_style = "green"
-                elif event_type in ["stopped", "disabled"]:
-                    event_style = "yellow"
-
-                table.add_row(
-                    time_str, Text(event_type, style=event_style), details_str or "-"
+            emit_info(panel, message_group=group_id)
+
+            # Show hint for more options
+            if lines is not None and showing < total_lines:
+                emit_info(
+                    Text.from_markup(
+                        f"[dim]💡 Use `/mcp logs {server_name} all` to see all logs, "
+                        f"or `/mcp logs {server_name} <number>` for specific count[/dim]"
+                    ),
+                    message_group=group_id,
                 )
-            emit_info(table, message_group=group_id)
 
         except Exception as e:
             logger.error(f"Error getting logs for server '{server_name}': {e}")
             emit_error(f"Error getting logs: {e}", message_group=group_id)
+
+    def _clear_logs(self, server_name: str, group_id: str) -> None:
+        """
+        Clear logs for a specific server.
+
+        Args:
+            server_name: Name of the server
+            group_id: Message group ID
+        """
+        try:
+            stats = get_log_stats(server_name)
+
+            if not stats["exists"] and stats["rotated_count"] == 0:
+                emit_info(
+                    f"No logs to clear for server: {server_name}",
+                    message_group=group_id,
+                )
+                return
+
+            # Clear the logs
+            clear_logs(server_name, include_rotated=True)
+
+            cleared_count = 1 + stats["rotated_count"]
+            emit_info(
+                f"🗑️  Cleared {cleared_count} log file(s) for **{server_name}**",
+                message_group=group_id,
+            )
+
+        except Exception as e:
+            logger.error(f"Error clearing logs for server '{server_name}': {e}")
+            emit_error(f"Error clearing logs: {e}", message_group=group_id)

code_puppy/command_line/mcp/restart_command.py

@@ -5,6 +5,8 @@ MCP Restart Command - Restarts a specific MCP server.
 import logging
 from typing import List, Optional
 
+from rich.text import Text
+
 from code_puppy.messaging import emit_info
 
 from .base import MCPCommandBase
@@ -72,7 +74,9 @@ class RestartCommand(MCPCommandBase):
                         # Update MCP tool cache immediately so token counts reflect the change
                         agent.update_mcp_tool_cache_sync()
                         emit_info(
-                            "[dim]Agent reloaded with updated servers[/dim]",
+                            Text.from_markup(
+                                "[dim]Agent reloaded with updated servers[/dim]"
+                            ),
                             message_group=group_id,
                         )
                     except Exception as e:
@@ -91,5 +95,6 @@ class RestartCommand(MCPCommandBase):
         except Exception as e:
             logger.error(f"Error restarting server '{server_name}': {e}")
             emit_info(
-                f"[red]Failed to restart server: {e}[/red]", message_group=group_id
+                Text.from_markup(f"[red]Failed to restart server: {e}[/red]"),
+                message_group=group_id,
             )

code_puppy/command_line/mcp/search_command.py

@@ -6,6 +6,7 @@ import logging
 from typing import List, Optional
 
 from rich.table import Table
+from rich.text import Text
 
 from code_puppy.messaging import emit_info, emit_system_message, emit_warning
 
@@ -99,19 +100,24 @@ class SearchCommand(MCPCommandBase):
             emit_system_message(table, message_group=group_id)
             emit_info("\n✓ = Verified  ⭐ = Popular", message_group=group_id)
             emit_info(
-                "[yellow]To install:[/yellow] /mcp install <id>", message_group=group_id
+                Text.from_markup("[yellow]To install:[/yellow] /mcp install <id>"),
+                message_group=group_id,
             )
             emit_info(
-                "[yellow]For details:[/yellow] /mcp search <specific-term>",
+                Text.from_markup(
+                    "[yellow]For details:[/yellow] /mcp search <specific-term>"
+                ),
                 message_group=group_id,
             )
 
         except ImportError:
             emit_info(
-                "[red]Server registry not available[/red]", message_group=group_id
+                Text.from_markup("[red]Server registry not available[/red]"),
+                message_group=group_id,
             )
         except Exception as e:
             logger.error(f"Error searching server registry: {e}")
             emit_info(
-                f"[red]Error searching servers: {e}[/red]", message_group=group_id
+                Text.from_markup(f"[red]Error searching servers: {e}[/red]"),
+                message_group=group_id,
             )

code_puppy/command_line/mcp/start_all_command.py

@@ -6,6 +6,8 @@ import logging
 import time
 from typing import List, Optional
 
+from rich.text import Text
+
 from code_puppy.mcp_.managed_server import ServerState
 from code_puppy.messaging import emit_info
 
@@ -67,20 +69,23 @@ class StartAllCommand(MCPCommandBase):
                 if success:
                     started_count += 1
                     emit_info(
-                        f"  [green]✓ Started: {server_name}[/green]",
+                        Text.from_markup(f"  [green]✓ Started: {server_name}[/green]"),
                         message_group=group_id,
                     )
                 else:
                     failed_count += 1
                     emit_info(
-                        f"  [red]✗ Failed: {server_name}[/red]", message_group=group_id
+                        Text.from_markup(f"  [red]✗ Failed: {server_name}[/red]"),
+                        message_group=group_id,
                     )
 
             # Summary
             emit_info("", message_group=group_id)
             if started_count > 0:
                 emit_info(
-                    f"[green]Started {started_count} server(s)[/green]",
+                    Text.from_markup(
+                        f"[green]Started {started_count} server(s)[/green]"
+                    ),
                     message_group=group_id,
                 )
             if already_running > 0:
@@ -90,7 +95,9 @@ class StartAllCommand(MCPCommandBase):
                 )
             if failed_count > 0:
                 emit_info(
-                    f"[yellow]Failed to start {failed_count} server(s)[/yellow]",
+                    Text.from_markup(
+                        f"[yellow]Failed to start {failed_count} server(s)[/yellow]"
+                    ),
                     message_group=group_id,
                 )
 
@@ -112,7 +119,9 @@ class StartAllCommand(MCPCommandBase):
                     # Update MCP tool cache immediately so token counts reflect the change
                     agent.update_mcp_tool_cache_sync()
                     emit_info(
-                        "[dim]Agent reloaded with updated servers[/dim]",
+                        Text.from_markup(
+                            "[dim]Agent reloaded with updated servers[/dim]"
+                        ),
                         message_group=group_id,
                     )
                 except Exception as e:
@@ -121,5 +130,6 @@ class StartAllCommand(MCPCommandBase):
         except Exception as e:
             logger.error(f"Error starting all servers: {e}")
             emit_info(
-                f"[red]Failed to start servers: {e}[/red]", message_group=group_id
+                Text.from_markup(f"[red]Failed to start servers: {e}[/red]"),
+                message_group=group_id,
             )

code_puppy/command_line/mcp/start_command.py

@@ -6,6 +6,8 @@ import logging
 import time
 from typing import List, Optional
 
+from rich.text import Text
+
 from code_puppy.messaging import emit_error, emit_info, emit_success
 
 from ...agents import get_current_agent
@@ -36,7 +38,7 @@ class StartCommand(MCPCommandBase):
 
         if not args:
             emit_info(
-                "[yellow]Usage: /mcp start <server_name>[/yellow]",
+                Text.from_markup("[yellow]Usage: /mcp start <server_name>[/yellow]"),
                 message_group=group_id,
             )
             return

code_puppy/command_line/mcp/status_command.py

@@ -7,6 +7,7 @@ from datetime import datetime
 from typing import List, Optional
 
 from rich.panel import Panel
+from rich.text import Text
 
 from code_puppy.mcp_.managed_server import ServerState
 from code_puppy.messaging import emit_error, emit_info
@@ -158,7 +159,7 @@ class StatusCommand(MCPCommandBase):
                 status_lines.append(f"[bold]Metadata:[/bold] {len(metadata)} keys")
 
             # Create and show the panel
-            panel_content = "\n".join(status_lines)
+            panel_content = Text.from_markup("\n".join(status_lines))
             panel = Panel(
                 panel_content, title=f"🔌 {server_name} Status", border_style="cyan"
             )

code_puppy/command_line/mcp/stop_all_command.py

@@ -6,6 +6,8 @@ import logging
 import time
 from typing import List, Optional
 
+from rich.text import Text
+
 from code_puppy.mcp_.managed_server import ServerState
 from code_puppy.messaging import emit_info
 
@@ -97,7 +99,9 @@ class StopAllCommand(MCPCommandBase):
                     # Update MCP tool cache immediately so token counts reflect the change
                     agent.update_mcp_tool_cache_sync()
                     emit_info(
-                        "[dim]Agent reloaded with updated servers[/dim]",
+                        Text.from_markup(
+                            "[dim]Agent reloaded with updated servers[/dim]"
+                        ),
                         message_group=group_id,
                     )
                 except Exception as e:

code_puppy/command_line/mcp/stop_command.py

@@ -5,6 +5,8 @@ MCP Stop Command - Stops a specific MCP server.
 import logging
 from typing import List, Optional
 
+from rich.text import Text
+
 from code_puppy.messaging import emit_error, emit_info
 
 from ...agents import get_current_agent
@@ -35,7 +37,7 @@ class StopCommand(MCPCommandBase):
 
         if not args:
             emit_info(
-                "[yellow]Usage: /mcp stop <server_name>[/yellow]",
+                Text.from_markup("[yellow]Usage: /mcp stop <server_name>[/yellow]"),
                 message_group=group_id,
             )
             return

code_puppy/command_line/mcp/wizard_utils.py

@@ -7,6 +7,8 @@ Provides interactive functionality for installing and configuring MCP servers.
 import logging
 from typing import Any, Dict, Optional
 
+from rich.text import Text
+
 from code_puppy.messaging import emit_error, emit_info, emit_prompt
 
 # Configure logging
@@ -51,7 +53,7 @@ def run_interactive_install_wizard(manager, group_id: str) -> bool:
         required_env_vars = selected_server.get_environment_vars()
         if required_env_vars:
             emit_info(
-                "\n[yellow]Required Environment Variables:[/yellow]",
+                Text.from_markup("\n[yellow]Required Environment Variables:[/yellow]"),
                 message_group=group_id,
             )
             for var in required_env_vars:
@@ -61,7 +63,8 @@ def run_interactive_install_wizard(manager, group_id: str) -> bool:
                 current_value = os.environ.get(var, "")
                 if current_value:
                     emit_info(
-                        f"  {var}: [green]Already set[/green]", message_group=group_id
+                        Text.from_markup(f"  {var}: [green]Already set[/green]"),
+                        message_group=group_id,
                     )
                     env_vars[var] = current_value
                 else:
@@ -73,7 +76,8 @@ def run_interactive_install_wizard(manager, group_id: str) -> bool:
         required_cmd_args = selected_server.get_command_line_args()
         if required_cmd_args:
             emit_info(
-                "\n[yellow]Command Line Arguments:[/yellow]", message_group=group_id
+                Text.from_markup("\n[yellow]Command Line Arguments:[/yellow]"),
+                message_group=group_id,
             )
             for arg_config in required_cmd_args:
                 name = arg_config.get("name", "")
@@ -312,7 +316,9 @@ def install_server_from_catalog(
             json.dump(data, f, indent=2)
 
         emit_info(
-            f"[green]✓ Successfully installed server: {server_name}[/green]",
+            Text.from_markup(
+                f"[green]✓ Successfully installed server: {server_name}[/green]"
+            ),
             message_group=group_id,
         )
         emit_info(

code_puppy/command_line/model_settings_menu.py

@@ -58,7 +58,7 @@ SETTING_DEFINITIONS: Dict[str, Dict] = {
         "name": "Reasoning Effort",
         "description": "Controls how much effort GPT-5 models spend on reasoning. Higher = more thorough but slower.",
         "type": "choice",
-        "choices": ["low", "medium", "high"],
+        "choices": ["minimal", "low", "medium", "high", "xhigh"],
         "default": "medium",
     },
     "verbosity": {
@@ -72,7 +72,7 @@ SETTING_DEFINITIONS: Dict[str, Dict] = {
         "name": "Extended Thinking",
         "description": "Enable Claude's extended thinking mode for complex reasoning tasks.",
         "type": "boolean",
-        "default": False,
+        "default": True,
     },
     "budget_tokens": {
         "name": "Thinking Budget (tokens)",
@@ -84,6 +84,12 @@ SETTING_DEFINITIONS: Dict[str, Dict] = {
         "default": 10000,
         "format": "{:.0f}",
     },
+    "interleaved_thinking": {
+        "name": "Interleaved Thinking",
+        "description": "Enable thinking between tool calls (Claude 4 only: Opus 4.5, Opus 4.1, Opus 4, Sonnet 4). Adds beta header. WARNING: On Vertex/Bedrock, this FAILS for non-Claude 4 models!",
+        "type": "boolean",
+        "default": False,
+    },
 }
 
 
@@ -93,6 +99,42 @@ def _load_all_model_names() -> List[str]:
     return list(models_config.keys())
 
 
+def _get_setting_choices(
+    setting_key: str, model_name: Optional[str] = None
+) -> List[str]:
+    """Get the available choices for a setting, filtered by model capabilities.
+
+    For reasoning_effort, only codex models support 'xhigh' - regular GPT-5.2
+    models are capped at 'high'.
+
+    Args:
+        setting_key: The setting name (e.g., 'reasoning_effort', 'verbosity')
+        model_name: Optional model name to filter choices for
+
+    Returns:
+        List of valid choices for this setting and model combination.
+    """
+    setting_def = SETTING_DEFINITIONS.get(setting_key, {})
+    if setting_def.get("type") != "choice":
+        return []
+
+    base_choices = setting_def.get("choices", [])
+
+    # For reasoning_effort, filter 'xhigh' based on model support
+    if setting_key == "reasoning_effort" and model_name:
+        models_config = ModelFactory.load_config()
+        model_config = models_config.get(model_name, {})
+
+        # Check if model supports xhigh reasoning
+        supports_xhigh = model_config.get("supports_xhigh_reasoning", False)
+
+        if not supports_xhigh:
+            # Remove xhigh from choices for non-codex models
+            return [c for c in base_choices if c != "xhigh"]
+
+    return base_choices
+
+
 class ModelSettingsMenu:
     """Interactive TUI for model settings configuration.
 
@@ -427,7 +469,8 @@ class ModelSettingsMenu:
             if setting_def.get("type") == "choice":
                 lines.append(("bold", "  Options:"))
                 lines.append(("", "\n"))
-                choices = setting_def.get("choices", [])
+                # Get filtered choices based on model capabilities
+                choices = _get_setting_choices(setting_key, self.selected_model)
                 lines.append(
                     (
                         "fg:ansibrightblack",
@@ -514,8 +557,11 @@ class ModelSettingsMenu:
         if current is not None:
             self.edit_value = current
         elif setting_def.get("type") == "choice":
-            # For choice settings, start with the default
-            self.edit_value = setting_def.get("default", setting_def["choices"][0])
+            # For choice settings, start with the default (using filtered choices)
+            choices = _get_setting_choices(setting_key, self.selected_model)
+            self.edit_value = setting_def.get(
+                "default", choices[0] if choices else None
+            )
         elif setting_def.get("type") == "boolean":
             # For boolean settings, start with the default
             self.edit_value = setting_def.get("default", False)
@@ -541,8 +587,8 @@ class ModelSettingsMenu:
         setting_def = SETTING_DEFINITIONS[setting_key]
 
         if setting_def.get("type") == "choice":
-            # Cycle through choices
-            choices = setting_def["choices"]
+            # Cycle through filtered choices based on model capabilities
+            choices = _get_setting_choices(setting_key, self.selected_model)
             current_idx = (
                 choices.index(self.edit_value) if self.edit_value in choices else 0
             )
@@ -789,6 +835,11 @@ class ModelSettingsMenu:
             sys.stdout.flush()
             set_awaiting_user_input(False)
 
+        # Clear exit message
+        from code_puppy.messaging import emit_info
+
+        emit_info("✓ Exited model settings")
+
         return self.result_changed