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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.340
+Version: 0.0.342
 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.340 → code_puppy-0.0.342}/code_puppy/agents/base_agent.py

@@ -913,6 +913,11 @@ class BaseAgent(ABC):
         """
         Truncate message history to manage token usage.
 
+        Protects:
+        - The first message (system prompt) - always kept
+        - The second message if it contains a ThinkingPart (extended thinking context)
+        - The most recent messages up to protected_tokens
+
         Args:
             messages: List of messages to truncate
             protected_tokens: Number of tokens to protect
@@ -924,12 +929,30 @@ class BaseAgent(ABC):
 
         emit_info("Truncating message history to manage token usage")
         result = [messages[0]]  # Always keep the first message (system prompt)
+
+        # Check if second message exists and contains a ThinkingPart
+        # If so, protect it (extended thinking context shouldn't be lost)
+        skip_second = False
+        if len(messages) > 1:
+            second_msg = messages[1]
+            has_thinking = any(
+                isinstance(part, ThinkingPart) for part in second_msg.parts
+            )
+            if has_thinking:
+                result.append(second_msg)
+                skip_second = True
+
         num_tokens = 0
         stack = queue.LifoQueue()
 
+        # Determine which messages to consider for the recent-tokens window
+        # Skip first message (already added), and skip second if it has thinking
+        start_idx = 2 if skip_second else 1
+        messages_to_scan = messages[start_idx:]
+
         # Put messages in reverse order (most recent first) into the stack
         # but break when we exceed protected_tokens
-        for idx, msg in enumerate(reversed(messages[1:])):  # Skip the first message
+        for msg in reversed(messages_to_scan):
             num_tokens += self.estimate_tokens_for_message(msg)
             if num_tokens > protected_tokens:
                 break

{code_puppy-0.0.340 → code_puppy-0.0.342}/code_puppy/claude_cache_client.py

@@ -9,14 +9,19 @@ serialization, avoiding httpx/Pydantic internals.
 
 from __future__ import annotations
 
+import base64
 import json
 import logging
+import time
 from typing import Any, Callable, MutableMapping
 
 import httpx
 
 logger = logging.getLogger(__name__)
 
+# Refresh token if it's older than 1 hour (3600 seconds)
+TOKEN_MAX_AGE_SECONDS = 3600
+
 try:
     from anthropic import AsyncAnthropic
 except ImportError:  # pragma: no cover - optional dep
@@ -24,9 +29,108 @@ except ImportError:  # pragma: no cover - optional dep
 
 
 class ClaudeCacheAsyncClient(httpx.AsyncClient):
+    def _get_jwt_age_seconds(self, token: str | None) -> float | None:
+        """Decode a JWT and return its age in seconds.
+
+        Returns None if the token can't be decoded or has no timestamp claims.
+        Uses 'iat' (issued at) if available, otherwise calculates from 'exp'.
+        """
+        if not token:
+            return None
+
+        try:
+            # JWT format: header.payload.signature
+            # We only need the payload (second part)
+            parts = token.split(".")
+            if len(parts) != 3:
+                return None
+
+            # Decode the payload (base64url encoded)
+            payload_b64 = parts[1]
+            # Add padding if needed (base64url doesn't require padding)
+            padding = 4 - len(payload_b64) % 4
+            if padding != 4:
+                payload_b64 += "=" * padding
+
+            payload_bytes = base64.urlsafe_b64decode(payload_b64)
+            payload = json.loads(payload_bytes.decode("utf-8"))
+
+            now = time.time()
+
+            # Prefer 'iat' (issued at) claim if available
+            if "iat" in payload:
+                iat = float(payload["iat"])
+                age = now - iat
+                return age
+
+            # Fall back to calculating from 'exp' claim
+            # Assume tokens are typically valid for 1 hour
+            if "exp" in payload:
+                exp = float(payload["exp"])
+                # If exp is in the future, calculate how long until expiry
+                # and assume the token was issued 1 hour before expiry
+                time_until_exp = exp - now
+                # If token has less than 1 hour left, it's "old"
+                age = TOKEN_MAX_AGE_SECONDS - time_until_exp
+                return max(0, age)
+
+            return None
+        except Exception as exc:
+            logger.debug("Failed to decode JWT age: %s", exc)
+            return None
+
+    def _extract_bearer_token(self, request: httpx.Request) -> str | None:
+        """Extract the bearer token from request headers."""
+        auth_header = request.headers.get("Authorization") or request.headers.get(
+            "authorization"
+        )
+        if auth_header and auth_header.lower().startswith("bearer "):
+            return auth_header[7:]  # Strip "Bearer " prefix
+        return None
+
+    def _should_refresh_token(self, request: httpx.Request) -> bool:
+        """Check if the token in the request is older than 1 hour."""
+        token = self._extract_bearer_token(request)
+        if not token:
+            return False
+
+        age = self._get_jwt_age_seconds(token)
+        if age is None:
+            return False
+
+        should_refresh = age >= TOKEN_MAX_AGE_SECONDS
+        if should_refresh:
+            logger.info(
+                "JWT token is %.1f seconds old (>= %d), will refresh proactively",
+                age,
+                TOKEN_MAX_AGE_SECONDS,
+            )
+        return should_refresh
+
     async def send(
         self, request: httpx.Request, *args: Any, **kwargs: Any
     ) -> httpx.Response:  # type: ignore[override]
+        # Proactive token refresh: check JWT age before every request
+        if not request.extensions.get("claude_oauth_refresh_attempted"):
+            try:
+                if self._should_refresh_token(request):
+                    refreshed_token = self._refresh_claude_oauth_token()
+                    if refreshed_token:
+                        logger.info("Proactively refreshed token before request")
+                        # Rebuild request with new token
+                        headers = dict(request.headers)
+                        self._update_auth_headers(headers, refreshed_token)
+                        body_bytes = self._extract_body_bytes(request)
+                        request = self.build_request(
+                            method=request.method,
+                            url=request.url,
+                            headers=headers,
+                            content=body_bytes,
+                        )
+                        request.extensions["claude_oauth_refresh_attempted"] = True
+            except Exception as exc:
+                logger.debug("Error during proactive token refresh check: %s", exc)
+
         try:
             if request.url.path.endswith("/v1/messages"):
                 body_bytes = self._extract_body_bytes(request)

{code_puppy-0.0.340 → code_puppy-0.0.342}/code_puppy/command_line/autosave_menu.py

@@ -69,12 +69,21 @@ def _get_session_entries(base_dir: Path) -> List[Tuple[str, dict]]:
 
 
 def _extract_last_user_message(history: list) -> str:
-    """Extract the most recent user message from history."""
+    """Extract the most recent user message from history.
+
+    Joins all content parts from the message since messages can have
+    multiple parts (e.g., text + attachments, multi-part prompts).
+    """
     # Walk backwards through history to find last user message
     for msg in reversed(history):
+        content_parts = []
         for part in msg.parts:
             if hasattr(part, "content"):
-                return part.content
+                content = part.content
+                if isinstance(content, str) and content.strip():
+                    content_parts.append(content)
+        if content_parts:
+            return "\n\n".join(content_parts)
     return "[No messages found]"
 
 
@@ -298,19 +307,13 @@ def _render_message_browser_panel(
             # Don't override Rich's ANSI styling - use empty style
             text_color = ""
 
-        # Truncate if too long (max 35 lines)
-        message_lines = rendered.split("\n")[:35]
-        is_truncated = len(rendered.split("\n")) > 35
+        # Show full message without truncation
+        message_lines = rendered.split("\n")
 
         for line in message_lines:
             lines.append((text_color, f"  {line}"))
             lines.append(("", "\n"))
 
-        if is_truncated:
-            lines.append(("", "\n"))
-            lines.append(("fg:yellow", "  ... truncated (message too long)"))
-            lines.append(("", "\n"))
-
     except Exception as e:
         lines.append(("fg:red", f"  Error rendering message: {e}"))
         lines.append(("", "\n"))
@@ -359,7 +362,7 @@ def _render_preview_panel(base_dir: Path, entry: Optional[Tuple[str, dict]]) ->
     lines.append(("", "\n\n"))
 
     lines.append(("bold", "  Last Message:"))
-    lines.append(("fg:ansibrightblack", "  (press 'e' to browse all)"))
+    lines.append(("fg:ansibrightblack", "  (press 'e' to browse full history)"))
     lines.append(("", "\n"))
 
     # Try to load and preview the last message
@@ -367,15 +370,11 @@ def _render_preview_panel(base_dir: Path, entry: Optional[Tuple[str, dict]]) ->
         history = load_session(session_name, base_dir)
         last_message = _extract_last_user_message(history)
 
-        # Check if original message is long (before Rich processing)
-        original_lines = last_message.split("\n") if last_message else []
-        is_long = len(original_lines) > 30
-
-        # Render markdown with rich but strip ANSI codes
+        # Render markdown with rich
         console = Console(
             file=StringIO(),
             legacy_windows=False,
-            no_color=False,  # Disable ANSI color codes
+            no_color=False,
             force_terminal=False,
             width=76,
         )
@@ -383,19 +382,14 @@ def _render_preview_panel(base_dir: Path, entry: Optional[Tuple[str, dict]]) ->
         console.print(md)
         rendered = console.file.getvalue()
 
-        # Truncate if too long (max 30 lines for bigger preview)
-        message_lines = rendered.split("\n")[:30]
+        # Show full message without truncation
+        message_lines = rendered.split("\n")
 
         for line in message_lines:
             # Rich already rendered the markdown, just display it dimmed
             lines.append(("fg:ansibrightblack", f"  {line}"))
             lines.append(("", "\n"))
 
-        if is_long:
-            lines.append(("", "\n"))
-            lines.append(("fg:yellow", "  ... truncated"))
-            lines.append(("", "\n"))
-
     except Exception as e:
         lines.append(("fg:red", f"  Error loading preview: {e}"))
         lines.append(("", "\n"))

{code_puppy-0.0.340 → code_puppy-0.0.342}/code_puppy/command_line/prompt_toolkit_completion.py

@@ -29,7 +29,6 @@ from code_puppy.command_line.attachments import (
 )
 from code_puppy.command_line.clipboard import (
     capture_clipboard_image_to_pending,
-    get_clipboard_manager,
     has_image_in_clipboard,
 )
 from code_puppy.command_line.command_registry import get_unique_commands
@@ -649,30 +648,18 @@ async def get_input_with_combined_completion(
         else:
             event.current_buffer.validate_and_handle()
 
-    # Handle bracketed paste (triggered by most terminal Cmd+V / Ctrl+V)
-    # This is the PRIMARY paste handler - works with Cmd+V on macOS terminals
+    # Handle bracketed paste - TEXT ONLY, never check clipboard for images.
+    # Drag-and-drop sends file paths through this handler (as text), and paste
+    # operations send text through here too. We should NOT conflate this with
+    # clipboard image capture - those are separate operations (Ctrl+V / F3).
     @bindings.add(Keys.BracketedPaste)
     def handle_bracketed_paste(event):
-        """Handle bracketed paste - works with Cmd+V on macOS terminals."""
-        # The pasted data is in event.data
+        """Handle bracketed paste - insert text data only."""
         pasted_data = event.data
-
-        # Check if clipboard has an image (the pasted text might just be empty or a file path)
-        try:
-            if has_image_in_clipboard():
-                placeholder = capture_clipboard_image_to_pending()
-                if placeholder:
-                    event.app.current_buffer.insert_text(placeholder + " ")
-                    count = get_clipboard_manager().get_pending_count()
-                    sys.stdout.write(f"\033[36m📋 +image ({count})\033[0m ")
-                    sys.stdout.flush()
-                    return  # Don't also paste the text data
-        except Exception:
-            pass
-
-        # No image - insert the pasted text as normal
         if pasted_data:
-            event.app.current_buffer.insert_text(pasted_data)
+            # Normalize Windows line endings to Unix style
+            sanitized_data = pasted_data.replace("\r\n", "\n").replace("\r", "\n")
+            event.app.current_buffer.insert_text(sanitized_data)
 
     # Fallback Ctrl+V for terminals without bracketed paste support
     @bindings.add("c-v", eager=True)
@@ -684,9 +671,9 @@ async def get_input_with_combined_completion(
                 placeholder = capture_clipboard_image_to_pending()
                 if placeholder:
                     event.app.current_buffer.insert_text(placeholder + " ")
-                    count = get_clipboard_manager().get_pending_count()
-                    sys.stdout.write(f"\033[36m📋 +image ({count})\033[0m ")
-                    sys.stdout.flush()
+                    # The placeholder itself is visible feedback - no need for extra output
+                    # Use bell for audible feedback (works in most terminals)
+                    event.app.output.bell()
                     return  # Don't also paste text
         except Exception:
             pass  # Fall through to text paste on any error
@@ -715,7 +702,7 @@ async def get_input_with_combined_completion(
                     timeout=2,
                 )
                 if result.returncode == 0:
-                    text = result.stdout.rstrip("\r\n")
+                    text = result.stdout
             else:  # Linux
                 # Try xclip first, then xsel
                 for cmd in [
@@ -733,6 +720,10 @@ async def get_input_with_combined_completion(
                         continue
 
             if text:
+                # Normalize Windows line endings to Unix style
+                text = text.replace("\r\n", "\n").replace("\r", "\n")
+                # Strip trailing newline that clipboard tools often add
+                text = text.rstrip("\n")
                 event.app.current_buffer.insert_text(text)
         except Exception:
             pass  # Silently fail if text paste doesn't work
@@ -746,15 +737,16 @@ async def get_input_with_combined_completion(
                 placeholder = capture_clipboard_image_to_pending()
                 if placeholder:
                     event.app.current_buffer.insert_text(placeholder + " ")
-                    count = get_clipboard_manager().get_pending_count()
-                    sys.stdout.write(f"\033[36m📋 +image ({count})\033[0m ")
-                    sys.stdout.flush()
+                    # The placeholder itself is visible feedback
+                    # Use bell for audible feedback (works in most terminals)
+                    event.app.output.bell()
             else:
-                sys.stdout.write("\033[33m⚠️ no image\033[0m ")
-                sys.stdout.flush()
+                # Insert a transient message that user can delete
+                event.app.current_buffer.insert_text("[⚠️ no image in clipboard] ")
+                event.app.output.bell()
         except Exception:
-            sys.stdout.write("\033[31m❌ clipboard error\033[0m ")
-            sys.stdout.flush()
+            event.app.current_buffer.insert_text("[❌ clipboard error] ")
+            event.app.output.bell()
 
     session = PromptSession(
         completer=completer,

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

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