drydock-cli 2.6.8__tar.gz → 2.6.9__tar.gz

drydock_cli-2.6.9/.auto_release.lock

@@ -0,0 +1 @@
+3928923

{drydock_cli-2.6.8 → drydock_cli-2.6.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 2.6.8
+Version: 2.6.9
 Summary: Drydock — nautical CLI coding agent
 Project-URL: Homepage, https://github.com/fbobe321/drydock
 Project-URL: Repository, https://github.com/fbobe321/drydock

{drydock_cli-2.6.8 → drydock_cli-2.6.9}/drydock/core/agent_loop.py

@@ -567,23 +567,34 @@ class AgentLoop:
                           or "maximum context" in error_str.lower()
                           or "400 bad request" in error_str.lower()
                           or "status: 400" in error_str.lower()):
-                        # Context limit or malformed request — aggressively compact
+                        # Context limit or malformed request — aggressive recovery
                         try:
-                            compacted = 0
+                            # First try: truncate old messages
                             for i, msg in enumerate(self.messages):
                                 if i >= len(self.messages) - 4:
-                                    break  # Keep last 4 messages
+                                    break
                                 if msg.role == Role.tool and hasattr(msg, 'content'):
                                     content = str(msg.content) if msg.content else ""
                                     if len(content) > 200:
-                                        msg.content = content[:100] + "\n[truncated]\n" + content[-50:]
-                                        compacted += 1
+                                        msg.content = content[:100] + "\n[truncated]"
                                 elif msg.role == Role.assistant and hasattr(msg, 'content'):
                                     content = str(msg.content) if msg.content else ""
                                     if len(content) > 500:
                                         msg.content = content[:200] + "\n[truncated]"
-                                        compacted += 1
-                            logger.info("Emergency compaction: truncated %d messages", compacted)
+
+                            # Second try: if messages > 20, keep only last 6
+                            if len(self.messages) > 20:
+                                first_user = None
+                                for msg in self.messages:
+                                    if msg.role == Role.user:
+                                        first_user = msg
+                                        break
+                                kept = []
+                                if first_user:
+                                    kept.append(first_user)
+                                kept.extend(self.messages[-5:])
+                                self.messages.reset(kept)
+                                logger.info("Emergency reset: kept first user + last 5 messages")
                         except Exception:
                             pass
                         error_text = "Context compacted due to API error. Continue with your task."
@@ -592,6 +603,8 @@ class AgentLoop:
                     self._inject_system_note(error_text)
                     continue
 
+                if not self.messages:
+                    continue
                 last_message = self.messages[-1]
 
                 # Track edits — no circuit breakers, just track for has_made_edit
@@ -625,6 +638,8 @@ class AgentLoop:
             if assistant_event.content:
                 yield assistant_event
 
+        if not self.messages:
+            return
         last_message = self.messages[-1]
 
         # Detect repetitive text generation (Gemma 4 sometimes loops text within one response)
@@ -1147,7 +1162,7 @@ class AgentLoop:
             self.messages.reset(cleaned)
 
         # Fix 2: If last message is assistant, add a user "Continue." prompt
-        if self.messages[-1].role == Role.assistant:
+        if self.messages and self.messages[-1].role == Role.assistant:
             self.messages.append(LLMMessage(role=Role.user, content="Continue."))
 
     async def _chat(self, max_tokens: int | None = None) -> LLMChunk:

{drydock_cli-2.6.8 → drydock_cli-2.6.9}/drydock/core/tools/builtins/search_replace.py

@@ -241,14 +241,13 @@ class SearchReplace(
                 ">>>>>>> REPLACE"
             )
 
-        # Detect garbled token output (common with some models/parsers)
+        # Detect garbled token output — only flag obvious corruption
+        # (mixed angle brackets + repeated letters like <<t<ttt<t), not normal repeats
         for block in search_replace_blocks:
