drydock-cli 3.0.75__tar.gz → 3.0.77__tar.gz

{drydock_cli-3.0.75/drydock_cli.egg-info → drydock_cli-3.0.77}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.75
+Version: 3.0.77
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -59,6 +59,10 @@ A full agentic CLI harness — every tool below is clean-room and dependency-fre
 
 - **Files & shell** — `Read` (with a structure index for huge files), `Write`,
   `Edit`, `Bash`, `Glob`, `Grep`.
+- **Vision (multimodal)** — reference an image path in your message (a `.png`/
+  `.jpg` screenshot, mockup, or diagram) and it's attached for a vision-capable
+  model to *see* — describe a UI, read text off a screenshot, debug a diagram.
+  Works with any `--mmproj`-enabled server (e.g. llama.cpp with a vision model).
 - **Version control** — `GitStatus`, `GitDiff`, `GitLog`, `GitCommit`
   (structured + truncated; commit is local and reversible).
 - **Internet** — `WebSearch` + `WebFetch` (DuckDuckGo; offline-safe).

{drydock_cli-3.0.75 → drydock_cli-3.0.77}/README.md

@@ -35,6 +35,10 @@ A full agentic CLI harness — every tool below is clean-room and dependency-fre
 
 - **Files & shell** — `Read` (with a structure index for huge files), `Write`,
   `Edit`, `Bash`, `Glob`, `Grep`.
+- **Vision (multimodal)** — reference an image path in your message (a `.png`/
+  `.jpg` screenshot, mockup, or diagram) and it's attached for a vision-capable
+  model to *see* — describe a UI, read text off a screenshot, debug a diagram.
+  Works with any `--mmproj`-enabled server (e.g. llama.cpp with a vision model).
 - **Version control** — `GitStatus`, `GitDiff`, `GitLog`, `GitCommit`
   (structured + truncated; commit is local and reversible).
 - **Internet** — `WebSearch` + `WebFetch` (DuckDuckGo; offline-safe).

{drydock_cli-3.0.75 → drydock_cli-3.0.77}/drydock/providers.py

@@ -56,6 +56,36 @@ PROVIDERS: dict[str, dict] = {
 }
 
 
+def probe_server_context(base_url: str, *, timeout: float = 4.0) -> int | None:
+    """Best-effort: ask the model server its REAL context window (tokens).
+    llama.cpp exposes it on `/props` (n_ctx); vLLM puts `max_model_len` on
+    `/v1/models`. Returns None if unknown/unreachable — never raises. This is the
+    definitive diagnostic for a "stuck at N tokens" cap that isn't drydock's
+    config (it's the server's own `-c` / `--ctx-size` / `max_model_len`)."""
+    import json
+    import urllib.request
+
+    root = base_url.rstrip("/")
+    base_no_v1 = root[:-3].rstrip("/") if root.endswith("/v1") else root
+
+    def _n_ctx(d):
+        return (d.get("default_generation_settings") or {}).get("n_ctx") or d.get("n_ctx")
+
+    def _max_model_len(d):
+        return next((m.get("max_model_len") for m in d.get("data", []) if m.get("max_model_len")), None)
+
+    for url, pick in ((base_no_v1 + "/props", _n_ctx), (root + "/models", _max_model_len)):
+        try:
+            with urllib.request.urlopen(url, timeout=timeout) as r:  # noqa: S310 (user's own server)
+                data = json.loads(r.read().decode("utf-8", "ignore"))
+            val = pick(data)
+            if isinstance(val, int) and val > 0:
+                return val
+        except Exception:  # noqa: BLE001 — best-effort probe
+            continue
+    return None
+
+
 class LLMUnreachable(RuntimeError):
     """The configured LLM endpoint could not be reached. Carries a
     user-facing message with remediation steps (shown verbatim in the TUI)."""
@@ -220,16 +250,11 @@ _IMAGE_MIME = {
 }
 
 
