drydock-cli 3.0.16__tar.gz → 3.0.18__tar.gz

{drydock_cli-3.0.16/drydock_cli.egg-info → drydock_cli-3.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.16
+Version: 3.0.18
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0

{drydock_cli-3.0.16 → drydock_cli-3.0.18}/drydock/__init__.py

@@ -7,4 +7,4 @@ try:
     __version__ = _version("drydock-cli")
 except PackageNotFoundError:
     # Running from source before install (e.g. PYTHONPATH dev runs).
-    __version__ = "3.0.16"
+    __version__ = "3.0.18"

{drydock_cli-3.0.16 → drydock_cli-3.0.18}/drydock/cli.py

@@ -59,27 +59,6 @@ def load_project_instructions() -> str:
     return ""
 
 
-def ensure_agents_md() -> None:
-    """Auto-create AGENTS.md if no project instructions exist."""
-    for name in ("AGENTS.md", "DRYDOCK.md", ".drydock.md", "CLAUDE.md"):
-        if (Path.cwd() / name).exists():
-            return
-    (Path.cwd() / "AGENTS.md").write_text(
-        "# Project Instructions\n\n"
-        "DO NOT ask for confirmation. ACT IMMEDIATELY.\n"
-        "If there is a PRD.md, implement it. If there is code, work on it.\n\n"
-        "## Workflow\n"
-        "1. Read requirements or explore existing code\n"
-        "2. Create/edit files with Write or Edit\n"
-        "3. Test with Bash\n"
-        "4. Fix errors and verify\n\n"
-        "## Rules\n"
-        "- Use absolute imports for Python packages\n"
-        "- Always create __init__.py and __main__.py\n"
-        "- Test with python3 -m package_name\n"
-    )
-
-
 # ── REPL ──────────────────────────────────────────────────────────────────
 
 def print_colored(text: str, color: str = "") -> None:
@@ -245,10 +224,12 @@ def main():
         "onboarding": onboarding,
     }
 
-    ensure_agents_md()
-    # Loaded after ensure_agents_md so the auto-created AGENTS.md is included.
-    # The TUI reads this from config; CLI modes call load_project_instructions
-    # directly (see run_interactive/run_oneshot).
+    # Load a user's OWN AGENTS.md/DRYDOCK.md as background context if present.
+    # Drydock never CREATES one: auto-writing an AGENTS.md littered every
+    # directory the user ran drydock in, and its "ACT IMMEDIATELY, implement
+    # the PRD" content fought the system prompt and risked turning a plain
+    # greeting into a runaway build. The TUI reads this from config; CLI modes
+    # call load_project_instructions directly (see run_interactive/run_oneshot).
     config["project_instructions"] = load_project_instructions()
 
     if args.prompt:

{drydock_cli-3.0.16 → drydock_cli-3.0.18}/drydock/tools/__init__.py

@@ -496,10 +496,16 @@ _TODO_DONE = {"x", "X", "✓"}
 _TODO_DOING = {"~", "-", "/", "*"}
 
 
-def parse_todo(tasks: str) -> list[tuple[str, str]]:
-    """Parse a plain-text checklist into (text, status) pairs. Each non-empty
-    line is one task, optionally prefixed with [x] done / [~] in_progress /
-    [ ] pending. Deliberately forgiving (a bare line counts as pending)."""
+def parse_todo(tasks) -> list[tuple[str, str]]:
+    """Parse a checklist into (text, status) pairs. Each non-empty line is one
+    task, optionally prefixed with [x] done / [~] in_progress / [ ] pending.
+    Deliberately forgiving: a bare line counts as pending, and `tasks` may be a
+    newline-joined string OR a list of lines (the model sometimes sends a JSON
+    array instead of one string — handle both rather than crash the TUI)."""
+    if isinstance(tasks, (list, tuple)):
+        tasks = "\n".join(str(t) for t in tasks)
+    elif tasks is not None and not isinstance(tasks, str):
+        tasks = str(tasks)
     out: list[tuple[str, str]] = []
     for raw in (tasks or "").splitlines():
         line = raw.strip().lstrip("-*•").strip()

{drydock_cli-3.0.16 → drydock_cli-3.0.18}/drydock/tui/app.py

@@ -210,9 +210,9 @@ class DrydockApp(App):
             return "deny"
 
     def _build_system(self, model: str | None) -> str:
-        # The TUI must honor AGENTS.md/DRYDOCK.md like the CLI does — it's the
-        # primary surface, and project instructions carry the user's tool/style
-        # conventions. cli.main() loads them into config after ensure_agents_md.
+        # The TUI honors a user's OWN AGENTS.md/DRYDOCK.md like the CLI does —
+        # cli.main() loads it into config["project_instructions"] as background
+        # context (drydock never auto-creates one).
         return system_prompt_for_model(model) + self.config.get("project_instructions", "")
 
     # ── layout ────────────────────────────────────────────────────────────

{drydock_cli-3.0.16 → drydock_cli-3.0.18}/drydock/tui/widgets.py

@@ -16,12 +16,22 @@ _FAILURE_PREFIXES = ("Error", "REFUSED")
 # "[NOTE: …]" lines (see loop_detect.annotate). Strip them before judging
 # success, or a failed Edit behind a "[NOTE: write #9…]" reads as ✓.
 _LEADING_NOTES = re.compile(r"^\s*(?:\[NOTE:[^\]]*\]\s*)+")
