code-puppy 0.0.339__tar.gz → 0.0.340__tar.gz

{code_puppy-0.0.339 → code_puppy-0.0.340}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.339
+Version: 0.0.340
 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.339 → code_puppy-0.0.340}/code_puppy/claude_cache_client.py

@@ -10,10 +10,13 @@ serialization, avoiding httpx/Pydantic internals.
 from __future__ import annotations
 
 import json
+import logging
 from typing import Any, Callable, MutableMapping
 
 import httpx
 
+logger = logging.getLogger(__name__)
+
 try:
     from anthropic import AsyncAnthropic
 except ImportError:  # pragma: no cover - optional dep
@@ -58,25 +61,44 @@ class ClaudeCacheAsyncClient(httpx.AsyncClient):
             pass
         response = await super().send(request, *args, **kwargs)
         try:
-            if response.status_code == 401 and not request.extensions.get(
+            # Check for both 401 and 400 - Anthropic/Cloudflare may return 400 for auth errors
+            # Also check if it's a Cloudflare HTML error response
+            if response.status_code in (400, 401) and not request.extensions.get(
                 "claude_oauth_refresh_attempted"
             ):
-                refreshed_token = self._refresh_claude_oauth_token()
-                if refreshed_token:
-                    await response.aclose()
-                    body_bytes = self._extract_body_bytes(request)
-                    headers = dict(request.headers)
-                    self._update_auth_headers(headers, refreshed_token)
-                    retry_request = self.build_request(
-                        method=request.method,
-                        url=request.url,
-                        headers=headers,
-                        content=body_bytes,
-                    )
-                    retry_request.extensions["claude_oauth_refresh_attempted"] = True
-                    return await super().send(retry_request, *args, **kwargs)
-        except Exception:
-            pass
+                # Determine if this is an auth error (including Cloudflare HTML errors)
+                is_auth_error = response.status_code == 401
+
+                if response.status_code == 400:
+                    # Check if this is a Cloudflare HTML error
+                    is_auth_error = self._is_cloudflare_html_error(response)
+                    if is_auth_error:
+                        logger.info(
+                            "Detected Cloudflare 400 error (likely auth-related), attempting token refresh"
+                        )
+
+                if is_auth_error:
+                    refreshed_token = self._refresh_claude_oauth_token()
+                    if refreshed_token:
+                        logger.info("Token refreshed successfully, retrying request")
+                        await response.aclose()
+                        body_bytes = self._extract_body_bytes(request)
+                        headers = dict(request.headers)
+                        self._update_auth_headers(headers, refreshed_token)
+                        retry_request = self.build_request(
+                            method=request.method,
+                            url=request.url,
+                            headers=headers,
+                            content=body_bytes,
+                        )
+                        retry_request.extensions["claude_oauth_refresh_attempted"] = (
+                            True
+                        )
+                        return await super().send(retry_request, *args, **kwargs)
+                    else:
+                        logger.warning("Token refresh failed, returning original error")
+        except Exception as exc:
+            logger.debug("Error during token refresh attempt: %s", exc)
         return response
 
     @staticmethod
@@ -111,15 +133,51 @@ class ClaudeCacheAsyncClient(httpx.AsyncClient):
         else:
             headers["Authorization"] = bearer_value
 
+    @staticmethod
+    def _is_cloudflare_html_error(response: httpx.Response) -> bool:
+        """Check if this is a Cloudflare HTML error response.
+
+        Cloudflare often returns HTML error pages with status 400 when
+        there are authentication issues.
+        """
+        # Check content type
+        content_type = response.headers.get("content-type", "")
+        if "text/html" not in content_type.lower():
+            return False
+
+        # Check if body contains Cloudflare markers
+        try:
+            # Read response body if not already consumed
+            if hasattr(response, "_content") and response._content:
+                body = response._content.decode("utf-8", errors="ignore")
+            else:
+                # Try to read the text (this might be already consumed)
+                try:
+                    body = response.text
+                except Exception:
+                    return False
+
+            # Look for Cloudflare and 400 Bad Request markers
+            body_lower = body.lower()
+            return "cloudflare" in body_lower and "400 bad request" in body_lower
+        except Exception as exc:
+            logger.debug("Error checking for Cloudflare error: %s", exc)
+            return False
+
     def _refresh_claude_oauth_token(self) -> str | None:
         try:
             from code_puppy.plugins.claude_code_oauth.utils import refresh_access_token
 
+            logger.info("Attempting to refresh Claude Code OAuth token...")
             refreshed_token = refresh_access_token(force=True)
             if refreshed_token:
                 self._update_auth_headers(self.headers, refreshed_token)
+                logger.info("Successfully refreshed Claude Code OAuth token")
+            else:
+                logger.warning("Token refresh returned None")
             return refreshed_token
-        except Exception:
+        except Exception as exc:
+            logger.error("Exception during token refresh: %s", exc)
             return None
 
     @staticmethod

{code_puppy-0.0.339 → code_puppy-0.0.340}/code_puppy/cli_runner.py

@@ -144,8 +144,8 @@ async def main():
         except ImportError:
             emit_system_message("🐶 Code Puppy is Loading...")
 
-        # Check for truecolor support and warn if not available
-        print_truecolor_warning(display_console)
+        # Truecolor warning moved to interactive_mode() so it prints LAST
+        # after all the help stuff - max visibility for the ugly red box!
 
     available_port = find_available_port()
     if available_port is None:
@@ -382,6 +382,10 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
 
         emit_warning(f"MOTD error: {e}")
 
+    # Print truecolor warning LAST so it's the most visible thing on startup
+    # Big ugly red box should be impossible to miss! 🔴
+    print_truecolor_warning(display_console)
+
     # Initialize the runtime agent manager
     if initial_command:
         from code_puppy.agents import get_current_agent

{code_puppy-0.0.339 → code_puppy-0.0.340}/code_puppy/mcp_/managed_server.py

@@ -222,18 +222,14 @@ class ManagedMCPServer:
                     http_kwargs["timeout"] = config["timeout"]
                 if "read_timeout" in config:
                     http_kwargs["read_timeout"] = config["read_timeout"]
-                if "headers" in config:
-                    # Expand environment variables in headers
-                    headers = config.get("headers")
-                    resolved_headers = {}
-                    if isinstance(headers, dict):
-                        for k, v in headers.items():
-                            if isinstance(v, str):
-                                resolved_headers[k] = os.path.expandvars(v)
-                            else:
-                                resolved_headers[k] = v
-                    http_kwargs["headers"] = resolved_headers
+
+                # Handle http_client vs headers (mutually exclusive)
+                if "http_client" in config:
+                    # Use provided http_client
+                    http_kwargs["http_client"] = config["http_client"]
+                elif config.get("headers"):
                     # Create HTTP client if headers are provided but no client specified
+                    http_kwargs["http_client"] = self._get_http_client()
 
                 self._pydantic_server = MCPServerStreamableHTTP(
                     **http_kwargs, process_tool_call=process_tool_call

{code_puppy-0.0.339 → code_puppy-0.0.340}/code_puppy/tools/common.py

@@ -727,15 +727,9 @@ def _format_diff_with_syntax_highlighting(
                 result.append("\n")
             continue
 
-        # Handle diff headers specially
-        if line.startswith("---"):
-            result.append(line, style="yellow")
-        elif line.startswith("+++"):
-            result.append(line, style="yellow")
-        elif line.startswith("@@"):
-            result.append(line, style="cyan")
-        elif line.startswith(("diff ", "index ")):
-            result.append(line, style="dim")
+        # Skip diff headers - they're redundant noise since we show the filename in the banner
+        if line.startswith(("---", "+++", "@@", "diff ", "index ")):
+            continue
         else:
             # Determine line type and extract code content
             if line.startswith("-"):

{code_puppy-0.0.339 → code_puppy-0.0.340}/pyproject.toml

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