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

code_puppy/command_line/mcp/wizard_utils.py

@@ -7,7 +7,9 @@ Provides interactive functionality for installing and configuring MCP servers.
 import logging
 from typing import Any, Dict, Optional
 
-from code_puppy.messaging import emit_info, emit_prompt
+from rich.text import Text
+
+from code_puppy.messaging import emit_error, emit_info, emit_prompt
 
 # Configure logging
 logger = logging.getLogger(__name__)
@@ -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", "")
@@ -101,11 +105,11 @@ def run_interactive_install_wizard(manager, group_id: str) -> bool:
         )
 
     except ImportError:
-        emit_info("[red]Server catalog not available[/red]", message_group=group_id)
+        emit_error("Server catalog not available", message_group=group_id)
         return False
     except Exception as e:
         logger.error(f"Error in interactive wizard: {e}")
-        emit_info(f"[red]Wizard error: {e}[/red]", message_group=group_id)
+        emit_error(f"Wizard error: {e}", message_group=group_id)
         return False
 
 
@@ -122,9 +126,7 @@ def interactive_server_selection(group_id: str):
 
         servers = catalog.get_popular(10)
         if not servers:
-            emit_info(
-                "[red]No servers available in catalog[/red]", message_group=group_id
-            )
+            emit_info("No servers available in catalog", message_group=group_id)
             return None
 
         emit_info("Popular MCP Servers:", message_group=group_id)
@@ -156,10 +158,10 @@ def interactive_server_selection(group_id: str):
             if 0 <= index < len(servers):
                 return servers[index]
             else:
-                emit_info("[red]Invalid selection[/red]", message_group=group_id)
+                emit_error("Invalid selection", message_group=group_id)
                 return None
         except ValueError:
-            emit_info("[red]Invalid input[/red]", message_group=group_id)
+            emit_error("Invalid input", message_group=group_id)
             return None
 
     except Exception as e:
