drydock-cli 2.6.21__tar.gz → 2.6.23__tar.gz

drydock_cli-2.6.23/.auto_release.lock

@@ -0,0 +1 @@
+126173

{drydock_cli-2.6.21 → drydock_cli-2.6.23}/PKG-INFO

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

@@ -1125,6 +1125,18 @@ class AgentLoop:
             )
         )
 
+        # Advisory loop detection: inject nudge when the model keeps repeating
+        # the same call. Never blocks, never stops — just steers the model toward
+        # a different approach. Catches the 28-identical-bash-calls failure mode.
+        try:
+            repetition = self._check_tool_call_repetition()
+            if repetition:
+                nudge = self._build_repetition_nudge(repetition, tool_call)
+                if nudge:
+                    self._inject_system_note(nudge)
+        except Exception as e:
+            logger.debug("Loop detection check failed: %s", e)
+
         self.telemetry_client.send_tool_call_finished(
             tool_call=tool_call,
             agent_profile_name=self.agent_profile.name,
@@ -1133,6 +1145,54 @@ class AgentLoop:
             result=result,
         )
 
+    def _build_repetition_nudge(
+        self, signal: str, tool_call: ResolvedToolCall
+    ) -> str | None:
+        """Build an advisory nudge for the model when a loop is detected.
+
+        Returns None if the tool call was already nudged recently (prevents
+        spamming the model with the same message on every turn).
+        """
+        # Rate-limit: don't nudge more than once every 3 turns for the same tool
+        last_nudge_turn = getattr(self, "_last_nudge_turn", -10)
+        current_turn = len(self.messages)
+        if current_turn - last_nudge_turn < 3:
+            return None
+        self._last_nudge_turn = current_turn
+
+        tool_name = tool_call.tool_name
+        if signal == "FORCE_STOP":
+            return (
+                f"You have called `{tool_name}` with the SAME arguments 8+ times "
+                f"and gotten the same result each time. This is a dead end. "
+                f"You MUST change your approach:\n"
+                f"- For bash: if output is empty, read the source files to find the bug — "
+                f"  don't just re-run the command\n"
+                f"- For write_file/search_replace: if the file already has your content, "
+                f"  move on to the NEXT file\n"
+                f"- If stuck, inspect the actual file contents with read_file before editing"
+            )
+        if signal.startswith("WARNING|"):
+            stuck_tool = signal.split("|", 1)[1] or tool_name
+            if stuck_tool == "bash":
+                return (
+                    f"You have run very similar `bash` commands several times in a row. "
+                    f"If the output is empty or unchanged, the command is not the problem — "
+                    f"the CODE is. Use read_file to inspect the source, then write_file or "
+                    f"search_replace to fix the bug. Do not re-run the same command again."
+                )
+            if stuck_tool in ("write_file", "search_replace"):
+                return (
+                    f"You have written the same file multiple times in a row. "
+                    f"Move to the NEXT file in your plan. If no next file, run the code "
+                    f"with bash to verify it works."
+                )
+            return (
+                f"You have called `{stuck_tool}` several times in a row with similar "
+                f"arguments. Try a different tool or a different approach."
+            )
+        return None
+
     def _sanitize_message_ordering(self) -> None:
         """Fix any role ordering violations before sending to vLLM/Mistral.
 

{drydock_cli-2.6.21 → drydock_cli-2.6.23}/drydock/core/tools/builtins/write_file.py

@@ -20,6 +20,70 @@ from drydock.core.tools.utils import resolve_file_tool_permission
 from drydock.core.types import ToolResultEvent, ToolStreamEvent
 
 
+def _check_main_module_entry(tree) -> str | None:
+    """Detect the 'imports main but never calls it' bug in __main__.py files.
+
+    Returns a description of the problem, or None if the file looks OK.
+
+    Specifically catches this pattern:
+
+        from pkg.cli import main
+        # no call to main() anywhere
+
+    Running `python3 -m pkg` then exits 0 with no output.
+    """
+    import ast
+
+    ENTRY_CANDIDATES = {"main", "cli", "run", "app", "entry", "entry_point"}
+
+    # Pass 1: collect entry-function names imported or defined at module level
+    entry_names: set[str] = set()
+    has_name_main_guard = False
+    for node in tree.body:
+        if isinstance(node, ast.ImportFrom):
+            for alias in node.names:
+                name = alias.asname or alias.name
+                if name in ENTRY_CANDIDATES:
+                    entry_names.add(name)
+        elif isinstance(node, ast.Import):
+            for alias in node.names:
+                name = alias.asname or alias.name.split(".")[-1]
+                if name in ENTRY_CANDIDATES:
+                    entry_names.add(name)
+        elif isinstance(node, ast.FunctionDef):
+            if node.name in ENTRY_CANDIDATES:
+                entry_names.add(node.name)
+        elif isinstance(node, ast.If):
+            test = node.test
+            if (isinstance(test, ast.Compare)
+                    and isinstance(test.left, ast.Name)
+                    and test.left.id == "__name__"):
+                has_name_main_guard = True
+
+    if not entry_names:
+        return None
+
+    # Pass 2: walk the entire tree and look for ANY call that references an
+    # entry name — either `main()`, `cli.main()`, or `sys.exit(main())`, etc.
+    for node in ast.walk(tree):
+        if not isinstance(node, ast.Call):
+            continue
+        # Collect all Name identifiers anywhere inside this Call expression.
+        # This catches sys.exit(main()), sys.exit(cli()), cli.main(), etc.
+        for child in ast.walk(node):
+            if isinstance(child, ast.Name) and child.id in entry_names:
+                return None
+            if isinstance(child, ast.Attribute) and child.attr in entry_names:
+                return None
+
+    if has_name_main_guard:
+        return (
+            f"imports {sorted(entry_names)} but the "
+            f"`if __name__ == \"__main__\":` block does not call any of them"
+        )
+    return f"imports {sorted(entry_names)} but never calls any of them"
+
+
 class WriteFileArgs(BaseModel):
     path: str
     content: str
@@ -112,13 +176,27 @@ class WriteFile(
         if file_path.suffix == ".py":
             try:
                 import ast
-                ast.parse(args.content)
+                tree = ast.parse(args.content)
             except SyntaxError as e:
                 syntax_warning = (
                     f"\n\n⚠ SYNTAX ERROR in {file_path.name} line {e.lineno}: {e.msg}"
                     f"\n  {e.text.rstrip() if e.text else ''}"
                     f"\n  Fix this before moving to the next file."
                 )
+            else:
+                # Catch silent-exit __main__.py: imports a `main` function but
+                # never actually calls it. Real bug found in the codec build —
+                # `python3 -m pkg` ran, exited 0, and produced no output.
+                if file_path.name == "__main__.py":
+                    entry_warning = _check_main_module_entry(tree)
+                    if entry_warning:
+                        syntax_warning = (
+                            f"\n\n⚠ {file_path.name} looks broken: {entry_warning}"
+                            f"\n  Add `if __name__ == \"__main__\": main()` at the "
+                            f"bottom, or call the entry function at module level. "
+                            f"Without it, `python3 -m {file_path.parent.name}` will "
+                            f"exit silently with no output."
+                        )
 
         result = WriteFileResult(
             path=str(file_path),

{drydock_cli-2.6.21 → drydock_cli-2.6.23}/pyproject.toml

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

{drydock_cli-2.6.21 → drydock_cli-2.6.23}/tests/test_smoke.py

@@ -33,7 +33,7 @@ class TestImports:
         from drydock.core.tools.builtins.search_replace import SearchReplace
         from drydock.core.tools.builtins.glob_tool import Glob
         from drydock.core.tools.builtins.notebook_edit import NotebookEdit
-        from drydock.core.tools.builtins.task_manager import TaskCreate
+        from drydock.core.tools.builtins._task_manager import TaskCreate
         from drydock.core.tools.builtins.lsp import Lsp
         from drydock.core.tools.builtins.cron import CronCreate
         from drydock.core.tools.builtins.tool_search import ToolSearch

{drydock_cli-2.6.21 → drydock_cli-2.6.23}/tests/test_tool_args.py

@@ -198,7 +198,7 @@ class TestTaskCreateArgs:
     """Task create tool argument validation."""
 
     def setup_method(self):
-        from drydock.core.tools.builtins.task_manager import TaskCreateArgs
+        from drydock.core.tools.builtins._task_manager import TaskCreateArgs
         self.TaskCreateArgs = TaskCreateArgs
 
     def test_normal(self):

drydock_cli-2.6.21/.auto_release.lock

@@ -1 +0,0 @@
-17525