code-puppy 0.0.324__tar.gz → 0.0.326__tar.gz

{code_puppy-0.0.324 → code_puppy-0.0.326}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.324
+Version: 0.0.326
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy

{code_puppy-0.0.324 → code_puppy-0.0.326}/code_puppy/agents/base_agent.py

@@ -4,7 +4,6 @@ import asyncio
 import json
 import math
 import signal
-import sys
 import threading
 import uuid
 from abc import ABC, abstractmethod
@@ -1340,15 +1339,19 @@ class BaseAgent(ABC):
     ) -> None:
         """Handle streaming events from the agent run.
 
-        This method processes streaming events and emits TextPart and ThinkingPart
-        content with styled banners as they stream in.
+        This method processes streaming events and emits TextPart, ThinkingPart,
+        and ToolCallPart content with styled banners/tokens as they stream in.
 
         Args:
             ctx: The run context.
             events: Async iterable of streaming events (PartStartEvent, PartDeltaEvent, etc.).
         """
         from pydantic_ai import PartDeltaEvent, PartStartEvent
-        from pydantic_ai.messages import TextPartDelta, ThinkingPartDelta
+        from pydantic_ai.messages import (
+            TextPartDelta,
+            ThinkingPartDelta,
+            ToolCallPartDelta,
+        )
         from rich.console import Console
         from rich.markdown import Markdown
         from rich.markup import escape
@@ -1364,15 +1367,16 @@ class BaseAgent(ABC):
             # Fallback if console not set (shouldn't happen in normal use)
             console = Console()
 
-        # Track which part indices we're currently streaming (for Text/Thinking parts)
+        # Track which part indices we're currently streaming (for Text/Thinking/Tool parts)
         streaming_parts: set[int] = set()
         thinking_parts: set[int] = (
             set()
         )  # Track which parts are thinking (for dim style)
         text_parts: set[int] = set()  # Track which parts are text
+        tool_parts: set[int] = set()  # Track which parts are tool calls
         banner_printed: set[int] = set()  # Track if banner was already printed
         text_buffer: dict[int, list[str]] = {}  # Buffer text for final markdown render
-        token_count: dict[int, int] = {}  # Track token count per text part
+        token_count: dict[int, int] = {}  # Track token count per text/tool part
         did_stream_anything = False  # Track if we streamed any content
 
         def _print_thinking_banner() -> None:
@@ -1442,7 +1446,16 @@ class BaseAgent(ABC):
                     # Buffer initial content if present
                     if part.content and part.content.strip():
                         text_buffer[event.index].append(part.content)
-                        token_count[event.index] += 1
+                        # Use len(content) / 3 for token estimation (more accurate than chunk counting)
+                        token_count[event.index] += len(part.content) // 3
+                elif isinstance(part, ToolCallPart):
+                    streaming_parts.add(event.index)
+                    tool_parts.add(event.index)
+                    token_count[event.index] = 0  # Initialize token counter
+                    # Track tool name for display
+                    banner_printed.add(
+                        event.index
+                    )  # Use banner_printed to track if we've shown tool info
 
             # PartDeltaEvent - stream the content as it arrives
             elif isinstance(event, PartDeltaEvent):
@@ -1460,7 +1473,10 @@ class BaseAgent(ABC):
                                     banner_printed.add(event.index)
                                 # Accumulate text for final markdown render
                                 text_buffer[event.index].append(delta.content_delta)
