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

Merge remote-tracking branch 'origin/main' into ethie/pm-clean

Browse Source
This commit is contained in:
ethernet
2026-09-22 18:01:46 -04:00
parent c60c1d90c8 3e00a356a4
commit 358c21c113
44 changed files with 1807 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/mcp_tool_common.py
View File

@@ -122,11 +122,11 @@ _FALSE_WORDS = frozenset({"false", "0", "no", "off"})
def _parse_boolish(value: Any, default: bool = True) -> bool:
"""Parse a bool-like config value with safe fallback."""
"""Parse a bool-like config value with safe fallback (YAML ``0``/``1`` are numbers, not words)."""
if value is None:
return default
if isinstance(value, bool):
return value
if isinstance(value, (bool, int, float)):
return bool(value)
if isinstance(value, str):
lowered = value.strip().lower()
if lowered in _TRUE_WORDS:
@@ -137,6 +137,13 @@ def _parse_boolish(value: Any, default: bool = True) -> bool:
return default
def mcp_server_enabled(cfg: dict) -> bool:
"""Whether ``mcp_servers.<name>`` is on. The ONE reader of the ``enabled`` key: the MCP client,
the toolset resolver, the profile editor, and every list/status surface call it, so a value
can never be on for one surface and off for another. Absent, ``null`` or unparseable = on."""
return _parse_boolish(cfg.get("enabled", True), default=True)
def _get_lifecycle_seconds(config: dict, key: str) -> Optional[float]:
"""Optional positive lifecycle timeout from top-level/nested ``lifecycle`` config (``0``
disables; negatives and non-numbers are warned about and ignored)."""

18
tools/mcp_tool_discovery.py
View File

@@ -11,7 +11,7 @@ import time
from contextlib import contextmanager
from pathlib import Path
from typing import Dict, List, Optional, Tuple
from tools.mcp_tool_common import _core, _parse_boolish
from tools.mcp_tool_common import _core, _parse_boolish, mcp_server_enabled
from tools import mcp_tool_config as _config
from tools import mcp_tool_errors as _errors
from tools import mcp_tool_lifecycle as _lifecycle
@@ -66,10 +66,6 @@ def _connect_cooldown_active(server_name: str) -> bool:
return deadline is not None and time.monotonic() < deadline
def _enabled(cfg: dict) -> bool:
return _parse_boolish(cfg.get("enabled", True), default=True)
def _owner_scope_home() -> Optional[Path]:
"""The profile home whose secret scope MCP credential reads must resolve under, or None when
the caller is already scoped or this is a single-profile process (scope key ``None``).
@@ -335,9 +331,9 @@ def _select_new_servers(servers: Dict[str, dict]) -> Dict[str, dict]:
k: v for k, v in servers.items()
if keys[k] not in _core._servers and keys[k] not in _core._server_connecting
and keys[k] not in _core._lazy_server_configs
and _enabled(v) and not _connect_cooldown_active(k)}
and mcp_server_enabled(v) and not _connect_cooldown_active(k)}
stale_cached = [_core._servers[keys[k]] for k, v in servers.items()
if keys[k] in _core._servers and _enabled(v)
if keys[k] in _core._servers and mcp_server_enabled(v)
and getattr(_core._servers[keys[k]], "session", None) is None]
for srv_name in new_servers:
_core._server_connecting.add(keys[srv_name])
@@ -587,7 +583,7 @@ def discover_mcp_tools(allowed_mcp_names: Optional[List[str]] = None) -> List[st
keys = {name: _resolve_server_key(name) for name in servers}
new_server_names = [name for name, cfg in servers.items()
if keys[name] not in _core._servers and keys[name] not in _core._server_connecting
and _enabled(cfg)]
and mcp_server_enabled(cfg)]
prior_lazy = set(_core._lazy_server_configs)
tool_names = register_mcp_servers(servers)
if new_server_names:
@@ -619,7 +615,7 @@ def reconcile_mcp_servers_with_config() -> Dict[str, List[str]]:
``{"removed": [...], "added": [...], "pending": [...]}``; a no-op when nothing changed."""
with _owner_secret_scope():
servers = _config._load_mcp_config()
wanted = {name for name, cfg in servers.items() if _enabled(cfg)}
wanted = {name for name, cfg in servers.items() if mcp_server_enabled(cfg)}
scope = _core._mcp_registry_scope()
with _core._lock:
owned = [key for key, owner in _core._server_scope_keys.items() if owner == scope]
@@ -708,7 +704,7 @@ def get_mcp_status(configured: Optional[Dict[str, dict]] = None, *, include_runt
result: List[dict] = []
for name, cfg in configured.items():
enabled = _enabled(cfg) # evaluated unconditionally: malformed values warn even when connected
enabled = mcp_server_enabled(cfg) # evaluated unconditionally: malformed values warn even when connected
server = active_servers.get(name)
live = server is not None and server.session is not None
# An in-flight or failed first-use connect outranks "lazy": that server is no longer
@@ -754,7 +750,7 @@ def probe_mcp_server_tools() -> Dict[str, List[tuple]]:
if not _core._ensure_mcp_sdk():
return {}
with _owner_secret_scope():
enabled = {k: v for k, v in (_config._load_mcp_config() or {}).items() if _enabled(v)}
enabled = {k: v for k, v in (_config._load_mcp_config() or {}).items() if mcp_server_enabled(v)}
if not enabled:
return {}
_loop._ensure_mcp_loop()

10
tools/mcp_tool_registration.py
View File

@@ -9,7 +9,7 @@ import threading
from dataclasses import dataclass
from types import SimpleNamespace
from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Optional
from tools.mcp_tool_common import _parse_boolish, _core, _resolve_tool_timeout, mcp_field
from tools.mcp_tool_common import _parse_boolish, _core, _resolve_tool_timeout, mcp_field, mcp_server_enabled
from tools import mcp_tool_handlers as _handlers
from tools import mcp_tool_schema as _schema
from tools.mcp_tool_handlers import (
@@ -407,10 +407,6 @@ def _register_server_tools(name: str, server: "MCPServerTask", config: dict) ->
return registered
def _server_enabled(config: dict) -> bool:
return _parse_boolish(config.get("enabled", True), default=True)
def _connection_identity(config: dict) -> tuple:
"""What makes one live connection reusable for another profile: the route fingerprint PLUS
everything that authenticates it (``config_fingerprint`` deliberately excludes credentials so
@@ -473,7 +469,7 @@ def _register_connected_into_current_scope(servers: dict) -> int:
server = _core._servers.get(key)
config = servers.get(_key_name(key))
cross_profile = _key_scope(key) != scope
if (config is None or not _server_enabled(config) or server is None
if (config is None or not mcp_server_enabled(config) or server is None
or getattr(server, "session", None) is None
or not _same_server_route(server, config, cross_profile=cross_profile)):
stale.append(key)
@@ -482,7 +478,7 @@ def _register_connected_into_current_scope(servers: dict) -> int:
registered_servers = 0
for name, config in servers.items():
if not _server_enabled(config):
if not mcp_server_enabled(config):
continue
with _core._lock:
if _server_key(name, scope, current=False) in _core._servers:

4
tools/mcp_tool_server_run.py
View File

@@ -249,8 +249,8 @@ class MCPServerRunMixin:
entry = (_config._load_mcp_config() or {}).get(self.name)
if entry is None:
return False
from tools.mcp_tool_common import _parse_boolish
return _parse_boolish(entry.get("enabled", True), default=True)
from tools.mcp_tool_common import mcp_server_enabled
return mcp_server_enabled(entry)
except Exception:
return True