drydock-cli 3.0.70__tar.gz → 3.0.72__tar.gz

{drydock_cli-3.0.70/drydock_cli.egg-info → drydock_cli-3.0.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.70
+Version: 3.0.72
 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.70 → drydock_cli-3.0.72}/drydock/extract.py

@@ -19,8 +19,9 @@ import zipfile
 from pathlib import Path
 
 # Extensions we can pull text out of (beyond the plain-text formats GraphRAG
-# already reads directly).
-EXTRACTABLE_EXT = {".pdf", ".docx"}
+# already reads directly). .ckl/.cklb are STIG checklists — we extract the
+# meaningful per-rule text (id/severity/status/finding), not the raw XML/JSON.
+EXTRACTABLE_EXT = {".pdf", ".docx", ".ckl", ".cklb"}
 
 _W = "{http://schemas.openxmlformats.org/wordprocessingml/2006/main}"
 
@@ -70,13 +71,38 @@ def _extract_pdf(path: str | Path) -> str | None:
         return None
 
 
+def _extract_checklist(path: str | Path) -> str | None:
+    """Flatten a STIG .ckl/.cklb to readable, queryable text (per-rule id,
+    severity, status, title, finding details) — so the agent can answer 'which
+    findings are open?' over an ingested checklist."""
+    try:
+        from drydock import stig
+
+        cl = stig.load(path)
+    except Exception:  # noqa: BLE001 — unreadable/unsupported → skip cleanly
+        return None
+    host = cl.asset.get("HOST_NAME") or cl.asset.get("host_name") or "?"
+    lines = [f"STIG Checklist: {cl.stig_name or 'STIG'} (host: {host})",
+             "Counts: " + ", ".join(f"{k}={v}" for k, v in cl.counts().items())]
+    for r in cl.rules:
+        lines.append(f"\n{r.group_id} ({r.rule_id}) severity={r.severity} "
+                     f"STATUS={r.status} — {r.title}")
+        if r.finding_details:
+            lines.append(f"  Finding: {r.finding_details}")
+        if r.check_content:
+            lines.append(f"  Check: {r.check_content[:300]}")
+    return "\n".join(lines) or None
+
+
 def extract_document(path: str | Path) -> str | None:
-    """Extract text from a supported document (.pdf/.docx), or None."""
+    """Extract text from a supported document (.pdf/.docx/.ckl/.cklb), or None."""
     ext = Path(path).suffix.lower()
     if ext == ".docx":
         return _extract_docx(path)
     if ext == ".pdf":
         return _extract_pdf(path)
+    if ext in (".ckl", ".cklb"):
+        return _extract_checklist(path)
     return None
 
 

{drydock_cli-3.0.70 → drydock_cli-3.0.72}/drydock/tui/app.py

@@ -12,9 +12,10 @@ import threading
 import time
 
 from textual import work
-from textual.app import App, ComposeResult
+from textual.app import App, ComposeResult, ScreenStackError
 from textual.binding import Binding
 from textual.containers import Vertical, VerticalScroll
+from textual.css.query import NoMatches
 from textual.widgets import Static
 
 from drydock.agent import (
@@ -351,8 +352,15 @@ class DrydockApp(App):
         return f"{spin} {self._work_word}…  ({elapsed} · ↓ {toks} tokens{eff}{queued})"
 
     def _refresh_status(self) -> None:
-        self.query_one("#status", Static).update(self._status_text())
-        self.query_one("#working", Static).update(self._working_text())
+        # The 0.18s _tick_work timer can fire one last time DURING app teardown,
+        # after the footer widgets have been removed — query_one would then raise
+        # NoMatches and crash the app (or fail a test). Be defensive: if the
+        # widgets aren't there (shutting down), there's nothing to refresh.
+        try:
+            self.query_one("#status", Static).update(self._status_text())
+            self.query_one("#working", Static).update(self._working_text())
+        except (NoMatches, ScreenStackError):
+            pass
 
     @property
     def _scroll(self) -> VerticalScroll:
@@ -469,6 +477,8 @@ class DrydockApp(App):
                 self._info("Nothing to go back to.")
         elif cmd == "/compact":
             self._cmd_compact()
+        elif cmd == "/context":
+            self._cmd_context(arg)
         elif cmd == "/graphrag":
             self._cmd_graphrag(arg)
         elif cmd == "/status":
@@ -490,6 +500,7 @@ class DrydockApp(App):
                 "  /stop            stop the running turn (or press Esc)\n"
                 "  /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"
                 "  /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"
@@ -735,6 +746,39 @@ class DrydockApp(App):
         else:
             self._begin(prompt)
 
+    def _cmd_context(self, arg: str) -> None:
+        """View or change the context-window budget (tokens) — the cap that drives
+        the ctx gauge + auto-compaction. `/context` shows it + its source; `/context
+        <n>` sets and PERSISTS it to ~/.drydock/config.toml. This is the lever for
+        'stuck at 32k': an old config.toml value (drydock never rewrites an existing
+        one) or a smaller model-server -c silently caps you."""
+        limit = self.config.get("context_limit", 65536) or 65536
+        arg = (arg or "").strip()
+        if not arg:
+            self._info(
+                f"context_limit: {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)"
+            )
+            return
+        try:
+            n = int(arg.replace(",", "").replace("k", "000").replace("K", "000"))
+            if n < 4096 or n > 2_000_000:
+                raise ValueError
+        except ValueError:
+            self._mount(ErrorMessage("usage: /context <tokens>  (4096–2000000, e.g. /context 65536)"))
+            return
+        self.config["context_limit"] = n
+        self._persist_config()
+        self._refresh_status()  # repaint the gauge against the new budget
+        self._info(
+            f"✓ context_limit set to {n:,} tokens and saved to ~/.drydock/config.toml.\n"
+            "Make sure your model server's context (-c / --ctx-size / max_model_len) is at\n"
+            "least this, or the server will still cap you below it."
+        )
+
     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).