-                                token_count[event.index] += 1
+                                # Use len(content) / 3 for token estimation
+                                token_count[event.index] += (
+                                    len(delta.content_delta) // 3
+                                )
                                 # Update token counter in place (single line)
                                 count = token_count[event.index]
                                 sys.stdout.write(
@@ -1474,14 +1490,32 @@ class BaseAgent(ABC):
                                     banner_printed.add(event.index)
                                 escaped = escape(delta.content_delta)
                                 console.print(f"[dim]{escaped}[/dim]", end="")
+                    elif isinstance(delta, ToolCallPartDelta):
+                        import sys
+
+                        # For tool calls, show token counter (use string repr for estimation)
+                        token_count[event.index] += len(str(delta)) // 3
+                        # Get tool name if available
+                        tool_name = getattr(delta, "tool_name_delta", "")
+                        count = token_count[event.index]
+                        # Display with tool wrench icon and tool name
+                        if tool_name:
+                            sys.stdout.write(
+                                f"\r\x1b[K  🔧 Calling {tool_name}... {count} tokens"
+                            )
+                        else:
+                            sys.stdout.write(
+                                f"\r\x1b[K  🔧 Calling tool... {count} tokens"
+                            )
+                        sys.stdout.flush()
 
             # PartEndEvent - finish the streaming with a newline
             elif isinstance(event, PartEndEvent):
                 if event.index in streaming_parts:
+                    import sys
+
                     # For text parts, clear counter line and render markdown
                     if event.index in text_parts:
-                        import sys
-
                         # Clear the token counter line
                         sys.stdout.write("\r\x1b[K")
                         sys.stdout.flush()
@@ -1494,24 +1528,31 @@ class BaseAgent(ABC):
                             except Exception:
                                 pass
                             del text_buffer[event.index]
-                        # Clean up token count
-                        token_count.pop(event.index, None)
+                    # For tool parts, clear the token counter line
+                    elif event.index in tool_parts:
+                        # Clear the token counter line
+                        sys.stdout.write("\r\x1b[K")
+                        sys.stdout.flush()
                     # For thinking parts, just print newline
                     elif event.index in banner_printed:
                         console.print()  # Final newline after streaming
+
+                    # Clean up token count
+                    token_count.pop(event.index, None)
                     # Clean up all tracking sets
                     streaming_parts.discard(event.index)
                     thinking_parts.discard(event.index)
                     text_parts.discard(event.index)
+                    tool_parts.discard(event.index)
                     banner_printed.discard(event.index)
 
-                    # Resume spinner if next part is NOT text/thinking (avoid race condition)
-                    # If next part is a tool call or None, it's safe to resume
+                    # Resume spinner if next part is NOT text/thinking/tool (avoid race condition)
+                    # If next part is None or handled differently, it's safe to resume
                     # Note: spinner itself handles blank line before appearing
                     from code_puppy.messaging.spinner import resume_all_spinners
 
                     next_kind = getattr(event, "next_part_kind", None)
-                    if next_kind not in ("text", "thinking"):
+                    if next_kind not in ("text", "thinking", "tool-call"):
                         resume_all_spinners()
 
         # Spinner is resumed in PartEndEvent when appropriate (based on next_part_kind)
@@ -1910,73 +1951,32 @@ class BaseAgent(ABC):
         def graceful_sigint_handler(_sig, _frame):
             # When using keyboard-based cancel, SIGINT should be a no-op
             # (just show a hint to user about the configured cancel key)
-            from code_puppy.keymap import get_cancel_agent_display_name
             import sys
 
+            from code_puppy.keymap import get_cancel_agent_display_name
+
             cancel_key = get_cancel_agent_display_name()
-            if sys.platform == "win32":
-                # On Windows, we use keyboard listener, so SIGINT might still fire
-                # but we handle cancellation via the key listener
-                pass  # Silent on Windows - the key listener handles it
-            else:
-                emit_info(f"Use {cancel_key} to cancel the agent task.")
+            emit_info(f"Use {cancel_key} to cancel the agent task.")
 
         original_handler = None
         key_listener_stop_event = None
         _key_listener_thread = None
-        _windows_ctrl_handler = None  # Store reference to prevent garbage collection
 
         try:
-            if sys.platform == "win32":
-                # Windows: Use SetConsoleCtrlHandler for reliable Ctrl+C handling
-                import ctypes
-
-                # Define the handler function type
-                HANDLER_ROUTINE = ctypes.WINFUNCTYPE(ctypes.c_bool, ctypes.c_ulong)
-
-                def windows_ctrl_handler(ctrl_type):
-                    """Handle Windows console control events."""
-                    CTRL_C_EVENT = 0
-                    CTRL_BREAK_EVENT = 1
-
-                    if ctrl_type in (CTRL_C_EVENT, CTRL_BREAK_EVENT):
-                        # Check if we're awaiting user input
-                        if is_awaiting_user_input():
-                            return False  # Let default handler run
-
-                        # Schedule agent cancellation
-                        schedule_agent_cancel()
-                        return True  # We handled it, don't terminate
-
-                    return False  # Let other handlers process it
-
-                # Create the callback - must keep reference alive!
-                _windows_ctrl_handler = HANDLER_ROUTINE(windows_ctrl_handler)
-
-                # Register the handler
-                kernel32 = ctypes.windll.kernel32
-                if not kernel32.SetConsoleCtrlHandler(_windows_ctrl_handler, True):
-                    emit_warning("Failed to set Windows Ctrl+C handler")
-
-                # Also spawn keyboard listener for Ctrl+X (shell cancel) and other keys
-                key_listener_stop_event = threading.Event()
-                _key_listener_thread = self._spawn_ctrl_x_key_listener(
-                    key_listener_stop_event,
-                    on_escape=lambda: None,  # Ctrl+X handled by command_runner
-                    on_cancel_agent=None,  # Ctrl+C handled by SetConsoleCtrlHandler above
-                )
-            elif cancel_agent_uses_signal():
-                # Unix with Ctrl+C: Use SIGINT-based cancellation
+            if cancel_agent_uses_signal():
+                # Use SIGINT-based cancellation (default Ctrl+C behavior)
                 original_handler = signal.signal(
                     signal.SIGINT, keyboard_interrupt_handler
                 )
             else:
-                # Unix with different cancel key: Use keyboard listener
+                # Use keyboard listener for agent cancellation
+                # Set a graceful SIGINT handler that shows a hint
                 original_handler = signal.signal(signal.SIGINT, graceful_sigint_handler)
+                # Spawn keyboard listener with the cancel agent callback
                 key_listener_stop_event = threading.Event()
                 _key_listener_thread = self._spawn_ctrl_x_key_listener(
                     key_listener_stop_event,
-                    on_escape=lambda: None,
+                    on_escape=lambda: None,  # Ctrl+X handled by command_runner
                     on_cancel_agent=schedule_agent_cancel,
                 )
 
@@ -2001,17 +2001,8 @@ class BaseAgent(ABC):
             # Stop keyboard listener if it was started
             if key_listener_stop_event is not None:
                 key_listener_stop_event.set()
-
-            # Unregister Windows Ctrl handler
-            if sys.platform == "win32" and _windows_ctrl_handler is not None:
-                try:
-                    import ctypes
-
-                    kernel32 = ctypes.windll.kernel32
-                    kernel32.SetConsoleCtrlHandler(_windows_ctrl_handler, False)
-                except Exception:
-                    pass  # Best effort cleanup
-
-            # Restore original signal handler (Unix)
-            if original_handler is not None:
+            # Restore original signal handler
+            if (
+                original_handler is not None
+            ):  # Explicit None check - SIG_DFL can be 0/falsy!
                 signal.signal(signal.SIGINT, original_handler)

{code_puppy-0.0.324 → code_puppy-0.0.326}/code_puppy/cli_runner.py

@@ -790,6 +790,5 @@ def main_entry():
             DBOS.destroy()
         return 0
     finally:
-        # Reset terminal on all platforms for clean state
-        reset_windows_terminal_full()  # Safe no-op on non-Windows
+        # Reset terminal on Unix-like systems (not Windows)
         reset_unix_terminal()

{code_puppy-0.0.324 → code_puppy-0.0.326}/code_puppy/command_line/add_model_menu.py

@@ -571,6 +571,7 @@ class AddModelMenu:
             "cerebras": "cerebras",
             "cohere": "custom_openai",
             "perplexity": "custom_openai",
+            "minimax": "custom_anthropic",
         }
 
         # Determine the model type