-def _user_content_with_images(content):
-    """Vision support: if the user's text references image file paths that exist
-    on disk, attach them as OpenAI multimodal image_url blocks (works with any
-    --mmproj-enabled server). Text-only prompts pass through unchanged as a plain
-    string, so display / loop-detection / compaction / token-counting (which all
-    assume string content) are untouched — the multimodal list is built ONLY here,
-    at the API boundary."""
+def detect_image_paths(content) -> list[str]:
+    """Image file paths referenced in a user message that exist on disk. Shared
+    by the multimodal attach (below) and the TUI (to confirm '📎 attached')."""
     if not isinstance(content, str) or "." not in content:
-        return content
-    import base64
+        return []
     import os
     import re
 
@@ -251,8 +276,22 @@ def _user_content_with_images(content):
         p = os.path.expanduser(raw)
         if os.path.isfile(p) and p not in seen:
             seen.append(p)
+    return seen
+
+
+def _user_content_with_images(content):
+    """Vision support: if the user's text references image file paths that exist
+    on disk, attach them as OpenAI multimodal image_url blocks (works with any
+    --mmproj-enabled server). Text-only prompts pass through unchanged as a plain
+    string, so display / loop-detection / compaction / token-counting (which all
+    assume string content) are untouched — the multimodal list is built ONLY here,
+    at the API boundary."""
+    seen = detect_image_paths(content)
     if not seen:
         return content
+    import base64
+    import os
+
     blocks: list[dict] = [{"type": "text", "text": content}]
     for p in seen:
         mime = _IMAGE_MIME.get(os.path.splitext(p)[1].lower(), "image/png")

{drydock_cli-3.0.75 → drydock_cli-3.0.77}/drydock/tui/app.py

@@ -409,6 +409,14 @@ class DrydockApp(App):
         # running, queue this one and drain it when the current turn finishes
         # instead of dropping it on the floor.
         self._mount(UserMessage(text))
+        # Confirm any image attachments so the user SEES vision is active (the
+        # actual attach happens at the API boundary in providers).
+        from drydock import providers
+        imgs = providers.detect_image_paths(text)
+        if imgs:
+            import os as _os
+            names = ", ".join(_os.path.basename(p) for p in imgs)
+            self._info(f"📎 attached {len(imgs)} image(s) for the model to see: {names}")
         if self._busy:
             self._queue.append(text)
             self._refresh_status()
@@ -758,12 +766,12 @@ class DrydockApp(App):
         arg = (arg or "").strip()
         if not arg:
             self._info(
-                f"context_limit: {limit:,} tokens (the '/{limit // 1024}k' in the ctx gauge).\n"
+                f"context_limit (drydock): {limit:,} tokens (the '/{limit // 1024}k' in the ctx gauge).\n"
                 "Source order: built-in default 65536 < ~/.drydock/config.toml < --context-limit.\n"
-                "If you're stuck below this, your MODEL SERVER's context is smaller — raise its\n"
-                "`-c`/`--ctx-size`/`max_model_len` to match. To change drydock's budget:\n"
-                "  /context <tokens>      e.g. /context 65536   (saved to config.toml)"
+                "Probing your model server for its REAL context window…\n"
+                "  To change drydock's budget:  /context <tokens>   (saved to config.toml)"
             )
+            self.run_worker(lambda: self._probe_server_context(limit), thread=True)
             return
         try:
             n = int(arg.replace(",", "").replace("k", "000").replace("K", "000"))
@@ -781,6 +789,30 @@ class DrydockApp(App):
             "least this, or the server will still cap you below it."
         )
 
