drydock-cli 3.0.58__tar.gz → 3.0.59__tar.gz

{drydock_cli-3.0.58/drydock_cli.egg-info → drydock_cli-3.0.59}/PKG-INFO

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

@@ -22,6 +22,29 @@ from pathlib import Path
 # 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
 
+
+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 —
+    32 KB of "y\\n" is ~24k tokens — so even after byte-capping it can eat a big
+    slice of the context window. Collapsing makes it cheap without losing the
+    signal. Non-repetitive output (a normal build log) is left untouched."""
+    lines = text.split("\n")
+    out: list[str] = []
+    i, n = 0, len(lines)
+    while i < n:
+        j = i
+        while j < n and lines[j] == lines[i]:
+            j += 1
+        count = j - i
+        if count >= run:
+            out.append(lines[i])
+            out.append(f"[... {count - 1} more identical lines collapsed ...]")
+        else:
+            out.extend(lines[i:j])
+        i = j
+    return "\n".join(out)
+
 from drydock.tool_registry import ToolDef, register
 from drydock.guards import (
     conflict_marker_refusal,
@@ -781,10 +804,13 @@ def tool_bash(params: dict, config: dict) -> str:
                     msg += _OFFLINE_HINT
                 return msg
         proc.wait()
-        output = "".join(chunks)
+        # Collapse repetitive runs FIRST (turns 256 KB of "y\n" into ~2 lines),
+        # then note if we hit the byte cap. Bounds both RAM (the cap) and context
+        # tokens (the collapse).
+        output = _collapse_repeated_lines("".join(chunks))
         if capped.is_set():
             return (
-                output[:_MAX_BASH_OUTPUT_BYTES]
+                output.rstrip()
                 + f"\n[output truncated at {_MAX_BASH_OUTPUT_BYTES // 1024} KB — "
                 "the command produced more; redirect to a file and inspect it in "
                 "pieces (head/tail/grep) instead of dumping it all]"

{drydock_cli-3.0.58 → drydock_cli-3.0.59/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.58
+Version: 3.0.59
 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.58 → drydock_cli-3.0.59}/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.58"
+version = "3.0.59"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

{drydock_cli-3.0.58 → drydock_cli-3.0.59}/tests/test_bash_output_bounding.py

@@ -35,3 +35,15 @@ def test_exit_code_still_reported(tmp_path):
     cfg = {"cwd": str(tmp_path)}
     out = tool_bash({"command": "echo oops; exit 3"}, cfg)
     assert "oops" in out and "exit code: 3" in out
+
+
+def test_repetitive_output_is_collapsed(tmp_path):
+    # PRD "protect context size": a repetitive dump must not eat the window.
+    out = tool_bash({"command": "yes | head -c 2000000"}, {"cwd": str(tmp_path)})
+    assert len(out) < 500                       # ~24k chars before the collapse
+    assert "identical lines collapsed" in out
+
+
+def test_collapse_preserves_distinct_lines(tmp_path):
+    out = tool_bash({"command": "printf 'a\\nb\\nc\\n'"}, {"cwd": str(tmp_path)})
+    assert out == "a\nb\nc"                      # nothing collapsed