@@ -600,6 +601,16 @@ class AddModelMenu:
                 api_key_env = f"${provider.env[0]}" if provider.env else "$API_KEY"
                 config["custom_endpoint"] = {"url": api_url, "api_key": api_key_env}
 
+        # Special handling for minimax: uses custom_anthropic but needs custom_endpoint
+        # and the URL needs /v1 stripped (comes as https://api.minimax.io/anthropic/v1)
+        if provider.id == "minimax" and provider.api:
+            api_url = provider.api
+            # Strip /v1 suffix if present
+            if api_url.endswith("/v1"):
+                api_url = api_url[:-3]
+            api_key_env = f"${provider.env[0]}" if provider.env else "$API_KEY"
+            config["custom_endpoint"] = {"url": api_url, "api_key": api_key_env}
+
         # Add context length if available
         if model.context_length and model.context_length > 0:
             config["context_length"] = model.context_length

{code_puppy-0.0.324 → code_puppy-0.0.326}/code_puppy/keymap.py

@@ -86,15 +86,9 @@ def cancel_agent_uses_signal() -> bool:
     """Check if the cancel agent key uses SIGINT (Ctrl+C).
 
     Returns:
-        True if the cancel key is ctrl+c AND we're not on Windows
-        (uses SIGINT handler), False if it uses keyboard listener approach.
+        True if the cancel key is ctrl+c (uses SIGINT handler),
+        False if it uses keyboard listener approach.
     """
