code-puppy 0.0.325__py3-none-any.whl → 0.0.336__py3-none-any.whl

code_puppy/http_utils.py

@@ -4,29 +4,19 @@ HTTP utilities module for code-puppy.
 This module provides functions for creating properly configured HTTP clients.
 """
 
+import asyncio
+import logging
 import os
 import socket
-from typing import Dict, Optional, Union
+import time
+from typing import Any, Dict, Optional, Union
 
 import httpx
 import requests
-from tenacity import stop_after_attempt, wait_exponential
 
 from code_puppy.config import get_http2
 
-try:
-    from pydantic_ai.retries import (
-        AsyncTenacityTransport,
-        RetryConfig,
-        TenacityTransport,
-        wait_retry_after,
-    )
-except ImportError:
-    # Fallback if pydantic_ai.retries is not available
-    AsyncTenacityTransport = None
-    RetryConfig = None
-    TenacityTransport = None
-    wait_retry_after = None
+logger = logging.getLogger(__name__)
 
 try:
     from .reopenable_async_client import ReopenableAsyncClient
@@ -34,12 +24,109 @@ except ImportError:
     ReopenableAsyncClient = None
 
 try:
-    from .messaging import emit_info
+    from .messaging import emit_info, emit_warning
 except ImportError:
     # Fallback if messaging system is not available
     def emit_info(content: str, **metadata):
         pass  # No-op if messaging system is not available
 
+    def emit_warning(content: str, **metadata):
+        pass
+
+
+class RetryingAsyncClient(httpx.AsyncClient):
+    """AsyncClient with built-in rate limit handling (429) and retries.
+
+    This replaces the Tenacity transport with a more direct subclass implementation,
+    which plays nicer with proxies and custom transports (like Antigravity).
+    """
+
+    def __init__(
+        self,
+        retry_status_codes: tuple = (429, 502, 503, 504),
+        max_retries: int = 5,
+        **kwargs,
+    ):
+        super().__init__(**kwargs)
+        self.retry_status_codes = retry_status_codes
+        self.max_retries = max_retries
+
+    async def send(self, request: httpx.Request, **kwargs: Any) -> httpx.Response:
+        """Send request with automatic retries for rate limits and server errors."""
+        last_response = None
+        last_exception = None
+
+        for attempt in range(self.max_retries + 1):
+            try:
+                # Clone request for retry (streams might be consumed)
+                # But only if it's not the first attempt
+                req_to_send = request
+                if attempt > 0:
+                    # httpx requests are reusable, but we need to be careful with streams
+                    pass
+
+                response = await super().send(req_to_send, **kwargs)
+                last_response = response
+
+                # Check for retryable status
+                if response.status_code not in self.retry_status_codes:
+                    return response
+
+                # Close response if we're going to retry
+                await response.aclose()
+
+                # Determine wait time
+                wait_time = 1.0 * (
+                    2**attempt
+                )  # Default exponential backoff: 1s, 2s, 4s...
+
+                # Check Retry-After header
+                retry_after = response.headers.get("Retry-After")
+                if retry_after:
+                    try:
+                        wait_time = float(retry_after)
+                    except ValueError:
+                        # Try parsing http-date
+                        from email.utils import parsedate_to_datetime
+
+                        try:
+                            date = parsedate_to_datetime(retry_after)
+                            wait_time = date.timestamp() - time.time()
+                        except Exception:
+                            pass
+
+                # Cap wait time
+                wait_time = max(0.5, min(wait_time, 60.0))
+
+                if attempt < self.max_retries:
+                    emit_info(
+                        f"HTTP retry: {response.status_code} received. Waiting {wait_time:.1f}s (attempt {attempt + 1}/{self.max_retries})"
+                    )
+                    await asyncio.sleep(wait_time)
+
+            except (httpx.ConnectError, httpx.ReadTimeout, httpx.PoolTimeout) as e:
+                last_exception = e
+                wait_time = 1.0 * (2**attempt)
+                if attempt < self.max_retries:
+                    emit_warning(
+                        f"HTTP connection error: {e}. Retrying in {wait_time}s..."
+                    )
+                    await asyncio.sleep(wait_time)
+                else:
+                    raise
+            except Exception:
+                raise
+
+        # Return last response (even if it's an error status)
+        if last_response:
+            return last_response
+
+        # Should catch this in loop, but just in case
+        if last_exception:
+            raise last_exception
+
+        return last_response
+
 
 def get_cert_bundle_path() -> str:
     # First check if SSL_CERT_FILE environment variable is set
@@ -60,53 +147,15 @@ def create_client(
     # Check if HTTP/2 is enabled in config
     http2_enabled = get_http2()
 
-    # Check if custom retry transport should be disabled (e.g., for integration tests with proxies)
-    disable_retry_transport = os.environ.get(
-        "CODE_PUPPY_DISABLE_RETRY_TRANSPORT", ""
-    ).lower() in ("1", "true", "yes")
-
     # If retry components are available, create a client with retry transport
-    if (
-        TenacityTransport
-        and RetryConfig
-        and wait_retry_after
-        and not disable_retry_transport
-    ):
-
-        def should_retry_status(response):
-            """Raise exceptions for retryable HTTP status codes."""
-            if response.status_code in retry_status_codes:
-                emit_info(
-                    f"HTTP retry: Retrying request due to status code {response.status_code}"
-                )
-                return True
-
-        transport = TenacityTransport(
-            config=RetryConfig(
-                retry=lambda e: isinstance(e, httpx.HTTPStatusError)
-                and e.response.status_code in retry_status_codes,
-                wait=wait_retry_after(
-                    fallback_strategy=wait_exponential(multiplier=1, max=60),
-                    max_wait=300,
-                ),
-                stop=stop_after_attempt(10),
-                reraise=True,
-            ),
-            validate_response=should_retry_status,
-        )
-
-        return httpx.Client(
-            transport=transport,
-            verify=verify,
-            headers=headers or {},
-            timeout=timeout,
-            http2=http2_enabled,
-        )
-    else:
-        # Fallback to regular client if retry components are not available
-        return httpx.Client(
-            verify=verify, headers=headers or {}, timeout=timeout, http2=http2_enabled
-        )
+    # Note: TenacityTransport was removed. For now we just return a standard client.
+    # Future TODO: Implement RetryingClient(httpx.Client) if needed.
+    return httpx.Client(
+        verify=verify,
+        headers=headers or {},
+        timeout=timeout,
+        http2=http2_enabled,
+    )
 
 
 def create_async_client(
@@ -145,52 +194,21 @@ def create_async_client(
     else:
         trust_env = False
 
-    # If retry components are available, create a client with retry transport
-    # BUT: disable retry transport when proxies are detected because custom transports
-    # don't play nicely with proxy configuration
-    if (
-        AsyncTenacityTransport
-        and RetryConfig
-        and wait_retry_after
-        and not disable_retry_transport
-        and not has_proxy
-    ):
-
-        def should_retry_status(response):
-            """Raise exceptions for retryable HTTP status codes."""
-            if response.status_code in retry_status_codes:
-                emit_info(
-                    f"HTTP retry: Retrying request due to status code {response.status_code}"
-                )
-                return True
-
-        # Create transport (with or without proxy base)
-        if has_proxy:
-            # Extract proxy URL from environment
-            proxy_url = (
-                os.environ.get("HTTPS_PROXY")
-                or os.environ.get("https_proxy")
-                or os.environ.get("HTTP_PROXY")
-                or os.environ.get("http_proxy")
-            )
-        else:
-            proxy_url = None
-
-        # Create retry transport wrapper
-        transport = AsyncTenacityTransport(
-            config=RetryConfig(
-                retry=lambda e: isinstance(e, httpx.HTTPStatusError)
-                and e.response.status_code in retry_status_codes,
-                wait=wait_retry_after(10),
-                stop=stop_after_attempt(10),
-                reraise=True,
-            ),
-            validate_response=should_retry_status,
+    # Extract proxy URL if needed
+    proxy_url = None
+    if has_proxy:
+        proxy_url = (
+            os.environ.get("HTTPS_PROXY")
+            or os.environ.get("https_proxy")
+            or os.environ.get("HTTP_PROXY")
+            or os.environ.get("http_proxy")
         )
 
-        return httpx.AsyncClient(
-            transport=transport,
-            proxy=proxy_url,  # Pass proxy to client, not transport
+    # Use RetryingAsyncClient if retries are enabled
+    if not disable_retry_transport:
+        return RetryingAsyncClient(
+            retry_status_codes=retry_status_codes,
+            proxy=proxy_url,
             verify=verify,
             headers=headers or {},
             timeout=timeout,
@@ -198,19 +216,7 @@ def create_async_client(
             trust_env=trust_env,
         )
     else:
-        # Fallback to regular client if retry components are not available,
-        # when retry transport is explicitly disabled, or when proxies are detected
-        # Extract proxy URL if needed
-        if has_proxy:
-            proxy_url = (
-                os.environ.get("HTTPS_PROXY")
-                or os.environ.get("https_proxy")
-                or os.environ.get("HTTP_PROXY")
-                or os.environ.get("http_proxy")
-            )
-        else:
-            proxy_url = None
-
+        # Regular client for testing
         return httpx.AsyncClient(
             proxy=proxy_url,
             verify=verify,
@@ -295,87 +301,41 @@ def create_reopenable_async_client(
     else:
         trust_env = False
 
-    # If retry components are available, create a client with retry transport
-    # BUT: disable retry transport when proxies are detected because custom transports
-    # don't play nicely with proxy configuration
-    if (
-        AsyncTenacityTransport
-        and RetryConfig
-        and wait_retry_after
-        and not disable_retry_transport
-        and not has_proxy
-    ):
+    # Extract proxy URL if needed
+    proxy_url = None
+    if has_proxy:
+        proxy_url = (
+            os.environ.get("HTTPS_PROXY")
+            or os.environ.get("https_proxy")
+            or os.environ.get("HTTP_PROXY")
+            or os.environ.get("http_proxy")
+        )
 
-        def should_retry_status(response):
-            """Raise exceptions for retryable HTTP status codes."""
-            if response.status_code in retry_status_codes:
-                emit_info(
-                    f"HTTP retry: Retrying request due to status code {response.status_code}"
-                )
-                return True
-
-        transport = AsyncTenacityTransport(
-            config=RetryConfig(
-                retry=lambda e: isinstance(e, httpx.HTTPStatusError)
-                and e.response.status_code in retry_status_codes,
-                wait=wait_retry_after(
-                    fallback_strategy=wait_exponential(multiplier=1, max=60),
-                    max_wait=300,
-                ),
-                stop=stop_after_attempt(10),
-                reraise=True,
-            ),
-            validate_response=should_retry_status,
+    if ReopenableAsyncClient is not None:
+        # Use RetryingAsyncClient if retries are enabled
+        client_class = (
+            RetryingAsyncClient if not disable_retry_transport else httpx.AsyncClient
         )
 
-        # Extract proxy URL if needed
-        if has_proxy:
-            proxy_url = (
-                os.environ.get("HTTPS_PROXY")
-                or os.environ.get("https_proxy")
-                or os.environ.get("HTTP_PROXY")
-                or os.environ.get("http_proxy")
-            )
-        else:
-            proxy_url = None
+        # Pass retry config only if using RetryingAsyncClient
+        kwargs = {
+            "proxy": proxy_url,
+            "verify": verify,
+            "headers": headers or {},
+            "timeout": timeout,
+            "http2": http2_enabled,
+            "trust_env": trust_env,
+        }
 
-        if ReopenableAsyncClient is not None:
-            return ReopenableAsyncClient(
-                transport=transport,
-                proxy=proxy_url,
-                verify=verify,
-                headers=headers or {},
-                timeout=timeout,
-                http2=http2_enabled,
-                trust_env=trust_env,
-            )
-        else:
-            # Fallback to regular AsyncClient if ReopenableAsyncClient is not available
-            return httpx.AsyncClient(
-                transport=transport,
-                proxy=proxy_url,
-                verify=verify,
-                headers=headers or {},
-                timeout=timeout,
-                http2=http2_enabled,
-                trust_env=trust_env,
-            )
-    else:
-        # Fallback to regular clients if retry components are not available
-        # or when proxies are detected
-        # Extract proxy URL if needed
-        if has_proxy:
-            proxy_url = (
-                os.environ.get("HTTPS_PROXY")
-                or os.environ.get("https_proxy")
-                or os.environ.get("HTTP_PROXY")
-                or os.environ.get("http_proxy")
-            )
-        else:
-            proxy_url = None
+        if not disable_retry_transport:
+            kwargs["retry_status_codes"] = retry_status_codes
 
-        if ReopenableAsyncClient is not None:
-            return ReopenableAsyncClient(
+        return ReopenableAsyncClient(client_class=client_class, **kwargs)
+    else:
+        # Fallback to RetryingAsyncClient
+        if not disable_retry_transport:
+            return RetryingAsyncClient(
+                retry_status_codes=retry_status_codes,
                 proxy=proxy_url,
                 verify=verify,
                 headers=headers or {},
@@ -384,7 +344,6 @@ def create_reopenable_async_client(
                 trust_env=trust_env,
             )
         else:
-            # Fallback to regular AsyncClient if ReopenableAsyncClient is not available
             return httpx.AsyncClient(
                 proxy=proxy_url,
                 verify=verify,

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() == "":
@@ -86,15 +94,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/messaging/rich_renderer.py

@@ -348,7 +348,17 @@ class RichConsoleRenderer:
     # =========================================================================
 
     def _render_file_listing(self, msg: FileListingMessage) -> None:
-        """Render a directory listing matching the old Rich-formatted output."""
+        """Render a compact directory listing with directory summaries.
+
+        Instead of listing every file, we group by directory and show:
+        - Directory name
+        - Number of files
+        - Total size
+        - Number of subdirectories
+        """
+        import os
+        from collections import defaultdict
+
         # Header on single line
         rec_flag = f"(recursive={msg.recursive})"
         banner = self._format_banner("directory_listing", "DIRECTORY LISTING")
@@ -357,32 +367,104 @@ class RichConsoleRenderer:
             f"📂 [bold cyan]{msg.directory}[/bold cyan] [dim]{rec_flag}[/dim]\n"
         )
 
-        # Directory header
-        dir_name = msg.directory.rstrip("/").split("/")[-1] or msg.directory
-        self._console.print(f"📁 [bold blue]{dir_name}[/bold blue]")
+        # Build a tree structure: {parent_path: {files: [], dirs: set(), size: int}}
+        # Each key is a directory path, value contains direct children stats
+        dir_stats: dict = defaultdict(
+            lambda: {"files": [], "subdirs": set(), "total_size": 0}
+        )
+
+        # Root directory is represented as ""
+        root_key = ""
 
-        # Build tree structure from flat list
         for entry in msg.files:
-            # Calculate indentation based on depth
-            prefix = ""
-            for d in range(entry.depth + 1):
-                if d == entry.depth:
-                    prefix += "└── "
-                else:
-                    prefix += "    "
+            path = entry.path
+            parent = os.path.dirname(path) if os.path.dirname(path) else root_key
 
             if entry.type == "dir":
-                self._console.print(f"{prefix}📁 [bold blue]{entry.path}/[/bold blue]")
+                # Register this dir as a subdir of its parent
+                dir_stats[parent]["subdirs"].add(path)
+                # Ensure the dir itself exists in stats (even if empty)
+                _ = dir_stats[path]
             else:
-                icon = self._get_file_icon(entry.path)
-                if entry.size > 0:
-                    size_str = f" [dim]({self._format_size(entry.size)})[/dim]"
-                else:
-                    size_str = ""
+                # It's a file - add to parent's stats
+                dir_stats[parent]["files"].append(entry)
+                dir_stats[parent]["total_size"] += entry.size
+
+        def render_dir_tree(dir_path: str, depth: int = 0) -> None:
+            """Recursively render directory with compact summary."""
+            stats = dir_stats.get(
+                dir_path, {"files": [], "subdirs": set(), "total_size": 0}
+            )
+            files = stats["files"]
+            subdirs = sorted(stats["subdirs"])
+
+            # Calculate total size including subdirectories (recursive)
+            def get_recursive_size(d: str) -> int:
+                s = dir_stats.get(d, {"files": [], "subdirs": set(), "total_size": 0})
+                size = s["total_size"]
+                for sub in s["subdirs"]:
+                    size += get_recursive_size(sub)
+                return size
+
+            def get_recursive_file_count(d: str) -> int:
+                s = dir_stats.get(d, {"files": [], "subdirs": set(), "total_size": 0})
+                count = len(s["files"])
+                for sub in s["subdirs"]:
+                    count += get_recursive_file_count(sub)
+                return count
+
+            indent = "    " * depth
+
+            # For root level, just show contents
+            if dir_path == root_key:
+                # Show files at root level (depth 0)
+                for f in sorted(files, key=lambda x: x.path):
+                    icon = self._get_file_icon(f.path)
+                    name = os.path.basename(f.path)
+                    size_str = (
+                        f" [dim]({self._format_size(f.size)})[/dim]"
+                        if f.size > 0
+                        else ""
+                    )
+                    self._console.print(
+                        f"{indent}{icon} [green]{name}[/green]{size_str}"
+                    )
+
+                # Show subdirs at root level
+                for subdir in subdirs:
+                    render_dir_tree(subdir, depth)
+            else:
+                # Show directory with summary
+                dir_name = os.path.basename(dir_path)
+                rec_size = get_recursive_size(dir_path)
+                rec_file_count = get_recursive_file_count(dir_path)
+                subdir_count = len(subdirs)
+
+                # Build summary parts
+                parts = []
+                if rec_file_count > 0:
+                    parts.append(
+                        f"{rec_file_count} file{'s' if rec_file_count != 1 else ''}"
+                    )
+                if subdir_count > 0:
+                    parts.append(
+                        f"{subdir_count} subdir{'s' if subdir_count != 1 else ''}"
+                    )
+                if rec_size > 0:
+                    parts.append(self._format_size(rec_size))
+
+                summary = f" [dim]({', '.join(parts)})[/dim]" if parts else ""
                 self._console.print(
-                    f"{prefix}{icon} [green]{entry.path}[/green]{size_str}"
+                    f"{indent}📁 [bold blue]{dir_name}/[/bold blue]{summary}"
                 )
 
+                # Recursively show subdirectories
+                for subdir in subdirs:
+                    render_dir_tree(subdir, depth + 1)
+
+        # Render the tree starting from root
+        render_dir_tree(root_key, 0)
+
         # Summary
         self._console.print("\n[bold cyan]Summary:[/bold cyan]")
         self._console.print(