Files
hermes-agent/tools/skills_hub.py
Teknium a5bd246865 Old pre-decomposition import paths are gone: plugin compat layer removed on schedule (#126164)
* refactor(plugins): remove the Sep 2026 decomposition compat layer on schedule

The PLUGIN-COMPAT layer (2776813df3 + d63e380324 + 0a5164cebe) kept pre-#102117 import paths
alive for external plugins until 2026-09-14. That window closed two weeks ago; since then the loader
has already been skipping plugins that use the old paths. This removes the layer itself:

- 328 appended `PLUGIN-COMPAT` blocks (lazy `__getattr__` pointer tables, re-exported third-party
  names, restored dead definitions) and the three re-export stub modules
  (gateway/startup_watchdog, hermes_cli/observability/relay_runtime, tools/environments/modal_utils)
- COMPAT_MANIFEST.md, compat_manifest.json, scripts/check_compat_pointers.py and its lint step
- the reporting surfaces: CLI banner notice, `hermes plugins compat`, the `hermes doctor` section,
  the post-update notice, the Desktop one-time dialog, the loader's pre-import skip and the
  `plugins.allow_deprecated_imports` escape hatch

An external plugin that still imports an old path now fails to load with its ImportError as the
reason in `hermes plugins list`, the same path as any broken plugin.

hermes_cli/plugin_compat.py stays as three inert stubs (compat_report, removal_in_effect,
summary_lines): an already-running pre-removal `hermes update` lazy-imports them after the checkout
swap (tests/compat/old_updater_surface.json).

In-tree fallout, both already dead: hermes_cli/setup.py::_check_espeak_ng (no callers; its
`shutil` came from a compat block) and gateway/config.py::SessionResetPolicy ("retained solely for
the scheduled plugin-compat window"). Two test_run_agent patches targeted the removed
`run_agent.handle_function_call` pointer; they now patch `model_tools.handle_function_call`, the
seam production reads, like every sibling test in that file.

* chore: retrigger CI (zero-job startup_failure phantom)

* test: drop resolution allowlist rows for the two deleted which() sites

hermes_cli/setup.py::_check_espeak_ng (dead) and tools/skillevaluator_scan.py::scanner_available
(a restored definition inside a PLUGIN-COMPAT block) no longer exist; the stale-row gate requires
their allowlist entries go with them.
2026-09-28 10:21:41 -07:00

418 lines
15 KiB
Python

#!/usr/bin/env python3
"""
Skills Hub — hub state management and the public facade for the source adapters.
Library module (not an agent tool). Owns the hub paths, guarded HTTP, index
cache, lock file, taps and audit log. Install/uninstall/update live in
``skills_hub_install``, the index fetch/source router/search in
``skills_hub_search``, and the adapters in the other ``tools.skills_hub_*``
siblings; import each name from its defining module.
Used by hermes_cli/skills_hub.py for CLI commands and the /skills slash command.
"""
import json
import logging
import time
from contextvars import ContextVar
from contextlib import ExitStack, contextmanager
from datetime import datetime, timezone
from pathlib import Path
from typing import Any, Dict, Iterator, List, Optional
from urllib.parse import urljoin
import httpx
from hermes_constants import get_hermes_home
from tools.url_safety import is_safe_url
from tools.url_safety import create_ssrf_safe_client
from tools.website_policy import check_website_access
from tools.skills_hub_models import _normalize_lock_install_path, _validate_skill_name
logger = logging.getLogger(__name__)
# ---------------------------------------------------------------------------
# Paths
# ---------------------------------------------------------------------------
# Resolved per-call (not frozen at import) so the profile override is honored;
# import-time constants leaked across profiles in single-process multi-profile
# runtimes. The path names (SKILLS_DIR, ...) resolve live via __getattr__ below.
INDEX_CACHE_TTL = 3600 # 1 hour
def _path_resolver(name: str, parent: str, leaf: str):
"""Resolver for hub path ``<parent>/<leaf>``: a test-injected real module attribute
(patch.object/monkeypatch on SKILLS_DIR etc.) wins over live resolution."""
def resolve() -> Path:
forced = globals().get(name)
return Path(forced) if forced is not None else _DYNAMIC_PATH_RESOLVERS[parent]() / leaf
resolve.__name__ = f"_{name.lower()}"
return resolve
def _hermes_home() -> Path:
return get_hermes_home()
_skills_dir = _path_resolver("SKILLS_DIR", "HERMES_HOME", "skills")
_hub_dir = _path_resolver("HUB_DIR", "SKILLS_DIR", ".hub")
_lock_file = _path_resolver("LOCK_FILE", "HUB_DIR", "lock.json")
_quarantine_dir = _path_resolver("QUARANTINE_DIR", "HUB_DIR", "quarantine")
_audit_log = _path_resolver("AUDIT_LOG", "HUB_DIR", "audit.log")
_taps_file = _path_resolver("TAPS_FILE", "HUB_DIR", "taps.json")
_index_cache_dir = _path_resolver("INDEX_CACHE_DIR", "HUB_DIR", "index-cache")
_DYNAMIC_PATH_RESOLVERS = {"HERMES_HOME": _hermes_home, **{
r.__name__[1:].upper(): r
for r in (_skills_dir, _hub_dir, _lock_file, _quarantine_dir, _audit_log, _taps_file, _index_cache_dir)
}}
def __getattr__(name: str):
"""Resolve legacy path constants dynamically (PEP 562) so they reflect the
active profile override; a test's patch.object-set real attribute shadows it."""
resolver = _DYNAMIC_PATH_RESOLVERS.get(name)
if resolver is not None:
return resolver()
raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
# ---------------------------------------------------------------------------
# Install-path safety + guarded HTTP
# ---------------------------------------------------------------------------
_REDIRECT_STATUS_CODES = {301, 302, 303, 307, 308}
_MAX_SKILL_FETCH_REDIRECTS = 5
# Default per-request timeout every one-shot hub GET used before pooling existed.
_DEFAULT_HTTP_TIMEOUT = 20
# An inspect resolves metadata and then the preview bundle through the same
# source adapter. Keeping this context local to that operation lets httpx reuse
# its verified connection without extending a client beyond the CLI request.
_skills_hub_http_client: ContextVar[Optional[Any]] = ContextVar(
"skills_hub_http_client", default=None
)
@contextmanager
def skills_hub_http_session() -> Iterator[None]:
"""Reuse one SSRF-safe HTTP client for a single skills-hub resolution."""
if _skills_hub_http_client.get() is not None:
yield
return
with create_ssrf_safe_client(timeout=_DEFAULT_HTTP_TIMEOUT, follow_redirects=False) as client:
token = _skills_hub_http_client.set(client)
try:
yield
finally:
_skills_hub_http_client.reset(token)
def _skills_hub_http_get(url: str, **kwargs: Any) -> httpx.Response:
"""GET through the active resolution pool, or preserve one-shot behavior."""
client = _skills_hub_http_client.get()
if client is not None:
return client.get(url, **kwargs)
return httpx.get(url, **kwargs)
def _ssrf_safe_http_get(url: str, *, timeout: int = _DEFAULT_HTTP_TIMEOUT,
headers: Optional[Dict[str, str]] = None) -> httpx.Response:
"""Fetch one URL with connect-time SSRF validation and no automatic redirects."""
with skills_hub_http_session():
return _skills_hub_http_client.get().get(url, timeout=timeout, headers=headers)
def _guarded_http_get(url: str, *, timeout: int = _DEFAULT_HTTP_TIMEOUT,
headers: Optional[Dict[str, str]] = None) -> Optional[httpx.Response]:
"""Fetch a URL with SSRF and redirect-target validation (each hop re-checked).
*headers* are plain request headers (no credentials) and are sent on every hop."""
from tools.url_safety import SSRFConnectionBlocked
current_url = url
for _ in range(_MAX_SKILL_FETCH_REDIRECTS + 1):
if not is_safe_url(current_url):
logger.warning("Blocked unsafe Skills Hub URL: %s", current_url)
return None
blocked = check_website_access(current_url)
if blocked:
logger.info(
"Blocked Skills Hub fetch for %s by rule %s",
blocked["host"],
blocked["rule"],
)
return None
try:
resp = _ssrf_safe_http_get(current_url, timeout=timeout, headers=headers)
except (SSRFConnectionBlocked, httpx.HTTPError) as exc:
logger.debug("Skills Hub fetch failed for %s: %s", current_url, exc)
return None
if resp.status_code in _REDIRECT_STATUS_CODES:
location = getattr(resp, "headers", {}).get("location")
if not location:
return None
current_url = urljoin(current_url, location)
continue
return resp
logger.warning("Skills Hub fetch exceeded redirect limit for %s", url)
return None
@contextmanager
def _guarded_http_stream(
url: str,
*,
params: Optional[Dict[str, str]] = None,
timeout: int = _DEFAULT_HTTP_TIMEOUT,
) -> Iterator[Optional[httpx.Response]]:
"""Stream one response with bounded, policy-checked redirects."""
from tools.url_safety import SSRFConnectionBlocked, create_ssrf_safe_client
current_url = url
current_params = params
response: Optional[httpx.Response] = None
stack = ExitStack()
try:
for _ in range(_MAX_SKILL_FETCH_REDIRECTS + 1):
if not is_safe_url(current_url):
logger.warning("Blocked unsafe Skills Hub URL: %s", current_url)
response = None
break
blocked = check_website_access(current_url)
if blocked:
logger.info(
"Blocked Skills Hub fetch for %s by rule %s",
blocked["host"],
blocked["rule"],
)
response = None
break
stack.close()
stack = ExitStack()
try:
client = stack.enter_context(
create_ssrf_safe_client(timeout=timeout, follow_redirects=False)
)
response = stack.enter_context(
client.stream("GET", current_url, params=current_params)
)
except (SSRFConnectionBlocked, httpx.HTTPError) as exc:
logger.debug("Skills Hub stream failed for %s: %s", current_url, exc)
response = None
break
if response.status_code not in _REDIRECT_STATUS_CODES:
break
location = response.headers.get("location")
if not location:
response = None
break
current_url = urljoin(current_url, location)
current_params = None
else:
logger.warning("Skills Hub fetch exceeded redirect limit for %s", url)
response = None
yield response
finally:
stack.close()
# ---------------------------------------------------------------------------
# Shared index cache (used by every adapter)
# ---------------------------------------------------------------------------
def _read_json_if_fresh(path: Path, ttl: float) -> Optional[Any]:
"""Parsed JSON from ``path`` when it exists and is younger than ``ttl`` seconds."""
try:
if time.time() - path.stat().st_mtime > ttl:
return None
return json.loads(path.read_text(encoding="utf-8-sig"))
except (OSError, json.JSONDecodeError):
return None
def _read_index_cache(key: str) -> Optional[Any]:
return _read_json_if_fresh(_index_cache_dir() / f"{key}.json", INDEX_CACHE_TTL)
def _write_index_cache(key: str, data: Any) -> None:
index_cache_dir = _index_cache_dir()
index_cache_dir.mkdir(parents=True, exist_ok=True)
# Cache files hold unvetted community text (possible prompt injection);
# a .ignore keeps ripgrep and .ignore-aware tools out of the hub dir.
ignore_file = _hub_dir() / ".ignore"
if not ignore_file.exists():
try:
ignore_file.write_text("# Exclude hub internals from search tools\n*\n", encoding="utf-8")
except OSError:
pass
try:
(index_cache_dir / f"{key}.json").write_text(
json.dumps(data, ensure_ascii=False, default=str), encoding="utf-8"
)
except OSError as e:
logger.debug("Could not write cache: %s", e)
# ---------------------------------------------------------------------------
# Hub state files: lock.json, taps.json, audit.log
# ---------------------------------------------------------------------------
class _JsonStateFile:
"""A JSON file under the hub dir with a fixed empty shape (``EMPTY``, deep-copied
on every miss/corrupt read); ``DEFAULT_PATH`` is the hub path resolver."""
EMPTY: dict = {}
DEFAULT_PATH: Any = None
def __init__(self, path: Optional[Path] = None):
self.path = path if path is not None else type(self).DEFAULT_PATH()
def _read(self) -> dict:
try:
return json.loads(self.path.read_text(encoding="utf-8-sig"))
except (json.JSONDecodeError, OSError):
return json.loads(json.dumps(self.EMPTY))
def _write(self, data: dict, **dumps_kwargs) -> None:
self.path.parent.mkdir(parents=True, exist_ok=True)
self.path.write_text(json.dumps(data, indent=2, **dumps_kwargs) + "\n", encoding="utf-8")
class HubLockFile(_JsonStateFile):
"""skills/.hub/lock.json — provenance of installed hub skills."""
EMPTY = {"version": 1, "installed": {}}
DEFAULT_PATH = staticmethod(_lock_file)
def load(self) -> dict:
return self._read()
def save(self, data: dict) -> None:
self._write(data, ensure_ascii=False)
def record_install(
self,
name: str,
source: str,
identifier: str,
trust_level: str,
scan_verdict: str,
skill_hash: str,
install_path: str,
files: List[str],
metadata: Optional[Dict[str, Any]] = None,
scan_provenance: Optional[Dict[str, Any]] = None,
) -> None:
# Validate name and install-path SHAPE at write time: a poisoned lock
# entry is the precondition for the uninstall_skill rmtree-escape.
safe_name = _validate_skill_name(name)
safe_install_path = _normalize_lock_install_path(install_path, safe_name)
data = self.load()
now = datetime.now(timezone.utc).isoformat()
data["installed"][safe_name] = {
"source": source,
"identifier": identifier,
"trust_level": trust_level,
"scan_verdict": scan_verdict,
"content_hash": skill_hash,
"install_path": safe_install_path,
"files": files,
"metadata": metadata or {},
"scan_provenance": scan_provenance or {},
"installed_at": now,
"updated_at": now,
}
self.save(data)
def record_uninstall(self, name: str) -> None:
data = self.load()
data["installed"].pop(name, None)
self.save(data)
def get_installed(self, name: str) -> Optional[dict]:
return self.load()["installed"].get(name)
def list_installed(self) -> List[dict]:
return [{"name": name, **entry} for name, entry in self.load()["installed"].items()]
class TapsManager(_JsonStateFile):
"""skills/.hub/taps.json — custom GitHub repo sources."""
EMPTY = {"taps": []}
DEFAULT_PATH = staticmethod(_taps_file)
def load(self) -> List[dict]:
return self._read().get("taps", [])
def save(self, taps: List[dict]) -> None:
self._write({"taps": taps})
def add(self, repo: str, path: str = "skills/") -> bool:
"""Add a tap. Returns False if already exists."""
taps = self.load()
if any(t["repo"] == repo for t in taps):
return False
taps.append({"repo": repo, "path": path})
self.save(taps)
return True
def remove(self, repo: str) -> bool:
"""Remove a tap by repo name. Returns False if not found."""
taps = self.load()
new_taps = [t for t in taps if t["repo"] != repo]
if len(new_taps) == len(taps):
return False
self.save(new_taps)
return True
list_taps = load
def append_audit_log(action: str, skill_name: str, source: str,
trust_level: str, verdict: str, extra: str = "") -> None:
"""Append one space-separated line to the audit log (best-effort)."""
audit_log = _audit_log()
audit_log.parent.mkdir(parents=True, exist_ok=True)
timestamp = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
parts = [timestamp, action, skill_name, f"{source}:{trust_level}", verdict]
if extra:
parts.append(extra)
try:
with open(audit_log, "a", encoding="utf-8") as f:
f.write(" ".join(parts) + "\n")
except OSError as e:
logger.debug("Could not write audit log: %s", e)
# ---------------------------------------------------------------------------
# Hub operations (high-level)
# ---------------------------------------------------------------------------
def ensure_hub_dirs() -> None:
"""Create the .hub directory structure if it doesn't exist."""
_hub_dir().mkdir(parents=True, exist_ok=True)
_quarantine_dir().mkdir(exist_ok=True)
_index_cache_dir().mkdir(exist_ok=True)
for path, initial in (
(_lock_file(), '{"version": 1, "installed": {}}\n'),
(_audit_log(), ""),
(_taps_file(), '{"taps": []}\n'),
):
if not path.exists():
path.write_text(initial, encoding="utf-8")