drydock-cli 2.2.6__tar.gz → 2.2.8__tar.gz

{drydock_cli-2.2.6 → drydock_cli-2.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 2.2.6
+Version: 2.2.8
 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.2.6 → drydock_cli-2.2.8}/drydock/cli/update_notifier/whats_new.py

@@ -24,7 +24,17 @@ def load_whats_new_content() -> str | None:
         return None
     try:
         content = whats_new_file.read_text(encoding="utf-8").strip()
-        return content if content else None
+        if not content:
+            return None
+        # Dynamically replace version in header with current version
+        import re
+        from drydock import __version__
+        content = re.sub(
+            r"^#\s*What's new in v[\d.]+",
+            f"# What's new in v{__version__}",
+            content,
+        )
+        return content
     except OSError:
         return None
 

{drydock_cli-2.2.6 → drydock_cli-2.2.8}/drydock/core/agent_loop.py

@@ -861,57 +861,18 @@ class AgentLoop:
                     if nudge_text:
                         self._inject_system_note(nudge_text)
 
-                # Loop guidance — prune duplicates and nudge, NEVER stop
+                # Loop guidance — retrospection, NEVER stop
                 if not should_break_loop:
                     rep = self._check_tool_call_repetition()
                     if rep == "FORCE_STOP" or (rep and rep.startswith("WARNING")):
-                        stuck_tool = ""
-                        if rep and "|" in rep:
-                            stuck_tool = rep.split("|", 1)[1]
-
                         # Prune duplicate tool calls to give model fresh context
                         self._prune_repeated_tool_calls()
 
-                        # Gentle nudge — just suggest a different approach
-                        nudge = "Try a different approach."
-                        if stuck_tool in ("read_file",):
-                            nudge = "You already read this. Try search_replace or a different file."
-                        elif stuck_tool in ("grep",):
-                            nudge = "Try a different search term or read a file you found."
-                        elif stuck_tool in ("bash", "run_command"):
-                            nudge = "If the command failed, read the error and fix the code."
-                        self._inject_system_note(nudge)
-
-                        # Extract tool-specific nudge
-                        nudge = ""
-                        if stuck_tool in ("read_file",):
-                            nudge = " You have been READING the same code repeatedly. You already know what it says. Make your EDIT now using search_replace or write_file."
-                        elif stuck_tool in ("grep",):
-                            nudge = " You have been SEARCHING repeatedly. Pick the most relevant file from your search results and READ it, then make your edit."
-                        elif stuck_tool in ("bash", "run_command"):
-                            nudge = (
-                                " You have been running the SAME bash command repeatedly. "
-                                "Running the same command again will give the same result. "
-                                "If it succeeded but didn't do what you expected, READ the source code "
-                                "to understand WHY, then FIX the code with search_replace. "
-                                "If it failed, try a DIFFERENT command or approach."
-                            )
-                        if repeat_warnings >= 4:
-                            # Escalated: replace tool result with strong directive
-                            warning_text = (
-                                "BLOCKED: Your tool call was not executed because you have been repeating the same action. "
-                                "You already have all the information you need from previous tool results. "
-                                "Your ONLY valid next action is: use search_replace to make your code fix. "
-                                "Do NOT read, grep, or bash. Use search_replace NOW."
-                            )
-                            self._inject_system_note(warning_text, replace_last_tool=True)
-                        else:
-                            warning_text = (
-                                "WARNING: You are repeating the same tool call with the same arguments. "
-                                "This is not making progress. Try a DIFFERENT approach, use a different tool, "
-                                "or tell the user what's blocking you." + nudge
-                            )
-                            self._inject_system_note(warning_text)
+                        # RETROSPECTION: Summarize recent actions and let the model
+                        # decide its own next step — no hardcoded nudges
+                        retro = self._build_retrospection()
+                        if retro:
+                            self._inject_system_note(retro)
 
                 if user_cancelled:
                     return
@@ -1584,6 +1545,55 @@ class AgentLoop:
                     feedback=feedback,
                 )
 
