mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-02 02:01:47 +00:00
feat(gateway,cli): confirm /reload-mcp to warn about prompt cache invalidation
Reloading MCP servers rebuilds the tool set for the active session, which invalidates the provider prompt cache (tool schemas are baked into the system prompt). The next message re-sends full input tokens — can be expensive on long-context or high-reasoning models. To surface that cost, /reload-mcp now routes through a new slash-confirm primitive with three options: Approve Once / Always Approve / Cancel. 'Always Approve' persists approvals.mcp_reload_confirm: false so future reloads run silently. Coverage: * Classic CLI (cli.py) — interactive numbered prompt. * TUI (tui_gateway + Ink ops.ts) — text warning on first call; `now` / `always` args skip the gate; `always` also persists the opt-out. * Messenger gateway — button UI on Telegram (inline keyboard), Discord (discord.ui.View), Slack (Block Kit actions); text fallback on every other platform via /approve /always /cancel replies intercepted in gateway/run.py _handle_message. * Config key: approvals.mcp_reload_confirm (default true). * Auto-reload paths (CLI file watcher, TUI config-sync mtime poll) pass confirm=true so they do NOT prompt. Implementation: * tools/slash_confirm.py — module-level pending-state store used by all adapters and by the CLI prompt. Thread-safe register/resolve/clear. * gateway/platforms/base.py — send_slash_confirm hook (default 'Not supported' → text fallback). * gateway/run.py — _request_slash_confirm helper + text intercept in _handle_message (yields to in-progress tool-exec approvals so dangerous-command /approve still unblocks the tool thread first). Tests: * tests/tools/test_slash_confirm.py — primitive lifecycle + async resolution + double-click atomicity (16 tests). * tests/hermes_cli/test_mcp_reload_confirm_gate.py — default-config shape + deep-merge preserves user opt-out (5 tests). Targeted runs (hermetic): 89 passed (slash-confirm, config gate, existing agent cache, existing telegram approval buttons).
This commit is contained in:
parent
7fae87bc00
commit
4d7fc0f37c
14 changed files with 1287 additions and 9 deletions
162
tools/slash_confirm.py
Normal file
162
tools/slash_confirm.py
Normal file
|
|
@ -0,0 +1,162 @@
|
|||
"""Generic slash-command confirmation primitive (gateway-side).
|
||||
|
||||
Slash commands that have a non-destructive but expensive side effect worth
|
||||
surfacing to the user (currently only ``/reload-mcp``, which invalidates
|
||||
the provider prompt cache) route through this module.
|
||||
|
||||
Two delivery paths:
|
||||
|
||||
1. Button UI — adapters that override ``send_slash_confirm`` render
|
||||
three inline buttons (Approve Once / Always Approve / Cancel). The
|
||||
button callback calls ``resolve(session_key, confirm_id, choice)``.
|
||||
|
||||
2. Text fallback — adapters without button UIs get a plain text prompt.
|
||||
Users reply with ``/approve``, ``/always``, or ``/cancel``; the
|
||||
gateway's ``_handle_message`` intercepts those replies and calls
|
||||
``resolve()`` directly.
|
||||
|
||||
State is stored module-level (like ``tools.approval``) so platform
|
||||
adapters can resolve callbacks without needing a backreference to the
|
||||
``GatewayRunner`` instance. The CLI path (``cli.py``) uses a local
|
||||
synchronous variant — see ``_prompt_slash_confirm`` there.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
import threading
|
||||
import time
|
||||
from typing import Any, Awaitable, Callable, Dict, Optional
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Pending confirmations keyed by gateway session_key. Each entry:
|
||||
# {
|
||||
# "confirm_id": str,
|
||||
# "command": str, # e.g. "reload-mcp"
|
||||
# "handler": Callable[[str], Awaitable[Optional[str]]],
|
||||
# "created_at": float, # time.time()
|
||||
# }
|
||||
_pending: Dict[str, Dict[str, Any]] = {}
|
||||
_lock = threading.RLock()
|
||||
|
||||
# Default timeout — a pending confirm older than this is discarded when
|
||||
# the next message arrives for the same session. Buttons work up until
|
||||
# the adapter drops the callback_data (Telegram: ~48h; Discord: ephemeral;
|
||||
# Slack: 3s ack + long-lived actions).
|
||||
DEFAULT_TIMEOUT_SECONDS = 300
|
||||
|
||||
|
||||
def register(
|
||||
session_key: str,
|
||||
confirm_id: str,
|
||||
command: str,
|
||||
handler: Callable[[str], Awaitable[Optional[str]]],
|
||||
) -> None:
|
||||
"""Register a pending slash-command confirmation.
|
||||
|
||||
Overwrites any prior pending confirm for the same ``session_key`` — the
|
||||
user invoking a new confirmable command supersedes the stale one.
|
||||
"""
|
||||
with _lock:
|
||||
_pending[session_key] = {
|
||||
"confirm_id": confirm_id,
|
||||
"command": command,
|
||||
"handler": handler,
|
||||
"created_at": time.time(),
|
||||
}
|
||||
|
||||
|
||||
def get_pending(session_key: str) -> Optional[Dict[str, Any]]:
|
||||
"""Return the pending confirm dict for a session, or None."""
|
||||
with _lock:
|
||||
entry = _pending.get(session_key)
|
||||
return dict(entry) if entry else None
|
||||
|
||||
|
||||
def clear(session_key: str) -> None:
|
||||
"""Drop the pending confirm for ``session_key`` without running it."""
|
||||
with _lock:
|
||||
_pending.pop(session_key, None)
|
||||
|
||||
|
||||
def clear_if_stale(session_key: str, timeout: float = DEFAULT_TIMEOUT_SECONDS) -> bool:
|
||||
"""Drop the pending confirm if older than ``timeout`` seconds.
|
||||
|
||||
Returns True if an entry was dropped.
|
||||
"""
|
||||
with _lock:
|
||||
entry = _pending.get(session_key)
|
||||
if not entry:
|
||||
return False
|
||||
if time.time() - float(entry.get("created_at", 0) or 0) > timeout:
|
||||
_pending.pop(session_key, None)
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
async def resolve(
|
||||
session_key: str,
|
||||
confirm_id: str,
|
||||
choice: str,
|
||||
timeout: float = DEFAULT_TIMEOUT_SECONDS,
|
||||
) -> Optional[str]:
|
||||
"""Resolve a pending confirm.
|
||||
|
||||
``choice`` must be one of ``"once"``, ``"always"``, or ``"cancel"``.
|
||||
Returns the handler's output string (to be sent as a follow-up
|
||||
message), or ``None`` if the confirm was stale, already resolved, or
|
||||
the confirm_id doesn't match.
|
||||
|
||||
Safe to call from an asyncio callback (button click) or from the
|
||||
gateway's message intercept path.
|
||||
"""
|
||||
with _lock:
|
||||
entry = _pending.get(session_key)
|
||||
if not entry:
|
||||
return None
|
||||
if entry.get("confirm_id") != confirm_id:
|
||||
# Stale confirm_id — superseded by a newer prompt on the same session.
|
||||
return None
|
||||
# Pop before we run the handler to prevent duplicate callbacks
|
||||
# (e.g. button double-click) from running it twice.
|
||||
_pending.pop(session_key, None)
|
||||
if time.time() - float(entry.get("created_at", 0) or 0) > timeout:
|
||||
return None
|
||||
handler = entry.get("handler")
|
||||
command = entry.get("command", "?")
|
||||
|
||||
if not handler:
|
||||
return None
|
||||
try:
|
||||
result = await handler(choice)
|
||||
except Exception as exc:
|
||||
logger.error(
|
||||
"Slash-confirm handler for /%s raised: %s",
|
||||
command, exc, exc_info=True,
|
||||
)
|
||||
return f"❌ Error handling confirmation: {exc}"
|
||||
return result if isinstance(result, str) else None
|
||||
|
||||
|
||||
def resolve_sync_compat(
|
||||
loop: asyncio.AbstractEventLoop,
|
||||
session_key: str,
|
||||
confirm_id: str,
|
||||
choice: str,
|
||||
) -> Optional[str]:
|
||||
"""Synchronous helper: schedule resolve() on a loop and wait for the result.
|
||||
|
||||
Used by platform callback paths that run on a different thread than the
|
||||
event loop (e.g. Discord's button click handler in some configurations).
|
||||
Prefer the async ``resolve()`` from an async context.
|
||||
"""
|
||||
try:
|
||||
fut = asyncio.run_coroutine_threadsafe(
|
||||
resolve(session_key, confirm_id, choice), loop,
|
||||
)
|
||||
return fut.result(timeout=30)
|
||||
except Exception as exc:
|
||||
logger.error("resolve_sync_compat failed: %s", exc)
|
||||
return None
|
||||
Loading…
Add table
Add a link
Reference in a new issue