-    import sys
-
-    # On Windows, always use keyboard listener - SIGINT is unreliable
-    if sys.platform == "win32":
-        return False
-
     return get_cancel_agent_key() == "ctrl+c"
 
 

{code_puppy-0.0.324 → code_puppy-0.0.326}/code_puppy/plugins/__init__.py

@@ -18,6 +18,9 @@ def _load_builtin_plugins(plugins_dir: Path) -> list[str]:
 
     Returns list of successfully loaded plugin names.
     """
+    # Import safety permission check for shell_safety plugin
+    from code_puppy.config import get_safety_permission_level
+
     loaded = []
 
     for item in plugins_dir.iterdir():
@@ -26,6 +29,15 @@ def _load_builtin_plugins(plugins_dir: Path) -> list[str]:
             callbacks_file = item / "register_callbacks.py"
 
             if callbacks_file.exists():
+                # Skip shell_safety plugin unless safety_permission_level is "low" or "none"
+                if plugin_name == "shell_safety":
+                    safety_level = get_safety_permission_level()
+                    if safety_level not in ("none", "low"):
+                        logger.debug(
+                            f"Skipping shell_safety plugin - safety_permission_level is '{safety_level}' (needs 'low' or 'none')"
+                        )
+                        continue
+
                 try:
                     module_name = f"code_puppy.plugins.{plugin_name}.register_callbacks"
                     importlib.import_module(module_name)

{code_puppy-0.0.324 → code_puppy-0.0.326}/code_puppy/tools/command_runner.py

@@ -192,11 +192,6 @@ def kill_all_running_shell_processes() -> int:
     """Kill all currently tracked running shell processes and stop reader threads.
 
     Returns the number of processes signaled.
-
-    Implementation notes:
-    - Atomically snapshot and clear the registry to prevent race conditions
-    - Deduplicate by PID to ensure each process is killed at most once
-    - Let exceptions from _kill_process_group propagate (tests expect this)
     """
     global _READER_STOP_EVENT
 
@@ -204,52 +199,30 @@ def kill_all_running_shell_processes() -> int:
     if _READER_STOP_EVENT:
         _READER_STOP_EVENT.set()
 
-    # Atomically take snapshot and clear registry
-    # This prevents other threads from seeing/processing the same processes
+    procs: list[subprocess.Popen]
     with _RUNNING_PROCESSES_LOCK:
-        procs_snapshot = list(_RUNNING_PROCESSES)
-        _RUNNING_PROCESSES.clear()
-
-    # Deduplicate by pid to ensure at-most-one kill per process
-    seen_pids: set = set()
-    killed_count = 0
-
-    for proc in procs_snapshot:
-        if proc is None:
-            continue
-
-        pid = getattr(proc, "pid", None)
-        key = pid if pid is not None else id(proc)
-
-        if key in seen_pids:
-            continue
-        seen_pids.add(key)
-
-        # Close pipes first to unblock readline()
+        procs = list(_RUNNING_PROCESSES)
+    count = 0
+    for p in procs:
         try:
-            if proc.stdout and not proc.stdout.closed:
-                proc.stdout.close()
-            if proc.stderr and not proc.stderr.closed:
-                proc.stderr.close()
-            if proc.stdin and not proc.stdin.closed:
-                proc.stdin.close()
-        except (OSError, ValueError):
-            pass
-
-        # Only attempt to kill processes that are still running
-        if proc.poll() is None:
-            # Let exceptions bubble up (tests expect this behavior)
-            _kill_process_group(proc)
-            killed_count += 1
-
-            # Track user-killed PIDs
-            if pid is not None:
-                try:
-                    _USER_KILLED_PROCESSES.add(pid)
-                except Exception:
-                    pass  # Non-fatal bookkeeping
+            # Close pipes first to unblock readline()
+            try:
+                if p.stdout and not p.stdout.closed:
+                    p.stdout.close()
+                if p.stderr and not p.stderr.closed:
+                    p.stderr.close()
+                if p.stdin and not p.stdin.closed:
+                    p.stdin.close()
+            except (OSError, ValueError):
+                pass
 
-    return killed_count
+            if p.poll() is None:
+                _kill_process_group(p)
+                count += 1
+                _USER_KILLED_PROCESSES.add(p.pid)
+        finally:
+            _unregister_process(p)
+    return count
 
 
 def get_running_shell_process_count() -> int:

{code_puppy-0.0.324 → code_puppy-0.0.326}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "code-puppy"
-version = "0.0.324"
+version = "0.0.326"
 description = "Code generation agent"
 readme = "README.md"
 requires-python = ">=3.11,<3.14"