+    def _build_retrospection(self) -> str | None:
+        """Build a retrospection summary of recent tool calls.
+
+        Instead of hardcoded nudges, show the model what it's been doing
+        and let it decide on a different approach. The model is better at
+        self-correcting when it can see its own pattern of behavior.
+        """
+        # Collect last 8 tool calls with their results (truncated)
+        recent: list[str] = []
+        count = 0
+        for msg in reversed(self.messages):
+            if count >= 8:
+                break
+            if msg.role == Role.assistant and msg.tool_calls:
+                for tc in reversed(msg.tool_calls or []):
+                    if tc.function:
+                        name = tc.function.name or "?"
+                        args_str = tc.function.arguments or ""
+                        # Truncate args for readability
+                        if len(args_str) > 120:
+                            args_str = args_str[:120] + "..."
+                        recent.append(f"  {count+1}. {name}({args_str})")
+                        count += 1
+                        if count >= 8:
+                            break
+            elif msg.role == Role.tool and recent:
+                # Add result summary to last entry
+                result = str(msg.content or "")[:150]
+                if "error" in result.lower() or "Error" in result:
+                    recent[-1] += f" → ERROR"
+                elif "not found" in result.lower():
+                    recent[-1] += f" → NOT FOUND"
+                else:
+                    recent[-1] += f" → ok"
+
+        if len(recent) < 3:
+            return None
+
+        recent.reverse()
+        summary = "\n".join(recent)
+
+        return (
+            f"RETROSPECTION — Your last {len(recent)} tool calls:\n"
+            f"{summary}\n\n"
+            f"You are repeating a pattern that is not making progress. "
+            f"Review the sequence above. What went wrong? What should you do differently? "
+            f"Choose a different approach on your own."
+        )
+
     def _inject_system_note(self, text: str, replace_last_tool: bool = False) -> None:
         """Safely inject a system note into conversation without breaking message ordering.
 

{drydock_cli-2.2.6 → drydock_cli-2.2.8}/drydock/core/tools/builtins/search_replace.py

@@ -23,11 +23,12 @@ from drydock.core.tools.utils import resolve_file_tool_permission
 from drydock.core.types import ToolResultEvent, ToolStreamEvent
 
 SEARCH_REPLACE_BLOCK_RE = re.compile(
-    r"<{5,} SEARCH\r?\n(.*?)\r?\n?={5,}\r?\n(.*?)\r?\n?>{5,} REPLACE", flags=re.DOTALL
+    r"<{5,}\s*(?:SEARCH\s*)+\r?\n(.*?)\r?\n?={5,}\r?\n(.*?)\r?\n?>{5,}\s*(?:REPLACE\s*)+",
+    flags=re.DOTALL,
 )
 
 SEARCH_REPLACE_BLOCK_WITH_FENCE_RE = re.compile(
-    r"```[\s\S]*?\n<{5,} SEARCH\r?\n(.*?)\r?\n?={5,}\r?\n(.*?)\r?\n?>{5,} REPLACE\s*\n```",
+    r"```[\s\S]*?\n<{5,}\s*(?:SEARCH\s*)+\r?\n(.*?)\r?\n?={5,}\r?\n(.*?)\r?\n?>{5,}\s*(?:REPLACE\s*)+\s*\n```",
     flags=re.DOTALL,
 )
 
@@ -213,6 +214,16 @@ class SearchReplace(
                 ">>>>>>> REPLACE"
             )
 
+        # Detect garbled token output (common with some models/parsers)
+        for block in search_replace_blocks:
+            if re.search(r'(.)\1{4,}', block.search) or re.search(r'<{3,}[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."
+                )
+
         return file_path, search_replace_blocks
 
     async def _read_file(self, file_path: Path) -> str:

drydock_cli-2.2.8/drydock/whats_new.md

@@ -0,0 +1,7 @@
+# What's new in v2.2.6
+
+- **Gemma 4 support**: Tool calling with Gemma 4 26B MoE via vLLM Docker — 3-4x faster inference
+- **search_replace compatibility**: Accepts JSON, separator, and block formats for any model
+- **Planner/diagnostic subagents**: Fixed missing prompt registration that crashed subagent delegation
+- **Context-limit recovery**: Auto-truncates old tool results on 400 errors instead of looping
+- **SWE-bench 70%**: File match rate up from 60% (devstral) to 70% (Gemma 4), 8x faster

{drydock_cli-2.2.6 → drydock_cli-2.2.8}/pyproject.toml

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

drydock_cli-2.2.6/drydock/whats_new.md

@@ -1,8 +0,0 @@
-# What's new in v1.8.0
-
-- **Multi-phase build orchestrator**: PRDs are built in phases — plan, scaffold, implement per file, auto-fix imports. 83% pass rate on 6 project types
-- **Deterministic planning**: No LLM needed for project planning — PRD parsed directly
-- **Auto-fix**: `__main__.py`, absolute imports, circular imports, cross-file name matching
-- **7 bundled skills**: /investigate, /review, /ship, /batch, /simplify, /deep-research, /create-presentation
-- **Smart circuit breaker**: Only blocks failed commands, allows retries after fixes
-- **Vibe references removed**: All user-facing strings now say Drydock