code-puppy 0.0.341__py3-none-any.whl → 0.0.361__py3-none-any.whl

code_puppy/claude_cache_client.py

@@ -5,6 +5,11 @@ ClaudeCacheAsyncClient: httpx client that tries to patch /v1/messages bodies.
 We now also expose `patch_anthropic_client_messages` which monkey-patches
 AsyncAnthropic.messages.create() so we can inject cache_control BEFORE
 serialization, avoiding httpx/Pydantic internals.
+
+This module also handles:
+- Tool name prefixing/unprefixing for Claude Code OAuth compatibility
+- Header transformations (anthropic-beta, user-agent)
+- URL modifications (adding ?beta=true query param)
 """
 
 from __future__ import annotations
@@ -12,8 +17,10 @@ from __future__ import annotations
 import base64
 import json
 import logging
+import re
 import time
 from typing import Any, Callable, MutableMapping
+from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
 
 import httpx
 
@@ -22,6 +29,13 @@ logger = logging.getLogger(__name__)
 # Refresh token if it's older than 1 hour (3600 seconds)
 TOKEN_MAX_AGE_SECONDS = 3600
 
+# Tool name prefix for Claude Code OAuth compatibility
+# Tools are prefixed on outgoing requests and unprefixed on incoming responses
+TOOL_PREFIX = "cp_"
+
+# User-Agent to send with Claude Code OAuth requests
+CLAUDE_CLI_USER_AGENT = "claude-cli/2.1.2 (external, cli)"
+
 try:
     from anthropic import AsyncAnthropic
 except ImportError:  # pragma: no cover - optional dep
@@ -29,6 +43,22 @@ except ImportError:  # pragma: no cover - optional dep
 
 
 class ClaudeCacheAsyncClient(httpx.AsyncClient):
+    """Async HTTP client with Claude Code OAuth transformations.
+
+    Handles:
+    - Cache control injection for prompt caching
+    - Tool name prefixing on outgoing requests
+    - Tool name unprefixing on incoming streaming responses
+    - Header transformations (anthropic-beta, user-agent)
+    - URL modifications (adding ?beta=true)
+    - Proactive token refresh
+    """
+
+    # Regex pattern for unprefixing tool names in streaming responses
+    _TOOL_UNPREFIX_PATTERN = re.compile(
+        rf'"name"\s*:\s*"{re.escape(TOOL_PREFIX)}([^"]+)"'
+    )
+
     def _get_jwt_age_seconds(self, token: str | None) -> float | None:
         """Decode a JWT and return its age in seconds.
 
@@ -107,9 +137,100 @@ class ClaudeCacheAsyncClient(httpx.AsyncClient):
             )
         return should_refresh
 
+    @staticmethod
+    def _prefix_tool_names(body: bytes) -> bytes | None:
+        """Prefix all tool names in the request body with TOOL_PREFIX.
+
+        This is required for Claude Code OAuth compatibility - tools must be
+        prefixed on outgoing requests and unprefixed on incoming responses.
+        """
+        try:
+            data = json.loads(body.decode("utf-8"))
+        except Exception:
+            return None
+
+        if not isinstance(data, dict):
+            return None
+
+        tools = data.get("tools")
+        if not isinstance(tools, list) or not tools:
+            return None
+
+        modified = False
+        for tool in tools:
+            if isinstance(tool, dict) and "name" in tool:
+                name = tool["name"]
+                if name and not name.startswith(TOOL_PREFIX):
+                    tool["name"] = f"{TOOL_PREFIX}{name}"
+                    modified = True
+
+        if not modified:
+            return None
+
+        return json.dumps(data).encode("utf-8")
+
+    def _unprefix_tool_names_in_text(self, text: str) -> str:
+        """Remove TOOL_PREFIX from tool names in streaming response text."""
+        return self._TOOL_UNPREFIX_PATTERN.sub(r'"name": "\1"', text)
+
+    @staticmethod
+    def _transform_headers_for_claude_code(
+        headers: MutableMapping[str, str],
+    ) -> None:
+        """Transform headers for Claude Code OAuth compatibility.
+
+        - Sets user-agent to claude-cli
+        - Merges anthropic-beta headers appropriately
+        - Removes x-api-key (using Bearer auth instead)
+        """
+        # Set user-agent
+        headers["user-agent"] = CLAUDE_CLI_USER_AGENT
+
+        # Handle anthropic-beta header
+        incoming_beta = headers.get("anthropic-beta", "")
+        incoming_betas = [b.strip() for b in incoming_beta.split(",") if b.strip()]
+
+        # Check if claude-code beta was explicitly requested
+        include_claude_code = "claude-code-20250219" in incoming_betas
+
+        # Build merged betas list
+        merged_betas = [
+            "oauth-2025-04-20",
+            "interleaved-thinking-2025-05-14",
+        ]
+        if include_claude_code:
+            merged_betas.append("claude-code-20250219")
+
+        headers["anthropic-beta"] = ",".join(merged_betas)
+
+        # Remove x-api-key if present (we use Bearer auth)
+        for key in ["x-api-key", "X-API-Key", "X-Api-Key"]:
+            if key in headers:
+                del headers[key]
+
+    @staticmethod
+    def _add_beta_query_param(url: httpx.URL) -> httpx.URL:
+        """Add ?beta=true query parameter to the URL if not already present."""
+        # Parse the URL
+        parsed = urlparse(str(url))
+        query_params = parse_qs(parsed.query)
+
+        # Only add if not already present
+        if "beta" not in query_params:
+            query_params["beta"] = ["true"]
+            # Rebuild query string
+            new_query = urlencode(query_params, doseq=True)
+            # Rebuild URL
+            new_parsed = parsed._replace(query=new_query)
+            return httpx.URL(urlunparse(new_parsed))
+
+        return url
+
     async def send(
         self, request: httpx.Request, *args: Any, **kwargs: Any
     ) -> httpx.Response:  # type: ignore[override]
