hermes-admin/hermes-agent
1
0
Fork 0
Code Issues Pull Requests Actions 32 Packages Projects Releases Wiki Activity

refactor(agent/relay_runtime): end_turn accounting via suppress+lock; logical-call unwind pops from the tail

Browse Source
This commit is contained in:
Teknium
2026-09-02 20:37:43 -07:00
parent b121ac4a83
commit 720a4d46ef
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
agent/relay_runtime.py
View File

@@ -1025,11 +1025,9 @@ class RelaySessionCoordinator:
if host is not None:
self._close_turn_scope(host, turn, outcome=outcome)
finally:
with contextlib.suppress(Exception): # accounting must never block
# Segment turn accounting (max_turns rotation trigger).
if turn._active_registered and host is not None:
with lease.session.lock:
lease.session.segment_turns += 1
if turn._active_registered and host is not None:
with contextlib.suppress(Exception), lease.session.lock: # accounting never blocks
lease.session.segment_turns += 1 # max_turns rotation trigger
try:
# Delegated agents own one turn: close their conversation while the
# active-turn guard is held so a parent timeout fallback cannot race it.
@@ -1132,17 +1130,19 @@ class RelaySessionCoordinator:
with turn.logical_llm_lock:
logical_calls = list(turn.logical_llm_calls.items())
turn.logical_llm_calls.clear()
for index, (request_id, logical_handle) in reversed(list(enumerate(logical_calls))):
while logical_calls:
_request_id, logical_handle = logical_calls[-1]
failure = host._close_scope_handle(
lease.session, logical_handle, output={"outcome": outcome},
failure_label="logical LLM scope close failed",
)
if failure is None:
logical_calls.pop()
continue
with turn.logical_llm_lock:
# Stack-owned scopes: if the newest handle cannot close even after orphan
# drain, older ones cannot either — retain the unclosed prefix.
for pending_request_id, pending_handle in logical_calls[: index + 1]:
for pending_request_id, pending_handle in logical_calls:
turn.logical_llm_calls.setdefault(pending_request_id, pending_handle)
logger.warning("Hermes Relay logical LLM finalization failed: %s", failure)
break