drydock-cli 3.0.93__tar.gz → 3.0.95__tar.gz

{drydock_cli-3.0.93/drydock_cli.egg-info → drydock_cli-3.0.95}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.93
+Version: 3.0.95
 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.93 → drydock_cli-3.0.95}/drydock/tools/__init__.py

@@ -21,6 +21,7 @@ from pathlib import Path
 # to gigabytes within the timeout. We stream with a byte cap and kill the command
 # once it's hit — bounding RAM regardless of how much it tries to produce.
 _MAX_BASH_OUTPUT_BYTES = 256 * 1024  # 256 KB — plenty of context, safe for RAM
+_PARTIAL_TAIL = 4000  # chars of pre-timeout output to keep (tail) in the timeout msg
 
 
 def _detect_bash() -> str | None:
@@ -46,6 +47,20 @@ def _detect_bash() -> str | None:
 _BASH_SHELL = _detect_bash()
 
 
+# ANSI escape sequences (CSI colour/cursor, OSC title, and lone two-char escapes).
+# Some tools emit these even to a pipe (--color=always, forced-colour test runners),
+# and they're pure display control — noise that wastes the model's tokens.
+_ANSI_RE = re.compile(r"\x1b(?:\[[0-9;?]*[ -/]*[@-~]|\][^\x07\x1b]*(?:\x07|\x1b\\)|[@-Z\\-_])")
+
+
+def _sanitize_bash_output(text: str) -> str:
+    """Strip ANSI escape sequences and drop NUL bytes from command output. NUL is
+    valid UTF-8 (so the errors='replace' decode keeps it) but raw NUL in a JSON
+    tool-result trips some LLM servers' tokenizers; ANSI codes are display noise.
+    Neither carries information the model needs. Newlines/tabs/Unicode are kept."""
+    return _ANSI_RE.sub("", text).replace("\x00", "")
+
+
 def _collapse_repeated_lines(text: str, run: int = 20) -> str:
     """Collapse a run of >= `run` IDENTICAL consecutive lines into one line + a
     count. Repetitive output (`yes`, a spinning progress log) tokenizes densely —
@@ -1006,6 +1021,18 @@ def tool_bash(params: dict, config: dict) -> str:
                 )
                 if _is_network_command(cmd):
                     msg += _OFFLINE_HINT
+                # Preserve any output produced BEFORE the hang — a test run or
+                # build that prints results/diagnostics then stalls would
+                # otherwise lose exactly what the agent needs. Tail-bounded so a
+                # big partial can't bloat context.
+                partial = _sanitize_bash_output(
+                    _collapse_repeated_lines("".join(list(chunks)))
+                ).rstrip()
+                if partial:
+                    tail = partial[-_PARTIAL_TAIL:]
+                    if len(partial) > _PARTIAL_TAIL:
+                        tail = "[... earlier output truncated ...]\n" + tail
+                    msg += f"\n\n--- output before timeout ---\n{tail}"
                 return msg
         if not backgrounded:
             proc.wait()
@@ -1013,7 +1040,7 @@ def tool_bash(params: dict, config: dict) -> str:
         # then note if we hit the byte cap. Bounds both RAM (the cap) and context
         # tokens (the collapse). Snapshot chunks (list()) in case the reader
         # daemon is still appending for a backgrounded child.
-        output = _collapse_repeated_lines("".join(list(chunks)))
+        output = _sanitize_bash_output(_collapse_repeated_lines("".join(list(chunks))))
         if backgrounded:
             return (output.rstrip() + "\n[a process was left running in the background; "
                     "the command returned. Check it with a follow-up command.]").lstrip("\n")

{drydock_cli-3.0.93 → drydock_cli-3.0.95/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.93
+Version: 3.0.95
 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.93 → drydock_cli-3.0.95}/drydock_cli.egg-info/SOURCES.txt

@@ -54,6 +54,7 @@ tests/test_bash_binary_output.py
 tests/test_bash_output_bounding.py
 tests/test_bash_process_group.py
 tests/test_bash_safety.py
+tests/test_bash_sanitize.py
 tests/test_bash_shell.py
 tests/test_bash_stdin.py
 tests/test_bash_timeout_network.py

{drydock_cli-3.0.93 → drydock_cli-3.0.95}/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.93"
+version = "3.0.95"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

{drydock_cli-3.0.93 → drydock_cli-3.0.95}/tests/test_bash_background.py

@@ -42,3 +42,23 @@ def test_foreground_hang_still_times_out():
 def test_failing_command_still_reports_exit_code():
     _, out = _timed("false")
     assert "[exit code: 1]" in out
+
+
+def test_timeout_preserves_partial_output():
+    """A command that prints useful output then hangs must return that output
+    alongside the timeout message — not discard it (test runs/builds that stall
+    after printing results/diagnostics)."""
+    from drydock.tools import tool_bash
+    out = tool_bash(
+        {"command": "echo IMPORTANT_RESULT; echo line2; sleep 30", "timeout": 3},
+        {"cwd": "/tmp"},
+    )
+    assert "timed out" in out
+    assert "IMPORTANT_RESULT" in out and "line2" in out
+    assert "output before timeout" in out
+
+
+def test_timeout_no_output_stays_clean():
+    from drydock.tools import tool_bash
+    out = tool_bash({"command": "sleep 30", "timeout": 2}, {"cwd": "/tmp"})
+    assert "timed out" in out and "output before timeout" not in out

drydock_cli-3.0.95/tests/test_bash_sanitize.py

@@ -0,0 +1,35 @@
+"""Bash output is sanitized before the model sees it: ANSI escape sequences
+(colour/cursor control some tools emit even to a pipe) are stripped, and NUL
+bytes (which trip some LLM servers' JSON handling) are dropped. Text/tabs/
+newlines/Unicode are preserved. Found by probing the output I/O path."""
+from __future__ import annotations
+
+import pytest
+
+from drydock.tools import tool_bash, _sanitize_bash_output
+
+
+@pytest.mark.parametrize("raw,clean", [
+    ("\x1b[31mRED\x1b[0m normal", "RED normal"),   # SGR colour
+    ("\x1b[2K\x1b[1Gline", "line"),                 # cursor control
+    ("\x1b]0;window title\x07keep", "keep"),        # OSC title
+    ("a\x00b\x00c", "abc"),                          # NUL bytes
+    ("plain\ttext\nline2 🚢⚓", "plain\ttext\nline2 🚢⚓"),  # preserved
+])
+def test_sanitizer(raw, clean):
+    assert _sanitize_bash_output(raw) == clean
+
+
+def test_end_to_end_forced_color_stripped():
+    out = tool_bash({"command": r"printf '\x1b[31mRED\x1b[0m done\n'", "timeout": 8}, {"cwd": "/tmp"})
+    assert "RED done" in out and "\x1b" not in out
+
+
+def test_end_to_end_nul_dropped():
+    out = tool_bash({"command": r"printf 'a\x00b\x00c'", "timeout": 8}, {"cwd": "/tmp"})
+    assert "\x00" not in out and "abc" in out
+
+
+def test_valid_unicode_survives():
+    out = tool_bash({"command": r"printf '\xf0\x9f\x9a\xa2 ship\n'", "timeout": 8}, {"cwd": "/tmp"})
+    assert "🚢" in out