+    def _probe_server_context(self, limit: int) -> None:
+        """Worker: ask the model server its real context window and report whether
+        IT (not drydock's config) is the thing capping you — the definitive answer
+        to 'stuck at N tokens'."""
+        from drydock import providers
+
+        base_url = self.config.get("base_url") or providers.PROVIDERS.get(
+            self.config.get("provider") or "vllm", {}).get("base_url", "http://localhost:8000/v1")
+        n_ctx = providers.probe_server_context(base_url)
+        if n_ctx is None:
+            msg = (f"Model server ({base_url}) didn't report its context size "
+                   "(not llama.cpp /props or vLLM max_model_len, or unreachable). "
+                   f"Your effective cap is the smaller of drydock's {limit:,} and the "
+                   "server's own -c/--ctx-size.")
+        elif n_ctx < limit:
+            msg = (f"⚠ Model server reports n_ctx = {n_ctx:,} tokens — SMALLER than "
+                   f"drydock's {limit:,}. The SERVER is your real cap (you'll stick near "
+                   f"{n_ctx // 1024}k). Restart it with a larger -c/--ctx-size/max_model_len, "
+                   "or lower /context to match.")
+        else:
+            msg = (f"✓ Model server reports n_ctx = {n_ctx:,} tokens (≥ drydock's {limit:,}), "
+                   "so drydock's budget is the effective limit — no server-side cap.")
+        self.call_from_thread(self._info, msg)
+
     def _cmd_compact(self) -> None:
         """Manually compact the conversation to reclaim context NOW, without
         waiting for the automatic 60%-of-window threshold (agent.maybe_compact).

{drydock_cli-3.0.75 → drydock_cli-3.0.77}/drydock/tuning.py

@@ -90,7 +90,11 @@ _DEFAULT_SYSTEM_PROMPT = (
     "start to lay out the plan, then START WORKING THROUGH IT IMMEDIATELY — do "
     "NOT stop to ask whether to proceed. Call `todo` again to flip a step to "
     "done and the next to in-progress as you finish each, and only stop when "
-    "every step is done. Don't write a TODO.md file for this."
+    "every step is done. Don't write a TODO.md file for this.\n"
+    "You have VISION: when the user references an image file path (.png/.jpg/"
+    ".jpeg/.gif/.webp/.bmp on disk — a screenshot, mockup, diagram, or photo), it "
+    "is attached and you can SEE it; describe it, read text from it, or debug "
+    "with it — never claim you cannot view images."
 )
 
 # Short, imperative prompt. Small local models do better with "act now" than
@@ -112,7 +116,11 @@ _GEMMA_SYSTEM_PROMPT = (
     "(one task per line, '[ ]'/'[~]'/'[x]'), then IMMEDIATELY start doing the "
     "steps — do NOT stop to ask whether to proceed. Call `todo` again to update "
     "it as you finish each step, and only stop when every step is done. Do not "
-    "write a TODO.md file for this."
+    "write a TODO.md file for this.\n"
+    "You have VISION: when the user's message references an image file path "
+    "(.png/.jpg/.jpeg/.gif/.webp/.bmp that exists on disk — a screenshot, mockup, "
+    "diagram, or photo), that image is attached and you can SEE it. Describe it, "
+    "read text from it, or use it to debug — never claim you cannot view images."
 )
 
 
@@ -221,11 +229,15 @@ _DRYDOCK_COMMANDS_HELP = (
     "- Custom skills (reusable `/<name>` prompts): `/skills new <name> <prompt "
     "text>` creates one (use $ARGS in the prompt for trailing input); `/skills` "
     "lists them; then they run it as `/<name>`.\n"
+    "- Images / vision: the user just references an image file path in their "
+    "message (a .png/.jpg screenshot, mockup, or diagram on disk) and it is "
+    "attached for you to SEE — no command needed.\n"
     "- Other: `/model` (model/endpoint), `/cwd`, `/undo` (revert last write), "
-    "`/back` (rewind a turn), `/compact` (shrink context), `/loop <n> <prompt>` "
-    "(repeat a prompt), `/mcp` (connected MCP servers), `/status`, `/clear`, "
-    "`/help`, `/quit`. Internet + git are tools you call yourself "
-    "(WebSearch/WebFetch, GitStatus/GitDiff/GitLog/GitCommit)."
+    "`/back` (rewind a turn), `/compact` (shrink context), `/context` (view/set "
+    "the context-window budget), `/loop <n> <prompt>` (repeat a prompt), `/mcp` "
+    "(connected MCP servers), `/rmf` & `/stig` (NIST 800-53 / DISA STIG), "
+    "`/status`, `/clear`, `/help`, `/quit`. Internet + git are tools you call "
+    "yourself (WebSearch/WebFetch, GitStatus/GitDiff/GitLog/GitCommit)."
 )
 
 

{drydock_cli-3.0.75 → drydock_cli-3.0.77/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.75
+Version: 3.0.77
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -59,6 +59,10 @@ A full agentic CLI harness — every tool below is clean-room and dependency-fre
 
 - **Files & shell** — `Read` (with a structure index for huge files), `Write`,
   `Edit`, `Bash`, `Glob`, `Grep`.
+- **Vision (multimodal)** — reference an image path in your message (a `.png`/
+  `.jpg` screenshot, mockup, or diagram) and it's attached for a vision-capable
+  model to *see* — describe a UI, read text off a screenshot, debug a diagram.
+  Works with any `--mmproj`-enabled server (e.g. llama.cpp with a vision model).
 - **Version control** — `GitStatus`, `GitDiff`, `GitLog`, `GitCommit`
   (structured + truncated; commit is local and reversible).
 - **Internet** — `WebSearch` + `WebFetch` (DuckDuckGo; offline-safe).

{drydock_cli-3.0.75 → drydock_cli-3.0.77}/drydock_cli.egg-info/SOURCES.txt

@@ -79,6 +79,7 @@ tests/test_rmf.py
 tests/test_rmf_graph.py
 tests/test_rmf_stig_graph.py
 tests/test_runaway_repetition.py
+tests/test_server_probe.py
 tests/test_skills.py
 tests/test_stig.py
 tests/test_stop.py

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

drydock_cli-3.0.77/tests/test_server_probe.py

@@ -0,0 +1,39 @@
+"""Server context-window probe — the definitive 'what's capping me' diagnostic."""
+from __future__ import annotations
+
+import json
+
+from drydock import providers
+
+
+class _Resp:
+    def __init__(self, body): self._b = json.dumps(body).encode()
+    def read(self): return self._b
+    def __enter__(self): return self
+    def __exit__(self, *a): return False
+
+
+def test_probe_llamacpp_props_n_ctx(monkeypatch):
+    import urllib.request
+    def fake(url, timeout=0):
+        assert url.endswith("/props")      # llama.cpp endpoint, /v1 stripped
+        return _Resp({"default_generation_settings": {"n_ctx": 32768}})
+    monkeypatch.setattr(urllib.request, "urlopen", fake)
+    assert providers.probe_server_context("http://localhost:8000/v1") == 32768
+
+
+def test_probe_vllm_max_model_len(monkeypatch):
+    import urllib.request
+    def fake(url, timeout=0):
+        if url.endswith("/props"):
+            raise OSError("no props on vLLM")
+        return _Resp({"data": [{"id": "m", "max_model_len": 65536}]})
+    monkeypatch.setattr(urllib.request, "urlopen", fake)
+    assert providers.probe_server_context("http://localhost:8000/v1") == 65536
+
+
+def test_probe_unreachable_is_none(monkeypatch):
+    import urllib.request
+    def boom(url, timeout=0): raise OSError("offline")
+    monkeypatch.setattr(urllib.request, "urlopen", boom)
+    assert providers.probe_server_context("http://localhost:9999/v1") is None

