code-puppy 0.0.287__py3-none-any.whl → 0.0.323__py3-none-any.whl

code_puppy/command_line/config_commands.py

@@ -27,6 +27,8 @@ def get_commands_help():
 )
 def handle_show_command(command: str) -> bool:
     """Show current puppy configuration."""
+    from rich.text import Text
+
     from code_puppy.agents import get_current_agent
     from code_puppy.command_line.model_picker_completion import get_active_model
     from code_puppy.config import (
@@ -79,14 +81,14 @@ def handle_show_command(command: str) -> bool:
 [bold]temperature:[/bold]           [cyan]{effective_temperature if effective_temperature is not None else "(model default)"}[/cyan]{" (per-model)" if effective_temperature != global_temperature and effective_temperature is not None else ""}
 
 """
-    emit_info(status_msg)
+    emit_info(Text.from_markup(status_msg))
     return True
 
 
 @register_command(
     name="reasoning",
     description="Set OpenAI reasoning effort for GPT-5 models (e.g., /reasoning high)",
-    usage="/reasoning <low|medium|high>",
+    usage="/reasoning <minimal|low|medium|high|xhigh>",
     category="config",
 )
 def handle_reasoning_command(command: str) -> bool:
@@ -95,7 +97,7 @@ def handle_reasoning_command(command: str) -> bool:
 
     tokens = command.split()
     if len(tokens) != 2:
-        emit_warning("Usage: /reasoning <low|medium|high>")
+        emit_warning("Usage: /reasoning <minimal|low|medium|high|xhigh>")
         return True
 
     effort = tokens[1]
@@ -171,6 +173,8 @@ def handle_verbosity_command(command: str) -> bool:
 )
 def handle_set_command(command: str) -> bool:
     """Set configuration values."""
+    from rich.text import Text
+
     from code_puppy.config import set_config_value
     from code_puppy.messaging import emit_error, emit_info, emit_success, emit_warning
 
@@ -197,14 +201,18 @@ def handle_set_command(command: str) -> bool:
             "\n  [cyan]auto_save_session[/cyan]    Auto-save chat after every response (true/false)"
         )
         emit_warning(
-            f"Usage: /set KEY=VALUE or /set KEY VALUE\nConfig keys: {', '.join(config_keys)}\n[dim]Note: compaction_strategy can be 'summarization' or 'truncation'[/dim]{session_help}"
+            Text.from_markup(
+                f"Usage: /set KEY=VALUE or /set KEY VALUE\nConfig keys: {', '.join(config_keys)}\n[dim]Note: compaction_strategy can be 'summarization' or 'truncation'[/dim]{session_help}"
+            )
         )
         return True
     if key:
         # Check if we're toggling DBOS enablement
         if key == "enable_dbos":
             emit_info(
-                "[yellow]⚠️ DBOS configuration changed. Please restart Code Puppy for this change to take effect.[/yellow]"
+                Text.from_markup(
+                    "[yellow]⚠️ DBOS configuration changed. Please restart Code Puppy for this change to take effect.[/yellow]"
+                )
             )
 
         set_config_value(key, value)
@@ -216,7 +224,7 @@ def handle_set_command(command: str) -> bool:
         try:
             current_agent = get_current_agent()
             current_agent.reload_code_generation_agent()
-            emit_info("[dim]Agent reloaded with updated config[/dim]")
+            emit_info("Agent reloaded with updated config")
         except Exception as reload_error:
             emit_warning(f"Config saved but agent reload failed: {reload_error}")
     else:
@@ -224,6 +232,23 @@ def handle_set_command(command: str) -> bool:
     return True
 
 
+def _get_json_agents_pinned_to_model(model_name: str) -> list:
+    """Get JSON agents that have this model pinned in their JSON file."""
+    from code_puppy.agents.json_agent import discover_json_agents
+
+    pinned = []
+    json_agents = discover_json_agents()
+    for agent_name, agent_path in json_agents.items():
+        try:
+            with open(agent_path, "r") as f:
+                agent_data = json.load(f)
+                if agent_data.get("model") == model_name:
+                    pinned.append(agent_name)
+        except Exception:
+            continue
+    return pinned
+
+
 @register_command(
     name="pin_model",
     description="Pin a specific model to an agent",
@@ -252,17 +277,17 @@ def handle_pin_model_command(command: str) -> bool:
 
         emit_info("Available models:")
         for model in available_models:
-            emit_info(f"  [cyan]{model}[/cyan]")
+            emit_info(f"  {model}")
 
         if builtin_agents:
             emit_info("\nAvailable built-in agents:")
             for agent_name, description in builtin_agents.items():
-                emit_info(f"  [cyan]{agent_name}[/cyan] - {description}")
+                emit_info(f"  {agent_name} - {description}")
 
         if json_agents:
             emit_info("\nAvailable JSON agents:")
             for agent_name, agent_path in json_agents.items():
-                emit_info(f"  [cyan]{agent_name}[/cyan] ({agent_path})")
+                emit_info(f"  {agent_name} ({agent_path})")
         return True
 
     agent_name = tokens[1].lower()
@@ -298,12 +323,12 @@ def handle_pin_model_command(command: str) -> bool:
         if builtin_agents:
             emit_info("Available built-in agents:")
             for name, desc in builtin_agents.items():
-                emit_info(f"  [cyan]{name}[/cyan] - {desc}")
+                emit_info(f"  {name} - {desc}")
 
         if json_agents:
             emit_info("\nAvailable JSON agents:")
             for name, path in json_agents.items():
-                emit_info(f"  [cyan]{name}[/cyan] ({path})")
+                emit_info(f"  {name} ({path})")
         return True
 
     # Handle different agent types
@@ -359,6 +384,7 @@ def handle_pin_model_command(command: str) -> bool:
 def handle_unpin_command(command: str) -> bool:
     """Unpin a model from an agent (resets to default)."""
     from code_puppy.agents.json_agent import discover_json_agents
+    from code_puppy.config import get_agent_pinned_model
     from code_puppy.messaging import emit_error, emit_info, emit_success, emit_warning
 
     tokens = command.split()
@@ -377,12 +403,26 @@ def handle_unpin_command(command: str) -> bool:
         if builtin_agents:
             emit_info("Available built-in agents:")
             for agent_name, description in builtin_agents.items():
-                emit_info(f"  [cyan]{agent_name}[/cyan] - {description}")
+                pinned_model = get_agent_pinned_model(agent_name)
+                if pinned_model:
+                    emit_info(f"  {agent_name} - {description} [→ {pinned_model}]")
+                else:
+                    emit_info(f"  {agent_name} - {description}")
 
         if json_agents:
             emit_info("\nAvailable JSON agents:")
             for agent_name, agent_path in json_agents.items():
-                emit_info(f"  [cyan]{agent_name}[/cyan] ({agent_path})")
+                # Read the JSON file to check for pinned model
+                try:
+                    with open(agent_path, "r") as f:
+                        agent_config = json.load(f)
+                    pinned_model = agent_config.get("model")
+                    if pinned_model:
+                        emit_info(f"  {agent_name} ({agent_path}) [→ {pinned_model}]")
+                    else:
+                        emit_info(f"  {agent_name} ({agent_path})")
+                except Exception:
+                    emit_info(f"  {agent_name} ({agent_path})")
         return True
 
     agent_name_input = tokens[1].lower()
@@ -422,12 +462,12 @@ def handle_unpin_command(command: str) -> bool:
         if builtin_agents:
             emit_info("Available built-in agents:")
             for name, desc in builtin_agents.items():
-                emit_info(f"  [cyan]{name}[/cyan] - {desc}")
+                emit_info(f"  {name} - {desc}")
 
         if json_agents:
             emit_info("\nAvailable JSON agents:")
             for name, path in json_agents.items():
-                emit_info(f"  [cyan]{name}[/cyan] ({path})")
+                emit_info(f"  {name} ({path})")
         return True
 
     try:
@@ -507,6 +547,37 @@ def handle_diff_command(command: str) -> bool:
     return True
 
 
+@register_command(
+    name="colors",
+    description="Configure banner colors for tool outputs (THINKING, SHELL COMMAND, etc.)",
+    usage="/colors",
+    category="config",
+)
+def handle_colors_command(command: str) -> bool:
+    """Configure banner colors via interactive TUI."""
+    import asyncio
+    import concurrent.futures
+
+    from code_puppy.command_line.colors_menu import interactive_colors_picker
+    from code_puppy.config import set_banner_color
+    from code_puppy.messaging import emit_error, emit_success
+
+    # Show interactive picker for banner color configuration
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        future = executor.submit(lambda: asyncio.run(interactive_colors_picker()))
+        result = future.result(timeout=300)  # 5 min timeout
+
+    if result:
+        # Apply the changes
+        try:
+            for banner_name, color in result.items():
+                set_banner_color(banner_name, color)
+            emit_success("Banner colors saved! 🎨")
+        except Exception as e:
+            emit_error(f"Failed to apply banner color settings: {e}")
+    return True
+
+
 # ============================================================================
 # UTILITY FUNCTIONS
 # ============================================================================
@@ -518,6 +589,8 @@ def _show_color_options(color_type: str):
     # ============================================================================
 
     """Show available Rich color options organized by category."""
+    from rich.text import Text
+
     from code_puppy.messaging import emit_info
 
     # Standard Rich colors organized by category
@@ -575,11 +648,15 @@ def _show_color_options(color_type: str):
             ("sea_green1", "🟢"),
         ]
         emit_info(
-            "[bold white on green]🎨 Recommended Colors for Additions:[/bold white on green]"
+            Text.from_markup(
+                "[bold white on green]🎨 Recommended Colors for Additions:[/bold white on green]"
+            )
         )
         for color, emoji in suggestions:
             emit_info(
-                f"  [cyan]{color:<16}[/cyan] [white on {color}]■■■■■■■■■■[/white on {color}] {emoji}"
+                Text.from_markup(
+                    f"  [cyan]{color:<16}[/cyan] [white on {color}]■■■■■■■■■■[/white on {color}] {emoji}"
+                )
             )
     elif color_type == "deletions":
         suggestions = [
@@ -590,22 +667,26 @@ def _show_color_options(color_type: str):
             ("dark_red", "🔴"),
         ]
         emit_info(
-            "[bold white on orange1]🎨 Recommended Colors for Deletions:[/bold white on orange1]"
+            Text.from_markup(
+                "[bold white on orange1]🎨 Recommended Colors for Deletions:[/bold white on orange1]"
+            )
         )
         for color, emoji in suggestions:
             emit_info(
-                f"  [cyan]{color:<16}[/cyan] [white on {color}]■■■■■■■■■■[/white on {color}] {emoji}"
+                Text.from_markup(
+                    f"  [cyan]{color:<16}[/cyan] [white on {color}]■■■■■■■■■■[/white on {color}] {emoji}"
+                )
             )
 
-    emit_info("\n[bold]🎨 All Available Rich Colors:[/bold]")
+    emit_info("\n🎨 All Available Rich Colors:")
     for category, colors in color_categories.items():
-        emit_info(f"\n[cyan]{category}:[/cyan]")
+        emit_info(f"\n{category}:")
         # Display in columns for better readability
         for i in range(0, len(colors), 4):
             row = colors[i : i + 4]
             row_text = "  ".join([f"[{color}]■[/{color}] {color}" for color, _ in row])
-            emit_info(f"  {row_text}")
+            emit_info(Text.from_markup(f"  {row_text}"))
 
-    emit_info("\n[yellow]Usage:[/yellow] [cyan]/diff {color_type} <color_name>[/cyan]")
-    emit_info("[dim]All diffs use white text on your chosen background colors[/dim]")
-    emit_info("[dim]You can also use hex colors like #ff0000 or rgb(255,0,0)[/dim]")
+    emit_info("\nUsage: /diff {color_type} <color_name>")
+    emit_info("All diffs use white text on your chosen background colors")
+    emit_info("You can also use hex colors like #ff0000 or rgb(255,0,0)")

code_puppy/command_line/core_commands.py

@@ -145,6 +145,8 @@ def handle_exit_command(command: str) -> bool:
 )
 def handle_agent_command(command: str) -> bool:
     """Handle agent switching."""
+    from rich.text import Text
+
     from code_puppy.agents import (
         get_agent_descriptions,
         get_available_agents,
@@ -199,9 +201,11 @@ def handle_agent_command(command: str) -> bool:
                     f"Switched to agent: {new_agent.display_name}",
                     message_group=group_id,
                 )
-                emit_info(f"[dim]{new_agent.description}[/dim]", message_group=group_id)
+                emit_info(f"{new_agent.description}", message_group=group_id)
                 emit_info(
-                    f"[dim]Auto-save session rotated to: {new_session_id}[/dim]",
+                    Text.from_markup(
+                        f"[dim]Auto-save session rotated to: {new_session_id}[/dim]"
+                    ),
                     message_group=group_id,
                 )
             else:
@@ -224,15 +228,19 @@ def handle_agent_command(command: str) -> bool:
             group_id = str(uuid.uuid4())
 
             emit_info(
-                f"[bold green]Current Agent:[/bold green] {current_agent.display_name}",
+                Text.from_markup(
+                    f"[bold green]Current Agent:[/bold green] {current_agent.display_name}"
+                ),
                 message_group=group_id,
             )
             emit_info(
-                f"[dim]{current_agent.description}[/dim]\n", message_group=group_id
+                Text.from_markup(f"[dim]{current_agent.description}[/dim]\n"),
+                message_group=group_id,
             )
 
             emit_info(
-                "[bold magenta]Available Agents:[/bold magenta]", message_group=group_id
+                Text.from_markup("[bold magenta]Available Agents:[/bold magenta]"),
+                message_group=group_id,
             )
             for name, display_name in available_agents.items():
                 description = descriptions.get(name, "No description")
@@ -240,13 +248,15 @@ def handle_agent_command(command: str) -> bool:
                     " [green]← current[/green]" if name == current_agent.name else ""
                 )
                 emit_info(
-                    f"  [cyan]{name:<12}[/cyan] {display_name}{current_marker}",
+                    Text.from_markup(
+                        f"  [cyan]{name:<12}[/cyan] {display_name}{current_marker}"
+                    ),
                     message_group=group_id,
                 )
-                emit_info(f"    [dim]{description}[/dim]", message_group=group_id)
+                emit_info(f"    {description}", message_group=group_id)
 
             emit_info(
-                "\n[yellow]Usage:[/yellow] /agent <agent-name>",
+                Text.from_markup("\n[yellow]Usage:[/yellow] /agent <agent-name>"),
                 message_group=group_id,
             )
             return True
@@ -290,9 +300,11 @@ def handle_agent_command(command: str) -> bool:
             f"Switched to agent: {new_agent.display_name}",
             message_group=group_id,
         )
-        emit_info(f"[dim]{new_agent.description}[/dim]", message_group=group_id)
+        emit_info(f"{new_agent.description}", message_group=group_id)
         emit_info(
-            f"[dim]Auto-save session rotated to: {new_session_id}[/dim]",
+            Text.from_markup(
+                f"[dim]Auto-save session rotated to: {new_session_id}[/dim]"
+            ),
             message_group=group_id,
         )
         return True
@@ -366,10 +378,10 @@ async def interactive_agent_picker() -> str | None:
     set_awaiting_user_input(True)
     time.sleep(0.3)  # Let spinners fully stop
 
-    console = Console()
-    console.print()
-    console.print(panel)
-    console.print()
+    local_console = Console()
+    emit_info("")
+    local_console.print(panel)
+    emit_info("")
 
     # Flush output before prompt_toolkit takes control
     sys.stdout.flush()
@@ -401,7 +413,7 @@ async def interactive_agent_picker() -> str | None:
             selected_agent = agent_name
 
     except (KeyboardInterrupt, EOFError):
-        console.print("\n[bold red]⊗ Cancelled by user[/bold red]")
+        emit_error("Cancelled by user")
         selected_agent = None
 
     finally:
@@ -460,10 +472,10 @@ async def interactive_model_picker() -> str | None:
     set_awaiting_user_input(True)
     time.sleep(0.3)  # Let spinners fully stop
 
-    console = Console()
-    console.print()
-    console.print(panel)
-    console.print()
+    local_console = Console()
+    emit_info("")
+    local_console.print(panel)
+    emit_info("")
 
     # Flush output before prompt_toolkit takes control
     sys.stdout.flush()
@@ -490,7 +502,7 @@ async def interactive_model_picker() -> str | None:
                 selected_model = selected_model[:-10].strip()
 
     except (KeyboardInterrupt, EOFError):
-        console.print("\n[bold red]⊗ Cancelled by user[/bold red]")
+        emit_error("Cancelled by user")
         selected_model = None
 
     finally:

code_puppy/command_line/mcp/add_command.py

@@ -7,8 +7,7 @@ import logging
 import os
 from typing import List, Optional
 
-from code_puppy.messaging import emit_info
-from code_puppy.tui_state import is_tui_mode
+from code_puppy.messaging import emit_error, emit_info
 
 from .base import MCPCommandBase
 from .wizard_utils import run_interactive_install_wizard
@@ -42,18 +41,6 @@ class AddCommand(MCPCommandBase):
         if group_id is None:
             group_id = self.generate_group_id()
 
-        # Check if in TUI mode and guide user to use Ctrl+T instead
-        if is_tui_mode() and not args:
-            emit_info(
-                "💡 In TUI mode, press Ctrl+T to open the MCP Install Wizard",
-                message_group=group_id,
-            )
-            emit_info(
-                "   The wizard provides a better interface for browsing and installing MCP servers.",
-                message_group=group_id,
-            )
-            return
-
         try:
             if args:
                 # Parse JSON from arguments
@@ -115,7 +102,7 @@ class AddCommand(MCPCommandBase):
             emit_info("Required module not available", message_group=group_id)
         except Exception as e:
             logger.error(f"Error in add command: {e}")
-            emit_info(f"[red]Error adding server: {e}[/red]", message_group=group_id)
+            emit_error(f"Error adding server: {e}", message_group=group_id)
 
     def _add_server_from_json(self, config_dict: dict, group_id: str) -> bool:
         """
@@ -179,5 +166,5 @@ class AddCommand(MCPCommandBase):
 
         except Exception as e:
             logger.error(f"Error adding server from JSON: {e}")
-            emit_info(f"[red]Failed to add server: {e}[/red]", message_group=group_id)
+            emit_error(f"Failed to add server: {e}", message_group=group_id)
             return False

code_puppy/command_line/mcp/base.py

@@ -6,8 +6,6 @@ Provides base classes and common utilities used across all MCP command modules.
 
 import logging
 
-from rich.console import Console
-
 from code_puppy.mcp_.manager import get_mcp_manager
 
 # Configure logging
@@ -24,7 +22,6 @@ class MCPCommandBase:
 
     def __init__(self):
         """Initialize the base command handler."""
-        self.console = Console()
         self.manager = get_mcp_manager()
         logger.debug(f"Initialized {self.__class__.__name__}")
 

code_puppy/command_line/mcp/catalog_server_installer.py

@@ -7,7 +7,7 @@ MCP servers from the catalog.
 import os
 from typing import Dict, Optional
 
-from code_puppy.messaging import emit_warning
+from code_puppy.messaging import emit_info, emit_success, emit_warning
 
 # Helpful hints for common environment variables
 ENV_VAR_HINTS = {
@@ -46,8 +46,8 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
 
     from .utils import find_server_id_by_name
 
-    print(f"\n📦 Installing: {server.display_name}\n")
-    print(f"   {server.description}\n")
+    emit_info(f"\n📦 Installing: {server.display_name}\n")
+    emit_info(f"   {server.description}\n")
 
     # Get custom name
     default_name = server.name
@@ -55,7 +55,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
         name_input = input(f"  Server name [{default_name}]: ").strip()
         server_name = name_input if name_input else default_name
     except (KeyboardInterrupt, EOFError):
-        print("")
+        emit_info("")
         emit_warning("Installation cancelled")
         return None
 
@@ -70,7 +70,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
                 emit_warning("Installation cancelled")
                 return None
         except (KeyboardInterrupt, EOFError):
-            print("")
+            emit_info("")
             emit_warning("Installation cancelled")
             return None
 
@@ -80,17 +80,17 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
     # Collect environment variables
     required_env_vars = server.get_environment_vars()
     if required_env_vars:
-        print("\n  🔑 Environment Variables:")
+        emit_info("\n  🔑 Environment Variables:")
         for var in required_env_vars:
             current_value = os.environ.get(var, "")
             if current_value:
-                print(f"     ✓ {var}: Already set")
+                emit_info(f"     ✓ {var}: Already set")
                 env_vars[var] = current_value
             else:
                 try:
                     hint = get_env_var_hint(var)
                     if hint:
-                        print(f"     {hint}")
+                        emit_info(f"     {hint}")
                     value = input(f"     Enter {var}: ").strip()
                     if value:
                         env_vars[var] = value
@@ -98,14 +98,14 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
                         set_config_value(var, value)
                         os.environ[var] = value
                 except (KeyboardInterrupt, EOFError):
-                    print("")
+                    emit_info("")
                     emit_warning("Installation cancelled")
                     return None
 
     # Collect command line arguments
     required_cmd_args = server.get_command_line_args()
     if required_cmd_args:
-        print("\n  ⚙️ Configuration:")
+        emit_info("\n  ⚙️ Configuration:")
         for arg_config in required_cmd_args:
             name = arg_config.get("name", "")
             prompt_text = arg_config.get("prompt", name)
@@ -128,7 +128,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
                     emit_warning(f"Required value '{name}' not provided")
                     return None
             except (KeyboardInterrupt, EOFError):
-                print("")
+                emit_info("")
                 emit_warning("Installation cancelled")
                 return None
 
@@ -161,16 +161,16 @@ def install_catalog_server(manager, server, config: Dict) -> bool:
     # Generate a group ID for messages
     group_id = f"mcp-install-{uuid.uuid4().hex[:8]}"
 
-    print(f"\n  📦 Installing {server.display_name} as '{server_name}'...")
+    emit_info(f"\n  📦 Installing {server.display_name} as '{server_name}'...")
 
     success = install_server_from_catalog(
         manager, server, server_name, env_vars, cmd_args, group_id
     )
 
     if success:
-        print(f"\n  ✅ Successfully installed '{server_name}'!")
-        print(f"  Use '/mcp start {server_name}' to start the server.\n")
+        emit_success(f"\n  ✅ Successfully installed '{server_name}'!")
+        emit_info(f"  Use '/mcp start {server_name}' to start the server.\n")
     else:
-        print("\n  ❌ Installation failed.\n")
+        emit_warning("\n  ❌ Installation failed.\n")
 
     return success