mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
39975613b1
Second, deeper pass over tools/gateway/hermes_cli plus first pass over the trees wave 1 missed (acp, acp_adapter, skills, computer_use, docker, dashboard, conformance, monitoring, secret_sources, hermes_state, providers). Same rubric as wave 1 (AGENTS.md test policy); security, alternation/caching invariants, issue-number regressions, and E2E kept. Real test-quality fixes found and rooted out along the way: - tests/tools/test_command_guards.py made real auxiliary-LLM HTTPS calls (DEFAULT_CONFIG smart-approval leaked in) — pinned approval mode=manual via autouse fixture: 17.4s → 0.4s. - test_model_switch_custom_providers.py / test_user_providers_model_switch.py silently probed live provider catalogs (~2s/test) — stubbed cached_provider_model_ids/provider_model_ids/fetch_api_models. - test_telegram_noise_filter.py: 15-platform copy-paste matrix over shared gateway.run logic → 3 representative platforms (55s → 3.9s). - test_gateway_shutdown.py: stop()'s 5s interrupt-deadline loop spun on MagicMock agents — interrupt.side_effect now clears _running_agents (22s → 1.0s). - test_gateway_inactivity_timeout.py poll-harness timings shrunk 3-5x (24s → 1.1s); test_mcp_stability.py backoff/SIGTERM-grace sleeps patched (15.4s → 2.5s); test_async_delegation.py negative-drain wait 5s → 0.5s. - test_telegram_init_deadline.py: loop-block margin restored to 1.0s with rationale comment — the watchdog-dump assertion needs the loop blocked well past deadline+grace under parallel load (flaked once in the 40-worker verification run at a 0.2s margin). Verification: full hermetic suite via scripts/run_tests.sh — 2,438 files, 21,718 tests passed, 0 failed, 293.9s wall. Suite totals vs original baseline: 46,820 → 19,757 test functions (−57.8%), wall 583.5s → 293.9s (−50%), subprocess CPU 13,564s → 11,623s.
423 lines
16 KiB
Python
423 lines
16 KiB
Python
"""Tests for the codex MCP plugin migration helper."""
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
import pytest
|
|
|
|
from hermes_cli.codex_runtime_plugin_migration import (
|
|
MIGRATION_MARKER,
|
|
MIGRATION_END_MARKER,
|
|
_build_hermes_tools_mcp_entry,
|
|
_format_toml_value,
|
|
_looks_like_test_tempdir,
|
|
_strip_existing_managed_block,
|
|
_strip_unmanaged_plugin_tables,
|
|
_translate_one_server,
|
|
migrate,
|
|
render_codex_toml_section,
|
|
)
|
|
|
|
|
|
# ---- per-server translation ----
|
|
|
|
class TestTranslateOneServer:
|
|
def test_stdio_basic(self):
|
|
cfg, skipped = _translate_one_server("filesystem", {
|
|
"command": "npx",
|
|
"args": ["-y", "@modelcontextprotocol/server-filesystem", "/tmp"],
|
|
"env": {"FOO": "bar"},
|
|
})
|
|
assert cfg == {
|
|
"command": "npx",
|
|
"args": ["-y", "@modelcontextprotocol/server-filesystem", "/tmp"],
|
|
"env": {"FOO": "bar"},
|
|
}
|
|
assert skipped == []
|
|
|
|
|
|
def test_enabled_true_omitted(self):
|
|
cfg, _ = _translate_one_server("x", {"command": "y", "enabled": True})
|
|
assert "enabled" not in cfg # codex defaults to true
|
|
|
|
|
|
def test_unknown_keys_warned(self):
|
|
cfg, skipped = _translate_one_server("x", {
|
|
"command": "y",
|
|
"totally_made_up_key": "value",
|
|
})
|
|
assert "totally_made_up_key" not in cfg
|
|
assert any("totally_made_up_key" in s for s in skipped)
|
|
|
|
|
|
# ---- TOML rendering ----
|
|
|
|
class TestTomlValueFormatter:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_atomic_write_no_temp_leak_on_success(self, tmp_path):
|
|
"""The atomic-write path uses tempfile.mkstemp + rename. On
|
|
success the temp file should not be left behind."""
|
|
migrate({"mcp_servers": {"x": {"command": "y"}}},
|
|
codex_home=tmp_path,
|
|
discover_plugins=False,
|
|
expose_hermes_tools=False,
|
|
default_permission_profile=None)
|
|
# config.toml should exist
|
|
assert (tmp_path / "config.toml").exists()
|
|
# And no .config.toml.* temp files left behind
|
|
leftover = [p.name for p in tmp_path.iterdir()
|
|
if p.name.startswith(".config.toml.")]
|
|
assert leftover == [], f"temp file leaked after migration: {leftover}"
|
|
|
|
def test_atomic_write_cleanup_on_rename_failure(self, tmp_path, monkeypatch):
|
|
"""If rename fails partway through (out of disk, permissions,
|
|
crash), the temp file must be cleaned up. Otherwise repeated
|
|
failed migrations would pile up .config.toml.* files."""
|
|
from pathlib import Path as _Path
|
|
original_replace = _Path.replace
|
|
|
|
def failing_replace(self, target):
|
|
raise OSError("simulated disk full")
|
|
|
|
monkeypatch.setattr(_Path, "replace", failing_replace)
|
|
report = migrate(
|
|
{"mcp_servers": {"x": {"command": "y"}}},
|
|
codex_home=tmp_path,
|
|
discover_plugins=False,
|
|
expose_hermes_tools=False,
|
|
default_permission_profile=None,
|
|
)
|
|
# Error surfaced
|
|
assert any("simulated disk full" in e for e in report.errors)
|
|
# And no leaked temp file
|
|
leftover = [p.name for p in tmp_path.iterdir()
|
|
if p.name.startswith(".config.toml.")]
|
|
assert leftover == [], f"temp files leaked: {leftover}"
|
|
|
|
|
|
|
|
class TestRenderToml:
|
|
|
|
def test_empty_servers_emits_placeholder(self):
|
|
out = render_codex_toml_section({})
|
|
assert "no MCP servers" in out
|
|
|
|
def test_servers_sorted_alphabetically(self):
|
|
out = render_codex_toml_section({
|
|
"zoo": {"command": "z"},
|
|
"alpha": {"command": "a"},
|
|
"middle": {"command": "m"},
|
|
})
|
|
# Find the section header positions and confirm order
|
|
a_pos = out.find("[mcp_servers.alpha]")
|
|
m_pos = out.find("[mcp_servers.middle]")
|
|
z_pos = out.find("[mcp_servers.zoo]")
|
|
assert 0 < a_pos < m_pos < z_pos
|
|
|
|
def test_server_with_args_and_env(self):
|
|
out = render_codex_toml_section({
|
|
"fs": {
|
|
"command": "npx",
|
|
"args": ["-y", "filesystem"],
|
|
"env": {"PATH": "/usr/bin"},
|
|
}
|
|
})
|
|
assert "[mcp_servers.fs]" in out
|
|
assert 'command = "npx"' in out
|
|
assert 'args = ["-y", "filesystem"]' in out
|
|
# Env emitted as inline table
|
|
assert 'env = { PATH = "/usr/bin" }' in out
|
|
|
|
|
|
# ---- existing-block stripping ----
|
|
|
|
class TestStripExistingManagedBlock:
|
|
def test_no_managed_block_unchanged(self):
|
|
text = "[other]\nfoo = 1\n"
|
|
assert _strip_existing_managed_block(text) == text
|
|
|
|
|
|
def test_preserves_user_content_above_managed_block(self):
|
|
text = (
|
|
"[model]\n"
|
|
'name = "gpt-5.5"\n'
|
|
"\n"
|
|
f"{MIGRATION_MARKER}\n"
|
|
"[mcp_servers.fs]\n"
|
|
'command = "x"\n'
|
|
)
|
|
out = _strip_existing_managed_block(text)
|
|
assert "[model]" in out
|
|
assert 'name = "gpt-5.5"' in out
|
|
assert "mcp_servers.fs" not in out
|
|
|
|
|
|
# ---- end-to-end migrate(, expose_hermes_tools=False) ----
|
|
|
|
class TestMigrate:
|
|
|
|
|
|
|
|
def test_plugin_discovery_writes_plugin_blocks(self, tmp_path, monkeypatch):
|
|
"""Discovered curated plugins land as [plugins."<name>@<marketplace>"]
|
|
blocks. This is what OpenClaw calls 'migrate native codex plugins.'"""
|
|
from hermes_cli import codex_runtime_plugin_migration as crpm
|
|
|
|
def fake_query(codex_home=None, timeout=8.0):
|
|
return [
|
|
{"name": "google-calendar", "marketplace": "openai-curated",
|
|
"enabled": True},
|
|
{"name": "github", "marketplace": "openai-curated",
|
|
"enabled": True},
|
|
], None
|
|
monkeypatch.setattr(crpm, "_query_codex_plugins", fake_query)
|
|
|
|
report = migrate({}, codex_home=tmp_path, discover_plugins=True)
|
|
text = (tmp_path / "config.toml").read_text()
|
|
assert '[plugins."github@openai-curated"]' in text
|
|
assert '[plugins."google-calendar@openai-curated"]' in text
|
|
assert "enabled = true" in text
|
|
assert "google-calendar@openai-curated" in report.migrated_plugins
|
|
assert "github@openai-curated" in report.migrated_plugins
|
|
|
|
|
|
def test_plugin_discovery_failure_non_fatal(self, tmp_path, monkeypatch):
|
|
"""If codex isn't installed or RPC fails, MCP migration still
|
|
completes. The error surfaces in the report but doesn't abort."""
|
|
from hermes_cli import codex_runtime_plugin_migration as crpm
|
|
|
|
def fake_query_fails(codex_home=None, timeout=8.0):
|
|
return [], "codex CLI not available"
|
|
monkeypatch.setattr(crpm, "_query_codex_plugins", fake_query_fails)
|
|
|
|
report = migrate({"mcp_servers": {"x": {"command": "y"}}},
|
|
codex_home=tmp_path, discover_plugins=True, expose_hermes_tools=False)
|
|
assert report.written
|
|
assert report.migrated == ["x"]
|
|
assert report.plugin_query_error == "codex CLI not available"
|
|
assert report.migrated_plugins == []
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_full_migration_round_trip(self, tmp_path):
|
|
hermes_cfg = {
|
|
"mcp_servers": {
|
|
"filesystem": {
|
|
"command": "npx",
|
|
"args": ["-y", "@modelcontextprotocol/server-filesystem"],
|
|
},
|
|
"github": {
|
|
"url": "https://api.github.com/mcp",
|
|
"headers": {"Authorization": "Bearer x"},
|
|
},
|
|
}
|
|
}
|
|
report = migrate(hermes_cfg, codex_home=tmp_path, expose_hermes_tools=False)
|
|
assert report.written
|
|
text = (tmp_path / "config.toml").read_text()
|
|
assert "[mcp_servers.filesystem]" in text
|
|
assert "[mcp_servers.github]" in text
|
|
assert 'command = "npx"' in text
|
|
assert 'url = "https://api.github.com/mcp"' in text
|
|
|
|
|
|
|
|
|
|
def test_preserves_user_mcp_server_outside_managed_block(self, tmp_path):
|
|
"""Quirk #6: when a user adds their own MCP server entry directly
|
|
to ~/.codex/config.toml outside Hermes' managed block, re-running
|
|
migration must preserve it. Tested both above and below the
|
|
managed block."""
|
|
target = tmp_path / "config.toml"
|
|
target.write_text(
|
|
"[mcp_servers.user-above]\n"
|
|
'command = "/usr/bin/above-server"\n'
|
|
'args = ["--above"]\n'
|
|
)
|
|
# First migrate — adds managed block below user content
|
|
migrate({"mcp_servers": {"hermes-mcp": {"command": "npx"}}},
|
|
codex_home=tmp_path, discover_plugins=False,
|
|
expose_hermes_tools=False)
|
|
text = target.read_text()
|
|
assert "user-above" in text, "user MCP server above managed block got nuked"
|
|
assert 'command = "/usr/bin/above-server"' in text
|
|
|
|
# Append another user entry below the managed block
|
|
target.write_text(
|
|
text + "\n[mcp_servers.user-below]\ncommand = \"below-server\"\n"
|
|
)
|
|
# Re-migrate — both should survive
|
|
migrate({"mcp_servers": {"hermes-mcp": {"command": "npx"}}},
|
|
codex_home=tmp_path, discover_plugins=False,
|
|
expose_hermes_tools=False)
|
|
final = target.read_text()
|
|
assert "user-above" in final
|
|
assert "user-below" in final
|
|
# And our managed block is still there with the new content
|
|
assert "[mcp_servers.hermes-mcp]" in final
|
|
|
|
|
|
|
|
def test_summary_reports_migration_count(self, tmp_path):
|
|
report = migrate({
|
|
"mcp_servers": {"a": {"command": "x"}, "b": {"command": "y"}}
|
|
}, codex_home=tmp_path, expose_hermes_tools=False)
|
|
summary = report.summary()
|
|
assert "Migrated 2 MCP server(s)" in summary
|
|
assert "- a" in summary
|
|
assert "- b" in summary
|
|
|
|
|
|
# ---- Bug B: duplicate [plugins.X] tables ----
|
|
|
|
|
|
class TestStripUnmanagedPluginTables:
|
|
"""Regression tests for issue #26250 Bug B.
|
|
|
|
When codex itself writes ``[plugins."<name>@<marketplace>"]`` tables
|
|
(via the user running ``codex plugins enable`` directly), re-running
|
|
``hermes codex-runtime migrate`` would re-emit them inside the managed
|
|
block and the resulting duplicate-table-header would crash codex.
|
|
"""
|
|
|
|
def test_strips_plugin_tables_outside_managed_block(self):
|
|
text = (
|
|
'model = "gpt-5.5"\n'
|
|
"\n"
|
|
"[mcp_servers.user-thing]\n"
|
|
'command = "x"\n'
|
|
"\n"
|
|
'[plugins."tasks@openai-curated"]\n'
|
|
"enabled = true\n"
|
|
"\n"
|
|
'[plugins."web-search@openai-curated"]\n'
|
|
"enabled = true\n"
|
|
"\n"
|
|
"[features]\n"
|
|
"terminal_resize_reflow = true\n"
|
|
)
|
|
stripped = _strip_unmanaged_plugin_tables(text)
|
|
assert "[plugins." not in stripped
|
|
# Non-plugin content preserved
|
|
assert "[mcp_servers.user-thing]" in stripped
|
|
assert "[features]" in stripped
|
|
assert "terminal_resize_reflow = true" in stripped
|
|
|
|
|
|
def test_multi_line_array_in_plugin_table_does_not_leak(self):
|
|
"""A multi-line TOML array inside a [plugins.X] table whose
|
|
continuation lines start with ``[`` (e.g. nested arrays) must NOT
|
|
prematurely exit the strip region — otherwise array fragments
|
|
leak into top-level output and produce invalid TOML on the next
|
|
codex startup. Regression guard for #26260 review.
|
|
"""
|
|
text = (
|
|
'[plugins."tasks@openai-curated"]\n'
|
|
"allowed = [\n"
|
|
' "a",\n'
|
|
' ["nested"],\n'
|
|
"]\n"
|
|
"[features]\n"
|
|
"x = 1\n"
|
|
)
|
|
stripped = _strip_unmanaged_plugin_tables(text)
|
|
# Everything inside the plugin table — including the multi-line
|
|
# array's continuation lines starting with `[` — should be gone.
|
|
assert '["nested"]' not in stripped
|
|
assert "allowed" not in stripped
|
|
# Sibling user table survives intact.
|
|
assert "[features]" in stripped
|
|
assert "x = 1" in stripped
|
|
# Result is still valid TOML.
|
|
import tomllib
|
|
tomllib.loads(stripped)
|
|
|
|
def test_migrate_dedups_codex_owned_plugin_tables(self, tmp_path, monkeypatch):
|
|
"""End-to-end: codex's pre-existing [plugins.X] tables get replaced by
|
|
the managed block's re-emission rather than duplicated."""
|
|
target = tmp_path / "config.toml"
|
|
target.write_text(
|
|
"[mcp_servers.user-server]\n"
|
|
'command = "x"\n'
|
|
"\n"
|
|
'[plugins."tasks@openai-curated"]\n'
|
|
"enabled = true\n"
|
|
)
|
|
|
|
# Simulate codex's plugin/list reporting the same plugin tasks@openai-curated.
|
|
def fake_query(codex_home=None, timeout=8.0):
|
|
return (
|
|
[{"name": "tasks", "marketplace": "openai-curated", "enabled": True}],
|
|
None,
|
|
)
|
|
|
|
monkeypatch.setattr(
|
|
"hermes_cli.codex_runtime_plugin_migration._query_codex_plugins",
|
|
fake_query,
|
|
)
|
|
migrate({}, codex_home=tmp_path, discover_plugins=True, expose_hermes_tools=False)
|
|
new_text = target.read_text()
|
|
# Only ONE [plugins."tasks@openai-curated"] header should remain — inside
|
|
# the managed block — not the original outside-the-block copy.
|
|
assert new_text.count('[plugins."tasks@openai-curated"]') == 1
|
|
# And the surviving one is inside our managed section.
|
|
managed_start = new_text.index(MIGRATION_MARKER)
|
|
managed_end = new_text.index(MIGRATION_END_MARKER)
|
|
plugin_idx = new_text.index('[plugins."tasks@openai-curated"]')
|
|
assert managed_start < plugin_idx < managed_end
|
|
# File parses cleanly as TOML (the original duplicate-key error is gone).
|
|
import tomllib
|
|
tomllib.loads(new_text)
|
|
|
|
|
|
# ---- Bug C: HERMES_HOME tempdir leak into ~/.codex/config.toml ----
|
|
|
|
|
|
class TestHermesHomeLeakGuard:
|
|
"""Regression tests for issue #26250 Bug C.
|
|
|
|
Previously ``_build_hermes_tools_mcp_entry()`` read ``HERMES_HOME``
|
|
directly from ``os.environ``, so a pytest ``monkeypatch.setenv`` would
|
|
leak a transient tempdir path into the user's real ``~/.codex/config.toml``
|
|
once codex spawned the hermes-tools MCP subprocess.
|
|
"""
|
|
|
|
|
|
|
|
|
|
def test_real_hermes_home_propagates(self, monkeypatch, tmp_path):
|
|
"""A legitimate HERMES_HOME (not a tempdir path) DOES propagate so the
|
|
MCP subprocess sees the same config as the parent CLI."""
|
|
# Use a path that looks real — under /Users or /home, not /var/folders.
|
|
# We can't easily create one in the test, so just use a stable path
|
|
# outside any tempdir-detector needle. The detector checks for tempdir
|
|
# markers, not for path existence.
|
|
real_path = "/Users/alice/.hermes"
|
|
monkeypatch.setenv("HERMES_HOME", real_path)
|
|
entry = _build_hermes_tools_mcp_entry()
|
|
env = entry.get("env", {})
|
|
assert env.get("HERMES_HOME") == real_path
|
|
|
|
def test_unset_hermes_home_omits_env_key(self, monkeypatch):
|
|
"""When HERMES_HOME is unset in the environment, the MCP entry MUST
|
|
NOT bake in a resolved-default path. The codex subprocess should
|
|
inherit whatever HERMES_HOME its launcher (systemd, gateway, shell)
|
|
sets at runtime, rather than being pinned to migrate-time defaults.
|
|
Regression guard for issue #26250 follow-up review."""
|
|
monkeypatch.delenv("HERMES_HOME", raising=False)
|
|
entry = _build_hermes_tools_mcp_entry()
|
|
env = entry.get("env", {})
|
|
assert "HERMES_HOME" not in env, (
|
|
f"HERMES_HOME should not be set when env var is unset, got: "
|
|
f"{env.get('HERMES_HOME')!r}"
|
|
)
|