+        is_messages_endpoint = request.url.path.endswith("/v1/messages")
+
         # Proactive token refresh: check JWT age before every request
         if not request.extensions.get("claude_oauth_refresh_attempted"):
             try:
@@ -131,50 +252,88 @@ class ClaudeCacheAsyncClient(httpx.AsyncClient):
             except Exception as exc:
                 logger.debug("Error during proactive token refresh check: %s", exc)
 
-        try:
-            if request.url.path.endswith("/v1/messages"):
+        # Apply Claude Code OAuth transformations for /v1/messages
+        if is_messages_endpoint:
+            try:
                 body_bytes = self._extract_body_bytes(request)
+                headers = dict(request.headers)
+                url = request.url
+                body_modified = False
+                headers_modified = False
+
+                # 1. Transform headers for Claude Code OAuth
+                self._transform_headers_for_claude_code(headers)
+                headers_modified = True
+
+                # 2. Add ?beta=true query param
+                url = self._add_beta_query_param(url)
+
+                # 3. Prefix tool names in request body
                 if body_bytes:
-                    updated = self._inject_cache_control(body_bytes)
-                    if updated is not None:
-                        # Rebuild a request with the updated body and transplant internals
-                        try:
-                            rebuilt = self.build_request(
-                                method=request.method,
-                                url=request.url,
-                                headers=request.headers,
-                                content=updated,
-                            )
-
-                            # Copy core internals so httpx uses the modified body/stream
-                            if hasattr(rebuilt, "_content"):
-                                setattr(request, "_content", rebuilt._content)  # type: ignore[attr-defined]
-                            if hasattr(rebuilt, "stream"):
-                                request.stream = rebuilt.stream
-                            if hasattr(rebuilt, "extensions"):
-                                request.extensions = rebuilt.extensions
-
-                            # Ensure Content-Length matches the new body
-                            request.headers["Content-Length"] = str(len(updated))
-
-                        except Exception:
-                            # Swallow instrumentation errors; do not break real calls.
-                            pass
-        except Exception:
-            # Swallow wrapper errors; do not break real calls.
-            pass
+                    prefixed_body = self._prefix_tool_names(body_bytes)
+                    if prefixed_body is not None:
+                        body_bytes = prefixed_body
+                        body_modified = True
+
+                    # 4. Inject cache_control
+                    cached_body = self._inject_cache_control(body_bytes)
+                    if cached_body is not None:
+                        body_bytes = cached_body
+                        body_modified = True
+
+                # Rebuild request if anything changed
+                if body_modified or headers_modified or url != request.url:
+                    try:
+                        rebuilt = self.build_request(
+                            method=request.method,
+                            url=url,
+                            headers=headers,
+                            content=body_bytes,
+                        )
+
+                        # Copy core internals so httpx uses the modified body/stream
+                        if hasattr(rebuilt, "_content"):
+                            setattr(request, "_content", rebuilt._content)  # type: ignore[attr-defined]
+                        if hasattr(rebuilt, "stream"):
+                            request.stream = rebuilt.stream
+                        if hasattr(rebuilt, "extensions"):
+                            request.extensions = rebuilt.extensions
+
+                        # Update URL
+                        request.url = url
+
+                        # Update headers
+                        for key, value in headers.items():
+                            request.headers[key] = value
+
+                        # Ensure Content-Length matches the new body
+                        if body_bytes:
+                            request.headers["Content-Length"] = str(len(body_bytes))
+
+                    except Exception as exc:
+                        logger.debug("Error rebuilding request: %s", exc)
+
+            except Exception as exc:
+                logger.debug("Error in Claude Code transformations: %s", exc)
+
+        # Send the request
         response = await super().send(request, *args, **kwargs)
