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.
88 lines
3.3 KiB
Python
88 lines
3.3 KiB
Python
"""Gateway must treat ``compression_deferred`` as a soft result (#49874).
|
|
|
|
A lock-contended compression defer means a CONCURRENT compressor is actively
|
|
shrinking the session — the opposite of ``compression_exhausted`` (session
|
|
permanently too large). The gateway's auto-reset (#9893/#35809) must never
|
|
fire for a deferred turn: the session stays intact and the next message
|
|
retries normally.
|
|
|
|
AST invariants on ``gateway/run.py`` (mirrors
|
|
``test_35809_auto_reset_clean_context.py``'s load-bearing pin style):
|
|
|
|
* the ``compression_deferred`` branch guards the auto-reset block — a
|
|
deferred result can never reach ``reset_session``;
|
|
* the deferred branch itself performs NO session mutation (no
|
|
``reset_session``, no ``_evict_cached_agent``, no
|
|
``_clear_conversation_scope``).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import ast
|
|
import inspect
|
|
|
|
from gateway import run as gateway_run
|
|
|
|
|
|
def _calls(node: ast.AST) -> set[str]:
|
|
return {
|
|
n.func.attr
|
|
for n in ast.walk(node)
|
|
if isinstance(n, ast.Call) and isinstance(n.func, ast.Attribute)
|
|
}
|
|
|
|
|
|
def _find_deferred_guarded_reset_chain() -> ast.If:
|
|
"""Return the ``if agent_result.get('compression_deferred') ... elif
|
|
agent_result.get('compression_exhausted') ... reset_session`` chain."""
|
|
tree = ast.parse(inspect.getsource(gateway_run))
|
|
|
|
for node in ast.walk(tree):
|
|
if not isinstance(node, ast.If):
|
|
continue
|
|
test_consts = [
|
|
n.value
|
|
for n in ast.walk(node.test)
|
|
if isinstance(n, ast.Constant) and isinstance(n.value, str)
|
|
]
|
|
if "compression_deferred" not in test_consts:
|
|
continue
|
|
# The reset must live in the orelse (elif compression_exhausted ...),
|
|
# never in the deferred body.
|
|
orelse_calls = set()
|
|
for sub in node.orelse:
|
|
orelse_calls |= _calls(sub)
|
|
if "reset_session" in orelse_calls:
|
|
return node
|
|
raise AssertionError(
|
|
"Could not locate the compression_deferred guard in front of the "
|
|
"compression-exhausted auto-reset block in gateway/run.py. The "
|
|
"soft-defer contract (#49874: lock-contended defer must never "
|
|
"auto-reset the session) is no longer structurally guaranteed."
|
|
)
|
|
|
|
|
|
class TestCompressionDeferredIsSoft:
|
|
def test_deferred_branch_guards_the_auto_reset(self):
|
|
"""The auto-reset (``reset_session``) must be unreachable when
|
|
``compression_deferred`` is set: the deferred check comes FIRST and
|
|
the reset lives only in its elif chain."""
|
|
node = _find_deferred_guarded_reset_chain()
|
|
# The exhaustion reset is in the orelse — verified by the finder.
|
|
# The deferred body must not mutate the session in any way.
|
|
body_calls = set()
|
|
for sub in node.body:
|
|
body_calls |= _calls(sub)
|
|
forbidden = {
|
|
"reset_session",
|
|
"_evict_cached_agent",
|
|
"_clear_conversation_scope",
|
|
}
|
|
assert not (body_calls & forbidden), (
|
|
f"The compression_deferred branch in gateway/run.py performs "
|
|
f"session mutation ({body_calls & forbidden}). A lock-contended "
|
|
f"defer is transient — the session must stay intact so the next "
|
|
f"message retries against the freshly compressed context "
|
|
f"(#49874, #69870)."
|
|
)
|
|
|