The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(config): the provider-env completion hook reads the process-wide source record
Ben Barclay5057eaa3a4d0
diff --git a/hermes_cli/config_provider_env.py b/hermes_cli/config_provider_env.pyindex 9fa841714fe..e1a6b1d0762 100644--- a/hermes_cli/config_provider_env.py+++ b/hermes_cli/config_provider_env.py@@ -63,11 +63,14 @@ def _provider_entries() -> dict:def sync_registered_providers() -> None:"""Provider discovery's completion hook: add the env vars of process-wide plugin providers it- registered (entry points enabled in config). Reads the registry as it stands, never config;+ registered (entry points enabled in config). Reads the process-wide registry and its source+ record as they stand: never config, never discovery. Not ``provider_source()``: that one is+ profile-aware and scans the bound home's plugin dirs, whose isolation check reads config.``$HERMES_HOME`` plugins (per profile) are not process-wide and are left out."""import providersfrom hermes_cli.config_defaults import OPTIONAL_ENV_VARS- profiles = [p for name, p in list(providers._REGISTRY.items()) if providers.provider_source(name) != "bundled"]+ sources = dict(providers._SOURCES)+ profiles = [p for name, p in list(providers._REGISTRY.items()) if sources.get(name) != "bundled"]entries = _entries_for(profiles, _STATIC_NAMES | _PROVIDER_NAMES | set(_CATALOG or ()))for var, entry in entries.items():dict.__setitem__(OPTIONAL_ENV_VARS, var, entry)diff --git a/tests/hermes_cli/test_config_provider_env.py b/tests/hermes_cli/test_config_provider_env.pyindex 49c0a29bdb2..329ad5ccc12 100644--- a/tests/hermes_cli/test_config_provider_env.py+++ b/tests/hermes_cli/test_config_provider_env.py@@ -1,6 +1,12 @@"""Provider-profile entries of OPTIONAL_ENV_VARS: config-free, same contents as before."""from __future__ import annotations+import json+import os+import subprocess+import sys+import textwrap+from pathlib import Pathfrom types import SimpleNamespaceimport pytest@@ -89,9 +95,114 @@ def test_discovery_completion_adds_registered_plugin_providers(table, monkeypatcmonkeypatch.setattr(config_defaults, "OPTIONAL_ENV_VARS", table)monkeypatch.setattr(providers, "_REGISTRY", {"alpha": _profile("alpha", "ALPHA_API_KEY"),"plug": _profile("plug", "PLUG_API_KEY", "ALPHA_API_KEY")})- monkeypatch.setattr(providers, "provider_source", lambda n: "bundled" if n == "alpha" else "entry_point")+ monkeypatch.setattr(providers, "_SOURCES", {"alpha": "bundled", "plug": "runtime"})assert "ALPHA_API_KEY" in tablecpe.sync_registered_providers()assert table["PLUG_API_KEY"]["description"] == "Plug API key"assert table["ALPHA_API_KEY"]["description"] == "Alpha API key" # an earlier entry is keptassert "PLUG_API_KEY" in cpe._PROVIDER_NAMES+++_ROOT = Path(__file__).resolve().parents[2]+++def _cold(script: str, home: Path, *args: str) -> dict:+ """Run *script* in a fresh interpreter (nothing imported, nothing discovered) and return the+ JSON object it prints last."""+ env = {**os.environ, "HERMES_HOME": str(home), "PYTHONPATH": str(_ROOT)}+ result = subprocess.run([sys.executable, "-c", textwrap.dedent(script), *args], cwd=_ROOT, env=env,+ stdin=subprocess.DEVNULL, capture_output=True, text=True, timeout=120, check=False)+ assert result.returncode == 0, result.stderr[-4000:]+ return json.loads(result.stdout.strip().splitlines()[-1])+++def _marker_plugin(root: Path, name: str, marker: Path, env_var: str) -> None:+ """A provider plugin whose import writes *marker*: proof its code ran."""+ plugin = root / name+ plugin.mkdir(parents=True)+ plugin.joinpath("__init__.py").write_text(textwrap.dedent(f"""+ from pathlib import Path+ Path({str(marker)!r}).write_text("imported")+ from providers import register_provider+ from providers.base import ProviderProfile+ register_provider(ProviderProfile(name={name!r}, env_vars=({env_var!r},), auth_type="api_key"))+ """))+++def test_cold_discovery_completion_reads_no_config_and_scans_no_home_plugins(tmp_path):+ """Round-5 blocker 1: the completion hook used ``provider_source()``, which scans the bound+ home's unscanned plugin tree (whose isolation check reads config). Under a backend that refuses+ every read it then raised before publishing the registered provider's env var."""+ home = tmp_path / "home"+ marker = tmp_path / "home-plugin-ran"+ _marker_plugin(home / "plugins" / "model-providers", "homeplug", marker, "HOMEPLUG_API_KEY")+ out = _cold("""+ import json, sys+ import hermes_cli.config as cfg+ import hermes_cli.config_backend as cb+ import providers+ from hermes_cli.config_backend import ConfigBackendUnavailable+ from providers.base import ProviderProfile++ reads = []+ def refuse(*a, **k):+ reads.append(repr(a)[:200])+ raise ConfigBackendUnavailable("this backend refuses every read")+ cb._route = refuse+ cfg.OPTIONAL_ENV_VARS.get("") # the bundled catalog, filled before discovery++ def steps(): # an enabled entry point registering, then nothing else (no config needed)+ providers.register_provider(ProviderProfile(name="epplug", env_vars=("EPPLUG_API_KEY",),+ auth_type="api_key"))+ providers._run_discovery_steps = steps+ hook_errors = []+ import hermes_cli.config_provider_env as cpe+ real = cpe.sync_registered_providers+ def hook():+ try:+ real()+ except BaseException as exc:+ hook_errors.append(repr(exc))+ raise+ cpe.sync_registered_providers = hook+ providers._discover_providers()+ print(json.dumps({"reads": reads, "hook_errors": hook_errors,+ "ep": "EPPLUG_API_KEY" in cfg.OPTIONAL_ENV_VARS,+ "home": "HOMEPLUG_API_KEY" in cfg.OPTIONAL_ENV_VARS,+ "scanned": [k for k in sys.modules if "homeplug" in k]}))+ """, home)+ assert out["hook_errors"] == [] and out["reads"] == []+ assert out["ep"] and not out["home"]+ assert out["scanned"] == [] and not marker.exists()+++_SAFE_CATALOG = """+ import json, sys+ from pathlib import Path+ from agent.safe_worker_policy import _bind_safe_worker_policy, _bind_worker_config+ if sys.argv[1] == "safe":+ _bind_safe_worker_policy(safe_mode=True, ignore_user_config=True, config={})+ else:+ _bind_worker_config({})+ import providers+ providers._BUNDLED_PLUGINS_DIR = Path(sys.argv[2])+ import hermes_cli.config as cfg+ present = "MARKPLUG_API_KEY" in cfg.OPTIONAL_ENV_VARS+ print(json.dumps({"present": present,+ "catalog_modules": [k for k in sys.modules if k.startswith("_hermes_provider_catalog_")]}))+"""++[email protected]("mode", ["safe", "ordinary"])+def test_cold_safe_worker_catalog_executes_no_plugin_code(tmp_path, mode):+ """Round-5 blocker 2: in a safe worker, building the provider env catalog (``bundled_profiles``)+ executes no plugin module, bundled included. The ordinary-worker run proves the marker plugin+ is really executed when the policy allows it, so the safe assertion is not vacuous."""+ bundled = tmp_path / "bundled"+ marker = tmp_path / "bundled-plugin-ran"+ _marker_plugin(bundled, "markplug", marker, "MARKPLUG_API_KEY")+ out = _cold(_SAFE_CATALOG, tmp_path / "home", mode, str(bundled))+ if mode == "safe":+ assert not marker.exists() and out["catalog_modules"] == [] and not out["present"]+ else:+ assert marker.exists() and out["present"]