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

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

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

@@ -281,3 +281,32 @@ def load(path: str | Path) -> Checklist:
     # sniff: JSON → cklb, else ckl
     head = Path(path).read_text("utf-8", "ignore").lstrip()[:1]
     return parse_cklb(path) if head == "{" else parse_ckl(path)
+
+
+def summary_lines(cl: "Checklist", label: str, status: str | None = None) -> list[str]:
+    """Build the `/stig` summary view: counts, an optional status listing (never
+    silently truncated), and scale-aware next-step hints. Pure/presentation so it
+    can be unit-tested without the TUI."""
+    host = cl.asset.get("HOST_NAME") or cl.asset.get("host_name") or "?"
+    c = cl.counts()
+    lines = [f"STIG checklist {label}  (host: {host}, format: {cl.fmt})",
+             f"  {len(cl.rules)} rules — " + " · ".join(f"{k}={v}" for k, v in c.items())]
+    if status:
+        sf = canonical_status(status)
+        hits = [r for r in cl.rules if r.status == sf]
+        lines.append(f"\n{sf} ({len(hits)}):")
+        lines += [f"  {r.group_id} ({r.severity}) — {r.title}" for r in hits[:50]]
+        if len(hits) > 50:  # never silently truncate
+            lines.append(f"  … showing first 50 of {len(hits)}; "
+                         "open the .ckl in STIG Viewer for the full list.")
+        return lines
+    nr = c.get("not_reviewed", 0)
+    if nr:
+        lines.append(f"\nAssess the {nr} un-reviewed rule(s) — one focused turn each:"
+                     f"\n  /loop {nr} /stig-assess {label}")
+        if nr > 40:
+            lines.append(f"  (large checklist — that's {nr} model turns; you can run it in "
+                         "batches and re-run /stig to see remaining counts.)")
+    if c.get("open"):
+        lines.append(f"List open findings to remediate:  /stig {label} open")
+    return lines

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

@@ -587,19 +587,8 @@ class DrydockApp(App):
         except Exception as e:  # noqa: BLE001
             self._mount(ErrorMessage(f"could not read checklist: {e}"))
             return