{drydock_cli-3.0.75 → drydock_cli-3.0.77}/tests/test_vision_input.py

@@ -82,3 +82,23 @@ def test_image_path_in_backticks_and_punctuation(tmp_path):
         out = _user_content_with_images(prompt)
         assert isinstance(out, list), f"not attached: {prompt!r}"
         assert any(b.get("type") == "image_url" for b in out), prompt
+
+
+def test_detect_image_paths_shared_helper(tmp_path):
+    from drydock.providers import detect_image_paths
+    img = _write_png(tmp_path / "shot.png")
+    # plain, quoted, backticked, and trailing-punctuation forms all resolve
+    assert detect_image_paths(f"look at {img}") == [img]
+    assert detect_image_paths(f'see "{img}".') == [img]
+    assert detect_image_paths(f"debug `{img}`,") == [img]
+    # nonexistent path or text-only → nothing attached
+    assert detect_image_paths(f"{tmp_path}/nope.png") == []
+    assert detect_image_paths("no images here, just prose") == []
+    # de-dupes repeats
+    assert detect_image_paths(f"{img} and again {img}") == [img]
+
+
+def test_vision_in_system_prompt():
+    from drydock.tuning import system_prompt_for_model
+    assert "VISION" in system_prompt_for_model("gemma4")
+    assert "VISION" in system_prompt_for_model("some-other-model")