-            if re.search(r'(.)\1{4,}', block.search) or re.search(r'<{3,}[a-z]', block.search):
+            if re.search(r'<[a-z]<[a-z]{2,}<[a-z]', block.search):
                 raise ToolError(
-                    "Your search text appears garbled (repeated/corrupted characters). "
-                    "This happens when regex or special characters confuse the tool call parser. "
-                    "WORKAROUND: Use read_file to get the exact line numbers, then use write_file "
-                    "to rewrite the entire function instead of search_replace on complex regex patterns."
+                    "Your search text appears garbled (token corruption). "
+                    "Use write_file to rewrite the function instead of search_replace."
                 )
 
         return file_path, search_replace_blocks

{drydock_cli-2.6.8 → drydock_cli-2.6.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "drydock-cli"
-version = "2.6.8"
+version = "2.6.9"
 description = "Drydock — nautical CLI coding agent"
 readme = "README.md"
 requires-python = ">=3.12"

drydock_cli-2.6.9/tests/test_user_issues.py

@@ -0,0 +1,129 @@
+"""Tests for user-reported issues (2026-04-07).
+
+Each test should FAIL before the fix and PASS after.
+"""
+import hashlib
+import pytest
+from unittest.mock import patch, MagicMock
+
+
+class TestMD5Crash:
+    """#61: Crash after install — md5 error in manager.py."""
+
+    def test_md5_usedforsecurity(self):
+        """md5 should work with usedforsecurity=False."""
+        h = hashlib.md5(b"test", usedforsecurity=False)
+        assert h.hexdigest() == "098f6bcd4621d373cade4e832627b4f6"
+
+    def test_tool_manager_import(self):
+        """Tool manager should not crash on import."""
+        from drydock.core.tools.manager import ToolManager
+        assert ToolManager is not None
+
+
+class TestSearchReplaceGarbled:
+    """#55: search_replace garbled characters."""
+
+    def test_garbled_detection(self):
+        from drydock.core.tools.builtins.search_replace import SearchReplaceArgs
+        args = SearchReplaceArgs.model_validate({
+            "file_path": "test.py",
+            "content": "<<<<<<< SEARCH\nold text\n=======\nnew text\n>>>>>>> REPLACE",
+        })
+        assert args.file_path == "test.py"
+
+
+class TestTodoEnumQuotes:
+    """#60: Todo enum quoting issues."""
+
+    def test_double_quoted(self):
+        from drydock.core.tools.builtins.todo import TodoItem
+        item = TodoItem.model_validate({
+            "id": "1", "content": "test",
+            "status": '"completed"', "priority": '"high"',
+        })
+        assert item.status.value == "completed"
+
+    def test_single_quoted(self):
+        from drydock.core.tools.builtins.todo import TodoItem
+        item = TodoItem.model_validate({
+            "id": "1", "content": "test",
+            "status": "'completed'", "priority": "'high'",
+        })
+        assert item.status.value == "completed"
+
+
+class TestEmptyState:
+    """#58: IndexError on empty lists."""
+
+    def test_empty_tool_calls(self):
+        from drydock.core.types import LLMMessage, Role
+        msg = LLMMessage(role=Role.assistant, content="hello", tool_calls=None)
+        calls = msg.tool_calls or []
+        assert calls == []
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v"])
+
+
+class TestSearchReplaceGarbledAdvanced:
+    """#55: Garbled detection should only catch real corruption."""
+
+    def test_legitimate_repeats_not_flagged(self):
+        """Normal repeated chars like ===== should NOT be flagged."""
+        from drydock.core.tools.builtins.search_replace import SearchReplace
+        blocks = SearchReplace._parse_search_replace_blocks(
+            "<<<<<<< SEARCH\ndef foo():\n    x = 5\n=======\ndef foo():\n    x = 10\n>>>>>>> REPLACE"
+        )
+        assert len(blocks) == 1
+        assert "x = 5" in blocks[0].search
+
+    def test_real_garble_detected(self):
+        """Token corruption like <<t<ttt<t should be caught."""
+        import re
+        garbled = "(?P<<t<ttt<t<tststssts>\\d+)"
+        assert re.search(r'<[a-z]<[a-z]{2,}<[a-z]', garbled)
+
+    def test_normal_regex_not_garbled(self):
+        """Normal regex should not trigger garble detection."""
+        import re
+        normal = r"(?P<timestamp>\d{4}-\d{2}-\d{2})"
+        assert not re.search(r'<[a-z]<[a-z]{2,}<[a-z]', normal)
+
+
+class TestIndexErrorGuards:
+    """#58: Guard all [-1] accesses on potentially empty lists."""
+
+    def test_empty_messages_safe(self):
+        """Accessing last message on empty list should not crash."""
+        messages = []
+        last = messages[-1] if messages else None
+        assert last is None
+
+    def test_agent_loop_no_md5(self):
+        """Agent loop should use sha256, not md5."""
+        import inspect
+        from drydock.core.agent_loop import AgentLoop
+        source = inspect.getsource(AgentLoop)
+        assert "hashlib.md5" not in source, "Still using md5 in agent_loop"
+        assert "hashlib.sha256" in source or "sha256" not in source  # either uses sha256 or doesn't hash at all
+
+
+class TestAPIRecovery:
+    """#57: API error recovery should auto-compact."""
+
+    def test_message_list_reset_keeps_structure(self):
+        """Reset should produce valid message ordering."""
+        from drydock.core.types import MessageList, LLMMessage, Role
+        ml = MessageList()
+        for i in range(25):
+            ml.append(LLMMessage(role=Role.user, content=f"msg {i}"))
+            ml.append(LLMMessage(role=Role.assistant, content=f"reply {i}"))
+        
+        # Simulate emergency reset: keep first user + last 5
+        first_user = ml[0]
+        kept = [first_user] + list(ml[-5:])
+        ml.reset(kept)
+        assert len(ml) == 6
+        assert ml[0].role == Role.user

drydock_cli-2.6.8/.auto_release.lock

@@ -1 +0,0 @@
-3923516

drydock_cli-2.6.8/tests/test_user_issues.py

@@ -1,67 +0,0 @@
-"""Tests for user-reported issues (2026-04-07).
-
-Each test should FAIL before the fix and PASS after.
-"""
-import hashlib
-import pytest
-from unittest.mock import patch, MagicMock
-
-
-class TestMD5Crash:
-    """#61: Crash after install — md5 error in manager.py."""
-
-    def test_md5_usedforsecurity(self):
-        """md5 should work with usedforsecurity=False."""
-        h = hashlib.md5(b"test", usedforsecurity=False)
-        assert h.hexdigest() == "098f6bcd4621d373cade4e832627b4f6"
-
-    def test_tool_manager_import(self):
-        """Tool manager should not crash on import."""
-        from drydock.core.tools.manager import ToolManager
-        assert ToolManager is not None
-
-
-class TestSearchReplaceGarbled:
-    """#55: search_replace garbled characters."""
-
-    def test_garbled_detection(self):
-        from drydock.core.tools.builtins.search_replace import SearchReplaceArgs
-        args = SearchReplaceArgs.model_validate({
-            "file_path": "test.py",
-            "content": "<<<<<<< SEARCH\nold text\n=======\nnew text\n>>>>>>> REPLACE",
-        })
-        assert args.file_path == "test.py"
-
-
-class TestTodoEnumQuotes:
-    """#60: Todo enum quoting issues."""
-
-    def test_double_quoted(self):
-        from drydock.core.tools.builtins.todo import TodoItem
-        item = TodoItem.model_validate({
-            "id": "1", "content": "test",
-            "status": '"completed"', "priority": '"high"',
-        })
-        assert item.status.value == "completed"
-
-    def test_single_quoted(self):
-        from drydock.core.tools.builtins.todo import TodoItem
-        item = TodoItem.model_validate({
-            "id": "1", "content": "test",
-            "status": "'completed'", "priority": "'high'",
-        })
-        assert item.status.value == "completed"
-
-
-class TestEmptyState:
-    """#58: IndexError on empty lists."""
-
-    def test_empty_tool_calls(self):
-        from drydock.core.types import LLMMessage, Role
-        msg = LLMMessage(role=Role.assistant, content="hello", tool_calls=None)
-        calls = msg.tool_calls or []
-        assert calls == []
-
-
-if __name__ == "__main__":
-    pytest.main([__file__, "-v"])