a5bd246865
* refactor(plugins): remove the Sep 2026 decomposition compat layer on schedule The PLUGIN-COMPAT layer (2776813df3+d63e380324+0a5164cebe) kept pre-#102117 import paths alive for external plugins until 2026-09-14. That window closed two weeks ago; since then the loader has already been skipping plugins that use the old paths. This removes the layer itself: - 328 appended `PLUGIN-COMPAT` blocks (lazy `__getattr__` pointer tables, re-exported third-party names, restored dead definitions) and the three re-export stub modules (gateway/startup_watchdog, hermes_cli/observability/relay_runtime, tools/environments/modal_utils) - COMPAT_MANIFEST.md, compat_manifest.json, scripts/check_compat_pointers.py and its lint step - the reporting surfaces: CLI banner notice, `hermes plugins compat`, the `hermes doctor` section, the post-update notice, the Desktop one-time dialog, the loader's pre-import skip and the `plugins.allow_deprecated_imports` escape hatch An external plugin that still imports an old path now fails to load with its ImportError as the reason in `hermes plugins list`, the same path as any broken plugin. hermes_cli/plugin_compat.py stays as three inert stubs (compat_report, removal_in_effect, summary_lines): an already-running pre-removal `hermes update` lazy-imports them after the checkout swap (tests/compat/old_updater_surface.json). In-tree fallout, both already dead: hermes_cli/setup.py::_check_espeak_ng (no callers; its `shutil` came from a compat block) and gateway/config.py::SessionResetPolicy ("retained solely for the scheduled plugin-compat window"). Two test_run_agent patches targeted the removed `run_agent.handle_function_call` pointer; they now patch `model_tools.handle_function_call`, the seam production reads, like every sibling test in that file. * chore: retrigger CI (zero-job startup_failure phantom) * test: drop resolution allowlist rows for the two deleted which() sites hermes_cli/setup.py::_check_espeak_ng (dead) and tools/skillevaluator_scan.py::scanner_available (a restored definition inside a PLUGIN-COMPAT block) no longer exist; the stale-row gate requires their allowlist entries go with them.
90 lines
3.5 KiB
Python
90 lines
3.5 KiB
Python
"""Generic slash-command confirmation primitive (gateway-side).
|
|
|
|
Slash commands with an expensive side effect (currently only ``/reload-mcp``, which invalidates
|
|
the provider prompt cache) route through here. Button-UI adapters render Approve Once / Always
|
|
Approve / Cancel and call ``resolve()``; text-only adapters get a prompt and the gateway
|
|
intercepts ``/approve``, ``/always``, ``/cancel``. State is module-level (like ``tools.approval``)
|
|
so adapters can resolve without a ``GatewayRunner`` backreference. The CLI has its own
|
|
synchronous variant (``_prompt_slash_confirm`` in ``cli.py``).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import threading
|
|
import time
|
|
from typing import Any, Awaitable, Callable, Dict, Optional
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# session_key -> {"confirm_id", "command", "handler", "created_at"}
|
|
_pending: Dict[str, Dict[str, Any]] = {}
|
|
_lock = threading.RLock()
|
|
|
|
# Older pending confirms are discarded when the session's next message arrives (buttons live
|
|
# as long as the adapter keeps callback_data).
|
|
DEFAULT_TIMEOUT_SECONDS = 300
|
|
|
|
|
|
def register(session_key: str, confirm_id: str, command: str,
|
|
handler: Callable[[str], Awaitable[Optional[str]]]) -> None:
|
|
"""Register a pending confirm, superseding any prior one for the session."""
|
|
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 a copy of 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 _is_stale(entry: Dict[str, Any], timeout: float) -> bool:
|
|
return time.time() - float(entry.get("created_at", 0) or 0) > timeout
|
|
|
|
|
|
def clear_if_stale(session_key: str, timeout: float = DEFAULT_TIMEOUT_SECONDS) -> bool:
|
|
"""Drop the pending confirm if older than ``timeout`` seconds; True if dropped."""
|
|
with _lock:
|
|
entry = _pending.get(session_key)
|
|
stale = bool(entry and _is_stale(entry, timeout))
|
|
if stale:
|
|
_pending.pop(session_key, None)
|
|
return stale
|
|
|
|
|
|
async def resolve(session_key: str, confirm_id: str, choice: str,
|
|
timeout: float = DEFAULT_TIMEOUT_SECONDS) -> Optional[str]:
|
|
"""Run the pending handler with ``choice`` ("once" / "always" / "cancel").
|
|
|
|
Returns the handler's output string, or None if the confirm was stale, already resolved,
|
|
or the confirm_id doesn't match (superseded prompt).
|
|
"""
|
|
with _lock:
|
|
entry = _pending.get(session_key)
|
|
if not entry or entry.get("confirm_id") != confirm_id:
|
|
return None
|
|
# Pop before running so duplicate callbacks (button double-click) cannot run it twice.
|
|
_pending.pop(session_key, None)
|
|
if _is_stale(entry, 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
|