drydock-cli 3.0.63__tar.gz → 3.0.65__tar.gz

{drydock_cli-3.0.63/drydock_cli.egg-info → drydock_cli-3.0.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.63
+Version: 3.0.65
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -137,6 +137,13 @@ control catalog into the knowledge base and ships four RMF skills — all
 /rmf-poam <finding>       # generate a POA&M entry from a scan/STIG finding
 ```
 
+Beyond text retrieval, `/rmf bootstrap` also builds a **typed ontology graph**
+(Control / Component / Vulnerability nodes; IMPLEMENTS / RESIDES_ON / ASSESSES
+edges). The agent records your system topology with `GraphAdd` and traces
+relationships with `GraphQuery` — including **control inheritance** ("which
+servers inherit physical controls from their enclave?"). Stdlib in-memory graph,
+no Neo4j.
+
 ## Install
 
 ```bash

{drydock_cli-3.0.63 → drydock_cli-3.0.65}/README.md

@@ -113,6 +113,13 @@ control catalog into the knowledge base and ships four RMF skills — all
 /rmf-poam <finding>       # generate a POA&M entry from a scan/STIG finding
 ```
 
+Beyond text retrieval, `/rmf bootstrap` also builds a **typed ontology graph**
+(Control / Component / Vulnerability nodes; IMPLEMENTS / RESIDES_ON / ASSESSES
+edges). The agent records your system topology with `GraphAdd` and traces
+relationships with `GraphQuery` — including **control inheritance** ("which
+servers inherit physical controls from their enclave?"). Stdlib in-memory graph,
+no Neo4j.
+
 ## Install
 
 ```bash

{drydock_cli-3.0.63 → drydock_cli-3.0.65}/drydock/rmf.py

@@ -123,4 +123,10 @@ def bootstrap(cwd: str, *, families: list[str] | None = None,
     store = graphrag.default_store_path(cwd)
     stats = graphrag.add_to_index([str(d) for d in docs], store, cwd=cwd)
     stats["family_docs"] = len(docs)
+    # Phase 2: also build the typed ontology graph (Control + Objective backbone)
+    # so the agent can TRACE relationships via GraphQuery, not just retrieve text.
+    from drydock import rmf_graph
+    g = rmf_graph.build_from_catalog(catalog, families=families)
+    g.save(rmf_graph.graph_path(cwd))
+    stats["graph"] = g.stats()
     return stats

drydock_cli-3.0.65/drydock/rmf_graph.py

@@ -0,0 +1,155 @@
+"""RMF typed ontology graph — schema-typed nodes + relationships for RMF
+traceability (Phase 2 of Operation RMF Automata).
+
+Clean-room, stdlib only: a small in-memory typed graph persisted as JSON (NOT an
+external Neo4j) so it stays local-first and dependency-free. It complements the
+GraphRAG text KB: GraphRAG answers "what does the doc say", this answers "trace
+the relationships" — e.g. which controls a component inherits from its parent.
+
+Node types:  Control · Objective (assessment objective / test case) · Component ·
+             Vulnerability · STIG · STIGRule · Boundary
+Edge types:  ASSESSES (Objective→Control) · IMPLEMENTS (Component→Control) ·
+             RESIDES_ON (Component→Component/Boundary) · AFFECTS (Vuln→Component) ·
+             SATISFIED_BY (Control→STIGRule) · EVALUATES (STIGRule→Component) ·
+             PART_OF (STIGRule→STIG) · APPLIES_TO (STIG→Component) · MITIGATES
+
+All logic original to Drydock.
+"""
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+
+def graph_path(cwd: str) -> Path:
+    return Path(cwd) / ".drydock" / "rmf" / "graph.json"
+
+
+class RmfGraph:
+    def __init__(self) -> None:
+        self.nodes: dict[str, dict] = {}   # id -> {type, attrs}
+        self.edges: list[dict] = []        # {src, rel, dst}
+        self._edge_keys: set[tuple] = set()
+
+    # ── mutation ────────────────────────────────────────────────────────────
+    def add_node(self, nid: str, ntype: str, **attrs) -> str:
+        nid = nid.strip()
+        node = self.nodes.setdefault(nid, {"type": ntype, "attrs": {}})
+        node["type"] = ntype
+        node["attrs"].update({k: v for k, v in attrs.items() if v is not None})
+        return nid
+
+    def add_edge(self, src: str, rel: str, dst: str) -> None:
+        key = (src, rel, dst)
+        if key in self._edge_keys:
+            return
+        self._edge_keys.add(key)
+        self.edges.append({"src": src, "rel": rel, "dst": dst})
+
+    # ── queries ─────────────────────────────────────────────────────────────
+    def get(self, nid: str) -> dict | None:
+        n = self.nodes.get(nid)
+        return {"id": nid, **n} if n else None
+
+    def of_type(self, ntype: str) -> list[str]:
+        return [nid for nid, n in self.nodes.items() if n["type"] == ntype]
+
+    def neighbors(self, nid: str, rel: str | None = None, *, direction: str = "out") -> list[str]:
+        out = []
+        for e in self.edges:
+            if rel and e["rel"] != rel:
+                continue
+            if direction == "out" and e["src"] == nid:
+                out.append(e["dst"])
+            elif direction == "in" and e["dst"] == nid:
+                out.append(e["src"])
+        return out
+
+    def inherited_controls(self, component: str) -> list[str]:
+        """Controls a component inherits from its ancestors (RESIDES_ON, transitive).
+        The PRD's "which servers inherit physical controls" / inheritance logic."""
+        inherited: list[str] = []
+        seen: set[str] = set()
+        frontier = self.neighbors(component, "RESIDES_ON", direction="out")
+        while frontier:
+            parent = frontier.pop()
+            if parent in seen:
+                continue
+            seen.add(parent)
+            inherited.extend(self.neighbors(parent, "IMPLEMENTS", direction="out"))
+            frontier.extend(self.neighbors(parent, "RESIDES_ON", direction="out"))
+        # de-dup, preserve order
+        s: set[str] = set()
+        return [c for c in inherited if not (c in s or s.add(c))]
+
+    # ── persistence ─────────────────────────────────────────────────────────
+    def save(self, path: str | Path) -> None:
+        p = Path(path)
+        p.parent.mkdir(parents=True, exist_ok=True)
+        p.write_text(json.dumps({"nodes": self.nodes, "edges": self.edges}), "utf-8")
+
+    @classmethod
+    def load(cls, path: str | Path) -> "RmfGraph":
+        g = cls()
+        p = Path(path)
+        if p.exists():
+            try:
+                data = json.loads(p.read_text("utf-8"))
+                g.nodes = data.get("nodes", {})
+                for e in data.get("edges", []):
+                    g.add_edge(e["src"], e["rel"], e["dst"])
+            except (OSError, ValueError, KeyError):
+                pass
+        return g
+
+    def stats(self) -> dict:
+        by_type: dict[str, int] = {}
+        for n in self.nodes.values():
+            by_type[n["type"]] = by_type.get(n["type"], 0) + 1
+        return {"nodes": len(self.nodes), "edges": len(self.edges), "by_type": by_type}
+
+
+# ── id helpers (stable, typed) ──────────────────────────────────────────────
+def control_id(cid: str) -> str:
+    return f"control:{cid.lower()}"
+
+
+def component_id(name: str) -> str:
+    return f"component:{name.strip().lower()}"
+
+
+def build_from_catalog(catalog: dict, *, families: list[str] | None = None) -> RmfGraph:
+    """Deterministically build Control + Objective nodes (and ASSESSES edges) from
+    an OSCAL 800-53 catalog. The typed backbone the user's components/vulns attach to."""
+    g = RmfGraph()
+    want = {f.lower() for f in families} if families else None
+    for group in catalog.get("catalog", {}).get("groups", []) or []:
+        fid = group.get("id", "")
+        if want is not None and fid.lower() not in want:
+            continue
+        family = group.get("title", fid)
+        for control in group.get("controls", []) or []:
+            _add_control(g, control, family)
+            for enh in control.get("controls", []) or []:
+                _add_control(g, enh, family, parent=control.get("id"))
+    return g
+
+
+def _add_control(g: RmfGraph, control: dict, family: str, parent: str | None = None) -> None:
+    cid = control.get("id", "")
+    if not cid:
+        return
+    node = control_id(cid)
+    g.add_node(node, "Control", control_id=cid.upper(), title=control.get("title", ""),
+               family=family)
+    if parent:
+        g.add_edge(node, "ENHANCES", control_id(parent))
+    params = {p["id"]: p.get("label") for p in control.get("params", []) or []}
+    for i, part in enumerate(control.get("parts", []) or []):
+        if part.get("name") == "assessment-objective":
+            from drydock.rmf import _part_prose
+            prose = _part_prose(part, params)
+            if prose:
+                oid = f"objective:{cid.lower()}:{i}"
+                g.add_node(oid, "Objective", prose=prose[:500])
+                g.add_edge(oid, "ASSESSES", node)

drydock_cli-3.0.65/drydock/stig.py

@@ -0,0 +1,173 @@
+"""STIG checklist engine — parse + generate DISA `.ckl` (XML) and `.cklb` (JSON).
+
+These checklists carry hostnames, IPs, and finding statuses that are almost
+always CUI, so all parsing/generation stays local. The model never sees raw XML:
+this exposes a compact per-rule view (id, severity, check content, fix text,
+status) for the LLM to assess one at a time, and writes results back by editing
+the parsed structure IN PLACE — so regenerating produces a well-formed file that
+re-imports into STIG Viewer / eMASS without breaking the schema.
+
+Stdlib only (xml.etree + json). All logic original to Drydock.
+"""
+from __future__ import annotations
+
+import json
+import xml.etree.ElementTree as ET
+from dataclasses import dataclass, field
+from pathlib import Path
+from typing import Any
+
+# Canonical statuses + how each format spells them.
+STATUSES = ("open", "not_a_finding", "not_applicable", "not_reviewed")
+_CKL_OUT = {"open": "Open", "not_a_finding": "NotAFinding",
+            "not_applicable": "Not_Applicable", "not_reviewed": "Not_Reviewed"}
+
+
+def canonical_status(s: str | None) -> str:
+    k = (s or "").strip().lower().replace(" ", "_")
+    return {
+        "open": "open", "notafinding": "not_a_finding", "not_a_finding": "not_a_finding",
+        "not_applicable": "not_applicable", "notapplicable": "not_applicable",
+        "not_reviewed": "not_reviewed", "notreviewed": "not_reviewed",
+    }.get(k, "not_reviewed")
+
+
+@dataclass
+class Rule:
+    group_id: str            # Vuln_Num, e.g. V-230222
+    rule_id: str             # SV-230222r...
+    title: str
+    severity: str            # high/medium/low (CAT I/II/III)
+    check_content: str
+    fix_text: str
+    status: str              # canonical
+    finding_details: str = ""
+    comments: str = ""
+    _raw: Any = field(default=None, repr=False)  # ET element or dict, for edit-in-place
+
+    def summary(self) -> str:
+        return f"{self.group_id} ({self.rule_id}) sev={self.severity} status={self.status} — {self.title}"
+
+
+class Checklist:
+    """A parsed checklist with edit-in-place fidelity. Format is 'ckl' or 'cklb'."""
+
+    def __init__(self, fmt: str) -> None:
+        self.fmt = fmt
+        self.asset: dict = {}
+        self.rules: list[Rule] = []
+        self._tree: Any = None   # ckl: ElementTree
+        self._data: Any = None   # cklb: dict
+
+    def by_id(self, ident: str) -> Rule | None:
+        ident = ident.strip().lower()
+        for r in self.rules:
+            if ident in (r.group_id.lower(), r.rule_id.lower()):
+                return r
+        # tolerate a base rule id without the trailing revision (SV-230222 vs SV-230222r1)
+        for r in self.rules:
+            if r.rule_id.lower().startswith(ident) or r.group_id.lower().startswith(ident):
+                return r
+        return None
+
+    def update(self, ident: str, *, status: str | None = None,
+               finding_details: str | None = None, comments: str | None = None) -> bool:
+        r = self.by_id(ident)
+        if r is None:
+            return False
+        if status is not None:
+            r.status = canonical_status(status)
+        if finding_details is not None:
+            r.finding_details = finding_details
+        if comments is not None:
+            r.comments = comments
+        self._write_back(r)
+        return True
+
+    def counts(self) -> dict:
+        c = {s: 0 for s in STATUSES}
+        for r in self.rules:
+            c[r.status] = c.get(r.status, 0) + 1
+        return c
+
+    # ── per-format write-back (edit the raw structure) ──────────────────────
+    def _write_back(self, r: Rule) -> None:
+        if self.fmt == "cklb":
+            d = r._raw
+            d["status"] = r.status
+            d["finding_details"] = r.finding_details
+            d["comments"] = r.comments
+        else:  # ckl
+            vuln = r._raw
+            _set_child_text(vuln, "STATUS", _CKL_OUT[r.status])
+            _set_child_text(vuln, "FINDING_DETAILS", r.finding_details)
+            _set_child_text(vuln, "COMMENTS", r.comments)
+
+    def to_text(self) -> str:
+        if self.fmt == "cklb":
+            return json.dumps(self._data, indent=2)
+        ET.indent(self._tree, space="  ")
+        return ET.tostring(self._tree.getroot(), encoding="unicode")
+
+    def save(self, path: str | Path) -> None:
+        Path(path).write_text(self.to_text(), encoding="utf-8")
+
+
+def _set_child_text(el: ET.Element, tag: str, text: str) -> None:
+    child = el.find(tag)
+    if child is None:
+        child = ET.SubElement(el, tag)
+    child.text = text or ""
+
+
+# ── parsing ─────────────────────────────────────────────────────────────────
+def parse_ckl(path: str | Path) -> Checklist:
+    cl = Checklist("ckl")
+    cl._tree = ET.parse(path)
+    root = cl._tree.getroot()
+    asset = root.find("ASSET")
+    if asset is not None:
+        cl.asset = {c.tag: (c.text or "") for c in asset}
+    for vuln in root.iter("VULN"):
+        data: dict[str, str] = {}
+        for sd in vuln.findall("STIG_DATA"):
+            data[sd.findtext("VULN_ATTRIBUTE") or ""] = sd.findtext("ATTRIBUTE_DATA") or ""
+        cl.rules.append(Rule(
+            group_id=data.get("Vuln_Num", ""), rule_id=data.get("Rule_ID", ""),
+            title=data.get("Rule_Title", ""), severity=data.get("Severity", ""),
+            check_content=data.get("Check_Content", ""), fix_text=data.get("Fix_Text", ""),
+            status=canonical_status(vuln.findtext("STATUS")),
+            finding_details=vuln.findtext("FINDING_DETAILS") or "",
+            comments=vuln.findtext("COMMENTS") or "", _raw=vuln,
+        ))
+    return cl
+
+
+def parse_cklb(path: str | Path) -> Checklist:
+    cl = Checklist("cklb")
+    cl._data = json.loads(Path(path).read_text("utf-8"))
+    cl.asset = cl._data.get("target_data", {}) or {}
+    for stig in cl._data.get("stigs", []) or []:
+        for rule in stig.get("rules", []) or []:
+            cl.rules.append(Rule(
+                group_id=rule.get("group_id", ""), rule_id=rule.get("rule_id", ""),
+                title=rule.get("rule_title", rule.get("group_title", "")),
+                severity=rule.get("severity", ""),
+                check_content=rule.get("check_content", ""), fix_text=rule.get("fix_text", ""),
+                status=canonical_status(rule.get("status")),
+                finding_details=rule.get("finding_details", ""),
+                comments=rule.get("comments", ""), _raw=rule,
+            ))
+    return cl
+
+
+def load(path: str | Path) -> Checklist:
+    """Parse a .ckl (XML) or .cklb (JSON) checklist."""
+    ext = Path(path).suffix.lower()
+    if ext == ".cklb":
+        return parse_cklb(path)
+    if ext == ".ckl":
+        return parse_ckl(path)
+    # 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)

{drydock_cli-3.0.63 → drydock_cli-3.0.65}/drydock/tools/__init__.py

@@ -270,6 +270,100 @@ SCHEMAS = [
             "required": ["message"],
         },
     },
+    {
+        "name": "StigRules",
+        "description": (
+            "List the rules in a DISA STIG checklist (.ckl / .cklb) with their "
+            "status, optionally filtered by status (e.g. not_reviewed). Use it to "
+            "see what needs assessing. Pair with StigRule to read one, StigSet to "
+            "record a result."
+        ),
+        "input_schema": {
+            "type": "object",
+            "properties": {
+                "path": {"type": "string", "description": "Path to the .ckl/.cklb file."},
+                "status": {"type": "string", "description": "Optional filter: open|not_a_finding|not_applicable|not_reviewed"},
+            },
+            "required": ["path"],
+        },
+    },
+    {
+        "name": "StigRule",
+        "description": (
+            "Read ONE STIG rule's full detail — Check Content + Fix Text — so you "
+            "can assess it against system evidence. Assess one rule at a time."
+        ),
+        "input_schema": {
+            "type": "object",
+            "properties": {
+                "path": {"type": "string"},
+                "rule_id": {"type": "string", "description": "Vuln_Num (V-…) or Rule_ID (SV-…)."},
+            },
+            "required": ["path", "rule_id"],
+        },
+    },
+    {
+        "name": "StigSet",
+        "description": (
+            "Record an assessment result for a STIG rule and save the checklist: "
+            "set status (open / not_a_finding / not_applicable / not_reviewed) and "
+            "the finding_details / comments narrative. Regenerates a valid "
+            ".ckl/.cklb that re-imports into STIG Viewer / eMASS."
+        ),
+        "input_schema": {
+            "type": "object",
+            "properties": {
+                "path": {"type": "string"},
+                "rule_id": {"type": "string"},
+                "status": {"type": "string", "description": "open | not_a_finding | not_applicable | not_reviewed"},
+                "finding_details": {"type": "string"},
+                "comments": {"type": "string"},
+            },
+            "required": ["path", "rule_id"],
+        },
+    },
+    {
+        "name": "GraphQuery",
+        "description": (
+            "Query the RMF ontology GRAPH to TRACE relationships (typed: Control, "
+            "Component, Vulnerability, Objective). Use it for traceability the text "
+            "knowledge base can't give: a control's assessment objectives, which "
+            "components implement a control, or which controls a component INHERITS "
+            "from its parent system. ops: control <id>, family <id>, component "
+            "<name>, implementers <control>, inherited <component>."
+        ),
+        "input_schema": {
+            "type": "object",
+            "properties": {
+                "op": {"type": "string", "description": "control | family | component | implementers | inherited"},
+                "id": {"type": "string", "description": "control id, family id, or component name"},
+            },
+            "required": ["op", "id"],
+        },
+    },
+    {
+        "name": "GraphAdd",
+        "description": (
+            "Record a typed fact in the RMF ontology graph as you read an SSP / "
+            "scan / checklist, so relationships can be traced later. ops: component "
+            "(a system component), implements (component implements a control), "
+            "resides_on (component resides on a parent/boundary — enables control "
+            "inheritance), vulnerability (a finding affecting a component)."
+        ),
+        "input_schema": {
+            "type": "object",
+            "properties": {
+                "op": {"type": "string", "description": "component | implements | resides_on | vulnerability"},
+                "component": {"type": "string"},
+                "control": {"type": "string", "description": "control id, for op=implements"},
+                "parent": {"type": "string", "description": "parent component/boundary, for op=resides_on"},
+                "id": {"type": "string", "description": "vulnerability/STIG/CVE id, for op=vulnerability"},
+                "severity": {"type": "string"},
+                "os": {"type": "string"}, "ip": {"type": "string"}, "data_type": {"type": "string"},
+            },
+            "required": ["op"],
+        },
+    },
     {
         "name": "WebSearch",
         "description": (
@@ -1053,6 +1147,164 @@ def tool_gitcommit(params: dict, config: dict) -> str:
         return f"git commit failed: {e}"
 
 
+def _rmf_graph(config):
+    from drydock import rmf_graph
+    cwd = config.get("cwd") or os.getcwd()
+    path = rmf_graph.graph_path(cwd)
+    return rmf_graph, rmf_graph.RmfGraph.load(path), path
+
+
+def _gattrs(g, nid) -> dict:
+    n = g.get(nid)
+    return n["attrs"] if n else {}
+
+
+def _stig_path(params, config):
+    p = (params.get("path") or "").strip()
+    return _resolve_path(p, config) if p else None
+
+
+def tool_stigrules(params: dict, config: dict) -> str:
+    """List the rules in a STIG checklist (.ckl/.cklb), optionally by status."""
+    from drydock import stig
+    path = _stig_path(params, config)
+    if not path:
+        return "Error: StigRules needs a `path` to a .ckl/.cklb checklist."
+    try:
+        cl = stig.load(path)
+    except Exception as e:  # noqa: BLE001
+        return f"Could not read checklist: {e}"
+    status = params.get("status")
+    sf = stig.canonical_status(status) if status else None
+    rules = [r for r in cl.rules if sf is None or r.status == sf]
+    head = (f"{path}: {len(cl.rules)} rules — " +
+            ", ".join(f"{k}={v}" for k, v in cl.counts().items()))
+    lines = [head] + [f"  {r.summary()}" for r in rules[:400]]
+    if len(rules) > 400:
+        lines.append(f"  … +{len(rules) - 400} more")
+    return "\n".join(lines)
+
+
+def tool_stigrule(params: dict, config: dict) -> str:
+    """Full detail of ONE STIG rule (check content + fix text) for assessment."""
+    from drydock import stig
+    path = _stig_path(params, config)
+    rid = (params.get("rule_id") or "").strip()
+    if not path or not rid:
+        return "Error: StigRule needs `path` and `rule_id`."
+    try:
+        cl = stig.load(path)
+    except Exception as e:  # noqa: BLE001
+        return f"Could not read checklist: {e}"
+    r = cl.by_id(rid)
+    if r is None:
+        return f"No rule {rid} in {path}."
+    return (f"{r.group_id} ({r.rule_id}) — {r.title}\nSeverity: {r.severity}\n"
+            f"Status: {r.status}\nCheck Content:\n{r.check_content}\n\n"
+            f"Fix Text:\n{r.fix_text}")
+
+
+def tool_stigset(params: dict, config: dict) -> str:
+    """Set a STIG rule's status + finding details/comments and save the file."""
+    from drydock import stig
+    path = _stig_path(params, config)
+    rid = (params.get("rule_id") or "").strip()
+    if not path or not rid:
+        return "Error: StigSet needs `path` and `rule_id`."
+    status = params.get("status")
+    if status and stig.canonical_status(status) not in stig.STATUSES:
+        return f"status must be one of {stig.STATUSES}."
+    try:
+        cl = stig.load(path)
+        ok = cl.update(rid, status=status, finding_details=params.get("finding_details"),
+                       comments=params.get("comments"))
+        if not ok:
+            return f"No rule {rid} in {path}."
+        cl.save(path)
+    except Exception as e:  # noqa: BLE001
+        return f"Could not update checklist: {e}"
+    return f"✓ {rid} set to {stig.canonical_status(status) if status else 'unchanged'} in {path}."
+
+
+def tool_graphquery(params: dict, config: dict) -> str:
+    """Traverse the RMF typed ontology graph (read-only)."""
+    rmf_graph, g, _ = _rmf_graph(config)
+    if not g.nodes:
+        return ("The RMF graph is empty. Run /rmf bootstrap to build the control "
+                "backbone, and use GraphAdd to record components/relationships.")
+    op = (params.get("op") or "").strip().lower()
+    ident = (params.get("id") or "").strip()
+    if op == "control":
+        node = rmf_graph.control_id(ident)
+        n = g.get(node)
+        if not n:
+            return f"No control {ident} in the graph."
+        objs = [_gattrs(g, o).get("prose", "") for o in g.neighbors(node, "ASSESSES", direction="in")]
+        impl = [_gattrs(g, c).get("name", c) for c in g.neighbors(node, "IMPLEMENTS", direction="in")]
+        out = [f"{n['attrs'].get('control_id', ident)} — {n['attrs'].get('title','')} "
+               f"(Family: {n['attrs'].get('family','')})"]
+        if objs:
+            out.append("Assessment objectives:\n" + "\n".join(f"  - {o}" for o in objs))
+        out.append("Implemented by: " + (", ".join(impl) if impl else "(no components recorded)"))
+        return "\n".join(out)
+    if op == "family":
+        ctrls = [_gattrs(g, c).get("control_id", c)
+                 for c in g.of_type("Control")
+                 if _gattrs(g, c).get("family", "").lower().startswith(ident.lower())
+                 or ident.lower() in _gattrs(g, c).get("family", "").lower()]
+        return f"Controls in '{ident}': " + (", ".join(sorted(ctrls)) or "(none)")
+    if op in ("component", "implementers", "inherited"):
+        comp = rmf_graph.component_id(ident)
+        if op == "implementers":
+            node = rmf_graph.control_id(ident)
+            comps = [_gattrs(g, c).get("name", c) for c in g.neighbors(node, "IMPLEMENTS", direction="in")]
+            return f"Components implementing {ident}: " + (", ".join(comps) or "(none)")
+        if op == "inherited":
+            inh = g.inherited_controls(comp)
+            names = [_gattrs(g, c).get("control_id", c) if g.get(c) else c for c in inh]
+            return (f"{ident} inherits {len(names)} control(s) from its parent system(s): "
+                    + (", ".join(names) or "(none — no RESIDES_ON recorded)"))
+        n = g.get(comp)
+        if not n:
+            return f"No component '{ident}' in the graph (add it with GraphAdd)."
+        impl = [_gattrs(g, c).get("control_id", c) for c in g.neighbors(comp, "IMPLEMENTS", direction="out")]
+        res = [_gattrs(g, p).get("name", p) for p in g.neighbors(comp, "RESIDES_ON", direction="out")]
+        vulns = [_gattrs(g, v).get("vuln_id", v) for v in g.neighbors(comp, "AFFECTS", direction="in")]
+        return (f"Component {ident} ({n['attrs'].get('os','')}): implements "
+                f"{', '.join(impl) or 'none'}; resides on {', '.join(res) or 'nothing'}; "
+                f"flaws {', '.join(vulns) or 'none'}.")
+    return "GraphQuery ops: control <id> | family <id> | component <name> | implementers <control> | inherited <component>"
+
+
+def tool_graphadd(params: dict, config: dict) -> str:
+    """Record a typed fact in the RMF ontology graph (write)."""
+    rmf_graph, g, path = _rmf_graph(config)
+    op = (params.get("op") or "").strip().lower()
+    comp = (params.get("component") or "").strip()
+    if op == "component" and comp:
+        g.add_node(rmf_graph.component_id(comp), "Component", name=comp,
+                   os=params.get("os"), ip=params.get("ip"), data_type=params.get("data_type"))
+        g.save(path); return f"Recorded component {comp}."
+    if op == "implements" and comp and params.get("control"):
+        g.add_node(rmf_graph.component_id(comp), "Component", name=comp)
+        g.add_edge(rmf_graph.component_id(comp), "IMPLEMENTS", rmf_graph.control_id(params["control"]))
+        g.save(path); return f"Recorded: {comp} IMPLEMENTS {params['control'].upper()}."
+    if op == "resides_on" and comp and params.get("parent"):
+        g.add_node(rmf_graph.component_id(comp), "Component", name=comp)
+        g.add_node(rmf_graph.component_id(params["parent"]), "Component", name=params["parent"])
+        g.add_edge(rmf_graph.component_id(comp), "RESIDES_ON", rmf_graph.component_id(params["parent"]))
+        g.save(path); return f"Recorded: {comp} RESIDES_ON {params['parent']}."
+    if op == "vulnerability" and params.get("id"):
+        vid = f"vuln:{params['id'].lower()}"
+        g.add_node(vid, "Vulnerability", vuln_id=params["id"], severity=params.get("severity"))
+        if comp:
+            g.add_node(rmf_graph.component_id(comp), "Component", name=comp)
+            g.add_edge(vid, "AFFECTS", rmf_graph.component_id(comp))
+        g.save(path); return f"Recorded vulnerability {params['id']}" + (f" affecting {comp}." if comp else ".")
+    return ("GraphAdd ops: component (name in `component`) | implements (`component`,`control`) "
+            "| resides_on (`component`,`parent`) | vulnerability (`id`, optional `component`,`severity`).")
+
+
 def tool_websearch(params: dict, config: dict) -> str:
     """Search the internet (DuckDuckGo). Read-only; clean message when offline."""
     from drydock import web
@@ -1128,6 +1380,11 @@ _TOOLS = [
     ("task", tool_task, True),
     ("Dispatch", tool_dispatch, True),
     ("Knowledge", tool_knowledge, True),
+    ("GraphQuery", tool_graphquery, True),
+    ("GraphAdd", tool_graphadd, False),
+    ("StigRules", tool_stigrules, True),
+    ("StigRule", tool_stigrule, True),
+    ("StigSet", tool_stigset, False),
     ("WebSearch", tool_websearch, True),
     ("WebFetch", tool_webfetch, True),
     ("GitStatus", tool_gitstatus, True),
@@ -1144,14 +1401,17 @@ def register_all():
             "Bash": tool_bash, "Glob": tool_glob, "Grep": tool_grep,
             "todo": tool_todo, "task": tool_task, "Dispatch": tool_dispatch,
             "Knowledge": tool_knowledge,
+            "GraphQuery": tool_graphquery, "GraphAdd": tool_graphadd,
+            "StigRules": tool_stigrules, "StigRule": tool_stigrule, "StigSet": tool_stigset,
             "WebSearch": tool_websearch, "WebFetch": tool_webfetch,
             "GitStatus": tool_gitstatus, "GitDiff": tool_gitdiff,
             "GitLog": tool_gitlog, "GitCommit": tool_gitcommit,
         }[name]
         # Read-only w.r.t. the parent's files (GitStatus/Diff/Log inspect only;
-        # GitCommit writes a local, reversible commit).
+        # GitCommit + GraphAdd write).
         read_only = name in (
-            "Read", "Glob", "Grep", "task", "Dispatch", "Knowledge",
+            "Read", "Glob", "Grep", "task", "Dispatch", "Knowledge", "GraphQuery",
+            "StigRules", "StigRule",
             "WebSearch", "WebFetch", "GitStatus", "GitDiff", "GitLog",
         )
         register(ToolDef(name=name, schema=schema, func=func, read_only=read_only))

{drydock_cli-3.0.63 → drydock_cli-3.0.65}/drydock/tui/app.py

@@ -554,10 +554,12 @@ class DrydockApp(App):
 
         try:
             stats = rmf.bootstrap(cwd, families=families)
+            gstats = stats.get("graph", {})
             msg = (
                 f"✓ RMF catalog ingested: {stats['family_docs']} family doc(s), "
-                f"{stats['chunks']} chunks total in the knowledge base. Controls are "
-                "now queryable — try /rmf-control AC-2 or ask about a control."
+                f"{stats['chunks']} KB chunks + a typed graph ({gstats.get('nodes', 0)} "
+                f"nodes, {gstats.get('edges', 0)} edges). Try /rmf-control AC-2 (text) "
+                "or ask the agent to trace relationships (GraphQuery / GraphAdd)."
             )
         except Exception as e:  # noqa: BLE001
             msg = (f"RMF bootstrap failed: {e}. (Needs internet for the one-time "

{drydock_cli-3.0.63 → drydock_cli-3.0.65/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.63
+Version: 3.0.65
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -137,6 +137,13 @@ control catalog into the knowledge base and ships four RMF skills — all
 /rmf-poam <finding>       # generate a POA&M entry from a scan/STIG finding
 ```
 
+Beyond text retrieval, `/rmf bootstrap` also builds a **typed ontology graph**
+(Control / Component / Vulnerability nodes; IMPLEMENTS / RESIDES_ON / ASSESSES
+edges). The agent records your system topology with `GraphAdd` and traces
+relationships with `GraphQuery` — including **control inheritance** ("which
+servers inherit physical controls from their enclave?"). Stdlib in-memory graph,
+no Neo4j.
+
 ## Install
 
 ```bash

{drydock_cli-3.0.63 → drydock_cli-3.0.65}/drydock_cli.egg-info/SOURCES.txt

@@ -18,7 +18,9 @@ drydock/loop_detect.py
 drydock/mcp.py
 drydock/providers.py
 drydock/rmf.py
+drydock/rmf_graph.py
 drydock/skills.py
+drydock/stig.py
 drydock/tool_registry.py
 drydock/tuning.py
 drydock/web.py
@@ -69,8 +71,10 @@ tests/test_plan_autocontinue.py
 tests/test_providers_unreachable.py
 tests/test_read_index.py
 tests/test_rmf.py
+tests/test_rmf_graph.py
 tests/test_runaway_repetition.py
 tests/test_skills.py
+tests/test_stig.py
 tests/test_stop.py
 tests/test_streaming_newlines.py
 tests/test_subagent.py

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

drydock_cli-3.0.65/tests/test_rmf_graph.py

@@ -0,0 +1,62 @@
+"""RMF Phase 2 — the typed ontology graph + GraphQuery/GraphAdd tools.
+Inheritance reasoning is the headline: a component inherits the controls its
+parent system implements (RESIDES_ON → IMPLEMENTS)."""
+from __future__ import annotations
+
+from drydock import rmf_graph as G
+from drydock.tools import tool_graphquery, tool_graphadd
+
+_CAT = {"catalog": {"groups": [
+    {"id": "ac", "title": "Access Control", "controls": [
+        {"id": "ac-2", "title": "Account Management",
+         "parts": [{"name": "assessment-objective", "prose": "accounts are managed"}]}]},
+    {"id": "pe", "title": "Physical and Environmental Protection", "controls": [
+        {"id": "pe-3", "title": "Physical Access Control", "parts": []}]},
+]}}
+
+
+def test_build_from_catalog_typed_nodes():
+    g = G.build_from_catalog(_CAT)
+    assert g.get(G.control_id("ac-2"))["attrs"]["title"] == "Account Management"
+    objs = g.neighbors(G.control_id("ac-2"), "ASSESSES", direction="in")
+    assert objs and g.get(objs[0])["type"] == "Objective"
+
+
+def test_inheritance_reasoning():
+    g = G.build_from_catalog(_CAT)
+    g.add_node(G.component_id("web-1"), "Component", name="web-1")
+    g.add_node(G.component_id("enclave"), "Boundary", name="enclave")
+    g.add_edge(G.component_id("web-1"), "RESIDES_ON", G.component_id("enclave"))
+    g.add_edge(G.component_id("enclave"), "IMPLEMENTS", G.control_id("pe-3"))
+    inh = g.inherited_controls(G.component_id("web-1"))
+    assert G.control_id("pe-3") in inh
+
+
+def test_persistence_roundtrip(tmp_path):
+    g = G.build_from_catalog(_CAT)
+    g.add_edge(G.component_id("a"), "RESIDES_ON", G.component_id("b"))
+    p = tmp_path / "g.json"; g.save(p)
+    g2 = G.RmfGraph.load(p)
+    assert g2.stats()["nodes"] == g.stats()["nodes"]
+    assert {"src": G.component_id("a"), "rel": "RESIDES_ON", "dst": G.component_id("b")} in g2.edges
+
+
+def test_graphadd_and_graphquery_tools(tmp_path):
+    from drydock import rmf_graph
+    # seed a catalog graph
+    g = G.build_from_catalog(_CAT)
+    g.save(rmf_graph.graph_path(str(tmp_path)))
+    cfg = {"cwd": str(tmp_path)}
+    # build a system via the write tool
+    assert "RESIDES_ON" in tool_graphadd({"op": "resides_on", "component": "srv1", "parent": "encl"}, cfg)
+    assert "IMPLEMENTS" in tool_graphadd({"op": "implements", "component": "encl", "control": "PE-3"}, cfg)
+    # query inheritance via the read tool
+    out = tool_graphquery({"op": "inherited", "id": "srv1"}, cfg)
+    assert "PE-3" in out and "inherits" in out
+    # control lookup + implementers
+    assert "Account Management" in tool_graphquery({"op": "control", "id": "AC-2"}, cfg)
+    assert "encl" in tool_graphquery({"op": "implementers", "id": "PE-3"}, cfg)
+
+
+def test_graphquery_empty_graph_is_graceful(tmp_path):
+    assert "empty" in tool_graphquery({"op": "control", "id": "AC-2"}, {"cwd": str(tmp_path)}).lower()

drydock_cli-3.0.65/tests/test_stig.py

@@ -0,0 +1,70 @@
+"""STIG .ckl/.cklb engine — parse, edit-in-place, round-trip; + the tools."""
+from __future__ import annotations
+
+import json
+
+from drydock import stig
+from drydock.tools import tool_stigrules, tool_stigrule, tool_stigset
+
+_CKL = '''<?xml version="1.0" encoding="UTF-8"?>
+<CHECKLIST><ASSET><HOST_NAME>web01</HOST_NAME><HOST_IP>10.0.0.5</HOST_IP></ASSET>
+<STIGS><iSTIG><STIG_INFO></STIG_INFO>
+<VULN>
+<STIG_DATA><VULN_ATTRIBUTE>Vuln_Num</VULN_ATTRIBUTE><ATTRIBUTE_DATA>V-230222</ATTRIBUTE_DATA></STIG_DATA>
+<STIG_DATA><VULN_ATTRIBUTE>Rule_ID</VULN_ATTRIBUTE><ATTRIBUTE_DATA>SV-230222r1</ATTRIBUTE_DATA></STIG_DATA>
+<STIG_DATA><VULN_ATTRIBUTE>Severity</VULN_ATTRIBUTE><ATTRIBUTE_DATA>medium</ATTRIBUTE_DATA></STIG_DATA>
+<STIG_DATA><VULN_ATTRIBUTE>Rule_Title</VULN_ATTRIBUTE><ATTRIBUTE_DATA>Enable FIPS</ATTRIBUTE_DATA></STIG_DATA>
+<STIG_DATA><VULN_ATTRIBUTE>Check_Content</VULN_ATTRIBUTE><ATTRIBUTE_DATA>Run fips-mode-setup --check</ATTRIBUTE_DATA></STIG_DATA>
+<STIG_DATA><VULN_ATTRIBUTE>Fix_Text</VULN_ATTRIBUTE><ATTRIBUTE_DATA>Run fips-mode-setup --enable</ATTRIBUTE_DATA></STIG_DATA>
+<STATUS>Not_Reviewed</STATUS><FINDING_DETAILS></FINDING_DETAILS><COMMENTS></COMMENTS></VULN>
+</iSTIG></STIGS></CHECKLIST>'''
+
+_CKLB = {"title": "RHEL9", "target_data": {"host_name": "web01"}, "stigs": [{"stig_name": "RHEL 9",
+    "rules": [{"group_id": "V-230222", "rule_id": "SV-230222r1", "rule_title": "Enable FIPS",
+               "severity": "medium", "check_content": "fips-mode-setup --check",
+               "fix_text": "fips-mode-setup --enable", "status": "not_reviewed",
+               "finding_details": "", "comments": ""}]}]}
+
+
+def test_ckl_roundtrip_edit_in_place(tmp_path):
+    p = tmp_path / "r.ckl"; p.write_text(_CKL)
+    cl = stig.load(p)
+    assert cl.fmt == "ckl" and cl.asset["HOST_NAME"] == "web01"
+    assert cl.rules[0].check_content == "Run fips-mode-setup --check"
+    assert cl.update("V-230222", status="open", finding_details="FIPS off.", comments="by drydock")
+    cl.save(p)
+    re = stig.load(p)
+    assert re.rules[0].status == "open" and re.rules[0].finding_details == "FIPS off."
+    # other STIG_DATA preserved (schema fidelity)
+    assert "Vuln_Num" in p.read_text() and "<STATUS>Open</STATUS>" in p.read_text()
+
+
+def test_cklb_roundtrip(tmp_path):
+    p = tmp_path / "r.cklb"; p.write_text(json.dumps(_CKLB))
+    cl = stig.load(p)
+    assert cl.fmt == "cklb"
+    cl.update("SV-230222r1", status="not_a_finding", finding_details="FIPS on.")
+    cl.save(p)
+    data = json.loads(p.read_text())  # still valid JSON
+    assert data["stigs"][0]["rules"][0]["status"] == "not_a_finding"
+    assert stig.load(p).rules[0].finding_details == "FIPS on."
+
+
+def test_status_canonicalization():
+    assert stig.canonical_status("NotAFinding") == "not_a_finding"
+    assert stig.canonical_status("Not_Applicable") == "not_applicable"
+    assert stig.canonical_status("garbage") == "not_reviewed"
+
+
+def test_stig_tools(tmp_path):
+    p = tmp_path / "r.ckl"; p.write_text(_CKL); cfg = {"cwd": str(tmp_path)}
+    out = tool_stigrules({"path": "r.ckl"}, cfg)
+    assert "V-230222" in out and "not_reviewed=1" in out
+    detail = tool_stigrule({"path": "r.ckl", "rule_id": "V-230222"}, cfg)
+    assert "Check Content" in detail and "fips-mode-setup --check" in detail
+    set_out = tool_stigset({"path": "r.ckl", "rule_id": "V-230222", "status": "open",
+                            "finding_details": "FIPS disabled."}, cfg)
+    assert "set to open" in set_out
+    assert stig.load(p).rules[0].status == "open"
+    # filter by status
+    assert "not_reviewed=0" in tool_stigrules({"path": "r.ckl"}, cfg)