@@ -823,7 +867,12 @@ class DrydockApp(App):
                 self._info("No knowledge base yet. Build one:  /graphrag build <path>")
                 return
             res = graphrag.query_index(index, rest, k=3)
-            self._info(graphrag.format_results(res, rest))
+            self._info(
+                graphrag.format_results(res, rest)
+                + "\n\n— This is a PREVIEW for you; it does not go to the model. "
+                "The agent retrieves from this knowledge base automatically (via "
+                "its Knowledge tool) when you just ASK a question — no slash command."
+            )
         elif sub in ("", "status"):
             index = graphrag.load_index(store)
             if index is None:

{drydock_cli-3.0.70 → drydock_cli-3.0.72}/drydock/tui/widgets.py

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

{drydock_cli-3.0.70 → drydock_cli-3.0.72/drydock_cli.egg-info}/PKG-INFO

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

{drydock_cli-3.0.70 → drydock_cli-3.0.72}/tests/test_extract.py

@@ -69,3 +69,27 @@ def test_graphrag_ingests_docx_and_pdf(tmp_path):
     if extract.pdf_backend_available():
         assert "manual.pdf" in srcs
         assert graphrag.query_index(idx, "refunds Zephyr gateway")["chunks"][0]["source"] == "manual.pdf"
+
+
+def test_extract_ckl_checklist(tmp_path):
+    p = tmp_path / "sys.ckl"
+    p.write_text('<?xml version="1.0"?><CHECKLIST><ASSET><HOST_NAME>web01</HOST_NAME></ASSET>'
+                 '<STIGS><iSTIG><STIG_INFO></STIG_INFO><VULN>'
+                 '<STIG_DATA><VULN_ATTRIBUTE>Vuln_Num</VULN_ATTRIBUTE><ATTRIBUTE_DATA>V-1</ATTRIBUTE_DATA></STIG_DATA>'
+                 '<STIG_DATA><VULN_ATTRIBUTE>Rule_Title</VULN_ATTRIBUTE><ATTRIBUTE_DATA>disable debug</ATTRIBUTE_DATA></STIG_DATA>'
+                 '<STATUS>Open</STATUS><FINDING_DETAILS>debug=true found</FINDING_DETAILS></VULN></iSTIG></STIGS></CHECKLIST>')
+    out = extract.extract_document(p)
+    assert out and "V-1" in out and "STATUS=open" in out and "debug=true found" in out
+
+
+def test_graphrag_ingests_ckl(tmp_path):
+    (tmp_path / "sys.ckl").write_text('<?xml version="1.0"?><CHECKLIST><STIGS><iSTIG><STIG_INFO></STIG_INFO>'
+        '<VULN><STIG_DATA><VULN_ATTRIBUTE>Vuln_Num</VULN_ATTRIBUTE><ATTRIBUTE_DATA>V-42</ATTRIBUTE_DATA></STIG_DATA>'
+        '<STIG_DATA><VULN_ATTRIBUTE>Rule_Title</VULN_ATTRIBUTE><ATTRIBUTE_DATA>SSH root login disabled</ATTRIBUTE_DATA></STIG_DATA>'
+        '<STATUS>NotAFinding</STATUS></VULN></iSTIG></STIGS></CHECKLIST>')
+    store = graphrag.default_store_path(str(tmp_path))
+    stats = graphrag.build_index(["."], store, cwd=str(tmp_path))
+    assert stats["files"] == 1
+    idx = graphrag.load_index(store)
+    assert "sys.ckl" in graphrag.sources(idx)
+    assert graphrag.query_index(idx, "SSH root login")["chunks"]

{drydock_cli-3.0.70 → drydock_cli-3.0.72}/tests/test_tui.py

@@ -385,3 +385,40 @@ def test_loop_command_iterates_and_stops():
             assert app._repeat is None
 
     asyncio.run(main())
+
+
+def test_refresh_status_survives_missing_widgets():
+    """The 0.18s _tick_work timer can fire one last time during app teardown,
+    after the footer widgets (#status/#working) are gone. _refresh_status must
+    swallow the resulting NoMatches, not crash the app. Regression for a flaky
+    NoMatches('#status') that surfaced under full-suite load."""
+    app = DrydockApp({"model": "gemma4", "provider": "vllm", "cwd": "/tmp"})
+    app._busy = True
+    # No widgets are mounted (no run_test), so query_one('#status') would raise
+    # NoMatches — the guard must make this a safe no-op.
+    app._refresh_status()   # must not raise
+    app._tick_work()        # the timer path that triggered the crash; must not raise
+
+
+def test_context_command_sets_and_persists(tmp_path, monkeypatch):
+    """/context <n> updates the live budget AND writes it to config.toml — the
+    fix for a stale context_limit (e.g. 32768 left from an old install) that
+    silently caps the window."""
+    monkeypatch.setenv("HOME", str(tmp_path))
+
+    async def main():
+        app = DrydockApp({"model": "gemma4", "provider": "vllm", "cwd": "/tmp",
+                          "context_limit": 32768})
+        async with app.run_test() as pilot:
+            await pilot.pause()
+            app._cmd_context("65536")          # set + persist
+            await pilot.pause()
+            assert app.config["context_limit"] == 65536
+            app._cmd_context("not-a-number")   # invalid → unchanged
+            await pilot.pause()
+            assert app.config["context_limit"] == 65536
+
+    asyncio.run(main())
+    import tomllib
+    saved = tomllib.loads((tmp_path / ".drydock" / "config.toml").read_text())
+    assert saved["context_limit"] == 65536   # survived to disk