code-puppy 0.0.332__py3-none-any.whl → 0.0.333__py3-none-any.whl

code_puppy/agents/base_agent.py

@@ -75,8 +75,6 @@ from code_puppy.model_factory import ModelFactory, make_model_settings
 from code_puppy.summarization_agent import run_summarization_sync
 from code_puppy.tools.agent_tools import _active_subagent_tasks
 from code_puppy.tools.command_runner import (
-    _add_windows_ctrl_handler,
-    _remove_windows_ctrl_handler,
     is_awaiting_user_input,
 )
 
@@ -1384,15 +1382,14 @@ class BaseAgent(ABC):
         def _print_thinking_banner() -> None:
             """Print the THINKING banner with spinner pause and line clear."""
             nonlocal did_stream_anything
-            import sys
             import time
 
             from code_puppy.config import get_banner_color
 
             pause_all_spinners()
             time.sleep(0.1)  # Delay to let spinner fully clear
-            sys.stdout.write("\r\x1b[K")  # Clear line
-            sys.stdout.flush()
+            # Clear line and print newline before banner
+            console.print(" " * 50, end="\r")
             console.print()  # Newline before banner
             # Bold banner with configurable color and lightning bolt
             thinking_color = get_banner_color("thinking")
@@ -1402,21 +1399,19 @@ class BaseAgent(ABC):
                 ),
                 end="",
             )
-            sys.stdout.flush()
             did_stream_anything = True
 
         def _print_response_banner() -> None:
             """Print the AGENT RESPONSE banner with spinner pause and line clear."""
             nonlocal did_stream_anything
-            import sys
             import time
 
             from code_puppy.config import get_banner_color
 
             pause_all_spinners()
             time.sleep(0.1)  # Delay to let spinner fully clear
-            sys.stdout.write("\r\x1b[K")  # Clear line
-            sys.stdout.flush()
+            # Clear line and print newline before banner
+            console.print(" " * 50, end="\r")
             console.print()  # Newline before banner
             response_color = get_banner_color("agent_response")
             console.print(
@@ -1424,7 +1419,6 @@ class BaseAgent(ABC):
                     f"[bold white on {response_color}] AGENT RESPONSE [/bold white on {response_color}]"
                 )
             )
-            sys.stdout.flush()
             did_stream_anything = True
 
         async for event in events:
@@ -1448,8 +1442,8 @@ class BaseAgent(ABC):
                     # Buffer initial content if present
                     if part.content and part.content.strip():
                         text_buffer[event.index].append(part.content)
-                        # Use len(content) / 3 for token estimation (more accurate than chunk counting)
-                        token_count[event.index] += len(part.content) // 3
+                        # Count chunks (each part counts as 1)
+                        token_count[event.index] += 1
                 elif isinstance(part, ToolCallPart):
                     streaming_parts.add(event.index)
                     tool_parts.add(event.index)
@@ -1467,24 +1461,20 @@ class BaseAgent(ABC):
                         if delta.content_delta:
                             # For text parts, show token counter then render at end
                             if event.index in text_parts:
-                                import sys
-
                                 # Print banner on first content
                                 if event.index not in banner_printed:
                                     _print_response_banner()
                                     banner_printed.add(event.index)
                                 # Accumulate text for final markdown render
                                 text_buffer[event.index].append(delta.content_delta)
-                                # Use len(content) / 3 for token estimation
-                                token_count[event.index] += (
-                                    len(delta.content_delta) // 3
-                                )
-                                # Update token counter in place (single line)
+                                # Count chunks received
+                                token_count[event.index] += 1
+                                # Update chunk counter in place (single line)
                                 count = token_count[event.index]
