drydock-cli 3.0.62__tar.gz → 3.0.64__tar.gz

{drydock_cli-3.0.62/drydock_cli.egg-info → drydock_cli-3.0.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.62
+Version: 3.0.64
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -89,6 +89,8 @@ Typed into the prompt. The agent also knows these, so you can just **ask it**
 | `/<name>` | Run a skill |
 | `/loop <count> <prompt>` | Repeat a prompt N times (Esc stops) |
 | `/mcp` | List connected MCP servers + their tools |
+| `/rmf bootstrap [families]` | Ingest the NIST SP 800-53 catalog (RMF automation) |
+| `/rmf-control` · `/rmf-categorize` · `/rmf-review` · `/rmf-poam` | Bundled RMF skills |
 | `/model` · `/cwd` | Show/set model & endpoint · working directory |
 | `/undo` · `/back` | Revert the last write · rewind the last turn |
 | `/compact` · `/status` · `/clear` | Shrink context · session stats · reset |
@@ -120,6 +122,28 @@ needs nothing extra; PDF uses the `pdftotext` binary (poppler) if present, else
 Skills are markdown files in `~/.drydock/skills/` (personal) or
 `<project>/.drydock/skills/` (project); `/skills new` writes one for you.
 
+### RMF automation (NIST SP 800-53)
+
+For Risk Management Framework work, Drydock can ingest the NIST SP 800-53 Rev 5
+control catalog into the knowledge base and ships four RMF skills — all
+**100% local** for CUI/sensitive systems.
+
+```
+/rmf bootstrap            # one-time: fetch + ingest the 800-53 catalog (offline after)
+/graphrag build ./ssp     # ingest your own SSP/POA&M (PDF/Word/text)
+/rmf-control AC-2         # look up a control
+/rmf-categorize ...       # FIPS 199 categorization + tailored baseline
+/rmf-review AC-2          # review an SSP implementation statement vs 800-53A
+/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.62 → drydock_cli-3.0.64}/README.md

@@ -65,6 +65,8 @@ Typed into the prompt. The agent also knows these, so you can just **ask it**
 | `/<name>` | Run a skill |
 | `/loop <count> <prompt>` | Repeat a prompt N times (Esc stops) |
 | `/mcp` | List connected MCP servers + their tools |
+| `/rmf bootstrap [families]` | Ingest the NIST SP 800-53 catalog (RMF automation) |
+| `/rmf-control` · `/rmf-categorize` · `/rmf-review` · `/rmf-poam` | Bundled RMF skills |
 | `/model` · `/cwd` | Show/set model & endpoint · working directory |
 | `/undo` · `/back` | Revert the last write · rewind the last turn |
 | `/compact` · `/status` · `/clear` | Shrink context · session stats · reset |
@@ -96,6 +98,28 @@ needs nothing extra; PDF uses the `pdftotext` binary (poppler) if present, else
 Skills are markdown files in `~/.drydock/skills/` (personal) or
 `<project>/.drydock/skills/` (project); `/skills new` writes one for you.
 
+### RMF automation (NIST SP 800-53)
+
+For Risk Management Framework work, Drydock can ingest the NIST SP 800-53 Rev 5
+control catalog into the knowledge base and ships four RMF skills — all
+**100% local** for CUI/sensitive systems.
+
+```
+/rmf bootstrap            # one-time: fetch + ingest the 800-53 catalog (offline after)
+/graphrag build ./ssp     # ingest your own SSP/POA&M (PDF/Word/text)
+/rmf-control AC-2         # look up a control
+/rmf-categorize ...       # FIPS 199 categorization + tailored baseline
+/rmf-review AC-2          # review an SSP implementation statement vs 800-53A
+/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.64/drydock/builtin_skills/rmf-categorize.md

@@ -0,0 +1,16 @@
+---
+name: rmf-categorize
+description: Categorize a system (FIPS 199) and recommend a tailored 800-53 baseline
+---
+Help categorize a system for RMF Steps 1-3. If the user has not given the system
+description and the data types it handles, ask for them first. Then:
+1. Recommend a FIPS 199 security categorization (Low / Moderate / High) for
+   confidentiality, integrity, and availability, each with a brief justification,
+   and the resulting overall (high-water-mark) impact level.
+2. Recommend the tailored initial NIST SP 800-53 baseline for that level — use the
+   Knowledge tool to cite the relevant control families and key control IDs.
+3. Note controls likely tailored OUT given the system boundary (e.g., wireless
+   access controls for an air-gapped network).
+Be concrete and cite control IDs.
+
+System details: $ARGS

drydock_cli-3.0.64/drydock/builtin_skills/rmf-control.md

@@ -0,0 +1,10 @@
+---
+name: rmf-control
+description: Look up a NIST SP 800-53 control from the knowledge base
+---
+Your FIRST action must be to call the Knowledge tool with the query "$ARGS" —
+do this before writing anything; do not answer from memory. From the passages it
+returns, summarize the control: ID and title, family, the control statement, and
+its key assessment objectives. ONLY if the Knowledge tool returns no passages at
+all may you say the control is not in the knowledge base (then suggest /rmf
+bootstrap). Control to look up: $ARGS

drydock_cli-3.0.64/drydock/builtin_skills/rmf-poam.md

@@ -0,0 +1,11 @@
+---
+name: rmf-poam
+description: Generate a POA&M entry from a finding / vulnerability / failed STIG
+---
+First call the Knowledge tool to map this finding to the impacted system
+component(s) and the specific NIST SP 800-53 control(s) it makes non-compliant:
+$ARGS. Then generate a formatted POA&M (Plan of Action & Milestones) entry with:
+Weakness description; Source (scan / STIG / assessment); Affected component(s);
+Non-compliant control(s); Severity; Recommended remediation with concrete
+technical milestones; estimated remediation timeline. Be specific (e.g., "Apply
+patch X to Server Y to satisfy SI-2"). Consult the Knowledge tool before writing.

drydock_cli-3.0.64/drydock/builtin_skills/rmf-review.md

@@ -0,0 +1,11 @@
+---
+name: rmf-review
+description: Review an SSP implementation statement against 800-53A objectives
+---
+First call the Knowledge tool to retrieve the control statement and assessment
+objectives (NIST SP 800-53A) for: $ARGS. Then review the implementation
+statement(s) for those control(s): flag where they are incomplete, lack
+specificity (who / what / how / how often), fail to address part of the control,
+or omit continuous-monitoring requirements. Output: a one-line verdict
+(adequate / needs work), then bulleted gaps, each mapped to the assessment
+objective it fails to satisfy. Always consult the Knowledge tool before judging.

{drydock_cli-3.0.62 → drydock_cli-3.0.64}/drydock/graphrag.py

@@ -52,6 +52,9 @@ _RE_IDENT = re.compile(r"\b([a-zA-Z_][a-zA-Z0-9_]*(?:[_./][a-zA-Z0-9_]+)+)\b")
 _RE_CAMEL = re.compile(r"\b([A-Z][a-z0-9]+(?:[A-Z][a-z0-9]+)+)\b")
 _RE_PROPER = re.compile(r"\b([A-Z][a-zA-Z0-9]+(?:[ \t]+[A-Z][a-zA-Z0-9]+){0,3})\b")
 _RE_ACRONYM = re.compile(r"\b([A-Z]{2,6})\b")
+# Dotted/hyphenated codes like control IDs (AC-2, AC-2.1, SI-4), CVEs, STIG IDs —
+# these tokenize into too-short pieces otherwise, so a lookup by the code misses.
+_RE_CODE = re.compile(r"\b([A-Za-z]{1,6}-\d+(?:\.\d+)*)\b")
 _RE_WORD = re.compile(r"[a-zA-Z0-9_]+")
 
 
@@ -63,7 +66,7 @@ def default_store_path(cwd: str) -> Path:
 def extract_entities(text: str) -> list[str]:
     """Heuristic entity extraction → normalized (lowercased) entity keys."""
     found: set[str] = set()
-    for rx in (_RE_BACKTICK, _RE_IDENT, _RE_CAMEL, _RE_PROPER, _RE_ACRONYM):
+    for rx in (_RE_BACKTICK, _RE_IDENT, _RE_CAMEL, _RE_PROPER, _RE_ACRONYM, _RE_CODE):
         for m in rx.findall(text):
             e = m.strip().lower()
             # Drop trivial / stopword-only entities and overlong noise.

drydock_cli-3.0.64/drydock/rmf.py

@@ -0,0 +1,132 @@
+"""RMF automation — NIST SP 800-53 catalog ingestion for GraphRAG.
+
+Local-first: fetch the machine-readable OSCAL catalog once (over the network),
+flatten each control to readable text (id, family, statement, guidance,
+assessment objective), and ingest it into the project GraphRAG knowledge base so
+the agent can look up and reason over controls offline via the `Knowledge` tool.
+
+Pairs with the bundled RMF skills (rmf-categorize / rmf-review / rmf-poam /
+rmf-control) and the user's own ingested SSP / POA&M / scan artifacts.
+
+Stdlib only (urllib + json). All logic original to Drydock.
+"""
+from __future__ import annotations
+
+import json
+import re
+import urllib.request
+from pathlib import Path
+
+# NIST's official OSCAL content (public domain). Rev 5 catalog.
+DEFAULT_CATALOG_URL = (
+    "https://raw.githubusercontent.com/usnistgov/oscal-content/main/"
+    "nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_catalog.json"
+)
+
+_INSERT = re.compile(r"\{\{\s*insert:\s*param,\s*([A-Za-z0-9_.\-]+)\s*\}\}")
+# Part names worth surfacing to the model, in order, with a readable label.
+_PART_LABELS = [
+    ("statement", "Statement"),
+    ("guidance", "Guidance"),
+    ("assessment-objective", "Assessment objective"),
+]
+
+
+def fetch_catalog(dest: str | Path, *, url: str = DEFAULT_CATALOG_URL,
+                  timeout: float = 60.0) -> Path:
+    """Download the OSCAL catalog JSON to dest. Returns the path."""
+    dest = Path(dest)
+    dest.parent.mkdir(parents=True, exist_ok=True)
+    req = urllib.request.Request(url, headers={"User-Agent": "drydock-rmf"})
+    with urllib.request.urlopen(req, timeout=timeout) as r:  # noqa: S310 (NIST, trusted)
+        dest.write_bytes(r.read())
+    return dest
+
+
+def _resolve(prose: str, params: dict) -> str:
+    """Replace OSCAL {{ insert: param, id }} markers with the param's label."""
+    def sub(m):
+        p = params.get(m.group(1))
+        return f"[{p}]" if p else "[assignment]"
+    return _INSERT.sub(sub, prose or "")
+
+
+def _part_prose(part: dict, params: dict) -> str:
+    """All prose in a part and its sub-parts, joined."""
+    bits = []
+    if part.get("prose"):
+        bits.append(_resolve(part["prose"], params))
+    for sub in part.get("parts", []) or []:
+        t = _part_prose(sub, params)
+        if t:
+            bits.append(t)
+    return "\n".join(bits).strip()
+
+
+def flatten_control(control: dict, family: str) -> str:
+    """Render one control as a readable text block for ingestion."""
+    params = {p["id"]: p.get("label") or (p.get("select") or {}).get("how-many")
+              for p in control.get("params", []) or []}
+    cid = control.get("id", "").upper()
+    lines = [f"{cid} — {control.get('title', '')}  (Family: {family})"]
+    parts = {p.get("name"): p for p in control.get("parts", []) or []}
+    for name, label in _PART_LABELS:
+        if name in parts:
+            prose = _part_prose(parts[name], params)
+            if prose:
+                lines.append(f"{label}: {prose}")
+    return "\n".join(lines)
+
+
+def catalog_to_family_docs(catalog: dict, dest_dir: str | Path,
+                           families: list[str] | None = None) -> list[Path]:
+    """Write one markdown doc per control family (e.g. ac.md). Returns paths.
+    `families` (lowercase ids like 'ac') filters which to write; None = all."""
+    dest_dir = Path(dest_dir)
+    dest_dir.mkdir(parents=True, exist_ok=True)
+    want = {f.lower() for f in families} if families else None
+    written: list[Path] = []
+    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
+        title = group.get("title", fid)
+        blocks = [f"# {title} ({fid.upper()}) — NIST SP 800-53 Rev 5\n"]
+        for control in group.get("controls", []) or []:
+            blocks.append(flatten_control(control, title))
+            # nested enhancements
+            for enh in control.get("controls", []) or []:
+                blocks.append(flatten_control(enh, title))
+        out = dest_dir / f"{fid}.md"
+        out.write_text("\n\n".join(blocks), encoding="utf-8")
+        written.append(out)
+    return written
+
+
+def rmf_dir(cwd: str) -> Path:
+    return Path(cwd) / ".drydock" / "rmf"
+
+
+def bootstrap(cwd: str, *, families: list[str] | None = None,
+              source: str | Path | None = None) -> dict:
+    """Fetch (if needed) + flatten the 800-53 catalog into <cwd>/.drydock/rmf and
+    ingest it into the GraphRAG KB. Returns {families, controls_docs, **kb_stats}.
+    `source` reuses an already-downloaded catalog JSON (offline)."""
+    from drydock import graphrag
+
+    base = rmf_dir(cwd)
+    cat_path = Path(source) if source else base / "catalog.json"
+    if not cat_path.exists():
+        fetch_catalog(cat_path)
+    catalog = json.loads(Path(cat_path).read_text("utf-8"))
+    docs = catalog_to_family_docs(catalog, base / "800-53", families)
+    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.64/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.62 → drydock_cli-3.0.64}/drydock/skills.py

@@ -74,7 +74,13 @@ def _parse(path: Path) -> Skill | None:
 
 
 def skills_dirs(cwd: str) -> list[Path]:
-    return [Path.home() / ".drydock" / "skills", Path(cwd) / ".drydock" / "skills"]
+    # Built-in skills ship with the package (e.g. the RMF skills); user + project
+    # dirs come AFTER so they override a built-in of the same name.
+    return [
+        Path(__file__).parent / "builtin_skills",
+        Path.home() / ".drydock" / "skills",
+        Path(cwd) / ".drydock" / "skills",
+    ]
 
 
 def create_skill(name: str, body: str, *, description: str = "", scope: str = "user",

{drydock_cli-3.0.62 → drydock_cli-3.0.64}/drydock/tools/__init__.py

@@ -270,6 +270,48 @@ SCHEMAS = [
             "required": ["message"],
         },
     },
+    {
+        "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 +1095,92 @@ 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 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 = [g.get(o)["attrs"].get("prose", "") for o in g.neighbors(node, "ASSESSES", direction="in")]
+        impl = [g.get(c)["attrs"].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 = [g.get(c)["attrs"].get("control_id", c)
+                 for c in g.of_type("Control")
+                 if g.get(c)["attrs"].get("family", "").lower().startswith(ident.lower())
+                 or ident.lower() in g.get(c)["attrs"].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 = [g.get(c)["attrs"].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 = [g.get(c)["attrs"].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 = [g.get(c)["attrs"].get("control_id", c) for c in g.neighbors(comp, "IMPLEMENTS", direction="out")]
+        res = [g.get(p)["attrs"].get("name", p) for p in g.neighbors(comp, "RESIDES_ON", direction="out")]
+        vulns = [g.get(v)["attrs"].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 +1256,8 @@ _TOOLS = [
     ("task", tool_task, True),
     ("Dispatch", tool_dispatch, True),
     ("Knowledge", tool_knowledge, True),
+    ("GraphQuery", tool_graphquery, True),
+    ("GraphAdd", tool_graphadd, False),
     ("WebSearch", tool_websearch, True),
     ("WebFetch", tool_webfetch, True),
     ("GitStatus", tool_gitstatus, True),
@@ -1144,14 +1274,15 @@ 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,
             "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",
             "WebSearch", "WebFetch", "GitStatus", "GitDiff", "GitLog",
         )
         register(ToolDef(name=name, schema=schema, func=func, read_only=read_only))

{drydock_cli-3.0.62 → drydock_cli-3.0.64}/drydock/tui/app.py

@@ -495,12 +495,15 @@ class DrydockApp(App):
                 "  /skills          list skills · /skills new <name> <prompt> to create one\n"
                 "  /loop            /loop <count> <prompt> — repeat a prompt (Esc stops)\n"
                 "  /mcp             list connected MCP servers and their tools\n"
+                "  /rmf             RMF automation — /rmf bootstrap, then /rmf-control etc.\n"
                 "  /clear           reset the conversation\n"
                 "  /quit            exit\n"
                 "Type a task and press Enter. ↑/↓ recall history · Esc stops · Ctrl+O expands tools."
             )
         elif cmd == "/mcp":
             self._cmd_mcp()
+        elif cmd == "/rmf":
+            self._cmd_rmf(arg)
         elif cmd == "/loop":
             self._cmd_loop(arg)
         elif cmd == "/skills":
@@ -510,6 +513,59 @@ class DrydockApp(App):
         else:
             self._mount(ErrorMessage(f"unknown command: {cmd} (try /help)"))
 
+    def _cmd_rmf(self, arg: str) -> None:
+        """RMF automation: bootstrap the NIST 800-53 catalog into the knowledge
+        base and surface the bundled RMF skills."""
+        from drydock import rmf
+
+        parts = arg.split()
+        sub = parts[0].lower() if parts else ""
+        cwd = self.config.get("cwd") or "."
+        if sub == "bootstrap":
+            families = [f.lower() for f in parts[1:]] or None
+            scope = ("families " + ", ".join(families)) if families else "all 20 families"
+            self._info(
+                f"Ingesting the NIST SP 800-53 Rev 5 catalog ({scope}) into the "
+                "knowledge base — one-time download + index, this can take ~30s…"
+            )
+            self.run_worker(lambda: self._rmf_bootstrap(cwd, families), thread=True)
+        elif sub in ("", "help", "status"):
+            cat = rmf.rmf_dir(cwd) / "catalog.json"
+            have = "downloaded" if cat.exists() else "not downloaded yet"
+            self._info(
+                "RMF automation — automate Risk Management Framework work.\n"
+                f"  Catalog (NIST 800-53 Rev 5): {have} ({cat})\n"
+                "  /rmf bootstrap [families…]   ingest the control catalog (e.g. "
+                "/rmf bootstrap ac si, or no args for all)\n"
+                "Skills (run as /<name>):\n"
+                "  /rmf-control <id>      look up a control (e.g. /rmf-control AC-2)\n"
+                "  /rmf-categorize …      FIPS 199 categorization + tailored baseline\n"
+                "  /rmf-review <control>  review an SSP implementation statement\n"
+                "  /rmf-poam <finding>    generate a POA&M entry\n"
+                "Ingest your own SSPs/POA&Ms (PDF/Word/text) with /graphrag build "
+                "<path> so the skills can cross-reference them."
+            )
+        else:
+            self._info("usage:  /rmf bootstrap [families…]  ·  /rmf status")
+
+    def _rmf_bootstrap(self, cwd: str, families) -> None:
+        """Worker-thread body: fetch + ingest the catalog, report back on the UI."""
+        from drydock import rmf
+
+        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']} 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 "
+                   "catalog download; after that it works offline.)")
+        self.call_from_thread(self._info, msg)
+
     def _cmd_mcp(self) -> None:
         """List connected MCP servers and the tools they expose."""
         from drydock import mcp

{drydock_cli-3.0.62 → drydock_cli-3.0.64}/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", "/clear", "/quit",
+    "/compact", "/graphrag", "/skills", "/loop", "/mcp", "/rmf", "/clear", "/quit",
 ]
 
 

{drydock_cli-3.0.62 → drydock_cli-3.0.64/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.62
+Version: 3.0.64
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -89,6 +89,8 @@ Typed into the prompt. The agent also knows these, so you can just **ask it**
 | `/<name>` | Run a skill |
 | `/loop <count> <prompt>` | Repeat a prompt N times (Esc stops) |
 | `/mcp` | List connected MCP servers + their tools |
+| `/rmf bootstrap [families]` | Ingest the NIST SP 800-53 catalog (RMF automation) |
+| `/rmf-control` · `/rmf-categorize` · `/rmf-review` · `/rmf-poam` | Bundled RMF skills |
 | `/model` · `/cwd` | Show/set model & endpoint · working directory |
 | `/undo` · `/back` | Revert the last write · rewind the last turn |
 | `/compact` · `/status` · `/clear` | Shrink context · session stats · reset |
@@ -120,6 +122,28 @@ needs nothing extra; PDF uses the `pdftotext` binary (poppler) if present, else
 Skills are markdown files in `~/.drydock/skills/` (personal) or
 `<project>/.drydock/skills/` (project); `/skills new` writes one for you.
 
+### RMF automation (NIST SP 800-53)
+
+For Risk Management Framework work, Drydock can ingest the NIST SP 800-53 Rev 5
+control catalog into the knowledge base and ships four RMF skills — all
+**100% local** for CUI/sensitive systems.
+
+```
+/rmf bootstrap            # one-time: fetch + ingest the 800-53 catalog (offline after)
+/graphrag build ./ssp     # ingest your own SSP/POA&M (PDF/Word/text)
+/rmf-control AC-2         # look up a control
+/rmf-categorize ...       # FIPS 199 categorization + tailored baseline
+/rmf-review AC-2          # review an SSP implementation statement vs 800-53A
+/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.62 → drydock_cli-3.0.64}/drydock_cli.egg-info/SOURCES.txt

@@ -17,10 +17,17 @@ drydock/guards.py
 drydock/loop_detect.py
 drydock/mcp.py
 drydock/providers.py
+drydock/rmf.py
+drydock/rmf_graph.py
 drydock/skills.py
 drydock/tool_registry.py
 drydock/tuning.py
 drydock/web.py
+drydock/builtin_skills/__init__.py
+drydock/builtin_skills/rmf-categorize.md
+drydock/builtin_skills/rmf-control.md
+drydock/builtin_skills/rmf-poam.md
+drydock/builtin_skills/rmf-review.md
 drydock/tools/__init__.py
 drydock/tui/__init__.py
 drydock/tui/app.py
@@ -62,6 +69,8 @@ tests/test_oneshot_unreachable.py
 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_stop.py

{drydock_cli-3.0.62 → drydock_cli-3.0.64}/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.62"
+version = "3.0.64"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -24,6 +24,10 @@ Issues = "https://github.com/fbobe321/drydock/issues"
 [tool.setuptools.packages.find]
 include = ["drydock*"]
 
+[tool.setuptools.package-data]
+# Ship the bundled skill prompts (RMF, etc.) inside the wheel.
+"drydock.builtin_skills" = ["*.md"]
+
 [project.scripts]
 drydock = "drydock.cli:main"
 

drydock_cli-3.0.64/tests/test_rmf.py

@@ -0,0 +1,51 @@
+"""RMF: NIST 800-53 catalog flatten + ingest. Uses a tiny synthetic OSCAL catalog
+so the test is offline + fast (no 10 MB download)."""
+from __future__ import annotations
+
+import json
+
+from drydock import rmf, graphrag, skills
+
+_CATALOG = {"catalog": {"groups": [{
+    "id": "ac", "title": "Access Control", "controls": [
+        {"id": "ac-2", "title": "Account Management",
+         "params": [{"id": "ac-2_prm_1", "label": "organization-defined roles"}],
+         "parts": [
+             {"name": "statement", "prose": "Manage accounts for {{ insert: param, ac-2_prm_1 }}."},
+             {"name": "assessment-objective", "prose": "Determine if accounts are managed."},
+         ],
+         "controls": [
+             {"id": "ac-2.1", "title": "Automated Account Management",
+              "parts": [{"name": "statement", "prose": "Support account management with automation."}]},
+         ]},
+    ]}]}}
+
+
+def test_flatten_resolves_params_and_parts(tmp_path):
+    docs = rmf.catalog_to_family_docs(_CATALOG, tmp_path)
+    text = docs[0].read_text()
+    assert "AC-2 — Account Management" in text
+    assert "[organization-defined roles]" in text          # param resolved
+    assert "Assessment objective:" in text
+    assert "AC-2.1 — Automated Account Management" in text  # enhancement included
+
+
+def test_family_filter(tmp_path):
+    assert rmf.catalog_to_family_docs(_CATALOG, tmp_path, families=["si"]) == []  # no SI in catalog
+    assert len(rmf.catalog_to_family_docs(_CATALOG, tmp_path, families=["ac"])) == 1
+
+
+def test_bootstrap_from_local_source_ingests_into_kb(tmp_path):
+    src = tmp_path / "cat.json"; src.write_text(json.dumps(_CATALOG))
+    stats = rmf.bootstrap(str(tmp_path), source=str(src))
+    assert stats["family_docs"] == 1 and stats["chunks"] >= 1
+    idx = graphrag.load_index(graphrag.default_store_path(str(tmp_path)))
+    assert idx is not None
+    res = graphrag.query_index(idx, "account management automation")
+    assert res["chunks"] and "ac" in res["chunks"][0]["source"].lower()
+
+
+def test_rmf_skills_are_bundled():
+    sk = skills.load_skills("/tmp")
+    for name in ("rmf-control", "rmf-categorize", "rmf-review", "rmf-poam"):
+        assert name in sk and sk[name].body.strip()

drydock_cli-3.0.64/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.62 → drydock_cli-3.0.64}/tests/test_skills.py

@@ -52,8 +52,10 @@ def test_empty_body_skipped(tmp_path):
     assert "empty" not in skills.load_skills(str(tmp_path))
 
 
-def test_no_skills_dir_is_empty(tmp_path):
-    assert skills.load_skills(str(tmp_path)) == {}
+def test_no_user_or_project_skills_yields_only_builtins(tmp_path):
+    # With no user/project skills, only the bundled built-ins (RMF) are present.
+    loaded = skills.load_skills(str(tmp_path))
+    assert set(loaded) == {"rmf-control", "rmf-categorize", "rmf-review", "rmf-poam"}
 
 
 def test_create_skill_user_scope(tmp_path, monkeypatch):