drydock-cli 0.6.6__tar.gz → 0.6.7__tar.gz

{drydock_cli-0.6.6 → drydock_cli-0.6.7}/PKG-INFO

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

{drydock_cli-0.6.6 → drydock_cli-0.6.7}/drydock/core/agent_loop.py

@@ -849,8 +849,9 @@ class AgentLoop:
 
     def _circuit_breaker_check(self, tool_call: ResolvedToolCall) -> str | None:
         """Block exact-duplicate tool calls. Returns cached result or None."""
+        args_str = json.dumps(tool_call.args_dict, sort_keys=True, default=str)
         sig = hashlib.md5(
-            f"{tool_call.tool_name}:{tool_call.raw_arguments}".encode()
+            f"{tool_call.tool_name}:{args_str}".encode()
         ).hexdigest()
 
         count, last_result = self._tool_call_history.get(sig, (0, ""))
@@ -883,8 +884,9 @@ class AgentLoop:
 
     def _circuit_breaker_record(self, tool_call: ResolvedToolCall, result_text: str) -> None:
         """Record a tool call execution for circuit breaker tracking."""
+        args_str = json.dumps(tool_call.args_dict, sort_keys=True, default=str)
         sig = hashlib.md5(
-            f"{tool_call.tool_name}:{tool_call.raw_arguments}".encode()
+            f"{tool_call.tool_name}:{args_str}".encode()
         ).hexdigest()
         count, _ = self._tool_call_history.get(sig, (0, ""))
         self._tool_call_history[sig] = (count + 1, result_text[:500])

{drydock_cli-0.6.6 → drydock_cli-0.6.7}/drydock/core/tools/builtins/webfetch.py

@@ -23,7 +23,7 @@ if TYPE_CHECKING:
     from drydock.core.types import ToolCallEvent, ToolResultEvent
 
 
-_HONEST_USER_AGENT = "vibe-cli"
+_HONEST_USER_AGENT = "drydock-cli"
 _HTTP_FORBIDDEN = 403
 
 