+
+        # Transform streaming response to unprefix tool names
+        if is_messages_endpoint and response.status_code == 200:
+            try:
+                response = self._wrap_response_with_tool_unprefixing(response, request)
+            except Exception as exc:
+                logger.debug("Error wrapping response for tool unprefixing: %s", exc)
+
+        # Handle auth errors with token refresh
         try:
-            # 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"
             ):
-                # 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(
@@ -203,8 +362,64 @@ class ClaudeCacheAsyncClient(httpx.AsyncClient):
                         logger.warning("Token refresh failed, returning original error")
         except Exception as exc:
             logger.debug("Error during token refresh attempt: %s", exc)
+
         return response
 
+    def _wrap_response_with_tool_unprefixing(
+        self, response: httpx.Response, request: httpx.Request
+    ) -> httpx.Response:
+        """Wrap a streaming response to unprefix tool names.
+
+        Creates a new response with a transformed stream that removes the
+        TOOL_PREFIX from tool names in the response body.
+        """
+        original_stream = response.stream
+        unprefix_fn = self._unprefix_tool_names_in_text
+
+        class UnprefixingStream(httpx.AsyncByteStream):
+            """Async byte stream that unprefixes tool names.
+
+            Inherits from httpx.AsyncByteStream to ensure proper stream interface.
+            """
+
+            def __init__(self, inner_stream: Any) -> None:
+                self._inner = inner_stream
+
+            async def __aiter__(self):
+                async for chunk in self._inner:
+                    if isinstance(chunk, bytes):
+                        text = chunk.decode("utf-8", errors="replace")
+                        text = unprefix_fn(text)
+                        yield text.encode("utf-8")
+                    else:
+                        yield chunk
+
+            async def aclose(self) -> None:
+                if hasattr(self._inner, "aclose"):
+                    try:
+                        result = self._inner.aclose()
+                        # Handle both sync and async aclose
+                        if hasattr(result, "__await__"):
+                            await result
+                    except Exception:
+                        pass  # Ignore close errors
+                elif hasattr(self._inner, "close"):
+                    try:
+                        self._inner.close()
+                    except Exception:
+                        pass
+
+        # Create a new response with the transformed stream
+        # Must include request for raise_for_status() to work
+        new_response = httpx.Response(
+            status_code=response.status_code,
+            headers=response.headers,
+            stream=UnprefixingStream(original_stream),
+            extensions=response.extensions,
+            request=request,
+        )
+        return new_response
+
     @staticmethod
     def _extract_body_bytes(request: httpx.Request) -> bytes | None:
         # Try public content first

code_puppy/cli_runner.py

