drydock-cli 2.6.1__tar.gz → 2.6.2__tar.gz

{drydock_cli-2.6.1 → drydock_cli-2.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 2.6.1
+Version: 2.6.2
 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.1 → drydock_cli-2.6.2}/drydock/core/agent_loop.py

@@ -594,174 +594,14 @@ class AgentLoop:
 
                 last_message = self.messages[-1]
 
-                # Track files explored, edits made, and bash/failure patterns
+                # Track edits — no circuit breakers, just track for has_made_edit
                 if not has_made_edit:
                     for msg in reversed(self.messages[-5:]):
                         if msg.role == Role.assistant and msg.tool_calls:
                             for tc in msg.tool_calls:
-                                if not tc.function:
-                                    continue
-                                if tc.function.name in ("search_replace", "write_file"):
-                                    first_edit = not has_made_edit
+                                if tc.function and tc.function.name in ("search_replace", "write_file"):
                                     has_made_edit = True
-                                    bash_count = 0  # Reset on successful edit
-                                    # Reset circuit breaker — the world changed after an edit,
-                                    # so previously-failing commands may now succeed
-                                    self._tool_call_history.clear()
-                                    self._consecutive_circuit_breaker_fires = 0
-                                    # Track blast radius
-                                    try:
-                                        edit_args = json.loads(tc.function.arguments or "{}")
-                                        edit_path = edit_args.get("file_path", edit_args.get("path", ""))
-                                        if edit_path and edit_path not in files_modified:
-                                            files_modified.append(edit_path)
-                                    except (json.JSONDecodeError, AttributeError):
-                                        edit_path = ""
-
-                                    # AUTO-FIX: Fix packaging issues the model gets wrong
-                                    if edit_path and edit_path.endswith(".py"):
-                                        self._auto_fix_package(edit_path)
-
-                                    # Auto-run diagnostics on edited Python files
-                                    if edit_path and edit_path.endswith(".py"):
-                                        try:
-                                            import asyncio
-                                            import subprocess
-                                            diag_result = subprocess.run(
-                                                ["python3", "-c", f"import ast; ast.parse(open('{edit_path}').read()); print('OK')"],
-                                                capture_output=True, text=True, timeout=5,
-                                            )
-                                            if diag_result.returncode != 0:
-                                                self._inject_system_note(
-                                                    f"SYNTAX ERROR in {edit_path}: {diag_result.stderr.strip()[:200]}. "
-                                                    f"Fix the syntax error before continuing."
-                                                )
-                                        except Exception:
-                                            pass
-
-                                    # After first edit: prompt to check related files
-                                    if first_edit and edit_path:
-                                        self._inject_system_note(
-                                            f"Good — you edited {edit_path}. Now check: "
-                                            f"does this bug have a RELATED file that also needs changes? "
-                                            f"Common patterns: if you edited a model, check the serializer/migration. "
-                                            f"If you edited a base class, check subclasses. "
-                                            f"If you edited a util, check callers. "
-                                            f"Use grep to search for imports of the function/class you changed."
-                                        )
-                                if tc.function.name == "read_file":
-                                    try:
-                                        args = json.loads(tc.function.arguments or "{}")
-                                        path = args.get("path", args.get("file_path", ""))
-                                        if path and path not in files_explored:
-                                            files_explored.append(path)
-                                    except (json.JSONDecodeError, AttributeError):
-                                        pass
-                                if tc.function.name in ("bash", "run_command"):
-                                    bash_count += 1
-
-                    # Track search_replace failures (called but error in result)
-                    for msg in reversed(self.messages[-3:]):
-                        if msg.role == Role.tool and msg.content:
-                            content = msg.content or ""
-                            if "search_replace" in content.lower() and "error" in content.lower():
-                                search_replace_failures += 1
-
-                # Blast radius check: warn when touching 5+ files
-                if len(files_modified) >= 5 and len(files_modified) % 5 == 0:
-                    self._inject_system_note(
-                        f"BLAST RADIUS WARNING: You have modified {len(files_modified)} files. "
-                        f"Files: {', '.join(files_modified[-5:])}. "
-                        f"This is a large change. Are you sure all these edits are needed? "
-                        f"Consider stopping to verify your approach."
-                    )
-
-                # Post-edit bash loop: model made edits but now loops on bash
-                # trying to test code that keeps failing
-                if has_made_edit and bash_count >= 3:
-                    # Count consecutive bash calls at end of tool history
-                    consecutive_bash = 0
-                    for tc_name in reversed(self._recent_tool_names()):
-                        if tc_name in ("bash", "run_command"):
-                            consecutive_bash += 1
-                        else:
-                            break
-                    if consecutive_bash >= 3:
-                        self._inject_system_note(
-                            "You have run 3+ bash commands in a row. "
-                            "If your project is WORKING, you are DONE — tell the user the project "
-                            "is complete and what commands they can use. "
-                            "If it is FAILING, STOP running bash and use read_file + search_replace "
-                            "to fix the code. Do NOT keep running the same test."
-                        )
-
-                # Detect bash file creation (touch, echo >, cat <<)
-                for msg in reversed(self.messages[-3:]):
-                    if msg.role == Role.assistant and msg.tool_calls:
-                        for tc in msg.tool_calls:
-                            if tc.function and tc.function.name in ("bash", "run_command"):
-                                cmd = ""
-                                try:
-                                    cmd = json.loads(tc.function.arguments or "{}").get("command", "")
-                                except (json.JSONDecodeError, AttributeError):
-                                    pass
-                                if any(kw in cmd for kw in ("touch ", "echo ", "cat <<", "printf ", "> ")):
-                                    self._inject_system_note(
-                                        f"Do NOT use bash to create files. Use write_file instead. "
-                                        f"bash touch/echo/cat does not create proper code files."
-                                    )
-
-                # Bash abuse detection: model uses bash instead of proper tools
-                if not has_made_edit and bash_count >= 3:
-                    if bash_count == 3:
-                        self._inject_system_note(
-                            "You have run 3 bash commands without creating or editing any files. "
-                            "STOP running bash. Start CREATING files with write_file or "
-                            "EDITING files with search_replace. bash does not create code."
-                        )
-                    elif bash_count == 6:
-                        self._inject_system_note(
-                            "WARNING: 6 bash commands, ZERO file edits. You are stuck in a loop. "
-                            "Your NEXT action MUST be write_file to create a file or "
-                            "search_replace to edit one. Do NOT run any more bash commands."
-                        )
-                    elif bash_count >= 10 and bash_count % 5 == 0:
-                        # Nudge every 5 bash calls, never stop
-                        self._inject_system_note(
-                            "You have run many bash commands. Consider using write_file "
-                            "or search_replace to create/edit files."
-                        )
-
-                # 3-Strike Rule: search_replace keeps failing
-                if search_replace_failures >= 3:
-                    if search_replace_failures == 3:
-                        self._inject_system_note(
-                            f"3-STRIKE RULE: Your search_replace has failed {search_replace_failures} times. "
-                            "STOP trying the same approach. "
-                            "Either: (1) use read_file to get the EXACT text first, "
-                            "(2) try a completely different file, or "
-                            "(3) ask the user for help with /consult."
-                        )
-                    elif search_replace_failures % 3 == 0:
-                        self._inject_system_note(
-                            f"STOP: {search_replace_failures} failed edits. You are stuck. Ask the user for help."
-                        )
-
-                # Context budget warning: after 7 tool turns without an edit,
-                # warn that context is being consumed without progress
-                if tool_turns == 7 and not has_made_edit and not context_summary_injected:
-                    context_summary_injected = True
-                    summary = (
-                        "CONTEXT BUDGET WARNING: You have used 7 tool calls without making an edit. "
-                        "Your context window is filling up — performance degrades as it fills. "
-                    )
-                    if files_explored:
-                        summary += "Files explored: " + ", ".join(files_explored[-5:]) + ". "
-                    summary += (
-                        "You MUST state your TARGET/FUNCTION/CAUSE/FIX now and use search_replace "
-                        "on your next turn. Do NOT continue exploring."
-                    )
-                    self._inject_system_note(summary)
+                                    break
 
                 should_break_loop = last_message.role != Role.tool
 

{drydock_cli-2.6.1 → drydock_cli-2.6.2}/drydock/core/llm/backend/generic.py

@@ -160,7 +160,7 @@ class OpenAIAdapter(APIAdapter):
         )
 
         # Enable thinking for models that support it (Gemma 4)
-        if thinking and thinking != "off":
+        if thinking and thinking not in ("off", ""):
             payload["chat_template_kwargs"] = {"enable_thinking": True}
 
         if enable_streaming:

{drydock_cli-2.6.1 → drydock_cli-2.6.2}/pyproject.toml

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