+# Bash appends "[exit code: N]" only when a command FAILED (non-zero return).
+# Without this, a failed shell command (e.g. `command not found`, a compile
+# error, a failing test) renders as a green ✓ — which hides exactly the kind
+# of failure the operator relies on the TUI to surface.
+_BASH_EXIT = re.compile(r"\[exit code: (\d+)\]")
 
 
 def result_is_ok(result: str) -> bool:
     """Whether a tool result should render as success (✓) vs failure (✗)."""
     cleaned = _LEADING_NOTES.sub("", result or "")
-    return not cleaned.lstrip().startswith(_FAILURE_PREFIXES)
+    if cleaned.lstrip().startswith(_FAILURE_PREFIXES):
+        return False
+    m = _BASH_EXIT.search(cleaned)
+    if m and m.group(1) != "0":
+        return False
+    return True
 
 
 _TOOL_BODY_MAX = 8000

{drydock_cli-3.0.16 → drydock_cli-3.0.18/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.16
+Version: 3.0.18
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0

{drydock_cli-3.0.16 → drydock_cli-3.0.18}/drydock_cli.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ drydock_cli.egg-info/top_level.txt
 tests/test_approval.py
 tests/test_back_command.py
 tests/test_bash_safety.py
+tests/test_cli_agents.py
 tests/test_compaction.py
 tests/test_config.py
 tests/test_detect.py
@@ -40,6 +41,7 @@ tests/test_loop_detect.py
 tests/test_plan_autocontinue.py
 tests/test_providers_unreachable.py
 tests/test_subagent.py
+tests/test_todo.py
 tests/test_tools_undo.py
 tests/test_tui.py
 tests/test_tuning.py

{drydock_cli-3.0.16 → drydock_cli-3.0.18}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 # PyPI distribution name is drydock-cli (the established install name, continued
 # from the retired v2 fork); the import package + CLI command stay `drydock`.
 name = "drydock-cli"
-version = "3.0.16"
+version = "3.0.18"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.12"

drydock_cli-3.0.18/tests/test_cli_agents.py

@@ -0,0 +1,34 @@
+"""Drydock must LOAD a user's own AGENTS.md/DRYDOCK.md as background context,
+but must NEVER auto-create one (it littered every working directory and its
+'ACT IMMEDIATELY, implement the PRD' content fought the system prompt)."""
+from __future__ import annotations
+
+import os
+
+from drydock import cli
+
+
+def _in_dir(tmp_path, fn):
+    cwd = os.getcwd()
+    os.chdir(tmp_path)
+    try:
+        return fn()
+    finally:
+        os.chdir(cwd)
+
+
+def test_no_agents_md_is_created(tmp_path):
+    # An empty project must stay empty after loading instructions.
+    text = _in_dir(tmp_path, cli.load_project_instructions)
+    assert text == ""
+    assert list(tmp_path.iterdir()) == []  # nothing written
+    assert not hasattr(cli, "ensure_agents_md")  # the auto-creator is gone
+
+
+def test_existing_agents_md_loaded_as_background(tmp_path):
+    (tmp_path / "AGENTS.md").write_text("Use 4-space indent. Prefer pathlib.")
+    text = _in_dir(tmp_path, cli.load_project_instructions)
+    assert "Use 4-space indent" in text
+    # Framed as background context, NOT a command to act now.
+    assert "background context" in text.lower()
+    assert "not a" in text.lower() and "act now" in text.lower()

drydock_cli-3.0.18/tests/test_todo.py

@@ -0,0 +1,38 @@
+"""Tests for the `todo` checklist tool and its forgiving parser."""
+from __future__ import annotations
+
+from drydock.tools import parse_todo, tool_todo
+
+
+def test_parse_todo_basic_statuses():
+    items = parse_todo("[x] done one\n[~] doing two\n[ ] pending three")
+    assert items == [
+        ("done one", "done"),
+        ("doing two", "in_progress"),
+        ("pending three", "pending"),
+    ]
+
+
+def test_parse_todo_accepts_list_input():
+    # The model sometimes sends a JSON array instead of one newline string —
+    # this must NOT crash (it took down the whole TUI before).
+    items = parse_todo([
+        "[~] Explore existing tests and run them",
+        "[ ] Add edge-case tests",
+        "[ ] Verify all tests pass",
+    ])
+    assert [s for _, s in items] == ["in_progress", "pending", "pending"]
+    assert items[0][0] == "Explore existing tests and run them"
+
+
+def test_parse_todo_none_and_empty():
+    assert parse_todo(None) == []
+    assert parse_todo("") == []
+    assert parse_todo([]) == []
+
+
+def test_tool_todo_accepts_list(tmp_path):
+    cfg: dict = {}
+    out = tool_todo({"tasks": ["[ ] a", "[x] b"]}, cfg)
+    assert "2 tasks" in out and "1 done" in out
+    assert len(cfg["_todo"]) == 2

{drydock_cli-3.0.16 → drydock_cli-3.0.18}/tests/test_tui.py

@@ -123,6 +123,13 @@ def test_result_is_ok_marks_failures():
     assert not result_is_ok("Error: nope")
     assert not result_is_ok("REFUSED: this command reformats a filesystem...")
     assert not result_is_ok("  Error: leading whitespace still counts")
+    # A failed shell command (Bash appends "[exit code: N]" only on failure)
+    # must render ✗, not a green ✓ — otherwise the TUI hides real failures.
+    assert not result_is_ok("bash: sqlite3: command not found\n[exit code: 127]")
+    assert not result_is_ok("test.c:1: error\n[exit code: 1]")
+    # Successful command output (no exit-code marker) stays ✓, even if it
+    # happens to mention the word 'error' in normal output.
+    assert result_is_ok("0 errors, 0 warnings\nBuild succeeded")
 
 
 def test_summarize_inputs_prefers_meaningful_keys():