@@ -827,11 +827,12 @@ async def run_prompt_with_attachments(
 
     link_attachments = [link.url_part for link in processed_prompt.link_attachments]
 
-    # IMPORTANT: Set the shared console on the agent so that streaming output
+    # IMPORTANT: Set the shared console for streaming output so it
     # uses the same console as the spinner. This prevents Live display conflicts
     # that cause line duplication during markdown streaming.
-    if spinner_console is not None:
-        agent._console = spinner_console
+    from code_puppy.agents.event_stream_handler import set_streaming_console
+
+    set_streaming_console(spinner_console)
 
     # Create the agent task first so we can track and cancel it
     agent_task = asyncio.create_task(

code_puppy/command_line/add_model_menu.py

@@ -17,6 +17,7 @@ from prompt_toolkit.layout import Dimension, Layout, VSplit, Window
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.widgets import Frame
 
+from code_puppy.command_line.utils import safe_input
 from code_puppy.config import EXTRA_MODELS_FILE, set_config_value
 from code_puppy.messaging import emit_error, emit_info, emit_warning
 from code_puppy.models_dev_parser import ModelInfo, ModelsDevRegistry, ProviderInfo
@@ -724,8 +725,8 @@ class AddModelMenu:
                 emit_info(f"  {hint}")
 
             try:
-                # Use regular input - simpler and works in threaded context
-                value = input(f"  Enter {env_var} (or press Enter to skip): ").strip()
+                # Use safe_input for cross-platform compatibility (Windows fix)
+                value = safe_input(f"  Enter {env_var} (or press Enter to skip): ")
 
                 if not value:
                     emit_warning(
@@ -785,7 +786,7 @@ class AddModelMenu:
         )
 
         try:
-            model_name = input("  Model ID: ").strip()
+            model_name = safe_input("  Model ID: ")
 
             if not model_name:
                 emit_warning("No model name provided, cancelled.")
@@ -795,7 +796,7 @@ class AddModelMenu:
             emit_info("\n  Enter the context window size (in tokens).")
             emit_info("  Common sizes: 8192, 32768, 128000, 200000, 1000000\n")
 
-            context_input = input("  Context size [128000]: ").strip()
+            context_input = safe_input("  Context size [128000]: ")
 
             if not context_input:
                 context_length = 128000  # Default
@@ -1045,11 +1046,9 @@ class AddModelMenu:
                     f"   It will be very limited for coding tasks."
                 )
                 try:
-                    confirm = (
-                        input("\n  Are you sure you want to add this model? (y/N): ")
-                        .strip()
-                        .lower()
-                    )
+                    confirm = safe_input(
+                        "\n  Are you sure you want to add this model? (y/N): "
+                    ).lower()
                     if confirm not in ("y", "yes"):
                         emit_info("Model addition cancelled.")
                         return False

code_puppy/command_line/core_commands.py

@@ -772,6 +772,91 @@ def handle_mcp_command(command: str) -> bool:
     return handler.handle_mcp_command(command)
 
 
+@register_command(
+    name="api",
+    description="Manage the Code Puppy API server",
+    usage="/api [start|stop|status]",
+    category="core",
+    detailed_help="Start, stop, or check status of the local FastAPI server for GUI integration.",
+)
+def handle_api_command(command: str) -> bool:
+    """Handle the /api command."""
+    import os
+    import signal
+    import subprocess
+    import sys
+    from pathlib import Path
+
+    from code_puppy.config import STATE_DIR
+    from code_puppy.messaging import emit_error, emit_info, emit_success
+
+    parts = command.split()
+    subcommand = parts[1] if len(parts) > 1 else "status"
+
+    pid_file = Path(STATE_DIR) / "api_server.pid"
+
+    if subcommand == "start":
+        # Check if already running
+        if pid_file.exists():
+            try:
+                pid = int(pid_file.read_text().strip())
+                os.kill(pid, 0)  # Check if process exists
+                emit_info(f"API server already running (PID {pid})")
+                return True
+            except (OSError, ValueError):
+                pid_file.unlink(missing_ok=True)  # Stale PID file
+
+        # Start the server in background
+        emit_info("Starting API server on http://127.0.0.1:8765 ...")
+        proc = subprocess.Popen(
+            [sys.executable, "-m", "code_puppy.api.main"],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            start_new_session=True,
+        )
+        pid_file.parent.mkdir(parents=True, exist_ok=True)
+        pid_file.write_text(str(proc.pid))
+        emit_success(f"API server started (PID {proc.pid})")
+        emit_info("Docs available at http://127.0.0.1:8765/docs")
+        return True
+
+    elif subcommand == "stop":
+        if not pid_file.exists():
+            emit_info("API server is not running")
+            return True
+
+        try:
+            pid = int(pid_file.read_text().strip())
+            os.kill(pid, signal.SIGTERM)
+            pid_file.unlink()
+            emit_success(f"API server stopped (PID {pid})")
+        except (OSError, ValueError) as e:
+            pid_file.unlink(missing_ok=True)
+            emit_error(f"Error stopping server: {e}")
+        return True
+
+    elif subcommand == "status":
+        if not pid_file.exists():
+            emit_info("API server is not running")
+            return True
+
+        try:
+            pid = int(pid_file.read_text().strip())
+            os.kill(pid, 0)  # Check if process exists
+            emit_success(f"API server is running (PID {pid})")
+            emit_info("URL: http://127.0.0.1:8765")
+            emit_info("Docs: http://127.0.0.1:8765/docs")
+        except (OSError, ValueError):
+            pid_file.unlink(missing_ok=True)
+            emit_info("API server is not running (stale PID file removed)")
+        return True
+
+    else:
+        emit_error(f"Unknown subcommand: {subcommand}")
+        emit_info("Usage: /api [start|stop|status]")
+        return True
+
+
 @register_command(
     name="generate-pr-description",
     description="Generate comprehensive PR description",

code_puppy/command_line/mcp/catalog_server_installer.py

@@ -7,6 +7,7 @@ MCP servers from the catalog.
 import os
 from typing import Dict, Optional
 
+from code_puppy.command_line.utils import safe_input
 from code_puppy.messaging import emit_info, emit_success, emit_warning
 
 # Helpful hints for common environment variables
@@ -52,7 +53,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
     # Get custom name
     default_name = server.name
     try:
-        name_input = input(f"  Server name [{default_name}]: ").strip()
+        name_input = safe_input(f"  Server name [{default_name}]: ")
         server_name = name_input if name_input else default_name
     except (KeyboardInterrupt, EOFError):
         emit_info("")
@@ -63,9 +64,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
     existing = find_server_id_by_name(manager, server_name)
     if existing:
         try:
-            override = input(
-                f"  Server '{server_name}' exists. Override? [y/N]: "
-            ).strip()
+            override = safe_input(f"  Server '{server_name}' exists. Override? [y/N]: ")
             if not override.lower().startswith("y"):
                 emit_warning("Installation cancelled")
                 return None
@@ -91,7 +90,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
                     hint = get_env_var_hint(var)
                     if hint:
                         emit_info(f"     {hint}")
-                    value = input(f"     Enter {var}: ").strip()
+                    value = safe_input(f"     Enter {var}: ")
                     if value:
                         env_vars[var] = value
                         # Save to config for future use
@@ -119,7 +118,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
                 prompt_str += " (optional)"
 
             try:
-                value = input(f"{prompt_str}: ").strip()
+                value = safe_input(f"{prompt_str}: ")
                 if value:
                     cmd_args[name] = value
                 elif default:

code_puppy/command_line/mcp/custom_server_form.py

@@ -43,7 +43,7 @@ CUSTOM_SERVER_EXAMPLES = {
   "type": "http",
   "url": "http://localhost:8080/mcp",
   "headers": {
-    "Authorization": "Bearer YOUR_API_KEY",
+    "Authorization": "Bearer $MY_API_KEY",
     "Content-Type": "application/json"
   },
   "timeout": 30
@@ -52,7 +52,7 @@ CUSTOM_SERVER_EXAMPLES = {
   "type": "sse",
   "url": "http://localhost:8080/sse",
   "headers": {
-    "Authorization": "Bearer YOUR_API_KEY"
+    "Authorization": "Bearer $MY_API_KEY"
   }
 }""",
 }
@@ -367,24 +367,59 @@ class CustomServerForm:
         config_dict = json.loads(self.json_config)
 
         try:
-            server_config = ServerConfig(
-                id=server_name,
-                name=server_name,
-                type=server_type,
-                enabled=True,
-                config=config_dict,
-            )
-
-            # Register with manager
-            server_id = self.manager.register_server(server_config)
-
-            if not server_id:
-                self.validation_error = "Failed to register server"
-                self.status_message = (
-                    "Save failed: Could not register server (name may already exist)"
+            # In edit mode, find the existing server and update it
+            if self.edit_mode and self.original_name:
+                existing_config = self.manager.get_server_by_name(self.original_name)
+                if existing_config:
+                    # Use the existing server's ID for the update
+                    server_config = ServerConfig(
+                        id=existing_config.id,
+                        name=server_name,
+                        type=server_type,
+                        enabled=True,
+                        config=config_dict,
+                    )
+
+                    # Update the server in the manager
+                    success = self.manager.update_server(
+                        existing_config.id, server_config
+                    )
+
+                    if not success:
+                        self.validation_error = "Failed to update server"
+                        self.status_message = "Save failed: Could not update server"
+                        self.status_is_error = True
+                        return False
+
+                    server_id = existing_config.id
+                else:
+                    # Original server not found, treat as new registration
+                    server_config = ServerConfig(
+                        id=server_name,
+                        name=server_name,
+                        type=server_type,
+                        enabled=True,
+                        config=config_dict,
+                    )
+                    server_id = self.manager.register_server(server_config)
+            else:
+                # New server - register it
+                server_config = ServerConfig(
+                    id=server_name,
+                    name=server_name,
+                    type=server_type,
+                    enabled=True,
+                    config=config_dict,
                 )
-                self.status_is_error = True
-                return False
+
+                # Register with manager
+                server_id = self.manager.register_server(server_config)
+
+                if not server_id:
+                    self.validation_error = "Failed to register server"
+                    self.status_message = "Save failed: Could not register server (name may already exist)"
+                    self.status_is_error = True
+                    return False
 
             # Save to mcp_servers.json for persistence
             if os.path.exists(MCP_SERVERS_FILE):