code-puppy 0.0.331__tar.gz → 0.0.333__tar.gz

{code_puppy-0.0.331 → code_puppy-0.0.333}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.331
+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.331 → code_puppy-0.0.333}/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-0.0.331 → code_puppy-0.0.333}/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."""
@@ -711,9 +770,6 @@ async def run_prompt_with_attachments(
     attachments = [attachment.content for attachment in processed_prompt.attachments]
     link_attachments = [link.url_part for link in processed_prompt.link_attachments]
 
-    # Trigger invoke_agent callbacks (e.g., Claude Code OAuth token refresh)
-    await callbacks.on_invoke_agent()
-
     # IMPORTANT: Set the shared console on the agent so that streaming output
     # uses the same console as the spinner. This prevents Live display conflicts
     # that cause line duplication during markdown streaming.

{code_puppy-0.0.331 → code_puppy-0.0.333}/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-0.0.331 → code_puppy-0.0.333}/code_puppy/plugins/claude_code_oauth/register_callbacks.py

@@ -25,7 +25,6 @@ from .utils import (
     fetch_claude_code_models,
     load_claude_models_filtered,
     load_stored_tokens,
-    maybe_refresh_token,
     prepare_oauth_context,
     remove_claude_code_models,
     save_tokens,
@@ -303,19 +302,5 @@ def _handle_custom_command(command: str, name: str) -> Optional[bool]:
     return None
 
 
-def _on_invoke_agent(*args, **kwargs) -> None:
-    """Called before each agent invocation.
-
-    Checks if 30 minutes have passed since last token refresh and
-    refreshes the Claude Code OAuth token if needed.
-    """
-    try:
-        if maybe_refresh_token():
-            logger.debug("Token refresh check completed")
-    except Exception as exc:  # pragma: no cover - defensive
-        logger.warning("Token refresh check failed: %s", exc)
-
-
 register_callback("custom_command_help", _custom_help)
 register_callback("custom_command", _handle_custom_command)
-register_callback("invoke_agent", _on_invoke_agent)

{code_puppy-0.0.331 → code_puppy-0.0.333}/code_puppy/plugins/claude_code_oauth/utils.py

@@ -23,10 +23,6 @@ from .config import (
 
 logger = logging.getLogger(__name__)
 
-# Token refresh tracking
-_last_refresh_time: float = 0.0
-REFRESH_INTERVAL_SECONDS: float = 30 * 60  # 30 minutes
-
 
 @dataclass
 class OAuthContext:
@@ -401,201 +397,3 @@ def remove_claude_code_models() -> int:
     except Exception as exc:  # pragma: no cover - defensive logging
         logger.error("Error removing Claude Code models: %s", exc)
     return 0
-
-
-def _update_model_tokens(new_access_token: str) -> bool:
-    """Update all Claude Code models with the new access token.
-
-    Args:
-        new_access_token: The new access token to set
-
-    Returns:
-        True if successful, False otherwise
-    """
-    try:
-        claude_models = load_claude_models()
-        if not claude_models:
-            logger.debug("No models to update")
-            return True
-
-        updated = 0
-        for _model_name, config in claude_models.items():
-            if config.get("oauth_source") == "claude-code-plugin":
-                if (
-                    "custom_endpoint" in config
-                    and "api_key" in config["custom_endpoint"]
-                ):
-                    config["custom_endpoint"]["api_key"] = new_access_token
-                    updated += 1
-
-        if updated > 0:
-            if save_claude_models(claude_models):
-                logger.info("Updated %s model configurations with new token", updated)
-                return True
-            else:
-                logger.error("Failed to save updated model configurations")
-                return False
-
-        return True
-
-    except Exception as exc:  # pragma: no cover - defensive logging
-        logger.error("Error updating model tokens: %s", exc)
-        return False
-
-
-def refresh_access_token() -> Optional[str]:
-    """Refresh the access token using the refresh token.
-
-    Returns:
-        New access token if successful, None otherwise
-    """
-    try:
-        tokens = load_stored_tokens()
-        if not tokens:
-            logger.debug("No stored tokens found for refresh")
-            return None
-
-        if "refresh_token" not in tokens:
-            logger.debug("No refresh token available")
-            return None
-
-        refresh_token = tokens["refresh_token"]
-
-        # Prepare refresh request
-        payload = {
-            "grant_type": "refresh_token",
-            "client_id": CLAUDE_CODE_OAUTH_CONFIG["client_id"],
-            "refresh_token": refresh_token,
-        }
-
-        headers = {
-            "Content-Type": "application/json",
-            "Accept": "application/json",
-            "anthropic-beta": "oauth-2025-04-20",
-        }
-
-        logger.info("Refreshing Claude Code access token...")
-        response = requests.post(
-            CLAUDE_CODE_OAUTH_CONFIG["token_url"],
-            json=payload,
-            headers=headers,
-            timeout=30,
-        )
-
-        if response.status_code == 200:
-            token_data = response.json()
-
-            # Update tokens with new access token and expiry
-            new_access_token = token_data.get("access_token")
-            if not new_access_token:
-                logger.error("No access_token in refresh response")
-                return None
-
-            # Update stored tokens
-            tokens["access_token"] = new_access_token
-
-            # Update expiry if provided
-            if "expires_in" in token_data:
-                tokens["expires_at"] = time.time() + token_data["expires_in"]
-
-            # Update refresh token if a new one was provided
-            if "refresh_token" in token_data:
-                tokens["refresh_token"] = token_data["refresh_token"]
-
-            # Save updated tokens
-            if save_tokens(tokens):
-                logger.info("Claude Code access token refreshed successfully")
-
-                # Update model configurations with new token
-                _update_model_tokens(new_access_token)
-
-                return new_access_token
-            else:
-                logger.error("Failed to save refreshed tokens")
-                return None
-        else:
-            logger.warning(
-                "Token refresh failed: %s - %s",
-                response.status_code,
-                response.text,
-            )
-            return None
-
-    except Exception as exc:  # pragma: no cover - defensive logging
-        logger.error("Error refreshing access token: %s", exc)
-        return None
-
-
-def _is_using_claude_code_model() -> bool:
-    """Check if the current agent is using a Claude Code OAuth model.
-
-    Returns:
-        True if currently using a claude-code-* model, False otherwise
-    """
-    try:
-        from code_puppy.agents import get_current_agent
-        from code_puppy.model_utils import is_claude_code_model
-
-        agent = get_current_agent()
-        if agent is None:
-            return False
-
-        model_name = agent.get_model_name()
-        if not model_name:
-            return False
-
-        return is_claude_code_model(model_name)
-    except Exception as exc:
-        logger.debug("Could not determine current model: %s", exc)
-        return False
-
-
-def maybe_refresh_token() -> bool:
-    """Refresh the token if 30 minutes have passed since last refresh.
-
-    This function is designed to be called on every prompt, but will only
-    actually refresh the token if:
-    1. The current model is a Claude Code OAuth model (starts with 'claude-code-')
-    2. REFRESH_INTERVAL_SECONDS (30 min) has passed since last refresh
-
-    Returns:
-        True if refresh was attempted (regardless of success), False if skipped
-    """
-    global _last_refresh_time
-
-    # Only refresh if we're actually using a Claude Code model
-    if not _is_using_claude_code_model():
-        return False
-
-    # Check if we have tokens at all
-    tokens = load_stored_tokens()
-    if not tokens or "refresh_token" not in tokens:
-        return False
-
-    current_time = time.time()
-    time_since_last = current_time - _last_refresh_time
-
-    if time_since_last < REFRESH_INTERVAL_SECONDS:
-        logger.debug(
-            "Skipping token refresh, %.1f minutes until next refresh",
-            (REFRESH_INTERVAL_SECONDS - time_since_last) / 60,
-        )
-        return False
-
-    logger.info(
-        "Token refresh interval reached (%.1f min since last refresh)",
-        time_since_last / 60,
-    )
-
-    # Attempt refresh
-    result = refresh_access_token()
-    if result:
-        _last_refresh_time = current_time
-        logger.info("Token refresh successful, next refresh in 30 minutes")
-    else:
-        # Even on failure, update the timestamp to avoid hammering the API
-        # We'll retry on the next 30-min interval
-        _last_refresh_time = current_time
-        logger.warning("Token refresh failed, will retry in 30 minutes")
-
-    return True