patchpal 0.4.1__tar.gz → 0.4.3__tar.gz

{patchpal-0.4.1/patchpal.egg-info → patchpal-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patchpal
-Version: 0.4.1
+Version: 0.4.3
 Summary: A lean Claude Code clone in pure  Python
 Author: PatchPal Contributors
 License-Expression: Apache-2.0

{patchpal-0.4.1 → patchpal-0.4.3}/patchpal/__init__.py

@@ -1,6 +1,6 @@
 """PatchPal - An open-source Claude Code clone implemented purely in Python."""
 
-__version__ = "0.4.1"
+__version__ = "0.4.3"
 
 from patchpal.agent import create_agent
 from patchpal.tools import (

{patchpal-0.4.1 → patchpal-0.4.3}/patchpal/agent.py

@@ -756,13 +756,52 @@ def _apply_prompt_caching(messages: List[Dict[str, Any]], model_id: str) -> List
 
     # Apply caching to system messages (first 2)
     for idx in system_messages[:2]:
-        if "cache_control" not in messages[idx] and "cachePoint" not in messages[idx]:
-            messages[idx] = {**messages[idx], **cache_marker}
+        msg = messages[idx]
+        # Skip if already has cache marker at content block level
+        if isinstance(msg.get("content"), list):
+            # Already structured - check if any block has cache_control/cachePoint
+            has_cache = any(
+                "cache_control" in block or "cachePoint" in block
+                for block in msg["content"]
+                if isinstance(block, dict)
+            )
+            if not has_cache and msg["content"]:
+                # Add cache marker to the last content block
+                last_block = msg["content"][-1]
+                if isinstance(last_block, dict):
+                    last_block.update(cache_marker)
+        else:
+            # Convert simple string content to structured format with cache marker
+            content_text = msg.get("content", "")
+            messages[idx] = {
+                **msg,
+                "content": [{"type": "text", "text": content_text, **cache_marker}],
+            }
 
     # Apply caching to last 2 messages
     for idx in last_two_indices:
-        if "cache_control" not in messages[idx] and "cachePoint" not in messages[idx]:
-            messages[idx] = {**messages[idx], **cache_marker}
+        msg = messages[idx]
+        # Skip if already has cache marker at content block level
+        if isinstance(msg.get("content"), list):
+            # Already structured - check if any block has cache_control/cachePoint
+            has_cache = any(
+                "cache_control" in block or "cachePoint" in block
+                for block in msg["content"]
+                if isinstance(block, dict)
+            )
+            if not has_cache and msg["content"]:
+                # Add cache marker to the last content block
+                last_block = msg["content"][-1]
+                if isinstance(last_block, dict):
+                    last_block.update(cache_marker)
+        else:
+            # Convert simple string content to structured format with cache marker
+            content_text = msg.get("content", "")
+            if content_text:  # Only convert non-empty content
+                messages[idx] = {
+                    **msg,
+                    "content": [{"type": "text", "text": content_text, **cache_marker}],
+                }
 
     return messages
 

{patchpal-0.4.1 → patchpal-0.4.3}/patchpal/tools.py

@@ -665,7 +665,7 @@ def _check_path(path: str, must_exist: bool = True) -> Path:
     Validate and resolve a path.
 
     Args:
-        path: Path to validate (relative or absolute)
+        path: Path to validate (relative, absolute, or with ~ for home directory)
         must_exist: Whether the file must exist
 
     Returns:
@@ -678,12 +678,15 @@ def _check_path(path: str, must_exist: bool = True) -> Path:
         Can access files anywhere on the system (repository or outside).
         Sensitive files (.env, credentials) are always blocked for safety.
     """
+    # Expand ~ for home directory first
+    expanded_path = os.path.expanduser(path)
+
     # Resolve path (handle both absolute and relative paths)
-    path_obj = Path(path)
+    path_obj = Path(expanded_path)
     if path_obj.is_absolute():
         p = path_obj.resolve()
     else:
-        p = (REPO_ROOT / path).resolve()
+        p = (REPO_ROOT / expanded_path).resolve()
 
     # Check if file exists when required
     if must_exist and not p.is_file():
@@ -1074,12 +1077,13 @@ def tree(path: str = ".", max_depth: int = 3, show_hidden: bool = False) -> str:
     # Limit max_depth
     max_depth = min(max_depth, 10)
 
-    # Resolve path (handle both absolute and relative paths)
-    path_obj = Path(path)
+    # Expand ~ for home directory and resolve path (handle both absolute and relative paths)
+    expanded_path = os.path.expanduser(path)
+    path_obj = Path(expanded_path)
     if path_obj.is_absolute():
         start_path = path_obj.resolve()
     else:
-        start_path = (REPO_ROOT / path).resolve()
+        start_path = (REPO_ROOT / expanded_path).resolve()
 
     # Check if path exists and is a directory
     if not start_path.exists():

{patchpal-0.4.1 → patchpal-0.4.3/patchpal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patchpal
-Version: 0.4.1
+Version: 0.4.3
 Summary: A lean Claude Code clone in pure  Python
 Author: PatchPal Contributors
 License-Expression: Apache-2.0

{patchpal-0.4.1 → patchpal-0.4.3}/tests/test_agent.py

@@ -441,13 +441,17 @@ def test_prompt_caching_application_anthropic():
     # Test with direct Anthropic API
     cached_messages = _apply_prompt_caching(messages.copy(), "anthropic/claude-sonnet-4-5")
 
-    # System message should have cache_control
-    assert "cache_control" in cached_messages[0]
-    assert cached_messages[0]["cache_control"] == {"type": "ephemeral"}
+    # System message should have cache_control inside content block
+    assert isinstance(cached_messages[0]["content"], list)
+    assert cached_messages[0]["content"][0]["type"] == "text"
+    assert "cache_control" in cached_messages[0]["content"][0]
+    assert cached_messages[0]["content"][0]["cache_control"] == {"type": "ephemeral"}
 
-    # Last 2 messages should have cache_control
-    assert "cache_control" in cached_messages[-1]  # Last user message
-    assert "cache_control" in cached_messages[-2]  # Last assistant message
+    # Last 2 messages should have cache_control inside content blocks
+    assert isinstance(cached_messages[-1]["content"], list)  # Last user message
+    assert "cache_control" in cached_messages[-1]["content"][0]
+    assert isinstance(cached_messages[-2]["content"], list)  # Last assistant message
+    assert "cache_control" in cached_messages[-2]["content"][0]
 
 
 def test_prompt_caching_application_bedrock():
@@ -466,13 +470,17 @@ def test_prompt_caching_application_bedrock():
         messages.copy(), "bedrock/anthropic.claude-sonnet-4-5-v1:0"
     )
 
-    # System message should have cachePoint (Bedrock format)
-    assert "cachePoint" in cached_messages[0]
-    assert cached_messages[0]["cachePoint"] == {"type": "ephemeral"}
+    # System message should have cachePoint inside content block (Bedrock format)
+    assert isinstance(cached_messages[0]["content"], list)
+    assert cached_messages[0]["content"][0]["type"] == "text"
+    assert "cachePoint" in cached_messages[0]["content"][0]
+    assert cached_messages[0]["content"][0]["cachePoint"] == {"type": "ephemeral"}
 
-    # Last 2 messages should have cachePoint
-    assert "cachePoint" in cached_messages[-1]
-    assert "cachePoint" in cached_messages[-2]
+    # Last 2 messages should have cachePoint inside content blocks
+    assert isinstance(cached_messages[-1]["content"], list)
+    assert "cachePoint" in cached_messages[-1]["content"][0]
+    assert isinstance(cached_messages[-2]["content"], list)
+    assert "cachePoint" in cached_messages[-2]["content"][0]
 
 
 def test_prompt_caching_no_modification_for_unsupported():
@@ -506,5 +514,10 @@ def test_prompt_caching_idempotent():
     cached_once = _apply_prompt_caching(messages.copy(), "anthropic/claude-sonnet-4-5")
     cached_twice = _apply_prompt_caching(cached_once.copy(), "anthropic/claude-sonnet-4-5")
 
-    # Should be the same after second application
-    assert cached_once == cached_twice
+    # Should have the same structure after second application
+    assert cached_once[0]["content"][0] == cached_twice[0]["content"][0]
+    assert cached_once[1]["content"][0] == cached_twice[1]["content"][0]
+
+    # Should only have one cache_control marker per message
+    assert len([k for k in cached_twice[0]["content"][0].keys() if "cache" in k]) == 1
+    assert len([k for k in cached_twice[1]["content"][0].keys() if "cache" in k]) == 1