-                                sys.stdout.write(
-                                    f"\r\x1b[K  ⏳ Receiving... {count} tokens"
+                                console.print(
+                                    f"  ⏳ Receiving... {count} chunks   ",
+                                    end="\r",
                                 )
-                                sys.stdout.flush()
                             else:
                                 # For thinking parts, stream immediately (dim)
                                 if event.index not in banner_printed:
@@ -1493,34 +1483,30 @@ class BaseAgent(ABC):
                                 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
+                        # For tool calls, count chunks received
+                        token_count[event.index] += 1
                         # 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"
+                            console.print(
+                                f"  🔧 Calling {tool_name}... {count} chunks   ",
+                                end="\r",
                             )
                         else:
-                            sys.stdout.write(
-                                f"\r\x1b[K  🔧 Calling tool... {count} tokens"
+                            console.print(
+                                f"  🔧 Calling tool... {count} chunks   ",
+                                end="\r",
                             )
-                        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:
-                        # Clear the token counter line
-                        sys.stdout.write("\r\x1b[K")
-                        sys.stdout.flush()
+                        # Clear the chunk counter line by printing spaces and returning
+                        console.print(" " * 50, end="\r")
                         # Render the final markdown nicely
                         if event.index in text_buffer:
                             try:
@@ -1530,11 +1516,10 @@ class BaseAgent(ABC):
                             except Exception:
                                 pass
                             del text_buffer[event.index]
-                    # For tool parts, clear the token counter line
+                    # For tool parts, clear the chunk counter line
                     elif event.index in tool_parts:
-                        # Clear the token counter line
-                        sys.stdout.write("\r\x1b[K")
-                        sys.stdout.flush()
+                        # Clear the chunk counter line by printing spaces and returning
+                        console.print(" " * 50, end="\r")
                     # For thinking parts, just print newline
                     elif event.index in banner_printed:
                         console.print()  # Final newline after streaming
@@ -1953,7 +1938,12 @@ 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)
+            # Also reset terminal to prevent bricking on Windows+uvx
             from code_puppy.keymap import get_cancel_agent_display_name
+            from code_puppy.terminal_utils import reset_windows_terminal_full
+
+            # Reset terminal state first to prevent bricking
+            reset_windows_terminal_full()
 
             cancel_key = get_cancel_agent_display_name()
             emit_info(f"Use {cancel_key} to cancel the agent task.")
@@ -1961,12 +1951,6 @@ class BaseAgent(ABC):
         original_handler = None
         key_listener_stop_event = None
         _key_listener_thread = None
-        windows_ctrl_handler = None
-
-        # Check if we're on Windows
-        import sys
-
-        is_windows = sys.platform.startswith("win")
 
         try:
             if cancel_agent_uses_signal():
@@ -1974,27 +1958,10 @@ class BaseAgent(ABC):
                 original_handler = signal.signal(
                     signal.SIGINT, keyboard_interrupt_handler
                 )
-                # On Windows, also use SetConsoleCtrlHandler for reliable Ctrl+C with uvx
-                if is_windows:
-                    windows_ctrl_handler = _add_windows_ctrl_handler(
-                        schedule_agent_cancel
-                    )
             else:
                 # Use keyboard listener for agent cancellation
                 # Set a graceful SIGINT handler that shows a hint
                 original_handler = signal.signal(signal.SIGINT, graceful_sigint_handler)
-                # On Windows, SetConsoleCtrlHandler should also show the hint
-                if is_windows:
-
-                    def graceful_ctrl_handler():
-                        from code_puppy.keymap import get_cancel_agent_display_name
-
-                        cancel_key = get_cancel_agent_display_name()
-                        emit_info(f"Use {cancel_key} to cancel the agent task.")
-
-                    windows_ctrl_handler = _add_windows_ctrl_handler(
-                        graceful_ctrl_handler
-                    )
                 # Spawn keyboard listener with the cancel agent callback
                 key_listener_stop_event = threading.Event()
                 _key_listener_thread = self._spawn_ctrl_x_key_listener(
@@ -2024,17 +1991,8 @@ class BaseAgent(ABC):
             # Stop keyboard listener if it was started
             if key_listener_stop_event is not None:
                 key_listener_stop_event.set()
-            # Remove Windows console handler
-            if windows_ctrl_handler is not None:
-                _remove_windows_ctrl_handler(windows_ctrl_handler)
             # 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)
-            # Windows-specific: Reset terminal after Ctrl+C to prevent corruption
-            # This fixes the issue where Enter key shows as 'm' after interrupting with uvx
-            if is_windows:
-                from code_puppy.terminal_utils import reset_windows_terminal_full
-
-                reset_windows_terminal_full()

code_puppy/cli_runner.py

@@ -171,6 +171,45 @@ async def main():
         emit_error(str(e))
         sys.exit(1)
 
+    # Show uvx detection notice if we're on Windows + uvx
+    # Also disable Ctrl+C at the console level to prevent terminal bricking
+    try:
+        from code_puppy.uvx_detection import should_use_alternate_cancel_key
+
+        if should_use_alternate_cancel_key():
+            from code_puppy.terminal_utils import (
+                disable_windows_ctrl_c,
+                set_keep_ctrl_c_disabled,
+            )
+
+            # Disable Ctrl+C at the console input level
+            # This prevents Ctrl+C from being processed as a signal at all
+            disable_windows_ctrl_c()
+
+            # Set flag to keep it disabled (prompt_toolkit may re-enable it)
+            set_keep_ctrl_c_disabled(True)
+
+            # Use print directly - emit_system_message can get cleared by ANSI codes
+            print(
+                "🔧 Detected uvx launch on Windows - using Ctrl+K for cancellation "
+                "(Ctrl+C is disabled to prevent terminal issues)"
+            )
+
+            # Also install a SIGINT handler as backup
+            import signal
+
+            from code_puppy.terminal_utils import reset_windows_terminal_full
+
+            def _uvx_protective_sigint_handler(_sig, _frame):
+                """Protective SIGINT handler for Windows+uvx."""
+                reset_windows_terminal_full()
+                # Re-disable Ctrl+C in case something re-enabled it
+                disable_windows_ctrl_c()
+
+            signal.signal(signal.SIGINT, _uvx_protective_sigint_handler)
+    except ImportError:
+        pass  # uvx_detection module not available, ignore
+
     # Load API keys from puppy.cfg into environment variables
     from code_puppy.config import load_api_keys_to_environment
 
@@ -421,10 +460,6 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
     current_agent_task = None
 
     while True:
-        # Windows-specific: Aggressively reset terminal at the start of every loop
-        # This fixes terminal corruption after Ctrl+C, especially when running via uvx
-        reset_windows_terminal_full()
-
         from code_puppy.agents.agent_manager import get_current_agent
         from code_puppy.messaging import emit_info
 
@@ -444,6 +479,15 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
                 task = await get_input_with_combined_completion(
                     get_prompt_with_active_model(), history_file=COMMAND_HISTORY_FILE
                 )
+
+                # Windows+uvx: Re-disable Ctrl+C after prompt_toolkit
+                # (prompt_toolkit restores console mode which re-enables Ctrl+C)
+                try:
+                    from code_puppy.terminal_utils import ensure_ctrl_c_disabled
+
+                    ensure_ctrl_c_disabled()
+                except ImportError:
+                    pass
             except ImportError:
                 # Fall back to basic input if prompt_toolkit is not available
                 task = input(">>> ")
@@ -608,8 +652,14 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
                 # Check if the task was cancelled (but don't show message if we just killed processes)
                 if result is None:
                     # Windows-specific: Reset terminal state after cancellation
-                    # Use full reset (ANSI + console mode) to fix stdin after Ctrl+C
-                    reset_windows_terminal_full()
+                    reset_windows_terminal_ansi()
+                    # Re-disable Ctrl+C if needed (uvx mode)
+                    try:
+                        from code_puppy.terminal_utils import ensure_ctrl_c_disabled
+
+                        ensure_ctrl_c_disabled()
+                    except ImportError:
+                        pass
                     continue
                 # Get the structured response
                 agent_response = result.output
@@ -650,6 +700,15 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
 
             auto_save_session_if_enabled()
 
+            # Re-disable Ctrl+C if needed (uvx mode) - must be done after
+            # each iteration as various operations may restore console mode
+            try:
+                from code_puppy.terminal_utils import ensure_ctrl_c_disabled
+
+                ensure_ctrl_c_disabled()
+            except ImportError:
+                pass
+
 
 def prettier_code_blocks():
     """Configure Rich to use prettier code block rendering."""

code_puppy/keymap.py

@@ -55,11 +55,19 @@ class KeymapError(Exception):
 def get_cancel_agent_key() -> str:
     """Get the configured cancel agent key from config.
 
+    On Windows when launched via uvx, this automatically returns "ctrl+k"
+    to work around uvx capturing Ctrl+C before it reaches Python.
+
     Returns:
         The key name (e.g., "ctrl+c", "ctrl+k") from config,
         or the default if not configured.
     """
     from code_puppy.config import get_value
+    from code_puppy.uvx_detection import should_use_alternate_cancel_key
+
+    # On Windows + uvx, force ctrl+k to bypass uvx's SIGINT capture
+    if should_use_alternate_cancel_key():
+        return "ctrl+k"
 
     key = get_value("cancel_agent_key")
     if key is None or key.strip() == "":

code_puppy/terminal_utils.py

@@ -6,6 +6,10 @@ Handles Windows console mode resets and Unix terminal sanity restoration.
 import platform
 import subprocess
 import sys
+from typing import Callable, Optional
+
+# Store the original console ctrl handler so we can restore it if needed
+_original_ctrl_handler: Optional[Callable] = None
 
 
 def reset_windows_terminal_ansi() -> None:
@@ -86,21 +90,36 @@ def reset_windows_console_mode() -> None:
         pass  # Silently ignore errors - best effort reset
 
 
-def reset_windows_terminal_full() -> None:
-    """Perform a full Windows terminal reset (console mode + ANSI).
+def flush_windows_keyboard_buffer() -> None:
+    """Flush the Windows keyboard buffer.
 
-    Combines both console mode reset and ANSI reset for complete
-    terminal state restoration after interrupts.
+    Clears any pending keyboard input that could interfere with
+    subsequent input operations after an interrupt.
+    """
+    if platform.system() != "Windows":
+        return
 
-    IMPORTANT: Console mode must be reset FIRST to re-enable
-    ENABLE_VIRTUAL_TERMINAL_PROCESSING, otherwise the ANSI escape
-    sequences will be printed as literal text (e.g., '[0m').
+    try:
+        import msvcrt
+
+        while msvcrt.kbhit():
+            msvcrt.getch()
+    except Exception:
+        pass  # Silently ignore errors - best effort flush
+
+
+def reset_windows_terminal_full() -> None:
+    """Perform a full Windows terminal reset (ANSI + console mode + keyboard buffer).
+
+    Combines ANSI reset, console mode reset, and keyboard buffer flush
+    for complete terminal state restoration after interrupts.
     """
     if platform.system() != "Windows":
         return
 
-    reset_windows_console_mode()  # Must be first! Enables ANSI processing
-    reset_windows_terminal_ansi()  # Now ANSI escapes will be interpreted
+    reset_windows_terminal_ansi()
+    reset_windows_console_mode()
+    flush_windows_keyboard_buffer()
 
 
 def reset_unix_terminal() -> None:
@@ -128,3 +147,145 @@ def reset_terminal() -> None:
         reset_windows_terminal_full()
     else:
         reset_unix_terminal()
+
+
+def disable_windows_ctrl_c() -> bool:
+    """Disable Ctrl+C processing at the Windows console input level.
+
+    This removes ENABLE_PROCESSED_INPUT from stdin, which prevents
+    Ctrl+C from being interpreted as a signal at all. Instead, it
+    becomes just a regular character (^C) that gets ignored.
+
+    This is more reliable than SetConsoleCtrlHandler because it
+    prevents Ctrl+C from being processed before it reaches any handler.
+
+    Returns:
+        True if successfully disabled, False otherwise.
+    """
+    global _original_ctrl_handler
+
+    if platform.system() != "Windows":
+        return False
+
+    try:
+        import ctypes
+
+        kernel32 = ctypes.windll.kernel32
+
+        # Get stdin handle
+        STD_INPUT_HANDLE = -10
+        stdin_handle = kernel32.GetStdHandle(STD_INPUT_HANDLE)
+
+        # Get current console mode
+        mode = ctypes.c_ulong()
+        if not kernel32.GetConsoleMode(stdin_handle, ctypes.byref(mode)):
+            return False
+
+        # Save original mode for potential restoration
+        _original_ctrl_handler = mode.value
+
+        # Console mode flags
+        ENABLE_PROCESSED_INPUT = 0x0001  # This makes Ctrl+C generate signals
+
+        # Remove ENABLE_PROCESSED_INPUT to disable Ctrl+C signal generation
+        new_mode = mode.value & ~ENABLE_PROCESSED_INPUT
+
+        if kernel32.SetConsoleMode(stdin_handle, new_mode):
+            return True
+        return False
+
+    except Exception:
+        return False
+
+
+def enable_windows_ctrl_c() -> bool:
+    """Re-enable Ctrl+C at the Windows console level.
+
+    Restores the original console mode saved by disable_windows_ctrl_c().
+
+    Returns:
+        True if successfully re-enabled, False otherwise.
+    """
+    global _original_ctrl_handler
+
+    if platform.system() != "Windows":
+        return False
+
+    if _original_ctrl_handler is None:
+        return True  # Nothing to restore
+
+    try:
+        import ctypes
+
+        kernel32 = ctypes.windll.kernel32
+
+        # Get stdin handle
+        STD_INPUT_HANDLE = -10
+        stdin_handle = kernel32.GetStdHandle(STD_INPUT_HANDLE)
+
+        # Restore original mode
+        if kernel32.SetConsoleMode(stdin_handle, _original_ctrl_handler):
+            _original_ctrl_handler = None
+            return True
+        return False
+
+    except Exception:
+        return False
+
+
+# Flag to track if we should keep Ctrl+C disabled
+_keep_ctrl_c_disabled: bool = False
+
+
+def set_keep_ctrl_c_disabled(value: bool) -> None:
+    """Set whether Ctrl+C should be kept disabled.
+
+    When True, ensure_ctrl_c_disabled() will re-disable Ctrl+C
+    even if something else (like prompt_toolkit) re-enables it.
+    """
+    global _keep_ctrl_c_disabled
+    _keep_ctrl_c_disabled = value
+
+
+def ensure_ctrl_c_disabled() -> bool:
+    """Ensure Ctrl+C is disabled if it should be.
+
+    Call this after operations that might restore console mode
+    (like prompt_toolkit input).
+
+    Returns:
+        True if Ctrl+C is now disabled (or wasn't needed), False on error.
+    """
+    if not _keep_ctrl_c_disabled:
+        return True
+
+    if platform.system() != "Windows":
+        return True
+
+    try:
+        import ctypes
+
+        kernel32 = ctypes.windll.kernel32
+
+        # Get stdin handle
+        STD_INPUT_HANDLE = -10
+        stdin_handle = kernel32.GetStdHandle(STD_INPUT_HANDLE)
+
+        # Get current console mode
+        mode = ctypes.c_ulong()
+        if not kernel32.GetConsoleMode(stdin_handle, ctypes.byref(mode)):
+            return False
+
+        # Console mode flags
+        ENABLE_PROCESSED_INPUT = 0x0001
+
+        # Check if Ctrl+C processing is enabled
+        if mode.value & ENABLE_PROCESSED_INPUT:
+            # Disable it
+            new_mode = mode.value & ~ENABLE_PROCESSED_INPUT
+            return bool(kernel32.SetConsoleMode(stdin_handle, new_mode))
+
+        return True  # Already disabled
+
+    except Exception:
+        return False

code_puppy/tools/command_runner.py

@@ -44,70 +44,9 @@ def _truncate_line(line: str) -> str:
 if sys.platform.startswith("win"):
     import msvcrt
 
-    # Load kernel32 for PeekNamedPipe and SetConsoleCtrlHandler
+    # Load kernel32 for PeekNamedPipe
     _kernel32 = ctypes.windll.kernel32
 
-    # SetConsoleCtrlHandler types for Ctrl+C handling on Windows
-    # This is more reliable than signal.SIGINT when running under uvx
-    _CTRL_C_EVENT = 0
-    _CTRL_BREAK_EVENT = 1
-    _HANDLER_ROUTINE = ctypes.WINFUNCTYPE(ctypes.c_int, ctypes.c_ulong)
-
-    # Track registered handlers to prevent garbage collection
-    _registered_console_handlers: list = []
-
-    def _add_windows_ctrl_handler(callback: Callable[[], None]) -> Optional[Callable]:
-        """Register a Windows console control handler for Ctrl+C/Ctrl+Break.
-
-        Args:
-            callback: Function to call when Ctrl+C or Ctrl+Break is pressed.
-                      Should take no arguments.
-
-        Returns:
-            The wrapped handler function (needed for removal), or None if failed.
-        """
-
-        def handler(ctrl_type: int) -> int:
-            if ctrl_type in (_CTRL_C_EVENT, _CTRL_BREAK_EVENT):
-                try:
-                    callback()
-                except Exception:
-                    pass
-                return 1  # TRUE = we handled it, don't pass to next handler
-            return 0  # FALSE = let next handler deal with it
-
-        # Wrap in WINFUNCTYPE to make it callable from C
-        wrapped = _HANDLER_ROUTINE(handler)
-        # Keep reference to prevent GC
-        _registered_console_handlers.append(wrapped)
-
-        try:
-            if _kernel32.SetConsoleCtrlHandler(wrapped, True):
-                return wrapped
-        except Exception:
-            pass
-        return None
-
-    def _remove_windows_ctrl_handler(handler: Callable) -> bool:
-        """Remove a previously registered Windows console control handler.
-
-        Args:
-            handler: The handler returned by _add_windows_ctrl_handler.
-
-        Returns:
-            True if successfully removed, False otherwise.
-        """
-        if handler is None:
-            return False
-        try:
-            result = _kernel32.SetConsoleCtrlHandler(handler, False)
-            # Clean up our reference
-            if handler in _registered_console_handlers:
-                _registered_console_handlers.remove(handler)
-            return bool(result)
-        except Exception:
-            return False
-
     def _win32_pipe_has_data(pipe) -> bool:
         """Check if a Windows pipe has data available without blocking.
 
@@ -148,15 +87,8 @@ if sys.platform.startswith("win"):
         except (ValueError, OSError, ctypes.ArgumentError):
             # Handle closed, invalid, or other errors
             return False
-
 else:
-    # Non-Windows: provide no-op stubs
-    def _add_windows_ctrl_handler(callback: Callable[[], None]) -> Optional[Callable]:
-        return None
-
-    def _remove_windows_ctrl_handler(handler: Callable) -> bool:
-        return False
-
+    # POSIX stub - not used, but keeps the code clean
     def _win32_pipe_has_data(pipe) -> bool:
         return False
 
@@ -174,7 +106,6 @@ _USER_KILLED_PROCESSES = set()
 _SHELL_CTRL_X_STOP_EVENT: Optional[threading.Event] = None
 _SHELL_CTRL_X_THREAD: Optional[threading.Thread] = None
 _ORIGINAL_SIGINT_HANDLER = None
-_WINDOWS_CTRL_HANDLER = None  # For SetConsoleCtrlHandler on Windows
 
 # Stop event to signal reader threads to terminate
 _READER_STOP_EVENT: Optional[threading.Event] = None
@@ -504,10 +435,8 @@ def _shell_command_keyboard_context():
     1. Disables the agent's Ctrl-C handler (so it doesn't cancel the agent)
     2. Enables a Ctrl-X listener to kill the running shell process
     3. Restores the original Ctrl-C handler when done
-    4. On Windows, uses SetConsoleCtrlHandler for reliable Ctrl+C with uvx
     """
     global _SHELL_CTRL_X_STOP_EVENT, _SHELL_CTRL_X_THREAD, _ORIGINAL_SIGINT_HANDLER
-    global _WINDOWS_CTRL_HANDLER
 
     # Handler for Ctrl-X: kill all running shell processes
     def handle_ctrl_x_press() -> None:
@@ -515,15 +444,11 @@ def _shell_command_keyboard_context():
         kill_all_running_shell_processes()
 
     # Handler for Ctrl-C during shell execution: just kill the shell process, don't cancel agent
-    def shell_ctrl_c_callback():
+    def shell_sigint_handler(_sig, _frame):
         """During shell execution, Ctrl-C kills the shell but doesn't cancel the agent."""
         emit_warning("\n🛑 Ctrl-C detected! Interrupting shell command...")
         kill_all_running_shell_processes()
 
-    def shell_sigint_handler(_sig, _frame):
-        """Signal handler wrapper for SIGINT."""
-        shell_ctrl_c_callback()
-
     # Set up Ctrl-X listener
     _SHELL_CTRL_X_STOP_EVENT = threading.Event()
     _SHELL_CTRL_X_THREAD = _spawn_ctrl_x_key_listener(
@@ -531,12 +456,7 @@ def _shell_command_keyboard_context():
         handle_ctrl_x_press,
     )
 
-    # On Windows, use SetConsoleCtrlHandler for reliable Ctrl+C handling
-    # This works even when running under uvx where SIGINT doesn't propagate properly
-    if sys.platform.startswith("win"):
-        _WINDOWS_CTRL_HANDLER = _add_windows_ctrl_handler(shell_ctrl_c_callback)
-
-    # Also set SIGINT handler (works on POSIX, may work on some Windows setups)
+    # Replace SIGINT handler temporarily
     try:
         _ORIGINAL_SIGINT_HANDLER = signal.signal(signal.SIGINT, shell_sigint_handler)
     except (ValueError, OSError):
@@ -556,10 +476,6 @@ def _shell_command_keyboard_context():
             except Exception:
                 pass
 
-        # Remove Windows console handler
-        if _WINDOWS_CTRL_HANDLER is not None:
-            _remove_windows_ctrl_handler(_WINDOWS_CTRL_HANDLER)
-
         # Restore original SIGINT handler
         if _ORIGINAL_SIGINT_HANDLER is not None:
             try:
@@ -571,7 +487,6 @@ def _shell_command_keyboard_context():
         _SHELL_CTRL_X_STOP_EVENT = None
         _SHELL_CTRL_X_THREAD = None
         _ORIGINAL_SIGINT_HANDLER = None
-        _WINDOWS_CTRL_HANDLER = None
 
 
 def run_shell_command_streaming(

code_puppy/uvx_detection.py

@@ -0,0 +1,242 @@
+"""Detect if code-puppy was launched via uvx on Windows.
+
+This module provides utilities to detect the launch method of code-puppy,
+specifically to handle signal differences when running via uvx on Windows.
+
+On Windows, when launched via `uvx code-puppy`, Ctrl+C (SIGINT) gets captured
+by uvx's process handling before reaching our Python process. To work around
+this, we detect the uvx launch scenario and switch to Ctrl+K for cancellation.
+
+Note: This issue is specific to uvx.exe, NOT uv.exe. Running via `uv run`
+handles SIGINT correctly on Windows.
+
+On non-Windows platforms, this is not an issue - Ctrl+C works fine with uvx.
+"""
+
+import os
+import platform
+import sys
+from functools import lru_cache
+from typing import Optional
+
+# Cache the detection result - it won't change during runtime
+_uvx_detection_cache: Optional[bool] = None
+
+
+def _get_parent_process_name_psutil(pid: int) -> Optional[str]:
+    """Get parent process name using psutil (if available).
+
+    Args:
+        pid: Process ID to get parent name for
+
+    Returns:
+        Parent process name (lowercase) or None if not found
+    """
+    try:
+        import psutil
+
+        proc = psutil.Process(pid)
+        parent = proc.parent()
+        if parent:
+            return parent.name().lower()
+    except Exception:
+        pass
+    return None
+
+
+def _get_parent_process_chain_psutil() -> list[str]:
+    """Get the entire parent process chain using psutil.
+
+    Returns:
+        List of process names from current process up to init/System
+    """
+    chain = []
+    try:
+        import psutil
+
+        proc = psutil.Process(os.getpid())
+        while proc:
+            chain.append(proc.name().lower())
+            parent = proc.parent()
+            if parent is None or parent.pid in (0, proc.pid):
+                break
+            proc = parent
+    except Exception:
+        pass
+    return chain
+
+
+def _get_parent_process_chain_windows_ctypes() -> list[str]:
+    """Get parent process chain on Windows using ctypes (no external deps).
+
+    This is a fallback when psutil is not available.
+
+    Returns:
+        List of process names from current process up to System
+    """
+    if platform.system() != "Windows":
+        return []
+
+    chain = []
+    try:
+        import ctypes
+        from ctypes import wintypes
+
+        # Windows API constants
+        TH32CS_SNAPPROCESS = 0x00000002
+        INVALID_HANDLE_VALUE = -1
+
+        class PROCESSENTRY32(ctypes.Structure):
+            _fields_ = [
+                ("dwSize", wintypes.DWORD),
+                ("cntUsage", wintypes.DWORD),
+                ("th32ProcessID", wintypes.DWORD),
+                ("th32DefaultHeapID", ctypes.POINTER(wintypes.ULONG)),
+                ("th32ModuleID", wintypes.DWORD),
+                ("cntThreads", wintypes.DWORD),
+                ("th32ParentProcessID", wintypes.DWORD),
+                ("pcPriClassBase", wintypes.LONG),
+                ("dwFlags", wintypes.DWORD),
+                ("szExeFile", ctypes.c_char * 260),
+            ]
+
+        kernel32 = ctypes.windll.kernel32
+
+        # Take a snapshot of all processes
+        snapshot = kernel32.CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0)
+        if snapshot == INVALID_HANDLE_VALUE:
+            return chain
+
+        try:
+            # Build a map of PID -> (parent_pid, exe_name)
+            process_map: dict[int, tuple[int, str]] = {}
+            pe = PROCESSENTRY32()
+            pe.dwSize = ctypes.sizeof(PROCESSENTRY32)
+
+            if kernel32.Process32First(snapshot, ctypes.byref(pe)):
+                while True:
+                    pid = pe.th32ProcessID
+                    parent_pid = pe.th32ParentProcessID
+                    exe_name = pe.szExeFile.decode("utf-8", errors="ignore").lower()
+                    process_map[pid] = (parent_pid, exe_name)
+
+                    if not kernel32.Process32Next(snapshot, ctypes.byref(pe)):
+                        break
+
+            # Traverse from current PID up the parent chain
+            current_pid = os.getpid()
+            visited = set()  # Prevent infinite loops
+
+            while current_pid in process_map and current_pid not in visited:
+                visited.add(current_pid)
+                parent_pid, exe_name = process_map[current_pid]
+                chain.append(exe_name)
+
+                if parent_pid == 0 or parent_pid == current_pid:
+                    break
+                current_pid = parent_pid
+
+        finally:
+            kernel32.CloseHandle(snapshot)
+
+    except Exception:
+        pass
+
+    return chain
+
+
+def _get_parent_process_chain() -> list[str]:
+    """Get the parent process chain using best available method.
+
+    Returns:
+        List of process names from current process up to init/System
+    """
+    # Try psutil first (more reliable, cross-platform)
+    try:
+        import psutil  # noqa: F401
+
+        return _get_parent_process_chain_psutil()
+    except ImportError:
+        pass
+
+    # Fall back to ctypes on Windows
+    if platform.system() == "Windows":
+        return _get_parent_process_chain_windows_ctypes()
+
+    return []
+
+
+def _is_uvx_in_chain(chain: list[str]) -> bool:
+    """Check if uvx is in the process chain.
+
+    Note: We only check for uvx.exe, NOT uv.exe. The uv.exe binary
+    (used by `uv run`) handles SIGINT correctly on Windows, but
+    uvx.exe captures it before it reaches Python.
+
+    Args:
+        chain: List of process names (lowercase)
+
+    Returns:
+        True if uvx.exe is found in the chain
+    """
+    # Only uvx.exe has the SIGINT issue, not uv.exe
+    uvx_names = {"uvx.exe", "uvx"}
+    return any(name in uvx_names for name in chain)
+
+
+@lru_cache(maxsize=1)
+def is_launched_via_uvx() -> bool:
+    """Detect if code-puppy was launched via uvx.
+
+    Traverses the parent process chain to find uvx.exe or uv.exe.
+    Result is cached for the lifetime of the process.
+
+    Returns:
+        True if launched via uvx, False otherwise
+    """
+    chain = _get_parent_process_chain()
+    return _is_uvx_in_chain(chain)
+
+
+def is_windows() -> bool:
+    """Check if we're running on Windows.
+
+    Returns:
+        True if running on Windows, False otherwise
+    """
+    return platform.system() == "Windows"
+
+
+def should_use_alternate_cancel_key() -> bool:
+    """Determine if we should use an alternate cancel key (Ctrl+K) instead of Ctrl+C.
+
+    This returns True when:
+    - Running on Windows AND
+    - Launched via uvx
+
+    In this scenario, Ctrl+C is captured by uvx before reaching Python,
+    so we need to use a different key (Ctrl+K) for agent cancellation.
+
+    Returns:
+        True if alternate cancel key should be used, False otherwise
+    """
+    return is_windows() and is_launched_via_uvx()
+
+
+def get_uvx_detection_info() -> dict:
+    """Get diagnostic information about uvx detection.
+
+    Useful for debugging and testing.
+
+    Returns:
+        Dictionary with detection details
+    """
+    chain = _get_parent_process_chain()
+    return {
+        "is_windows": is_windows(),
+        "is_launched_via_uvx": is_launched_via_uvx(),
+        "should_use_alternate_cancel_key": should_use_alternate_cancel_key(),
+        "parent_process_chain": chain,
+        "current_pid": os.getpid(),
+        "python_executable": sys.executable,
+    }

{code_puppy-0.0.332.dist-info → code_puppy-0.0.333.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.332
+Version: 0.0.333
 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.332.dist-info → code_puppy-0.0.333.dist-info}/RECORD

@@ -3,12 +3,12 @@ code_puppy/__main__.py,sha256=pDVssJOWP8A83iFkxMLY9YteHYat0EyWDQqMkKHpWp4,203
 code_puppy/callbacks.py,sha256=hqTV--dNxG5vwWWm3MrEjmb8MZuHFFdmHePl23NXPHk,8621
 code_puppy/chatgpt_codex_client.py,sha256=Om0ANB_kpHubhCwNzF9ENf8RvKBqs0IYzBLl_SNw0Vk,9833
 code_puppy/claude_cache_client.py,sha256=hZr_YtXZSQvBoJFtRbbecKucYqJgoMopqUmm0IxFYGY,6071
-code_puppy/cli_runner.py,sha256=M3UlDgH4h8IPCfxwadElztGKhaNe47FNZJtxtcoVbBg,29875
+code_puppy/cli_runner.py,sha256=VkDaANmywBNoj6wCzaLlI1Z2yFC98U4BqHmSIcV4HCw,32150
 code_puppy/config.py,sha256=qqeJrQP7gqADqeYqVzfksP7NYGROLrBQCuYic5PuQfY,52295
 code_puppy/error_logging.py,sha256=a80OILCUtJhexI6a9GM-r5LqIdjvSRzggfgPp2jv1X0,3297
 code_puppy/gemini_code_assist.py,sha256=KGS7sO5OLc83nDF3xxS-QiU6vxW9vcm6hmzilu79Ef8,13867
 code_puppy/http_utils.py,sha256=w5mWYIGIWJZJvgvMahXs9BmdidoJvGn4CASDRY88a8o,13414
-code_puppy/keymap.py,sha256=Uzvq7HB-6inTjKox-90JWzuijztRdWqhJpfTDZVy5no,3235
+code_puppy/keymap.py,sha256=IvMkTlB_bIqOWpbTpmftkdyjhtD5todXuEIw1zCZ4u0,3584
 code_puppy/main.py,sha256=82r3vZy_XcyEsenLn82BnUusaoyL3Bpm_Th_jKgqecE,273
 code_puppy/model_factory.py,sha256=H_a5nX462Q-dhX3g3ZY7dmBCIAUOd1aOSZa4HMxF1o4,34191
 code_puppy/model_utils.py,sha256=NU8W8NW5F7QS_PXHaLeh55Air1koUV7IVYFP7Rz3XpY,3615
@@ -21,7 +21,8 @@ code_puppy/round_robin_model.py,sha256=kSawwPUiPgg0yg8r4AAVgvjzsWkptxpSORd75-HP7
 code_puppy/session_storage.py,sha256=T4hOsAl9z0yz2JZCptjJBOnN8fCmkLZx5eLy1hTdv6Q,9631
 code_puppy/status_display.py,sha256=qHzIQGAPEa2_-4gQSg7_rE1ihOosBq8WO73MWFNmmlo,8938
 code_puppy/summarization_agent.py,sha256=6Pu_Wp_rF-HAhoX9u2uXTabRVkOZUYwRoMP1lzNS4ew,4485
-code_puppy/terminal_utils.py,sha256=P6ProVD_3nHW0zHNRIMWTcg8HvBk9e0ir5bhUgJpT5k,3921
+code_puppy/terminal_utils.py,sha256=CxcNLfPwTDblI0AEtEwhfZ4DTfqqwHjM_A10QslaMBk,8220
+code_puppy/uvx_detection.py,sha256=tP9X9Nvzow--KIqtqjgrHQkSxMJ3EevfoaeoB9VLY2o,7224
 code_puppy/version_checker.py,sha256=aq2Mwxl1CR9sEFBgrPt3OQOowLOBUp9VaQYWJhuUv8Q,1780
 code_puppy/agents/__init__.py,sha256=PtPB7Z5MSwmUKipgt_qxvIuGggcuVaYwNbnp1UP4tPc,518
 code_puppy/agents/agent_c_reviewer.py,sha256=1kO_89hcrhlS4sJ6elDLSEx-h43jAaWGgvIL0SZUuKo,8214
@@ -39,7 +40,7 @@ code_puppy/agents/agent_qa_expert.py,sha256=5Ikb4U3SZQknUEfwlHZiyZXKqnffnOTQagr_
 code_puppy/agents/agent_qa_kitten.py,sha256=5PeFFSwCFlTUvP6h5bGntx0xv5NmRwBiw0HnMqY8nLI,9107
 code_puppy/agents/agent_security_auditor.py,sha256=SpiYNA0XAsIwBj7S2_EQPRslRUmF_-b89pIJyW7DYtY,12022
 code_puppy/agents/agent_typescript_reviewer.py,sha256=vsnpp98xg6cIoFAEJrRTUM_i4wLEWGm5nJxs6fhHobM,10275
-code_puppy/agents/base_agent.py,sha256=32nNAGnBMUXLrI-5qTGpEWNEGW_gIN1ELQP1eH_lBCo,84509
+code_puppy/agents/base_agent.py,sha256=r_znuUZJMv97Lh8zeSdS_KJzVGe7X3rAgBk3NZpIO7I,82855
 code_puppy/agents/json_agent.py,sha256=lhopDJDoiSGHvD8A6t50hi9ZBoNRKgUywfxd0Po_Dzc,4886
 code_puppy/agents/prompt_reviewer.py,sha256=JJrJ0m5q0Puxl8vFsyhAbY9ftU9n6c6UxEVdNct1E-Q,5558
 code_puppy/command_line/__init__.py,sha256=y7WeRemfYppk8KVbCGeAIiTuiOszIURCDjOMZv_YRmU,45
@@ -144,7 +145,7 @@ code_puppy/plugins/shell_safety/register_callbacks.py,sha256=W3v664RR48Fdbbbltf_
 code_puppy/prompts/codex_system_prompt.md,sha256=hEFTCziroLqZmqNle5kG34A8kvTteOWezCiVrAEKhE0,24400
 code_puppy/tools/__init__.py,sha256=BVTZ85jLHgDANwOnUSOz3UDlp8VQDq4DoGF23BRlyWw,6032
 code_puppy/tools/agent_tools.py,sha256=snBI6FlFtR03CbYKXwu53R48c_fRSuDIwcNdVUruLcA,21020
-code_puppy/tools/command_runner.py,sha256=miofNbQ0B62B_iaBpa4ZiifaUk-kgGWWGHWOW-CRzaA,47524
+code_puppy/tools/command_runner.py,sha256=WLesijwbXEsnyuIJvWZHbVVyoUAPQcTWJbz31pXPSi0,44325
 code_puppy/tools/common.py,sha256=IboS6sbwN4a3FzHdfsZJtEFiyDUCszevI6LpH14ydEk,40561
 code_puppy/tools/file_modifications.py,sha256=vz9n7R0AGDSdLUArZr_55yJLkyI30M8zreAppxIx02M,29380
 code_puppy/tools/file_operations.py,sha256=CqhpuBnOFOcQCIYXOujskxq2VMLWYJhibYrH0YcPSfA,35692
@@ -159,10 +160,10 @@ code_puppy/tools/browser/browser_scripts.py,sha256=sNb8eLEyzhasy5hV4B9OjM8yIVMLV
 code_puppy/tools/browser/browser_workflows.py,sha256=nitW42vCf0ieTX1gLabozTugNQ8phtoFzZbiAhw1V90,6491
 code_puppy/tools/browser/camoufox_manager.py,sha256=RZjGOEftE5sI_tsercUyXFSZI2wpStXf-q0PdYh2G3I,8680
 code_puppy/tools/browser/vqa_agent.py,sha256=DBn9HKloILqJSTSdNZzH_PYWT0B2h9VwmY6akFQI_uU,2913
-code_puppy-0.0.332.data/data/code_puppy/models.json,sha256=IPABdOrDw2OZJxa0XGBWSWmBRerV6_pIEmKVLRtUbAk,3105
-code_puppy-0.0.332.data/data/code_puppy/models_dev_api.json,sha256=wHjkj-IM_fx1oHki6-GqtOoCrRMR0ScK0f-Iz0UEcy8,548187
-code_puppy-0.0.332.dist-info/METADATA,sha256=_5P2HAkEUyhzQqQu0AxUJpB8Nn9-8tD4KtbB3m2Ei_4,28854
-code_puppy-0.0.332.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-code_puppy-0.0.332.dist-info/entry_points.txt,sha256=Tp4eQC99WY3HOKd3sdvb22vZODRq0XkZVNpXOag_KdI,91
-code_puppy-0.0.332.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
-code_puppy-0.0.332.dist-info/RECORD,,
+code_puppy-0.0.333.data/data/code_puppy/models.json,sha256=IPABdOrDw2OZJxa0XGBWSWmBRerV6_pIEmKVLRtUbAk,3105
+code_puppy-0.0.333.data/data/code_puppy/models_dev_api.json,sha256=wHjkj-IM_fx1oHki6-GqtOoCrRMR0ScK0f-Iz0UEcy8,548187
+code_puppy-0.0.333.dist-info/METADATA,sha256=VP7p42x7DQGz8JDM0nIF7MXuY41YkD0wIxBINx4334w,28854
+code_puppy-0.0.333.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+code_puppy-0.0.333.dist-info/entry_points.txt,sha256=Tp4eQC99WY3HOKd3sdvb22vZODRq0XkZVNpXOag_KdI,91
+code_puppy-0.0.333.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
+code_puppy-0.0.333.dist-info/RECORD,,