mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-25 17:04:52 +00:00
Follow-up to the salvaged #57634 commits: - agent/manual_compression_feedback.py: new describe_compression_lock_skip() — single source of truth for lock-skip wording. A descriptive holder string means another compressor CONFIRMED holds the lock ('already in progress (holder: ...)'); True/None means acquisition failed without a confirmed holder (hermes_state.try_acquire_compression_lock catches sqlite3.Error internally and returns False), so the message says 'could not acquire ... the lock check failed' instead of falsely claiming a concurrent compression is running. - cli.py, gateway/slash_commands.py, tui_gateway/server.py (all three in-process consumers: session.compress RPC, command.dispatch compress branch, slash.exec mirror) now route through the shared helper. - tui_gateway/server.py command.dispatch compress branch: catch CompressionLockHeld explicitly — it previously fell into the generic 'compress failed' error handler. - Deferred-notify contract (#69324): lock-skip discards the pending context-engine notification (committed=False) in _compress_session_history and the CLI path before returning. - tests: lock-skip wording pins per surface, VISIBLE_COMPRESSION_MESSAGES noise-filter carve-outs for both wordings, MagicMock signal opt-outs for sibling tests added on main after the original PR.
239 lines
8.3 KiB
Python
239 lines
8.3 KiB
Python
"""Tests for TUI gateway /compress lock-hold signalling.
|
|
|
|
Covers the shared _compress_session_history choke point plus ALL THREE
|
|
in-process manual-compress consumers (session.compress RPC, the
|
|
command.dispatch compress branch, and the slash.exec mirror via
|
|
_mirror_slash_side_effects) — each must surface the lock-skip reason
|
|
instead of the misleading "No changes from compression" no-op text or a
|
|
generic "compress failed" error.
|
|
"""
|
|
import threading
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
|
|
def _make_history():
|
|
return [
|
|
{"role": "user", "content": "a"},
|
|
{"role": "assistant", "content": "b"},
|
|
{"role": "user", "content": "c"},
|
|
{"role": "assistant", "content": "d"},
|
|
]
|
|
|
|
|
|
def _make_lock_skip_agent(signal):
|
|
"""Agent double whose _compress_context no-ops and sets the lock signal."""
|
|
agent = MagicMock()
|
|
agent._cached_system_prompt = ""
|
|
agent.tools = None
|
|
agent.session_id = "sess-lock"
|
|
# Deferred-notify contract: no pending notification exists.
|
|
agent._pending_context_engine_compression_notification = None
|
|
|
|
def _fake_compress(msgs=None, *_args, **_kwargs):
|
|
agent._compression_skipped_due_to_lock = signal
|
|
return (list(msgs) if msgs is not None else _make_history(), "")
|
|
|
|
agent._compress_context.side_effect = _fake_compress
|
|
return agent
|
|
|
|
|
|
def _make_session(agent, history):
|
|
return {
|
|
"agent": agent,
|
|
"history_lock": threading.Lock(),
|
|
"history": history,
|
|
"history_version": 1,
|
|
"running": False,
|
|
"session_key": "sess-lock",
|
|
}
|
|
|
|
|
|
def test_compress_session_history_raises_on_lock_skip():
|
|
"""When _compression_skipped_due_to_lock is set on the agent,
|
|
_compress_session_history must raise CompressionLockHeld with
|
|
the holder string so callers can surface a clear message."""
|
|
from tui_gateway.server import _compress_session_history, CompressionLockHeld
|
|
|
|
history = _make_history()
|
|
agent = _make_lock_skip_agent("pid=99999:tid=1:agent=1:nonce=abc")
|
|
session = _make_session(agent, history)
|
|
|
|
with (
|
|
patch(
|
|
"agent.model_metadata.estimate_request_tokens_rough", return_value=100
|
|
),
|
|
pytest.raises(CompressionLockHeld) as exc_info,
|
|
):
|
|
_compress_session_history(session)
|
|
|
|
assert exc_info.value.holder == "pid=99999:tid=1:agent=1:nonce=abc"
|
|
# The history must be untouched by the lock-skip.
|
|
assert session["history"] == history
|
|
assert session["history_version"] == 1
|
|
|
|
|
|
def test_compress_session_history_clears_signal_after_raise():
|
|
"""The signal attribute must be cleared when the exception is raised
|
|
so stale signals don't leak into subsequent operations."""
|
|
from tui_gateway.server import _compress_session_history, CompressionLockHeld
|
|
|
|
history = _make_history()
|
|
agent = _make_lock_skip_agent(True)
|
|
session = _make_session(agent, history)
|
|
|
|
with (
|
|
patch(
|
|
"agent.model_metadata.estimate_request_tokens_rough", return_value=100
|
|
),
|
|
pytest.raises(CompressionLockHeld),
|
|
):
|
|
_compress_session_history(session)
|
|
|
|
# Signal must be cleared after the raise.
|
|
assert agent._compression_skipped_due_to_lock is None
|
|
|
|
|
|
def test_compress_session_history_unconfirmed_signal_yields_none_holder():
|
|
"""signal=True (acquisition failed, holder unconfirmed — e.g. SQLite
|
|
error made try_acquire return False) must map to holder=None, NOT a
|
|
fabricated holder, so downstream wording doesn't claim a concurrent
|
|
compression is definitely running."""
|
|
from tui_gateway.server import _compress_session_history, CompressionLockHeld
|
|
|
|
agent = _make_lock_skip_agent(True)
|
|
session = _make_session(agent, _make_history())
|
|
|
|
with (
|
|
patch(
|
|
"agent.model_metadata.estimate_request_tokens_rough", return_value=100
|
|
),
|
|
pytest.raises(CompressionLockHeld) as exc_info,
|
|
):
|
|
_compress_session_history(session)
|
|
|
|
assert exc_info.value.holder is None
|
|
|
|
|
|
# ── Consumer 1: session.compress RPC ───────────────────────────────────
|
|
|
|
|
|
def test_session_compress_rpc_returns_lock_held_payload():
|
|
from tui_gateway import server
|
|
|
|
agent = _make_lock_skip_agent("pid=4242")
|
|
session = _make_session(agent, _make_history())
|
|
sid = "sid-lock-rpc"
|
|
server._sessions[sid] = session
|
|
try:
|
|
with (
|
|
patch.object(server, "_sess", return_value=(session, None)),
|
|
patch.object(server, "_session_uses_compute_host", return_value=False),
|
|
patch.object(server, "_status_update"),
|
|
patch(
|
|
"agent.model_metadata.estimate_request_tokens_rough",
|
|
return_value=100,
|
|
),
|
|
):
|
|
r = server._methods["session.compress"]("r1", {"session_id": sid})
|
|
finally:
|
|
server._sessions.pop(sid, None)
|
|
|
|
result = r["result"]
|
|
assert result["lock_held"] is True
|
|
assert result["compressed"] is False
|
|
assert "Compression already in progress" in result["message"]
|
|
assert "pid=4242" in result["message"]
|
|
assert "No changes from compression" not in result["message"]
|
|
|
|
|
|
# ── Consumer 2: command.dispatch compress branch ───────────────────────
|
|
|
|
|
|
def test_command_dispatch_compress_reports_lock_skip_as_output_not_error():
|
|
"""CompressionLockHeld must NOT fall through to the generic
|
|
'compress failed' error handler — it's a clean no-op with feedback."""
|
|
from tui_gateway import server
|
|
|
|
agent = _make_lock_skip_agent("pid=5150")
|
|
session = _make_session(agent, _make_history())
|
|
sid = "sid-lock-dispatch"
|
|
server._sessions[sid] = session
|
|
try:
|
|
with (
|
|
patch.object(server, "_session_uses_compute_host", return_value=False),
|
|
patch(
|
|
"agent.model_metadata.estimate_request_tokens_rough",
|
|
return_value=100,
|
|
),
|
|
):
|
|
r = server._methods["command.dispatch"](
|
|
"r2", {"name": "compress", "arg": "", "session_id": sid}
|
|
)
|
|
finally:
|
|
server._sessions.pop(sid, None)
|
|
|
|
assert "error" not in r, f"lock-skip surfaced as error: {r.get('error')}"
|
|
output = r["result"]["output"]
|
|
assert r["result"]["type"] == "exec"
|
|
assert "Compression already in progress" in output
|
|
assert "pid=5150" in output
|
|
assert "compress failed" not in output
|
|
assert "No changes from compression" not in output
|
|
|
|
|
|
# ── Consumer 3: slash.exec mirror (_mirror_slash_side_effects) ─────────
|
|
|
|
|
|
def test_mirror_slash_side_effects_reports_lock_skip():
|
|
from tui_gateway import server
|
|
|
|
agent = _make_lock_skip_agent("pid=6161")
|
|
session = _make_session(agent, _make_history())
|
|
sid = "sid-lock-mirror"
|
|
server._sessions[sid] = session
|
|
try:
|
|
with (
|
|
patch.object(server, "_sync_session_key_after_compress"),
|
|
patch.object(server, "_emit"),
|
|
patch(
|
|
"agent.model_metadata.estimate_request_tokens_rough",
|
|
return_value=100,
|
|
),
|
|
):
|
|
output = server._mirror_slash_side_effects(sid, session, "/compress")
|
|
finally:
|
|
server._sessions.pop(sid, None)
|
|
|
|
assert "Compression already in progress" in output
|
|
assert "pid=6161" in output
|
|
assert "No changes from compression" not in output
|
|
assert "live session sync failed" not in output
|
|
|
|
|
|
def test_mirror_slash_side_effects_unconfirmed_lock_skip_wording():
|
|
"""signal=True (no confirmed holder) must use the 'could not acquire'
|
|
wording rather than claiming another compression is running."""
|
|
from tui_gateway import server
|
|
|
|
agent = _make_lock_skip_agent(True)
|
|
session = _make_session(agent, _make_history())
|
|
sid = "sid-lock-mirror-unconfirmed"
|
|
server._sessions[sid] = session
|
|
try:
|
|
with (
|
|
patch.object(server, "_sync_session_key_after_compress"),
|
|
patch.object(server, "_emit"),
|
|
patch(
|
|
"agent.model_metadata.estimate_request_tokens_rough",
|
|
return_value=100,
|
|
),
|
|
):
|
|
output = server._mirror_slash_side_effects(sid, session, "/compress")
|
|
finally:
|
|
server._sessions.pop(sid, None)
|
|
|
|
assert "Compression skipped" in output
|
|
assert "could not acquire" in output
|
|
assert "already in progress" not in output
|