mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-23 16:36:23 +00:00
* fix(gateway): serialize concurrent turns per resolved session_id with a turn lease Closes the serialization half of #64934. The busy guards are keyed by routing key, but the durable transcript is owned by session_id — and switch_session() makes the key→id mapping many-to-one (/resume from a second chat/topic, CLI-continuity rebinding, async-delegation pinning, topic-binding tip-walks). Two routing keys mapped to one session_id ran concurrent turns on two different agent objects, invisible to every per-key guard: flushes persisted in completion order, the identity-marker dedup swallowed rows, and the second turn ran on a stale history base — leaving a permanent user;user alternation wedge. The fix: an asyncio lease keyed by RESOLVED session_id (gateway/turn_lease.py), acquired in _handle_message_with_agent after session resolution is final (post switch_session/tip-walk), immediately before the transcript load, and released in _handle_message's finally on every exit path. Tokens are granted per (routing key, run generation) so a stale unwind can never release a newer turn's lease (#28686 ownership lesson). Same-key messages never reach the acquisition point mid-turn (both routing-key guards hold them), so the lock is uncontended outside the alias-key route — where the second turn now waits for the first turn's flush and logs one WARNING naming the session and both routing keys (pairs with the #67371 tripwire). Fail-open: a stuck holder degrades to today's unserialized behavior with a loud ERROR after agent.gateway_timeout — never a wedged session; a degraded token holds nothing and can't steal the lease. Registry is size-capped and never evicts a live lease. Persist-disabled review forks never dispatch through _handle_message, so they cannot contend. Known limits (tracked on #64934): CLI-continuity cross-process pairs need a DB-level lease; mid-turn compression rotation leaves a small alias window for a follow-up at the binding-sync sites. Validation: 8 behavior tests (alias-key wait + flush order, no cross-session contention, generation-scoped idempotent release, timeout fail-open without lease theft, bounded registry, bare-runner-safe release wiring) + E2E against a real SessionStore reproducing the issue's switch_session alias route — strict alternation and arrival order preserved. * refactor(gateway): conversation-scope funnel + mid-turn lease rebind Completes the #64934 system beyond the point fix. Two structural changes, both eliminating whole bug classes rather than instances: 1. _clear_conversation_scope — THE single conversation-boundary funnel. /new, /resume, auto-reset, expiry finalization, and the compression-exhausted reset each carried a hand-copied pop-list of the per-session dicts, and the lists drifted every time a new dict was added (#48031, #58403, #10702, #35809 were all 'boundary X forgot dict Y' bugs). All five sites now make one funnel call driven by the _CONVERSATION_SCOPED_STATE registry; adding a new conversation-scoped dict means adding one name to the registry, and every boundary picks it up automatically. Scope rules documented at the registry: turn-scoped state, the monotonic generation counter, and the agent cache are deliberately excluded (different lifecycles). 2. SessionTurnLeaseRegistry.rebind — the held turn lease now FOLLOWS mid-turn compression rotation. Both rotation sites (session-hygiene pre-compression, agent-result session_id swap) alias the same _SessionLease object under the new id, so an alias routing key resolving the fresh child (topic tip-walk) still serializes against the in-flight turn. Closes the rotation-alias window flagged as a known limit on #64934. Ownership-checked like release; when the target id already has a live lease the rebind fails open with a loud WARNING (never a mid-turn deadlock). Tests: 3 new rebind behavior tests + 5 funnel behavior tests (including a real-setter drift guard); the two AST change-detector pins in test_10710/test_48031 were re-pointed at the funnel and the #58403 pin converted to a behavioral test. E2E: rotation-alias scenario against a real SessionStore + SessionDB — turn B on the fresh child waits behind the rotated holder, sees its rows, alternation intact.
305 lines
11 KiB
Python
305 lines
11 KiB
Python
"""Behavior tests for the per-session turn lease (#64934).
|
|
|
|
The lease serializes the [load history → run → flush] region per RESOLVED
|
|
session_id, closing the alias-key overlap route: two routing keys mapped to
|
|
one session_id via switch_session() run turns on two different agent objects,
|
|
invisible to every routing-key guard.
|
|
|
|
Covers:
|
|
- alias-key turn waits until the first turn's flush, and flush order is
|
|
preserved (the second turn loads history AFTER the first turn's release)
|
|
- distinct sessions do not contend
|
|
- generation-scoped, idempotent release: a stale unwind can never free a
|
|
newer turn's lease; double-release is a no-op
|
|
- timeout fail-open: a stuck holder degrades to unserialized with a degraded
|
|
token, never a wedged session, and the degraded token releases nothing
|
|
- registry stays bounded; live leases are never evicted
|
|
- GatewayRunner._release_turn_lease wiring (bare-runner safe, token-scoped)
|
|
"""
|
|
|
|
import asyncio
|
|
|
|
import pytest
|
|
|
|
from gateway.turn_lease import SessionTurnLeaseRegistry
|
|
|
|
|
|
def _run(coro):
|
|
return asyncio.run(coro)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Serialization behavior
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_alias_key_turn_waits_and_order_is_preserved():
|
|
"""Second routing key on the same session_id waits for the first turn's
|
|
release; events interleave in strict [load1, flush1, load2, flush2] order."""
|
|
|
|
async def scenario():
|
|
registry = SessionTurnLeaseRegistry()
|
|
events = []
|
|
|
|
async def turn(owner_key, generation, hold):
|
|
token = await registry.acquire(
|
|
"sess-1", owner_key=owner_key, generation=generation, timeout=5
|
|
)
|
|
assert token is not None and not token.degraded
|
|
events.append(f"load:{owner_key}")
|
|
await asyncio.sleep(hold) # simulate run + flush
|
|
events.append(f"flush:{owner_key}")
|
|
registry.release(token)
|
|
|
|
t1 = asyncio.create_task(turn("key-a", 1, hold=0.05))
|
|
await asyncio.sleep(0.01) # let turn 1 take the lease
|
|
t2 = asyncio.create_task(turn("key-b", 1, hold=0))
|
|
await asyncio.gather(t1, t2)
|
|
return events
|
|
|
|
events = _run(scenario())
|
|
assert events == ["load:key-a", "flush:key-a", "load:key-b", "flush:key-b"]
|
|
|
|
|
|
def test_distinct_sessions_do_not_contend():
|
|
async def scenario():
|
|
registry = SessionTurnLeaseRegistry()
|
|
order = []
|
|
|
|
async def turn(session_id, owner_key):
|
|
token = await registry.acquire(
|
|
session_id, owner_key=owner_key, generation=1, timeout=5
|
|
)
|
|
order.append(f"start:{session_id}")
|
|
await asyncio.sleep(0.05)
|
|
order.append(f"end:{session_id}")
|
|
registry.release(token)
|
|
|
|
await asyncio.gather(turn("sess-a", "key-a"), turn("sess-b", "key-b"))
|
|
return order
|
|
|
|
order = _run(scenario())
|
|
# Both started before either finished — no serialization across sessions.
|
|
assert order[:2] == ["start:sess-a", "start:sess-b"]
|
|
|
|
|
|
def test_contention_logs_named_warning(caplog):
|
|
async def scenario():
|
|
registry = SessionTurnLeaseRegistry()
|
|
t1 = await registry.acquire("sess-w", owner_key="key-a", generation=3, timeout=5)
|
|
|
|
async def second():
|
|
t2 = await registry.acquire(
|
|
"sess-w", owner_key="key-b", generation=7, timeout=5
|
|
)
|
|
registry.release(t2)
|
|
|
|
task = asyncio.create_task(second())
|
|
await asyncio.sleep(0.01)
|
|
registry.release(t1)
|
|
await task
|
|
|
|
with caplog.at_level("WARNING", logger="gateway.turn_lease"):
|
|
_run(scenario())
|
|
warnings = [r for r in caplog.records if "turn lease contention" in r.getMessage()]
|
|
assert len(warnings) == 1
|
|
msg = warnings[0].getMessage()
|
|
assert "sess-w" in msg and "key-a" in msg and "key-b" in msg
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Release semantics
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_generation_scoped_idempotent_release():
|
|
"""A released token re-released is a no-op, and a stale token cannot free
|
|
a newer turn's lease."""
|
|
|
|
async def scenario():
|
|
registry = SessionTurnLeaseRegistry()
|
|
stale = await registry.acquire("sess-g", owner_key="key-a", generation=1, timeout=5)
|
|
assert stale is not None
|
|
assert registry.release(stale) is True
|
|
# Double release: no-op.
|
|
assert registry.release(stale) is False
|
|
|
|
newer = await registry.acquire("sess-g", owner_key="key-a", generation=2, timeout=5)
|
|
# Stale token (already released, older generation) must not free the
|
|
# newer holder even if some unwind calls release again.
|
|
stale.released = False # simulate a buggy double-unwind resurrecting it
|
|
assert registry.release(stale) is False
|
|
# Newer turn still holds the lease: a third acquire must wait.
|
|
waiter = asyncio.create_task(
|
|
registry.acquire("sess-g", owner_key="key-b", generation=3, timeout=5)
|
|
)
|
|
await asyncio.sleep(0.02)
|
|
assert not waiter.done()
|
|
assert registry.release(newer) is True
|
|
third = await waiter
|
|
assert third is not None and not third.degraded
|
|
registry.release(third)
|
|
|
|
_run(scenario())
|
|
|
|
|
|
def test_release_none_and_empty_session_are_noops():
|
|
async def scenario():
|
|
registry = SessionTurnLeaseRegistry()
|
|
assert registry.release(None) is False
|
|
assert await registry.acquire("", owner_key="k", generation=1) is None
|
|
|
|
_run(scenario())
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Fail-open on timeout
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_timeout_fails_open_with_degraded_token(caplog):
|
|
async def scenario():
|
|
registry = SessionTurnLeaseRegistry()
|
|
holder = await registry.acquire(
|
|
"sess-t", owner_key="key-stuck", generation=1, timeout=5
|
|
)
|
|
degraded = await registry.acquire(
|
|
"sess-t", owner_key="key-b", generation=2, timeout=0.05
|
|
)
|
|
assert degraded is not None
|
|
assert degraded.degraded is True
|
|
# Degraded release must NOT free the stuck holder's lock (no lease theft).
|
|
assert registry.release(degraded) is False
|
|
third = asyncio.create_task(
|
|
registry.acquire("sess-t", owner_key="key-c", generation=3, timeout=5)
|
|
)
|
|
await asyncio.sleep(0.02)
|
|
assert not third.done() # still held by the original holder
|
|
registry.release(holder)
|
|
t3 = await third
|
|
assert t3 is not None and not t3.degraded
|
|
registry.release(t3)
|
|
|
|
with caplog.at_level("ERROR", logger="gateway.turn_lease"):
|
|
_run(scenario())
|
|
errors = [r for r in caplog.records if "failing open" in r.getMessage()]
|
|
assert len(errors) == 1
|
|
assert "sess-t" in errors[0].getMessage()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Bounded registry
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_registry_bounded_and_never_evicts_live_lease():
|
|
async def scenario():
|
|
registry = SessionTurnLeaseRegistry(max_entries=5)
|
|
live = await registry.acquire("live", owner_key="k", generation=1, timeout=5)
|
|
# Churn far past the cap with idle leases.
|
|
for i in range(50):
|
|
t = await registry.acquire(f"s{i}", owner_key="k", generation=1, timeout=5)
|
|
registry.release(t)
|
|
assert len(registry) <= 6 # cap + the transient new entry
|
|
# The live lease survived every eviction pass: releasing it works and
|
|
# it still serializes.
|
|
assert registry.release(live) is True
|
|
|
|
_run(scenario())
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Mid-turn rotation rebind
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_rebind_moves_serialization_to_new_session_id():
|
|
"""After a mid-turn compression rotation, an alias key acquiring the NEW
|
|
id must wait behind the holder; release under the new id frees it."""
|
|
|
|
async def scenario():
|
|
registry = SessionTurnLeaseRegistry()
|
|
token = await registry.acquire("parent", owner_key="key-a", generation=1, timeout=5)
|
|
assert registry.rebind(token, "child") is True
|
|
assert token is not None and token.session_id == "child"
|
|
|
|
# Alias key resolving the fresh child id serializes behind the holder.
|
|
waiter = asyncio.create_task(
|
|
registry.acquire("child", owner_key="key-b", generation=1, timeout=5)
|
|
)
|
|
await asyncio.sleep(0.02)
|
|
assert not waiter.done()
|
|
|
|
assert registry.release(token) is True
|
|
t2 = await waiter
|
|
assert t2 is not None and not t2.degraded
|
|
registry.release(t2)
|
|
|
|
_run(scenario())
|
|
|
|
|
|
def test_rebind_is_ownership_checked_and_noop_safe():
|
|
async def scenario():
|
|
registry = SessionTurnLeaseRegistry()
|
|
token = await registry.acquire("s1", owner_key="k", generation=1, timeout=5)
|
|
assert token is not None
|
|
# Same id → no-op.
|
|
assert registry.rebind(token, "s1") is False
|
|
# Empty target → no-op.
|
|
assert registry.rebind(token, "") is False
|
|
# None / released tokens → no-op.
|
|
assert registry.rebind(None, "s2") is False
|
|
registry.release(token)
|
|
assert registry.rebind(token, "s2") is False
|
|
|
|
_run(scenario())
|
|
|
|
|
|
def test_rebind_blocked_when_target_lease_is_live():
|
|
"""Two live serialization domains can't be merged mid-wait — rebind
|
|
fails open (token stays on the old id) with a loud warning."""
|
|
|
|
async def scenario():
|
|
registry = SessionTurnLeaseRegistry()
|
|
t_a = await registry.acquire("sess-a", owner_key="key-a", generation=1, timeout=5)
|
|
t_b = await registry.acquire("sess-b", owner_key="key-b", generation=1, timeout=5)
|
|
assert t_a is not None and t_b is not None
|
|
assert registry.rebind(t_a, "sess-b") is False
|
|
assert t_a.session_id == "sess-a" # unchanged
|
|
# Both still release cleanly under their own ids.
|
|
assert registry.release(t_a) is True
|
|
assert registry.release(t_b) is True
|
|
|
|
_run(scenario())
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# GatewayRunner wiring
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_runner_release_turn_lease_is_token_scoped_and_bare_safe():
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
# Bare runner without __init__: must be a safe no-op (pitfall #17).
|
|
assert runner._release_turn_lease("key-a", 1) is False
|
|
|
|
async def scenario():
|
|
runner._turn_leases = SessionTurnLeaseRegistry()
|
|
runner._turn_lease_tokens = {}
|
|
token = await runner._turn_leases.acquire(
|
|
"sess-r", owner_key="key-a", generation=1, timeout=5
|
|
)
|
|
runner._turn_lease_tokens[("key-a", 1)] = token
|
|
# Wrong generation: pops nothing, releases nothing.
|
|
assert runner._release_turn_lease("key-a", 2) is False
|
|
assert runner._turn_leases._leases["sess-r"].holder is token
|
|
# Right (key, generation): releases.
|
|
assert runner._release_turn_lease("key-a", 1) is True
|
|
# Idempotent.
|
|
assert runner._release_turn_lease("key-a", 1) is False
|
|
# Empty key guard.
|
|
assert runner._release_turn_lease("", 1) is False
|
|
|
|
_run(scenario())
|