drydock-cli 3.1.31__tar.gz → 3.1.32__tar.gz

{drydock_cli-3.1.31/drydock_cli.egg-info → drydock_cli-3.1.32}/PKG-INFO

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

{drydock_cli-3.1.31 → drydock_cli-3.1.32}/drydock/advisor.py

@@ -24,6 +24,35 @@ _ADVISOR_SYSTEM = (
 )
 
 
+def _msg_text(content) -> str:
+    """Flatten a message's content (str or multimodal block list) to plain text."""
+    if isinstance(content, str):
+        return content
+    if isinstance(content, list):
+        parts = [str(b.get("text") or b.get("content") or "") if isinstance(b, dict) else str(b)
+                 for b in content]
+        return " ".join(p for p in parts if p)
+    return str(content or "")
+
+
+def recent_context(messages: list, *, max_msgs: int = 12, max_chars: int = 6000) -> str:
+    """Compact the tail of the transcript to brief the advisor (§ Consult). The calling model —
+    especially a small local one — often passes little/no `context`, leaving the advisor blind;
+    this auto-attaches the last few turns (assistant reasoning + tool results/errors) so it can
+    actually help. Keeps the MOST RECENT content when truncating."""
+    if not messages:
+        return ""
+    out = []
+    for m in messages[-max_msgs:]:
+        if not isinstance(m, dict) or m.get("role") == "system":
+            continue
+        txt = _msg_text(m.get("content")).strip()
+        if txt:
+            out.append(f"[{m.get('role', '?')}] {txt[:1200]}")
+    blob = "\n".join(out)
+    return ("…" + blob[-max_chars:]) if len(blob) > max_chars else blob
+
+
 def is_configured(config: dict) -> bool:
     """True when an advisor endpoint + model are set."""
     return bool((config.get("advisor_base_url") or "").strip()

{drydock_cli-3.1.31 → drydock_cli-3.1.32}/drydock/agent.py

@@ -670,6 +670,9 @@ def run(
                           canonical=canonical_name(tc["name"]),
                           effect=tool_effect_of(tc["name"], _ro).value,
                           input=str(tc.get("input"))[:200])
+                    # Expose the recent transcript so context-hungry tools (Consult) can brief
+                    # the advisor without relying on the model to hand-pass context.
+                    config["_recent_messages"] = state.messages
                     tool_result = execute_structured(tc["name"], tc["input"], config)
                     result = tool_result.text
             # Emit the completion event IMMEDIATELY after execution (before

{drydock_cli-3.1.31 → drydock_cli-3.1.32}/drydock/tools/__init__.py

@@ -2054,7 +2054,14 @@ def tool_consult(params: dict, config: dict) -> str:
     question = _as_str_arg(params.get("question") or params.get("prompt")).strip()
     if not question:
         return "Error: Consult needs a `question`."
-    return advisor.consult(question, config, context=params.get("context", "") or "")
+    ctx = _as_str_arg(params.get("context") or "").strip()
+    # Auto-enrich: the advisor is useless without knowing what's going on, and the calling
+    # model often passes thin/no context. Attach the recent transcript (errors + reasoning)
+    # that the agent stashed in config so the advisor always has real information to work with.
+    auto = advisor.recent_context(config.get("_recent_messages") or [])
+    if auto:
+        ctx = (ctx + "\n\n" if ctx else "") + "Recent activity (auto-attached):\n" + auto
+    return advisor.consult(question, config, context=ctx)
 
 
 # A sub-agent's whole job is to keep its investigation OUT of the main agent's

{drydock_cli-3.1.31 → drydock_cli-3.1.32/drydock_cli.egg-info}/PKG-INFO

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

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

{drydock_cli-3.1.31 → drydock_cli-3.1.32}/tests/test_advisor.py

@@ -88,3 +88,58 @@ def test_test_connection_timeout_says_reachable_but_slow(monkeypatch):
     monkeypatch.setattr(advisor, "_call", slow)
     out = advisor.test_connection({"advisor_base_url": "http://b/v1", "advisor_model": "m"})
     assert out.startswith("✗") and "REACHABLE but slow" in out and "/ask" in out
+
+
+# ── recent-context auto-enrichment (advisor gets info even w/ thin caller context) ──
+def test_recent_context_formats_and_keeps_newest():
+    msgs = [
+        {"role": "system", "content": "SYS should be skipped"},
+        {"role": "assistant", "content": "I'll run the tests."},
+        {"role": "tool", "content": "FAILED test_x - AssertionError: expected 42"},
+        {"role": "assistant", "content": "The assertion failed; investigating add()."},
+    ]
+    out = advisor.recent_context(msgs)
+    assert "SYS should be skipped" not in out              # system dropped
+    assert "FAILED test_x" in out and "investigating add()" in out
+    assert "[tool]" in out and "[assistant]" in out
+
+
+def test_recent_context_truncates_to_recent_chars():
+    msgs = [{"role": "assistant", "content": "x" * 500} for _ in range(40)]
+    out = advisor.recent_context(msgs, max_chars=1000)
+    assert len(out) <= 1001 and out.startswith("…")        # kept the tail
+
+
+def test_recent_context_handles_multimodal_blocks():
+    msgs = [{"role": "user", "content": [{"type": "text", "text": "look at this"}, {"type": "image"}]}]
+    assert "look at this" in advisor.recent_context(msgs)
+
+
+def test_consult_tool_auto_attaches_recent_transcript(monkeypatch):
+    from drydock import tools as T
+    captured = {}
+    monkeypatch.setattr(advisor, "consult",
+                        lambda q, cfg, context="": captured.update(question=q, context=context) or "ok")
+    cfg = {
+        "advisor_base_url": "http://b/v1", "advisor_model": "m",
+        "_recent_messages": [
+            {"role": "tool", "content": "FAILED test_reconnect - state lost after reconnect"},
+            {"role": "assistant", "content": "Trying a lock around the queue."},
+        ],
+    }
+    # model passed only a bare question (thin context) — the fix must attach the transcript
+    T.tool_consult({"question": "why does reconnect lose state?"}, cfg)
+    assert "FAILED test_reconnect" in captured["context"]       # advisor now sees the error
+    assert "lock around the queue" in captured["context"]
+    assert "Recent activity" in captured["context"]
+
+
+def test_consult_tool_keeps_model_context_and_adds_recent(monkeypatch):
+    from drydock import tools as T
+    captured = {}
+    monkeypatch.setattr(advisor, "consult",
+                        lambda q, cfg, context="": captured.update(context=context) or "ok")
+    cfg = {"advisor_base_url": "http://b/v1", "advisor_model": "m",
+           "_recent_messages": [{"role": "tool", "content": "ERR: boom"}]}
+    T.tool_consult({"question": "help", "context": "my hand-written context"}, cfg)
+    assert "my hand-written context" in captured["context"] and "ERR: boom" in captured["context"]