drydock-cli 3.0.83__tar.gz → 3.0.85__tar.gz

{drydock_cli-3.0.83/drydock_cli.egg-info → drydock_cli-3.0.85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.83
+Version: 3.0.85
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -156,10 +156,14 @@ stance).
 /advisor                                         # show current config (key masked)
 ```
 
-**Use it** two ways:
-- **You:** `/ask <question>` — consults the advisor and shows its answer.
+**Use it** three ways:
+- **You (private):** `/ask <question>` — consults the advisor and shows its
+  answer to *you only* (not added to the agent's context).
+- **You (feed the agent):** `/ask! <question>` — same, but also **injects** the
+  answer into the agent's context and has the primary model process it, so a
+  second opinion can steer the current task.
 - **The agent:** it can call the read-only `Consult` tool on its own when it hits
-  something hard, passing the relevant code/error as context. You act on the advice.
+  something hard (the answer comes back as a tool result, so it's in context).
 
 **Pointing it at Gemini** — two options:
 1. **Gemini's official OpenAI-compatible endpoint** (if this box has internet):

{drydock_cli-3.0.83 → drydock_cli-3.0.85}/README.md

@@ -132,10 +132,14 @@ stance).
 /advisor                                         # show current config (key masked)
 ```
 
-**Use it** two ways:
-- **You:** `/ask <question>` — consults the advisor and shows its answer.
+**Use it** three ways:
+- **You (private):** `/ask <question>` — consults the advisor and shows its
+  answer to *you only* (not added to the agent's context).
+- **You (feed the agent):** `/ask! <question>` — same, but also **injects** the
+  answer into the agent's context and has the primary model process it, so a
+  second opinion can steer the current task.
 - **The agent:** it can call the read-only `Consult` tool on its own when it hits
-  something hard, passing the relevant code/error as context. You act on the advice.
+  something hard (the answer comes back as a tool result, so it's in context).
 
 **Pointing it at Gemini** — two options:
 1. **Gemini's official OpenAI-compatible endpoint** (if this box has internet):

{drydock_cli-3.0.83 → drydock_cli-3.0.85}/drydock/advisor.py

@@ -91,8 +91,16 @@ def test_connection(config: dict) -> str:
     base = config.get("advisor_base_url")
     t0 = time.monotonic()
     try:
-        reply = _call("Reply with exactly: OK", config, timeout=30.0, max_tokens=8)
+        # Generous read timeout: a slow/cold LOCAL model can take a while to
+        # return even a few tokens. A truly-down endpoint fails fast on the 10s
+        # connect timeout, so this only waits on a reachable-but-slow server.
+        reply = _call("Reply with exactly: OK", config, timeout=90.0, max_tokens=8)
     except Exception as e:  # noqa: BLE001
+        emsg = str(e).lower()
+        if "timeout" in emsg or "timed out" in emsg:
+            return (f"✗ advisor timed out (>90s) — {model} at {base} is REACHABLE but slow "
+                    "to respond (a cold or loaded local model?). `/ask` allows much longer, "
+                    "so it may still work; or give the server a moment and retry.")
         return (f"✗ advisor unreachable — {model} at {base}\n   {e}\n"
                 "   Check the endpoint is up, the URL ends in /v1, and the key/model are right.")
     dt = time.monotonic() - t0

{drydock_cli-3.0.83 → drydock_cli-3.0.85}/drydock/tui/app.py

@@ -491,6 +491,8 @@ class DrydockApp(App):
             self._cmd_advisor(arg)
         elif cmd == "/ask":
             self._cmd_ask(arg)
+        elif cmd == "/ask!":
+            self._cmd_ask(arg, inject=True)
         elif cmd == "/graphrag":
             self._cmd_graphrag(arg)
         elif cmd == "/status":
@@ -513,7 +515,7 @@ class DrydockApp(App):
                 "  /status          session model, cwd, turns, tokens\n"
                 "  /compact         shrink old context to free up the window\n"
                 "  /context         view/set the context-window budget (e.g. /context 65536)\n"
-                "  /advisor         set up a 2nd 'advisor' model (e.g. Gemini) · /ask <q> to consult it\n"
+                "  /advisor         set up a 2nd 'advisor' model (Gemini etc.); /ask <q> = you, /ask! = feed to agent\n"
                 "  /graphrag        ingest docs into a knowledge base the agent can use\n"
                 "                   build <path> · add <path> · query <q> · status · clear\n"
                 "  /skills          list skills · /skills new <name> <prompt> to create one\n"
@@ -891,23 +893,43 @@ class DrydockApp(App):
         shown = "•••••" if keymap[sub] == "advisor_api_key" else val
         self._info(f"✓ advisor {sub} set to {shown} (saved to config.toml).")
 
-    def _cmd_ask(self, arg: str) -> None:
-        """Ask the second/advisor model directly and show its answer."""
+    def _cmd_ask(self, arg: str, *, inject: bool = False) -> None:
+        """Consult the advisor model. `/ask` shows the answer to YOU only;
+        `/ask!` also INJECTS it into the agent's context and has the primary model
+        process it (so a second opinion can steer the current task)."""
         from drydock import advisor
         q = (arg or "").strip()
         if not q:
-            self._info("usage: /ask <question>   — consult your configured advisor (second) model")
+            self._info("usage: /ask <question>  (show to you)  ·  /ask! <question>  "
+                       "(also feed the answer to the agent)")
             return
         if not advisor.is_configured(self.config):
             self._info(advisor.not_configured_message())
             return
-        self._info(f"Asking the advisor ({self.config.get('advisor_model')})…")
-        self.run_worker(lambda: self._ask_worker(q), thread=True)
+        self._info(f"Asking the advisor ({self.config.get('advisor_model')})"
+                   + (" — its answer will be added to the agent's context…" if inject else "…"))
+        self.run_worker(lambda: self._ask_worker(q, inject), thread=True)
 
-    def _ask_worker(self, question: str) -> None:
+    def _ask_worker(self, question: str, inject: bool = False) -> None:
         from drydock import advisor
         answer = advisor.consult(question, self.config)
-        self.call_from_thread(self._info, f"💡 advisor:\n{answer}")
+        self.call_from_thread(self._deliver_advice, question, answer, inject)
+
+    def _deliver_advice(self, question: str, answer: str, inject: bool) -> None:
+        """Show the advisor's answer; if inject, feed it into the agent's context
+        so the primary model processes it (queued if a turn is already running)."""
+        failed = answer.startswith(("No advisor", "Could not reach", "Error", "✗"))
+        if not inject or failed:
+            self._info(f"💡 advisor:\n{answer}")
+            return
+        self._info(f"💡 advisor (added to the agent's context):\n{answer}")
+        turn = (f"[Second opinion from the advisor model — I asked it: {question}]\n\n"
+                f"{answer}\n\n[Consider this advice for the current task.]")
+        if self._busy:
+            self._queue.append(turn)
+            self._refresh_status()
+        else:
+            self._begin(turn)
 
     def _cmd_compact(self) -> None:
         """Manually compact the conversation to reclaim context NOW, without

{drydock_cli-3.0.83 → drydock_cli-3.0.85}/drydock/tui/widgets.py

@@ -153,8 +153,8 @@ class PromptHistory:
 # completes the prefix.
 SLASH_COMMANDS = [
     "/help", "/model", "/cwd", "/undo", "/back", "/stop", "/status",
-    "/compact", "/context", "/advisor", "/ask", "/graphrag", "/skills", "/loop",
-    "/mcp", "/rmf", "/stig",
+    "/compact", "/context", "/advisor", "/ask", "/ask!", "/graphrag", "/skills",
+    "/loop", "/mcp", "/rmf", "/stig",
     "/clear", "/quit",
 ]
 

{drydock_cli-3.0.83 → drydock_cli-3.0.85/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.83
+Version: 3.0.85
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -156,10 +156,14 @@ stance).
 /advisor                                         # show current config (key masked)
 ```
 
-**Use it** two ways:
-- **You:** `/ask <question>` — consults the advisor and shows its answer.
+**Use it** three ways:
+- **You (private):** `/ask <question>` — consults the advisor and shows its
+  answer to *you only* (not added to the agent's context).
+- **You (feed the agent):** `/ask! <question>` — same, but also **injects** the
+  answer into the agent's context and has the primary model process it, so a
+  second opinion can steer the current task.
 - **The agent:** it can call the read-only `Consult` tool on its own when it hits
-  something hard, passing the relevant code/error as context. You act on the advice.
+  something hard (the answer comes back as a tool result, so it's in context).
 
 **Pointing it at Gemini** — two options:
 1. **Gemini's official OpenAI-compatible endpoint** (if this box has internet):

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

{drydock_cli-3.0.83 → drydock_cli-3.0.85}/tests/test_advisor.py

@@ -81,3 +81,10 @@ def test_test_connection_failure(monkeypatch):
 
 def test_test_connection_unconfigured():
     assert "No advisor" in advisor.test_connection({})
+
+
+def test_test_connection_timeout_says_reachable_but_slow(monkeypatch):
+    def slow(*a, **k): raise TimeoutError("Request timed out.")
+    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

{drydock_cli-3.0.83 → drydock_cli-3.0.85}/tests/test_tui.py

@@ -422,3 +422,38 @@ def test_context_command_sets_and_persists(tmp_path, monkeypatch):
     import tomllib
     saved = tomllib.loads((tmp_path / ".drydock" / "config.toml").read_text())
     assert saved["context_limit"] == 65536   # survived to disk
+
+
+def test_ask_bang_injects_advice_but_plain_ask_does_not():
+    """/ask! feeds the advisor's answer into the agent's context (starts a turn
+    with it); plain /ask (inject=False) only displays it."""
+    async def main():
+        app = DrydockApp({"model": "gemma4", "provider": "vllm", "cwd": "/tmp"})
+        async with app.run_test() as pilot:
+            await pilot.pause()
+            started: list[str] = []
+            app._run_agent = lambda text: started.append(text)  # type: ignore[method-assign]
+
+            # inject=True → a turn begins carrying the advice
+            app._deliver_advice("what DS for an LRU cache?",
+                                "Use a hash map + a doubly linked list.", True)
+            for _ in range(40):
+                await pilot.pause()
+                if started:
+                    break
+            assert started, "/ask! should start a turn"
+            assert "hash map + a doubly linked list" in started[0]
+            assert "advisor model" in started[0]     # framed as a second opinion
+
+            # inject=False → display only, no new turn
+            started.clear()
+            app._deliver_advice("q", "some answer", False)
+            await pilot.pause()
+            assert started == []
+
+            # a FAILED consult must not inject even with inject=True
+            app._deliver_advice("q", "Could not reach the advisor model at http://x: boom", True)
+            await pilot.pause()
+            assert started == []
+
+    asyncio.run(main())