mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
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.
220 lines
8.1 KiB
Python
220 lines
8.1 KiB
Python
from hermes_state import AsyncSessionDB
|
|
"""Regression tests for approval-state cleanup on session boundaries."""
|
|
|
|
from datetime import datetime
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
|
|
from gateway.config import Platform
|
|
from gateway.platforms.base import MessageEvent
|
|
from gateway.session import SessionEntry, SessionSource, build_session_key
|
|
from tools import approval as approval_mod
|
|
from tools import slash_confirm as slash_confirm_mod
|
|
from tools.approval import (
|
|
_ApprovalEntry,
|
|
approve_session,
|
|
enable_session_yolo,
|
|
is_approved,
|
|
is_session_yolo_enabled,
|
|
)
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _clear_approval_state():
|
|
approval_mod._gateway_queues.clear()
|
|
approval_mod._gateway_notify_cbs.clear()
|
|
approval_mod._session_approved.clear()
|
|
approval_mod._session_yolo.clear()
|
|
approval_mod._permanent_approved.clear()
|
|
approval_mod._pending.clear()
|
|
slash_confirm_mod._pending.clear()
|
|
yield
|
|
approval_mod._gateway_queues.clear()
|
|
approval_mod._gateway_notify_cbs.clear()
|
|
approval_mod._session_approved.clear()
|
|
approval_mod._session_yolo.clear()
|
|
approval_mod._permanent_approved.clear()
|
|
approval_mod._pending.clear()
|
|
slash_confirm_mod._pending.clear()
|
|
|
|
|
|
def _make_source() -> SessionSource:
|
|
return SessionSource(
|
|
platform=Platform.TELEGRAM,
|
|
user_id="u1",
|
|
chat_id="c1",
|
|
user_name="tester",
|
|
chat_type="dm",
|
|
)
|
|
|
|
|
|
def _make_event(text: str) -> MessageEvent:
|
|
return MessageEvent(text=text, source=_make_source(), message_id="m1")
|
|
|
|
|
|
def _make_entry(session_id: str, source: SessionSource | None = None) -> SessionEntry:
|
|
source = source or _make_source()
|
|
return SessionEntry(
|
|
session_key=build_session_key(source),
|
|
session_id=session_id,
|
|
created_at=datetime.now(),
|
|
updated_at=datetime.now(),
|
|
origin=source,
|
|
platform=source.platform,
|
|
chat_type=source.chat_type,
|
|
)
|
|
|
|
|
|
def _make_resume_runner():
|
|
from gateway.run import GatewayRunner
|
|
|
|
source = _make_source()
|
|
session_key = build_session_key(source)
|
|
current_entry = _make_entry("current-session", source)
|
|
resumed_entry = _make_entry("resumed-session", source)
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner.adapters = {}
|
|
runner._background_tasks = set()
|
|
runner._running_agents = {}
|
|
runner._running_agents_ts = {}
|
|
runner._busy_ack_ts = {}
|
|
runner._pending_approvals = {}
|
|
runner._update_prompt_pending = {}
|
|
runner._agent_cache_lock = None
|
|
runner.session_store = MagicMock()
|
|
runner.session_store.get_or_create_session.return_value = current_entry
|
|
runner.session_store.switch_session.return_value = resumed_entry
|
|
runner.session_store.load_transcript.return_value = []
|
|
runner._session_db = AsyncSessionDB(MagicMock())
|
|
runner._session_db._db.resolve_session_by_title.return_value = "resumed-session"
|
|
runner._session_db._db.get_session_title.return_value = "Resumed Work"
|
|
# The resumed session is live and shares the caller's origin, so the
|
|
# /resume IDOR guard authorizes it (this test covers the post-resume
|
|
# security-state clearing, not the ownership check).
|
|
runner._gateway_session_origin_for_id = lambda sid: source
|
|
return runner, session_key
|
|
|
|
|
|
def _make_branch_runner():
|
|
from gateway.run import GatewayRunner
|
|
|
|
source = _make_source()
|
|
session_key = build_session_key(source)
|
|
current_entry = _make_entry("current-session", source)
|
|
branched_entry = _make_entry("branched-session", source)
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner.adapters = {}
|
|
runner.config = {}
|
|
runner._running_agents = {}
|
|
runner._running_agents_ts = {}
|
|
runner._busy_ack_ts = {}
|
|
runner._pending_approvals = {}
|
|
runner._update_prompt_pending = {}
|
|
runner._agent_cache_lock = None
|
|
runner.session_store = MagicMock()
|
|
runner.session_store.get_or_create_session.return_value = current_entry
|
|
runner.session_store.load_transcript.return_value = [
|
|
{"role": "user", "content": "hello"},
|
|
{"role": "assistant", "content": "world"},
|
|
]
|
|
runner.session_store.switch_session.return_value = branched_entry
|
|
runner._session_db = AsyncSessionDB(MagicMock())
|
|
runner._session_db._db.get_session_title.return_value = "Current Work"
|
|
runner._session_db._db.get_next_title_in_lineage.return_value = "Current Work #2"
|
|
return runner, session_key
|
|
|
|
|
|
def test_clear_session_boundary_security_state_is_scoped():
|
|
"""The helper must wipe only the target session's approval/yolo state.
|
|
|
|
Also exercises the /new reset path indirectly: /new calls this helper,
|
|
so if the helper is scoped correctly, /new's clearing is correct too.
|
|
"""
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner._pending_approvals = {}
|
|
runner._update_prompt_pending = {}
|
|
runner._pending_skills_reload_notes = {}
|
|
|
|
source = _make_source()
|
|
session_key = build_session_key(source)
|
|
other_key = "agent:main:telegram:dm:other-chat"
|
|
|
|
approve_session(session_key, "recursive delete")
|
|
approve_session(other_key, "recursive delete")
|
|
enable_session_yolo(session_key)
|
|
enable_session_yolo(other_key)
|
|
runner._pending_approvals[session_key] = {"command": "rm -rf /tmp/demo"}
|
|
runner._pending_approvals[other_key] = {"command": "rm -rf /tmp/other"}
|
|
runner._update_prompt_pending[session_key] = True
|
|
runner._update_prompt_pending[other_key] = True
|
|
runner._pending_skills_reload_notes[session_key] = (
|
|
"[USER INITIATED SKILLS RELOAD: target]"
|
|
)
|
|
runner._pending_skills_reload_notes[other_key] = (
|
|
"[USER INITIATED SKILLS RELOAD: other]"
|
|
)
|
|
|
|
async def _target_handler(choice):
|
|
return f"target:{choice}"
|
|
|
|
async def _other_handler(choice):
|
|
return f"other:{choice}"
|
|
|
|
slash_confirm_mod.register(session_key, "confirm-target", "reload-mcp", _target_handler)
|
|
slash_confirm_mod.register(other_key, "confirm-other", "reload-mcp", _other_handler)
|
|
|
|
runner._clear_session_boundary_security_state(session_key)
|
|
|
|
# Target session cleared
|
|
assert is_approved(session_key, "recursive delete") is False
|
|
assert is_session_yolo_enabled(session_key) is False
|
|
assert session_key not in runner._pending_approvals
|
|
assert session_key not in runner._update_prompt_pending
|
|
assert session_key not in runner._pending_skills_reload_notes
|
|
assert slash_confirm_mod.get_pending(session_key) is None
|
|
# Other session untouched
|
|
assert is_approved(other_key, "recursive delete") is True
|
|
assert is_session_yolo_enabled(other_key) is True
|
|
assert other_key in runner._pending_approvals
|
|
assert other_key in runner._update_prompt_pending
|
|
assert other_key in runner._pending_skills_reload_notes
|
|
assert slash_confirm_mod.get_pending(other_key) is not None
|
|
|
|
# Empty session_key is a no-op
|
|
runner._clear_session_boundary_security_state("")
|
|
assert is_approved(other_key, "recursive delete") is True
|
|
assert other_key in runner._update_prompt_pending
|
|
assert other_key in runner._pending_skills_reload_notes
|
|
assert slash_confirm_mod.get_pending(other_key) is not None
|
|
|
|
|
|
def test_clear_session_boundary_security_state_wakes_blocked_approvals():
|
|
"""Boundary cleanup must cancel blocked approval waiters immediately."""
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner._pending_approvals = {}
|
|
runner._update_prompt_pending = {}
|
|
|
|
source = _make_source()
|
|
session_key = build_session_key(source)
|
|
other_key = "agent:main:telegram:dm:other-chat"
|
|
|
|
target_entry = _ApprovalEntry({"command": "rm -rf /tmp/demo"})
|
|
other_entry = _ApprovalEntry({"command": "rm -rf /tmp/other"})
|
|
approval_mod._gateway_queues[session_key] = [target_entry]
|
|
approval_mod._gateway_queues[other_key] = [other_entry]
|
|
|
|
runner._clear_session_boundary_security_state(session_key)
|
|
|
|
assert target_entry.event.is_set()
|
|
assert target_entry.result == "deny"
|
|
assert other_entry.event.is_set() is False
|
|
assert other_entry.result is None
|
|
assert session_key not in approval_mod._gateway_queues
|
|
assert other_key in approval_mod._gateway_queues
|