mirrors/hermes-agent
1
0
Fork 0
mirror of https://github.com/NousResearch/hermes-agent.git synced 2026-05-24 05:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix(gateway): clear slash-confirm state during session boundary cleanup

Browse source
This commit is contained in:
novax635 2026-05-09 14:18:20 +03:00
parent 93e25ceb13
commit 8b6501786c
2 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gateway/run.py
View file

@ -12803,6 +12803,20 @@ class GatewayRunner:
if isinstance(update_prompt_pending, dict): if isinstance(update_prompt_pending, dict):
update_prompt_pending.pop(session_key, None) update_prompt_pending.pop(session_key, None)
try:
from tools import slash_confirm as _slash_confirm_mod
except Exception:
_slash_confirm_mod = None
if _slash_confirm_mod is not None:
try:
_slash_confirm_mod.clear(session_key)
except Exception as e:
logger.debug(
"Failed to clear slash-confirm state for session boundary %s: %s",
session_key,
e,
)
try: try:
from tools.approval import clear_session as _clear_approval_session from tools.approval import clear_session as _clear_approval_session
except Exception: except Exception:

15
tests/gateway/test_session_boundary_security_state.py
View file

@ -9,6 +9,7 @@ from gateway.config import Platform
from gateway.platforms.base import MessageEvent from gateway.platforms.base import MessageEvent
from gateway.session import SessionEntry, SessionSource, build_session_key from gateway.session import SessionEntry, SessionSource, build_session_key
from tools import approval as approval_mod from tools import approval as approval_mod
from tools import slash_confirm as slash_confirm_mod
from tools.approval import ( from tools.approval import (
_ApprovalEntry, _ApprovalEntry,
approve_session, approve_session,
@ -26,6 +27,7 @@ def _clear_approval_state():
approval_mod._session_yolo.clear() approval_mod._session_yolo.clear()
approval_mod._permanent_approved.clear() approval_mod._permanent_approved.clear()
approval_mod._pending.clear() approval_mod._pending.clear()
slash_confirm_mod._pending.clear()
yield yield
approval_mod._gateway_queues.clear() approval_mod._gateway_queues.clear()
approval_mod._gateway_notify_cbs.clear() approval_mod._gateway_notify_cbs.clear()
@ -33,6 +35,7 @@ def _clear_approval_state():
approval_mod._session_yolo.clear() approval_mod._session_yolo.clear()
approval_mod._permanent_approved.clear() approval_mod._permanent_approved.clear()
approval_mod._pending.clear() approval_mod._pending.clear()
slash_confirm_mod._pending.clear()
def _make_source() -> SessionSource: def _make_source() -> SessionSource:
@ -249,6 +252,15 @@ def test_clear_session_boundary_security_state_is_scoped():
"[USER INITIATED SKILLS RELOAD: other]" "[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) runner._clear_session_boundary_security_state(session_key)
# Target session cleared # Target session cleared
@ -257,18 +269,21 @@ def test_clear_session_boundary_security_state_is_scoped():
assert session_key not in runner._pending_approvals assert session_key not in runner._pending_approvals
assert session_key not in runner._update_prompt_pending assert session_key not in runner._update_prompt_pending
assert session_key not in runner._pending_skills_reload_notes assert session_key not in runner._pending_skills_reload_notes
assert slash_confirm_mod.get_pending(session_key) is None
# Other session untouched # Other session untouched
assert is_approved(other_key, "recursive delete") is True assert is_approved(other_key, "recursive delete") is True
assert is_session_yolo_enabled(other_key) is True assert is_session_yolo_enabled(other_key) is True
assert other_key in runner._pending_approvals assert other_key in runner._pending_approvals
assert other_key in runner._update_prompt_pending assert other_key in runner._update_prompt_pending
assert other_key in runner._pending_skills_reload_notes 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 # Empty session_key is a no-op
runner._clear_session_boundary_security_state("") runner._clear_session_boundary_security_state("")
assert is_approved(other_key, "recursive delete") is True assert is_approved(other_key, "recursive delete") is True
assert other_key in runner._update_prompt_pending assert other_key in runner._update_prompt_pending
assert other_key in runner._pending_skills_reload_notes 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(): def test_clear_session_boundary_security_state_wakes_blocked_approvals():