@@ -215,7 +217,7 @@ def interactive_configure_server(
         if env_vars:
             emit_info("Environment Variables:", message_group=group_id)
             for var, value in env_vars.items():
-                emit_info(f"  {var}: [hidden]{value}[/hidden]", message_group=group_id)
+                emit_info(f"  {var}: ***", message_group=group_id)
 
         if cmd_args:
             emit_info("Command Line Arguments:", message_group=group_id)
@@ -234,7 +236,7 @@ def interactive_configure_server(
 
     except Exception as e:
         logger.error(f"Error configuring server: {e}")
-        emit_info(f"[red]Configuration error: {e}[/red]", message_group=group_id)
+        emit_error(f"Configuration error: {e}", message_group=group_id)
         return False
 
 
@@ -288,7 +290,7 @@ def install_server_from_catalog(
 
         if not server_id:
             emit_info(
-                "[red]Failed to register server with manager[/red]",
+                "Failed to register server with manager",
                 message_group=group_id,
             )
             return False
@@ -314,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(
@@ -326,5 +330,5 @@ def install_server_from_catalog(
 
     except Exception as e:
         logger.error(f"Error installing server: {e}")
-        emit_info(f"[red]Installation failed: {e}[/red]", message_group=group_id)
+        emit_error(f"Installation failed: {e}", message_group=group_id)
         return False

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
             )

code_puppy/command_line/motd.py

@@ -1,6 +1,6 @@
 """
 🐶 MOTD (Message of the Day) feature for code-puppy! 🐕
-Stores seen versions in ~/.code_puppy/motd.txt - woof woof! 🐾
+Stores seen versions in XDG_CONFIG_HOME/code_puppy/motd.txt - woof woof! 🐾
 """
 
 import os

code_puppy/command_line/pin_command_completion.py

@@ -1,9 +1,84 @@
+import json
 from typing import Iterable
 
 from prompt_toolkit.completion import Completer, Completion
 from prompt_toolkit.document import Document
 
 
+def _get_json_agents_for_model(model_name: str) -> list:
+    """Get JSON agents that have this model pinned in their JSON file."""
+    try:
+        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
+    except Exception:
+        return []
+
+
+def _get_pinned_model_for_agent(agent_name: str) -> str | None:
+    """Get the pinned model for an agent (config or JSON)."""
+    # Check config first (for built-in agents)
+    try:
+        from code_puppy.config import get_agent_pinned_model
+
+        pinned = get_agent_pinned_model(agent_name)
+        if pinned:
+            return pinned
+    except Exception:
+        pass
+
+    # Check if it's a JSON agent with a model key
+    try:
+        from code_puppy.agents.json_agent import discover_json_agents
+
+        json_agents = discover_json_agents()
+        if agent_name in json_agents:
+            with open(json_agents[agent_name], "r") as f:
+                agent_data = json.load(f)
+                return agent_data.get("model")
+    except Exception:
+        pass
+
+    return None
+
+
+def _get_model_display_meta(model_name: str) -> str:
+    """Get display meta for a model showing pinned agents."""
+    try:
+        from code_puppy.config import get_agents_pinned_to_model
+
+        pinned_agents = get_agents_pinned_to_model(model_name)
+        pinned_agents.extend(_get_json_agents_for_model(model_name))
+        pinned_agents = list(set(pinned_agents))  # Deduplicate
+
+        if pinned_agents:
+            agents_str = ", ".join(pinned_agents[:2])
+            if len(pinned_agents) > 2:
+                agents_str += "..."
+            return f"Pinned: [{agents_str}]"
+    except Exception:
+        pass
+    return "Model"
+
+
+def _get_agent_display_meta(agent_name: str) -> str:
+    """Get display meta for an agent showing pinned model."""
+    pinned_model = _get_pinned_model_for_agent(agent_name)
+    if pinned_model:
+        return f"→ {pinned_model}"
+    return "default"
+
+
 def load_agent_names():
     """Load all available agent names (both built-in and JSON agents)."""
     agents = set()
@@ -86,7 +161,7 @@ class PinCompleter(Completer):
                     agent_name,
                     start_position=-len(command_part),
                     display=agent_name,
-                    display_meta="Agent",
+                    display_meta=_get_agent_display_meta(agent_name),
                 )
 
         # Case 2: Completing first argument (agent name)
@@ -115,7 +190,7 @@ class PinCompleter(Completer):
                         model_name,
                         start_position=0,  # Insert at cursor position
                         display=model_name,
-                        display_meta="Model",
+                        display_meta=_get_model_display_meta(model_name),
                     )
             else:
                 # Still typing agent name, show agent completions
@@ -128,7 +203,7 @@ class PinCompleter(Completer):
                             agent_name,
                             start_position=start_pos,
                             display=agent_name,
-                            display_meta="Agent",
+                            display_meta=_get_agent_display_meta(agent_name),
                         )
 
         # Case 3: Completing second argument (model name)
@@ -152,7 +227,7 @@ class PinCompleter(Completer):
                         model_name,
                         start_position=0,
                         display=model_name,
-                        display_meta="Model",
+                        display_meta=_get_model_display_meta(model_name),
                     )
             else:
                 # Filter based on what the user has typed
@@ -174,7 +249,7 @@ class PinCompleter(Completer):
                             model_name,
                             start_position=start_pos,
                             display=model_name,
-                            display_meta="Model",
+                            display_meta=_get_model_display_meta(model_name),
                         )
 
         # Case 4: Handle special case when user selected (unpin)
@@ -233,7 +308,7 @@ class UnpinCompleter(Completer):
                     agent_name,
                     start_position=-len(command_part),
                     display=agent_name,
-                    display_meta="Agent",
+                    display_meta=_get_agent_display_meta(agent_name),
                 )
         elif len(tokens) == 1:
             # Filter agent names based on partial input
@@ -247,7 +322,7 @@ class UnpinCompleter(Completer):
                         agent_name,
                         start_position=start_pos,
                         display=agent_name,
-                        display_meta="Agent",
+                        display_meta=_get_agent_display_meta(agent_name),
                     )
         else:
             # No completion for additional arguments

code_puppy/command_line/prompt_toolkit_completion.py

@@ -98,10 +98,9 @@ class SafeFileHistory(FileHistory):
         except (UnicodeEncodeError, UnicodeDecodeError, OSError) as e:
             # If we still can't write, log the error but don't crash
             # This can happen with particularly malformed input
-            print(
-                f"Warning: Could not save to command history: {e}",
-                file=sys.stderr,
-            )
+            # Note: Using sys.stderr here intentionally - this is a low-level
+            # warning that shouldn't use the messaging system
+            sys.stderr.write(f"Warning: Could not save to command history: {e}\n")
 
 
 class SetCompleter(Completer):
