code-puppy 0.0.302__py3-none-any.whl → 0.0.335__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 (
@@ -44,6 +46,7 @@ def handle_show_command(command: str) -> bool:
         get_use_dbos,
         get_yolo_mode,
     )
+    from code_puppy.keymap import get_cancel_agent_display_name
     from code_puppy.messaging import emit_info
 
     puppy_name = get_puppy_name()
@@ -77,16 +80,17 @@ def handle_show_command(command: str) -> bool:
 [bold]reasoning_effort:[/bold]      [cyan]{get_openai_reasoning_effort()}[/cyan]
 [bold]verbosity:[/bold]             [cyan]{get_openai_verbosity()}[/cyan]
 [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 ""}
+[bold]cancel_agent_key:[/bold]      [cyan]{get_cancel_agent_display_name()}[/cyan] (options: ctrl+c, ctrl+k, ctrl+q)
 
 """
-    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 +99,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 +175,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
 
@@ -196,15 +202,40 @@ def handle_set_command(command: str) -> bool:
             "\n[yellow]Session Management[/yellow]"
             "\n  [cyan]auto_save_session[/cyan]    Auto-save chat after every response (true/false)"
         )
+        keymap_help = (
+            "\n[yellow]Keyboard Shortcuts[/yellow]"
+            "\n  [cyan]cancel_agent_key[/cyan]     Key to cancel agent tasks (ctrl+c, ctrl+k, or ctrl+q)"
+        )
         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}{keymap_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]"
+                )
+            )
+
+        # Validate cancel_agent_key before setting
+        if key == "cancel_agent_key":
+            from code_puppy.keymap import VALID_CANCEL_KEYS
+
+            normalized_value = value.strip().lower()
+            if normalized_value not in VALID_CANCEL_KEYS:
+                emit_error(
+                    f"Invalid cancel_agent_key '{value}'. Valid options: {', '.join(sorted(VALID_CANCEL_KEYS))}"
+                )
+                return True
+            value = normalized_value  # Use normalized value
+            emit_info(
+                Text.from_markup(
+                    "[yellow]⚠️ cancel_agent_key changed. Please restart Code Puppy for this change to take effect.[/yellow]"
+                )
             )
 
         set_config_value(key, value)
@@ -539,6 +570,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
 # ============================================================================
@@ -550,6 +612,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
@@ -607,11 +671,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 = [
@@ -622,11 +690,15 @@ 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🎨 All Available Rich Colors:")
@@ -636,7 +708,7 @@ def _show_color_options(color_type: str):
         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("\nUsage: /diff {color_type} <color_name>")
     emit_info("All diffs use white text on your chosen background colors")

code_puppy/command_line/core_commands.py

@@ -115,6 +115,57 @@ def handle_motd_command(command: str) -> bool:
     return True
 
 
+@register_command(
+    name="tutorial",
+    description="Run the interactive tutorial wizard",
+    usage="/tutorial",
+    category="core",
+)
+def handle_tutorial_command(command: str) -> bool:
+    """Run the interactive tutorial wizard.
+
+    Usage:
+        /tutorial  - Run the tutorial (can be run anytime)
+    """
+    import asyncio
+    import concurrent.futures
+
+    from code_puppy.command_line.onboarding_wizard import (
+        reset_onboarding,
+        run_onboarding_wizard,
+    )
+    from code_puppy.config import set_model_name
+
+    # Always reset so user can re-run the tutorial anytime
+    reset_onboarding()
+
+    # Run the async wizard in a thread pool (same pattern as agent picker)
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        future = executor.submit(lambda: asyncio.run(run_onboarding_wizard()))
+        result = future.result(timeout=300)  # 5 min timeout
+
+    if result == "chatgpt":
+        emit_info("🔐 Starting ChatGPT OAuth flow...")
+        from code_puppy.plugins.chatgpt_oauth.oauth_flow import run_oauth_flow
+
+        run_oauth_flow()
+        set_model_name("chatgpt-gpt-5.2-codex")
+    elif result == "claude":
+        emit_info("🔐 Starting Claude Code OAuth flow...")
+        from code_puppy.plugins.claude_code_oauth.register_callbacks import (
+            _perform_authentication,
+        )
+
+        _perform_authentication()
+        set_model_name("claude-code-claude-opus-4-5-20251101")
+    elif result == "completed":
+        emit_info("🎉 Tutorial complete! Happy coding!")
+    elif result == "skipped":
+        emit_info("⏭️ Tutorial skipped. Run /tutorial anytime!")
+
+    return True
+
+
 @register_command(
     name="exit",
     description="Exit interactive mode",
@@ -145,6 +196,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,
@@ -201,7 +254,9 @@ def handle_agent_command(command: str) -> bool:
                 )
                 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 +279,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 +299,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"    {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
@@ -292,7 +353,9 @@ def handle_agent_command(command: str) -> bool:
         )
         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

code_puppy/command_line/diff_menu.py

@@ -456,6 +456,11 @@ async def interactive_diff_picker() -> Optional[dict]:
         sys.stdout.write("\033[?1049l")  # Exit alternate buffer
         sys.stdout.flush()
 
+    # Clear exit message
+    from code_puppy.messaging import emit_info
+
+    emit_info("✓ Exited diff color configuration")
+
     # Return changes if any
     if config.has_changes():
         return {

code_puppy/command_line/mcp/custom_server_form.py

@@ -604,6 +604,10 @@ class CustomServerForm:
             sys.stdout.flush()
             set_awaiting_user_input(False)
 
+        # Clear exit message if not installing
+        if self.result != "installed":
+            emit_info("✓ Exited custom server form")
+
         # Handle result
         if self.result == "installed":
             if self.edit_mode:

code_puppy/command_line/mcp/edit_command.py

@@ -8,6 +8,8 @@ import logging
 import os
 from typing import List, Optional
 
+from rich.text import Text
+
 from code_puppy.config import MCP_SERVERS_FILE
 from code_puppy.messaging import emit_error, emit_info, emit_warning
 
@@ -39,7 +41,7 @@ class EditCommand(MCPCommandBase):
             # Need a server name
             if not args:
                 emit_info(
-                    "[yellow]Usage: /mcp edit <server_name>[/yellow]",
+                    Text.from_markup("[yellow]Usage: /mcp edit <server_name>[/yellow]"),
                     message_group=group_id,
                 )
                 emit_info(

code_puppy/command_line/mcp/handler.py

@@ -8,6 +8,8 @@ to their respective command modules.
 import logging
 import shlex
 
+from rich.text import Text
+
 from code_puppy.messaging import emit_info
 
 from .add_command import AddCommand
@@ -103,7 +105,8 @@ class MCPCommandHandler(MCPCommandBase):
                 args = shlex.split(args_str)
             except ValueError as e:
                 emit_info(
-                    f"[red]Invalid command syntax: {e}[/red]", message_group=group_id
+                    Text.from_markup(f"[red]Invalid command syntax: {e}[/red]"),
+                    message_group=group_id,
                 )
                 return True
 
@@ -121,7 +124,9 @@ class MCPCommandHandler(MCPCommandBase):
                 return True
             else:
                 emit_info(
-                    f"[yellow]Unknown MCP subcommand: {subcommand}[/yellow]",
+                    Text.from_markup(
+                        f"[yellow]Unknown MCP subcommand: {subcommand}[/yellow]"
+                    ),
                     message_group=group_id,
                 )
                 emit_info(

code_puppy/command_line/mcp/install_command.py

@@ -5,6 +5,8 @@ MCP Install Command - Installs pre-configured MCP servers from the registry.
 import logging
 from typing import List, Optional
 
+from rich.text import Text
+
 from code_puppy.messaging import emit_error, emit_info
 
 from .base import MCPCommandBase
@@ -150,7 +152,9 @@ class InstallCommand(MCPCommandBase):
             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:
@@ -160,7 +164,7 @@ class InstallCommand(MCPCommandBase):
                     current_value = os.environ.get(var, "")
                     if current_value:
                         emit_info(
-                            f"  {var}: [green]Already set[/green]",
+                            Text.from_markup(f"  {var}: [green]Already set[/green]"),
                             message_group=group_id,
                         )
                         env_vars[var] = current_value
@@ -173,7 +177,8 @@ class InstallCommand(MCPCommandBase):
             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", "")

code_puppy/command_line/mcp/install_menu.py

@@ -16,7 +16,7 @@ from prompt_toolkit.layout import Dimension, Layout, VSplit, Window
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.widgets import Frame
 
-from code_puppy.messaging import emit_error, emit_warning
+from code_puppy.messaging import emit_error, emit_info, emit_warning
 from code_puppy.tools.command_runner import set_awaiting_user_input
 
 from .catalog_server_installer import (
@@ -635,6 +635,10 @@ class MCPInstallMenu:
             sys.stdout.flush()
             set_awaiting_user_input(False)
 
+        # Clear exit message (unless we're about to prompt for more input)
+        if self.result not in ("pending_custom", "pending_install"):
+            emit_info("✓ Exited MCP server browser")
+
         # Handle custom server after TUI exits
         if self.result == "pending_custom":
             success = run_custom_server_form(self.manager)