@@ -146,8 +146,10 @@ class WebFetch(
     async def _do_fetch(
         self, url: str, timeout: int, headers: dict[str, str]
     ) -> httpx.Response:
+        import os
+        verify_ssl = os.environ.get("DRYDOCK_INSECURE") != "1"
         async with httpx.AsyncClient(
-            follow_redirects=True, timeout=httpx.Timeout(timeout)
+            follow_redirects=True, timeout=httpx.Timeout(timeout), verify=verify_ssl
         ) as client:
             response = await client.get(url, headers=headers)
 

{drydock_cli-0.6.6 → drydock_cli-0.6.7}/pyproject.toml

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

{drydock_cli-0.6.6 → drydock_cli-0.6.7}/tests/test_drydock_tasks.py

@@ -400,7 +400,7 @@ class TestCircuitBreaker:
         al.messages = MessageList()
         al._tool_call_history = {}
 
-        tc = SimpleNamespace(tool_name="bash", raw_arguments='{"command": "ls -ltr"}')
+        tc = SimpleNamespace(tool_name="bash", args_dict={"command": "ls -ltr"})
 
         assert al._circuit_breaker_check(tc) is None
         al._circuit_breaker_record(tc, "file1.py\nfile2.py")
@@ -421,8 +421,8 @@ class TestCircuitBreaker:
         al.messages = MessageList()
         al._tool_call_history = {}
 
-        tc1 = SimpleNamespace(tool_name="bash", raw_arguments='{"command": "ls -ltr"}')
-        tc2 = SimpleNamespace(tool_name="bash", raw_arguments='{"command": "ls -la"}')
+        tc1 = SimpleNamespace(tool_name="bash", args_dict={"command": "ls -ltr"})
+        tc2 = SimpleNamespace(tool_name="bash", args_dict={"command": "ls -la"})
 
         al._circuit_breaker_record(tc1, "result1")
         al._circuit_breaker_record(tc1, "result1")

{drydock_cli-0.6.6 → drydock_cli-0.6.7}/tests/test_loop_detection.py

@@ -59,18 +59,18 @@ class TestCircuitBreaker:
 
     def test_first_call_allowed(self):
         al = _make_agent()
-        tc = SimpleNamespace(tool_name="bash", raw_arguments='{"command":"ls -ltr"}')
+        tc = SimpleNamespace(tool_name="bash", args_dict={"command":"ls -ltr"})
         assert al._circuit_breaker_check(tc) is None
 
     def test_second_call_allowed(self):
         al = _make_agent()
-        tc = SimpleNamespace(tool_name="bash", raw_arguments='{"command":"ls -ltr"}')
+        tc = SimpleNamespace(tool_name="bash", args_dict={"command":"ls -ltr"})
         al._circuit_breaker_record(tc, "file1.py\nfile2.py")
         assert al._circuit_breaker_check(tc) is None
 
     def test_third_call_blocked(self):
         al = _make_agent()
-        tc = SimpleNamespace(tool_name="bash", raw_arguments='{"command":"ls -ltr"}')
+        tc = SimpleNamespace(tool_name="bash", args_dict={"command":"ls -ltr"})
         al._circuit_breaker_record(tc, "file1.py\nfile2.py")
         al._circuit_breaker_record(tc, "file1.py\nfile2.py")
         result = al._circuit_breaker_check(tc)
@@ -79,7 +79,7 @@ class TestCircuitBreaker:
 
     def test_blocked_message_contains_previous_result(self):
         al = _make_agent()
-        tc = SimpleNamespace(tool_name="bash", raw_arguments='{"command":"ls -ltr"}')
+        tc = SimpleNamespace(tool_name="bash", args_dict={"command":"ls -ltr"})
         al._circuit_breaker_record(tc, "important_file.py")
         al._circuit_breaker_record(tc, "important_file.py")
         result = al._circuit_breaker_check(tc)
@@ -87,7 +87,7 @@ class TestCircuitBreaker:
 
     def test_blocked_message_contains_alternatives(self):
         al = _make_agent()
-        tc = SimpleNamespace(tool_name="bash", raw_arguments='{"command":"ls -ltr"}')
+        tc = SimpleNamespace(tool_name="bash", args_dict={"command":"ls -ltr"})
         al._circuit_breaker_record(tc, "output")
         al._circuit_breaker_record(tc, "output")
         result = al._circuit_breaker_check(tc)
@@ -95,8 +95,8 @@ class TestCircuitBreaker:
 
     def test_different_args_not_blocked(self):
         al = _make_agent()
-        tc1 = SimpleNamespace(tool_name="bash", raw_arguments='{"command":"ls -ltr"}')
-        tc2 = SimpleNamespace(tool_name="bash", raw_arguments='{"command":"ls -la"}')
+        tc1 = SimpleNamespace(tool_name="bash", args_dict={"command":"ls -ltr"})
+        tc2 = SimpleNamespace(tool_name="bash", args_dict={"command":"ls -la"})
         al._circuit_breaker_record(tc1, "r1")
         al._circuit_breaker_record(tc1, "r1")
         assert al._circuit_breaker_check(tc1) is not None  # Blocked
@@ -104,8 +104,8 @@ class TestCircuitBreaker:
 
     def test_different_tools_not_blocked(self):
         al = _make_agent()
-        tc1 = SimpleNamespace(tool_name="bash", raw_arguments='{"command":"ls"}')
-        tc2 = SimpleNamespace(tool_name="grep", raw_arguments='{"pattern":"foo"}')
+        tc1 = SimpleNamespace(tool_name="bash", args_dict={"command":"ls"})
+        tc2 = SimpleNamespace(tool_name="grep", args_dict={"pattern":"foo"})
         al._circuit_breaker_record(tc1, "r1")
         al._circuit_breaker_record(tc1, "r1")
         assert al._circuit_breaker_check(tc1) is not None
@@ -113,7 +113,7 @@ class TestCircuitBreaker:
 
     def test_already_attempted_summary(self):
         al = _make_agent()
-        tc = SimpleNamespace(tool_name="bash", raw_arguments='{"command":"ls"}')
+        tc = SimpleNamespace(tool_name="bash", args_dict={"command":"ls"})
         al._circuit_breaker_record(tc, "output1")
         al._circuit_breaker_record(tc, "output1")
         result = al._circuit_breaker_check(tc)
@@ -327,7 +327,7 @@ class TestRealWorldLoops:
     def test_ls_ltr_loop(self):
         """User reports: `ls -ltr` runs 5+ times."""
         al = _make_agent()
-        tc = SimpleNamespace(tool_name="bash", raw_arguments='{"command":"ls -ltr"}')
+        tc = SimpleNamespace(tool_name="bash", args_dict={"command":"ls -ltr"})
 
         # First 2 calls go through
         al._circuit_breaker_record(tc, "total 48\n-rw-r--r-- 1 user user 1234 auth.py")