@@ -375,13 +374,20 @@ class AgentCompleter(Completer):
             return
 
         # Filter and yield agent completions
+        try:
+            from code_puppy.command_line.pin_command_completion import (
+                _get_agent_display_meta,
+            )
+        except ImportError:
+            _get_agent_display_meta = lambda x: "default"  # noqa: E731
+
         for agent_name in agent_names:
             if agent_name.lower().startswith(text_after_trigger.lower()):
                 yield Completion(
                     agent_name,
                     start_position=start_position,
                     display=agent_name,
-                    display_meta="Agent",
+                    display_meta=_get_agent_display_meta(agent_name),
                 )
 
 
@@ -576,12 +582,26 @@ async def get_input_with_combined_completion(
     # Ctrl+X keybinding - exit with KeyboardInterrupt for shell command cancellation
     @bindings.add(Keys.ControlX)
     def _(event):
-        event.app.exit(exception=KeyboardInterrupt)
+        try:
+            event.app.exit(exception=KeyboardInterrupt)
+        except Exception:
+            # Ignore "Return value already set" errors when exit was already called
+            # This happens when user presses multiple exit keys in quick succession
+            pass
 
     # Escape keybinding - exit with KeyboardInterrupt
     @bindings.add(Keys.Escape)
     def _(event):
-        event.app.exit(exception=KeyboardInterrupt)
+        try:
+            event.app.exit(exception=KeyboardInterrupt)
+        except Exception:
+            # Ignore "Return value already set" errors when exit was already called
+            pass
+
+    # NOTE: We intentionally do NOT override Ctrl+C here.
+    # prompt_toolkit's default Ctrl+C handler properly resets the terminal state on Windows.
+    # Overriding it with event.app.exit(exception=KeyboardInterrupt) can leave the terminal
+    # in a bad state where characters cannot be typed. Let prompt_toolkit handle Ctrl+C natively.
 
     # Toggle multiline with Alt+M
     @bindings.add(Keys.Escape, "m")
@@ -589,14 +609,17 @@ async def get_input_with_combined_completion(
         multiline["enabled"] = not multiline["enabled"]
         status = "ON" if multiline["enabled"] else "OFF"
         # Print status for user feedback (version-agnostic)
-        print(f"[multiline] {status}", flush=True)
+        # Note: Using sys.stdout here for immediate feedback during input
+        sys.stdout.write(f"[multiline] {status}\n")
+        sys.stdout.flush()
 
     # Also toggle multiline with F2 (more reliable across platforms)
     @bindings.add("f2")
     def _(event):
         multiline["enabled"] = not multiline["enabled"]
         status = "ON" if multiline["enabled"] else "OFF"
-        print(f"[multiline] {status}", flush=True)
+        sys.stdout.write(f"[multiline] {status}\n")
+        sys.stdout.flush()
 
     # Newline insert bindings — robust and explicit
     # Ctrl+J (line feed) works in virtually all terminals; mark eager so it wins

code_puppy/command_line/session_commands.py

@@ -246,6 +246,8 @@ def handle_dump_context_command(command: str) -> bool:
 )
 def handle_load_context_command(command: str) -> bool:
     """Load message history from a file."""
+    from rich.text import Text
+
     from code_puppy.agents.agent_manager import get_current_agent
     from code_puppy.config import rotate_autosave_id
     from code_puppy.messaging import emit_error, emit_info, emit_success, emit_warning
@@ -278,12 +280,17 @@ def handle_load_context_command(command: str) -> bool:
     # Rotate autosave id to avoid overwriting any existing autosave
     try:
         new_id = rotate_autosave_id()
-        autosave_info = f"\n[dim]Autosave session rotated to: {new_id}[/dim]"
+        autosave_info = Text.from_markup(
+            f"\n[dim]Autosave session rotated to: {new_id}[/dim]"
+        )
     except Exception:
-        autosave_info = ""
+        autosave_info = Text("")
 
-    emit_success(
+    # Build the success message with proper Text concatenation
+    success_msg = Text(
         f"✅ Context loaded: {len(history)} messages ({total_tokens} tokens)\n"
-        f"📁 From: {session_path}{autosave_info}"
+        f"📁 From: {session_path}"
     )
+    success_msg.append_text(autosave_info)
+    emit_success(success_msg)
     return True