-        host = cl.asset.get("HOST_NAME") or cl.asset.get("host_name") or "?"
-        c = cl.counts()
-        lines = [f"STIG checklist {path}  (host: {host}, format: {cl.fmt})",
-                 f"  {len(cl.rules)} rules — " + " · ".join(f"{k}={v}" for k, v in c.items())]
-        if len(parts) > 1:
-            sf = stig.canonical_status(parts[1])
-            hits = [r for r in cl.rules if r.status == sf]
-            lines.append(f"\n{sf} ({len(hits)}):")
-            lines += [f"  {r.group_id} ({r.severity}) — {r.title}" for r in hits[:50]]
-        else:
-            lines.append("Assess un-reviewed rules:  /loop "
-                         f"{c.get('not_reviewed', 0) or 1} /stig-assess {parts[0]}")
-        self._info("\n".join(lines))
+        status = parts[1] if len(parts) > 1 else None
+        self._info("\n".join(stig.summary_lines(cl, parts[0], status)))
 
     def _cmd_rmf(self, arg: str) -> None:
         """RMF automation: bootstrap the NIST 800-53 catalog into the knowledge

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

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

{drydock_cli-3.0.72 → drydock_cli-3.0.73}/tests/test_mcp.py

@@ -55,3 +55,33 @@ def test_bad_server_is_skipped(tmp_path):
     schemas = mcp.connect_all(str(tmp_path), log=logs.append)
     assert schemas == []
     assert any("failed to start" in m for m in logs)
+
+
+def test_content_to_text_joins_text_blocks():
+    out = mcp._content_to_text({"content": [{"type": "text", "text": "line1"},
+                                            {"type": "text", "text": "line2"}]})
+    assert out == "line1\nline2"
+
+
+def test_content_to_text_non_text_block_is_json():
+    out = mcp._content_to_text({"content": [{"type": "image", "data": "abc"}]})
+    assert '"type": "image"' in out and '"data": "abc"' in out
+
+
+def test_content_to_text_error_and_empty_and_nondict():
+    assert mcp._content_to_text({"content": [{"type": "text", "text": "boom"}],
+                                 "isError": True}).startswith("[tool reported an error]")
+    assert mcp._content_to_text({"content": []}) == "(empty result)"
+    assert mcp._content_to_text("raw string") == "raw string"
+
+
+def test_load_config_project_overrides_user(tmp_path, monkeypatch):
+    monkeypatch.setenv("HOME", str(tmp_path))
+    user = tmp_path / ".drydock"; user.mkdir()
+    (user / "mcp.json").write_text('{"mcpServers": {"db": {"command": "user-cmd"}}}')
+    proj = tmp_path / "proj" / ".drydock"; proj.mkdir(parents=True)
+    (proj / "mcp.json").write_text('{"mcpServers": {"db": {"command": "proj-cmd"},'
+                                   ' "nocmd": {"args": []}}}')
+    cfg = mcp.load_config(str(tmp_path / "proj"))
+    assert cfg["db"]["command"] == "proj-cmd"   # project wins
+    assert "nocmd" not in cfg                    # missing command → skipped

{drydock_cli-3.0.72 → drydock_cli-3.0.73}/tests/test_rmf_graph.py

@@ -60,3 +60,29 @@ def test_graphadd_and_graphquery_tools(tmp_path):
 
 def test_graphquery_empty_graph_is_graceful(tmp_path):
     assert "empty" in tool_graphquery({"op": "control", "id": "AC-2"}, {"cwd": str(tmp_path)}).lower()
+
+
+def test_inherited_controls_handles_cycle():
+    """A RESIDES_ON cycle (misconfigured topology) must not infinite-loop."""
+    g = G.RmfGraph()
+    a, b = G.component_id("a"), G.component_id("b")
+    g.add_node(a, "Component"); g.add_node(b, "Component")
+    g.add_edge(a, "RESIDES_ON", b)
+    g.add_edge(b, "RESIDES_ON", a)            # cycle
+    g.add_edge(b, "IMPLEMENTS", G.control_id("pe-3"))
+    got = g.inherited_controls(a)             # must terminate
+    assert G.control_id("pe-3") in got
+
+
+def test_inherited_controls_missing_node_is_empty():
+    g = G.RmfGraph()
+    assert g.inherited_controls(G.component_id("ghost")) == []
+
+
+def test_neighbors_direction_and_missing():
+    g = G.RmfGraph()
+    g.add_edge("x", "REL", "y")
+    assert g.neighbors("x", "REL") == ["y"]
+    assert g.neighbors("y", "REL", direction="in") == ["x"]
+    assert g.neighbors("y", "REL", direction="out") == []
+    assert g.neighbors("nope") == []

{drydock_cli-3.0.72 → drydock_cli-3.0.73}/tests/test_stig.py

@@ -93,3 +93,51 @@ def test_empty_and_minimal_checklists(tmp_path):
     assert stig.load(tmp_path / "e.ckl").rules == []
     (tmp_path / "m.cklb").write_text('{"stigs":[{"rules":[{"group_id":"V-5"}]}]}')
     assert stig.load(tmp_path / "m.cklb").rules[0].group_id == "V-5"
+
+
+def test_cklb_writeback_only_changes_status_fields(tmp_path):
+    """Editing a .cklb must change ONLY status/finding_details/comments and keep
+    everything else byte-stable (eMASS round-trip fidelity)."""
+    import json
+    data = {"title": "t", "stigs": [{"stig_name": "Demo", "version": "1", "rules": [
+        {"group_id": "V-1", "rule_id": "SV-1", "rule_title": "Rule one",
+         "severity": "high", "status": "not_reviewed", "check_content": "do x",
+         "fix_text": "fix x", "finding_details": "", "comments": "", "weight": "10.0"}]}]}
+    p = tmp_path / "a.cklb"; p.write_text(json.dumps(data))
+    cl = stig.load(p)
+    cl.update("V-1", status="open", finding_details="found it")
+    cl.save(p)
+    re = json.loads(p.read_text())
+    rule = re["stigs"][0]["rules"][0]
+    assert rule["status"] == "open" and rule["finding_details"] == "found it"
+    # untouched fields preserved exactly
+    assert rule["severity"] == "high" and rule["check_content"] == "do x"
+    assert rule["weight"] == "10.0" and rule["rule_title"] == "Rule one"
+
+
+def test_summary_lines_scale_and_no_silent_truncation(tmp_path):
+    import json
+    # 60 rules: 55 open, 5 not_reviewed → exercises >40 hint, open hint, >50 cap note
+    rules = [{"group_id": f"V-{i}", "rule_id": f"SV-{i}", "rule_title": f"r{i}",
+              "severity": "medium", "status": "open" if i < 55 else "not_reviewed"}
+             for i in range(60)]
+    (tmp_path / "b.cklb").write_text(json.dumps(
+        {"stigs": [{"stig_name": "S", "version": "1", "rules": rules}]}))
+    cl = stig.load(tmp_path / "b.cklb")
+    summ = "\n".join(stig.summary_lines(cl, "b.cklb"))
+    assert "/loop 5 /stig-assess b.cklb" in summ          # exact not_reviewed count
+    assert "List open findings" in summ                    # open hint shown
+    open_view = "\n".join(stig.summary_lines(cl, "b.cklb", "open"))
+    assert "showing first 50 of 55" in open_view           # no silent truncation
+    assert open_view.count("V-") <= 51                     # capped list + the note
+
+
+def test_summary_lines_large_checklist_hint(tmp_path):
+    import json
+    rules = [{"group_id": f"V-{i}", "rule_id": f"SV-{i}", "rule_title": "x",
+              "severity": "low", "status": "not_reviewed"} for i in range(286)]
+    (tmp_path / "big.cklb").write_text(json.dumps(
+        {"stigs": [{"stig_name": "ASD", "version": "6", "rules": rules}]}))
+    cl = stig.load(tmp_path / "big.cklb")
+    summ = "\n".join(stig.summary_lines(cl, "big.cklb"))
+    assert "/loop 286" in summ and "286 model turns" in summ

{drydock_cli-3.0.72 → drydock_cli-3.0.73}/tests/test_web_tools.py

@@ -70,3 +70,36 @@ def test_search_parses_ddg_html(monkeypatch):
     assert res and res[0]["title"] == "Example A"
     assert res[0]["url"] == "https://example.com/a"   # uddg redirect unwrapped
     assert res[0]["snippet"] == "snippet A text"
+
+
+class _FakeResp:
+    def __init__(self, body: bytes, ctype: str):
+        self._body = body
+        self.headers = {"Content-Type": ctype}
+    def read(self, *a): return self._body
+    def __enter__(self): return self
+    def __exit__(self, *a): return False
+
+
+def test_fetch_strips_html_script_and_tags(monkeypatch):
+    import urllib.request
+    html_doc = (b"<html><head><script>var x=1; evil()</script><style>a{}</style></head>"
+                b"<body><h1>Title</h1><p>Hello &amp; welcome</p></body></html>")
+    monkeypatch.setattr(urllib.request, "urlopen",
+                        lambda *a, **k: _FakeResp(html_doc, "text/html"))
+    out = web.fetch("example.com")
+    assert "Title" in out and "Hello & welcome" in out
+    assert "evil()" not in out and "<p>" not in out   # script + tags gone
+
+
+def test_fetch_truncates_long_text(monkeypatch):
+    import urllib.request
+    big = b"<html><body>" + b"x " * 5000 + b"</body></html>"
+    monkeypatch.setattr(urllib.request, "urlopen",
+                        lambda *a, **k: _FakeResp(big, "text/html"))
+    out = web.fetch("example.com", max_chars=500)
+    assert "truncated" in out and len(out) < 700
+
+
+def test_format_search_empty():
+    assert "No web results" in web.format_search("rare query", [])

{drydock_cli-3.0.72 → drydock_cli-3.0.73}/tests/test_xccdf.py

@@ -54,3 +54,32 @@ def test_xccdf_to_blank_ckl(tmp_path):
     assert stig.load(out).rules[0].status == "open"
     # the regenerated .ckl preserves the DISA status enum
     assert "<STATUS>Open</STATUS>" in out.read_text()
+
+
+def test_xccdf_scale_many_rules(tmp_path):
+    """A full DISA STIG (e.g. the ASD STIG) has hundreds of rules. Verify the
+    XCCDF->.ckl path handles scale: all rules parsed, well-formed, round-trips,
+    full id/title fidelity. (Validated live against U_ASD_STIG_V6R1 = 286 rules.)"""
+    rules = "".join(
+        f'<Group id="V-{i:05d}"><title>SRG-APP-{i:06d}</title>'
+        f'<Rule id="SV-{i:05d}r1_rule" severity="medium" weight="10.0">'
+        f'<version>APSC-DV-{i:06d}</version><title>Requirement {i}.</title>'
+        f'<description>&lt;VulnDiscussion&gt;Discussion {i}.&lt;/VulnDiscussion&gt;</description>'
+        f'<ident system="http://cyber.mil/cci">CCI-{i:06d}</ident>'
+        f'<fixtext fixref="F-{i}">Fix {i}.</fixtext>'
+        f'<check system="C-{i}"><check-content>Check {i}.</check-content></check>'
+        f'</Rule></Group>'
+        for i in range(250)
+    )
+    xccdf = ('<?xml version="1.0"?><Benchmark xmlns="http://checklists.nist.gov/xccdf/1.1" '
+             'id="BIG"><title>Big STIG</title><version>1</version>'
+             f'<plain-text id="release-info">Release: 1</plain-text>{rules}</Benchmark>')
+    p = tmp_path / "big-xccdf.xml"; p.write_text(xccdf)
+    cl = stig.xccdf_to_checklist(p, host="srv")
+    assert len(cl.rules) == 250
+    assert all(r.rule_id and r.title for r in cl.rules)        # full fidelity
+    out = tmp_path / "big.ckl"; cl.save(out)
+    ET.parse(out)                                              # valid at scale
+    re = stig.load(out)
+    assert len(re.rules) == 250 and re.counts()["not_reviewed"] == 250
+    assert re.rules[123].rule_id == "SV-00123r1_rule"          # order + content preserved