* feat(connections): manage_connections covers local MCP servers; setup_mcp leaves the schema
One model tool now connects the user to apps of both kinds. A target
`{"name": "linear", "mcp": true}` is a locally configured MCP server;
`install` / `enable` / `authorize` are its verbs. Bare strings and
`{"name": ...}` stay managed connectors and that leg is unchanged.
MCP targets run through one backend-owned connection operation
(tools/connections_tool_operation.py): created with a server-side
deadline from the new config key `connections.wait_timeout_seconds`
(default 120, floor 5, no ceiling), per-target state, and exactly-once
settlement (all resolved / Continue / deadline / interrupt). Unresolved
targets freeze as `not_connected` with the settle reason.
Why the fold works now: the approval card is reached through
`agent.connection_callback` via the agent-level inline executor table,
which is the only path that carries a GUI callback. Registry dispatch
(every non-GUI surface) settles MCP targets as `unavailable` with the
`hermes mcp install / login` hint; managed targets in the same call
are unaffected.
`setup_mcp` is removed from every advertised toolset and from the
deferral list; an inline-table shim keeps calls from conversations
opened before this change dispatching (prompt-cache protection).
`_LEGACY_TOOL_ALIASES` is not the mechanism: inline tools bypass it.
Gateway: `mcp.setup.request/respond` are replaced by
`connection.request/respond/expire` (no wire compat; desktop ships
with this). The bridge waits exactly the operation's deadline. The
`session.resume` snapshot gains `pending_connection` so a reopened
window restores the card with the original deadline.
`manage_connections` joins `_SEQUENTIAL_DEADLINE_EXEMPT_TOOLS`: the
operation owns its wait; the 420s guard must not report `tool_timeout`
while the card is live.
The portal `check_fn` on the tool is dropped in favour of a
handler-level gate on the managed leg, so signed-out sessions can still
approve local MCPs.
* wip(desktop): connection.request store, resume restore, card routing for MCP targets
Renderer half of the setup_mcp fold, first slice: connection-request store
(mirrors clarify), connection.request/expire handling, pending_connection
resume restore, mcpTargets() + isCardTool(name, args) so MCP-target
manage_connections calls classify as cards. Not yet: the card component
rewrite (mcp-setup-tool.tsx), mcp-directory.ts removal, vitest, docs.
Does not typecheck until the card rewrite lands.
* fix(config): hermes update turns on the connections toolset for saved toolset lists
`hermes tools` writes an explicit `platform_toolsets.<platform>` list, and the
resolver reads absence from that list as "unchecked". The `connections`
toolset (#106842) shipped after most users last saved, so `manage_connections`
is stripped from the schema on every install that ever opened the picker.
The Nous entitlement gate never runs; the agent reports the tool as missing.
Migration 44 -> 45 (renumbered when folded into #109517; main was already at 44) appends `connections` to each explicit per-platform list
that lacks it and records the offer in `known_builtin_toolsets` where that
record exists, so a later uncheck reads as a decline. It skips: platforms
whose record already holds `connections` (the user saw the checkbox and left
it off), bare composite lists ([hermes-cli]) that already inherit it, platforms
where the toolset is not allowed, and any config whose `agent.disabled_toolsets`
names `connections` (Blank Slate, `hermes tools --disable`), because the
resolver subtracts that list last and the enable would never take effect.
The explicit-list test is the resolver's own: any configurable or plugin key.
`hermes update` runs migrations post-pull for the active profile and every
sibling, so one update is enough. Fresh installs and composite users were
never affected.
* refactor: anti-slop pass on the desktop slice; shorten added comments
Parse connection.request at the boundary with a typed wire interface instead of
unknown + typeof; mcpTargets reuses connectorText; comments cut to one or two
lines. slop-ratchet: no net-new findings in 13 touched files.
* feat(desktop): the MCP approval card answers manage_connections; MCP Directory removed
The existing card (mcp-setup-tool.tsx) now reads the connection-request store,
renders for manage_connections calls with mcp:true targets, answers through
connection.respond with a per-target outcome, and no longer calls reload.mcp
after Install; the new server's tools arrive on the between-turns refresh.
A settled operation renders the first target's frozen state.
session.resume restores a pending card with its original deadline on both the
activate and cold-resume paths.
lib/mcp-directory.ts is deleted along with its two fallback branches
(suggestion provider, card install). The catalog was already primary in both;
a catalog miss now yields no suggestion / a notInCatalog error. The GitHub
never-suggest test is rewritten on catalog-shaped data.
vitest: connection-request store (6), suggestion provider, clarify restore.
slop-ratchet: no net-new findings in 19 touched files.
* chore: drop __pycache__ files swept in by an over-broad git add
* fix(desktop): correlate the connection.request row with the model's tool call by reason
The synthetic row from connection.request and the tool.start row carried
different ids and no shared match value (op_id is not in the model's args),
so the card mounted twice. reason is the arg both sides carry.
* docs: manage_connections covers local MCP servers; connections.wait_timeout_seconds
* fix(connections): settle reason derives from target state, never from the renderer
A card that answers one of two targets and claims all_resolved must settle as
continue with the other target not_connected; found live with a two-target call.
* fix(desktop): a pending connection card re-arms on resume and activate
The store entry was restored but the transcript row was not, so navigating
away and back (or reloading) lost the card while the backend kept waiting.
restorePendingClarifyToolCall's core is generalized to any blocking tool
name and both resume paths project the connection row through it.
Verified live: card restored after navigate-away and after a full renderer
reload, deadline_at unchanged, approve settles connected.
* style: literal wording in added comments, docstrings and docs
* fix: shared gateway-event contract and config-schema category for the connection events
connection.request/expire replace mcp.setup.* in apps/shared gateway-events
(json list, BACKEND_EVENT_NAMES, GatewayEventMap) so the renderer's event
union includes them and the tui_gateway contract test passes. The new
`connections` config section folds into the agent tab like the other
single-field sections.
* style: import order (perfectionist) in the desktop and shared files this PR touches
* chore: retrigger CI (zero-job dispatch failure, auto-heal)
486 lines
24 KiB
Python
486 lines
24 KiB
Python
"""Toolset helpers: get/resolve/validate named tool groups (static TOOLSETS + registry-registered)."""
|
|
|
|
from typing import Dict, List, Any, Set, Optional, Tuple
|
|
|
|
|
|
# Shared tool list for CLI and all messaging platform toolsets (edit once, all
|
|
# platforms follow). Desktop GUI affordances are deliberately NOT here: they live
|
|
# in `desktop_ui`/`project`, enabled per desktop-sourced session by the GUI gateway
|
|
# (tui_gateway/server.py::_load_enabled_toolsets). HA, kanban and computer_use
|
|
# entries are further gated by their tools' check_fns.
|
|
_HERMES_CORE_TOOLS = [
|
|
"web_search", "web_extract",
|
|
"terminal", "process_manage",
|
|
"read_file", "write_file", "patch", "search_files",
|
|
"vision_analyze", "image_generate",
|
|
"skills_list", "skill_view", "skill_manage",
|
|
"browser_navigate", "browser_snapshot", "browser_click",
|
|
"browser_type", "browser_scroll", "browser_back",
|
|
"browser_press", "browser_get_images",
|
|
"browser_vision", "browser_console", "browser_cdp", "browser_dialog",
|
|
"browser_vault_list", "browser_vault_unlock", "browser_vault_fill", "browser_vault_save_login", "browser_vault_enter_code", # ride with the browser
|
|
"browser_exec", # replaces the other browser tools when browser.backend is "browser-use"
|
|
"text_to_speech",
|
|
"todo_list", "memory",
|
|
"session_search",
|
|
"clarify",
|
|
"execute_code", "delegate_task",
|
|
"cronjob_manage",
|
|
"ha_list_entities", "ha_get_state", "ha_list_services", "ha_call_service",
|
|
"kanban_show", "kanban_list",
|
|
"kanban_complete", "kanban_block", "kanban_request_review",
|
|
"kanban_request_changes",
|
|
"kanban_heartbeat",
|
|
"kanban_comment", "kanban_create", "kanban_link",
|
|
"kanban_unblock",
|
|
"kanban_attach", "kanban_attach_url", "kanban_attachments",
|
|
"computer_use",
|
|
# Service-gated connector account status and authorization links.
|
|
"manage_connections",
|
|
]
|
|
|
|
# Webhook payloads are untrusted third-party content: no file/system execution.
|
|
_HERMES_WEBHOOK_SAFE_TOOLS = ["web_search", "web_extract", "vision_analyze", "clarify"]
|
|
_HA_TOOLS = ["ha_list_entities", "ha_get_state", "ha_list_services", "ha_call_service"]
|
|
_FEISHU_TOOLS = [
|
|
"feishu_doc_read", "feishu_drive_list_comments", "feishu_drive_list_comment_replies",
|
|
"feishu_drive_reply_comment", "feishu_drive_add_comment",
|
|
]
|
|
_YUANBAO_TOOLS = ["yb_query_group_info", "yb_query_group_members", "yb_send_dm", "yb_search_sticker", "yb_send_sticker"]
|
|
|
|
|
|
def _ts(description, tools=(), includes=(), **extra):
|
|
"""One TOOLSETS entry (fresh lists per entry; extra keys such as posture pass through)."""
|
|
return {"description": description, "tools": list(tools), "includes": list(includes), **extra}
|
|
|
|
|
|
def _bundle(description, extras=()):
|
|
"""A `hermes-*` platform bundle: the shared core tools plus optional platform extras."""
|
|
return _ts(description, _HERMES_CORE_TOOLS + list(extras))
|
|
|
|
|
|
def _core_without(*excluded, kanban=True):
|
|
"""_HERMES_CORE_TOOLS minus *excluded* (and, unless kanban=True, every kanban_* tool); order preserved."""
|
|
return [t for t in _HERMES_CORE_TOOLS if t not in excluded and (kanban or not t.startswith("kanban_"))]
|
|
|
|
|
|
# Coding posture: everything you reach for while pairing on code; drops messaging,
|
|
# tts, image_gen, home-assistant, cron, kanban and computer-use.
|
|
_CODING_TOOLS = _core_without("image_generate", "text_to_speech", "cronjob_manage", "computer_use", *_HA_TOOLS, kanban=False)
|
|
|
|
# Core toolset definitions: individual tools or references to other toolsets.
|
|
TOOLSETS = {
|
|
# Basic toolsets - individual tool categories
|
|
"web": _ts("Web research and content extraction tools", ["web_search", "web_extract"]),
|
|
"search": _ts("Web search only (no content extraction/scraping)", ["web_search"]),
|
|
"x_search": _ts(
|
|
"Search X (Twitter) posts and threads via xAI's built-in x_search Responses "
|
|
"tool. Read-only public X discovery; use the xurl skill for authenticated X "
|
|
"API reads and account actions. Available when xAI credentials are configured "
|
|
"(SuperGrok OAuth or XAI_API_KEY). Off by default; enable in `hermes tools` → "
|
|
"X (Twitter) Search.",
|
|
["x_search"],
|
|
),
|
|
"vision": _ts("Image analysis and vision tools", ["vision_analyze"]),
|
|
"video": _ts("Video analysis and understanding tools (opt-in, not in default toolset)", ["video_analyze"]),
|
|
"image_gen": _ts("Creative generation tools (images)", ["image_generate"]),
|
|
"video_gen": _ts(
|
|
"Video generation tools. Single ``video_generate`` tool covers text-to-video "
|
|
"(prompt only) and image-to-video (prompt + image_url), plus "
|
|
"reference-to-video. Provider-specific edit/extend workflows may appear as "
|
|
"separate tools. Configure via ``hermes tools`` → Video Generation.",
|
|
["video_generate", "xai_video_edit", "xai_video_extend"],
|
|
),
|
|
"computer_use": _ts(
|
|
"Background desktop control via cua-driver (macOS/Windows/Linux) — "
|
|
"screenshots, mouse, keyboard, scroll, drag. Does NOT steal the user's cursor "
|
|
"or keyboard focus. Works with any tool-capable model.",
|
|
["computer_use"],
|
|
),
|
|
"terminal": _ts("Terminal/command execution and process management tools", ["terminal", "process_manage"]),
|
|
"skills": _ts(
|
|
"Access, create, edit, and manage skill documents with specialized "
|
|
"instructions and knowledge",
|
|
["skills_list", "skill_view", "skill_manage"],
|
|
),
|
|
# web_search belongs to `web`/`search` only. Listing it here too let
|
|
# `disabled_toolsets: [browser]` (headless/Docker deployments) strip
|
|
# web_search from every session, because disabled toolsets are a strict
|
|
# end-of-pipeline subtraction (#17309, #64503).
|
|
"browser": _ts(
|
|
"Browser automation for web interaction (navigate, click, type, scroll, "
|
|
"iframes, hold-click)",
|
|
[t for t in _HERMES_CORE_TOOLS if t.startswith("browser_")],
|
|
),
|
|
"cronjob": _ts(
|
|
"Cronjob management tool - create, list, update, pause, resume, remove, and "
|
|
"trigger scheduled tasks",
|
|
["cronjob_manage"],
|
|
),
|
|
"file": _ts(
|
|
"File manipulation tools: read, write, patch (with fuzzy matching), and "
|
|
"search (content + files)",
|
|
["read_file", "write_file", "patch", "search_files"],
|
|
),
|
|
"tts": _ts("Text-to-speech: convert text to audio with Edge TTS (free), ElevenLabs, OpenAI, or xAI", ["text_to_speech"]),
|
|
"todo": _ts("Task planning and tracking for multi-step work", ["todo_list"]),
|
|
"memory": _ts("Persistent memory across sessions (personal notes + user profile)", ["memory"]),
|
|
"context_engine": _ts("Runtime tools exposed by the active context engine"),
|
|
"session_search": _ts("Search and recall past conversations with summarization", ["session_search"]),
|
|
"connections": _ts("Remote connector discovery, execution, and account authorization", ["manage_connections"]),
|
|
"project": _ts("Desktop Projects — create/switch named workspaces (GUI sessions only)", ["desktop_project"]),
|
|
"bot_room": _ts("Verified text-only Group Chat turn capabilities"),
|
|
|
|
# GUI-renderer affordances, enabled per desktop-sourced SESSION by the GUI
|
|
# gateway (tui_gateway/server.py::_load_enabled_toolsets) — never by a
|
|
# process env var, which is blind to a desktop client on a remote backend.
|
|
"desktop_ui": _ts(
|
|
"Desktop GUI affordances — in-app terminal/browser panes, pane focus, "
|
|
"reactions (GUI sessions only)",
|
|
["read_terminal", "close_terminal", "desktop_preview", "drive_preview",
|
|
"annotate_preview", "read_window_below", "focus_pane", "react_to_message",
|
|
"gui_tour", "show_tip"],
|
|
),
|
|
"clarify": _ts("Ask the user clarifying questions (multiple-choice or open-ended)", ["clarify"]),
|
|
"code_execution": _ts("Run Python scripts that call tools programmatically (reduces LLM round trips)", ["execute_code"]),
|
|
"delegation": _ts("Spawn subagents with isolated context for complex subtasks", ["delegate_task"]),
|
|
"homeassistant": _ts("Home Assistant smart home control and monitoring", _HA_TOOLS),
|
|
"kanban": _ts(
|
|
"Kanban multi-agent coordination — only active when the agent is spawned by "
|
|
"the kanban dispatcher (HERMES_KANBAN_TASK env set). The dispatcher runs "
|
|
"inside the gateway by default; see `kanban.dispatch_in_gateway` in "
|
|
"config.yaml. Lets workers mark tasks done with structured handoffs, enter "
|
|
"first-class review (request_review — not a block), return review changes, "
|
|
"block for human input, heartbeat during long ops, comment on threads, attach "
|
|
"files, and (for orchestrators) list, unblock, and fan out tasks.",
|
|
[t for t in _HERMES_CORE_TOOLS if t.startswith("kanban_")],
|
|
),
|
|
"discord": _ts("Discord read and participate tools (fetch messages, search members, create threads)", ["discord"]),
|
|
"discord_admin": _ts("Discord server management (list channels/roles, pin messages, assign roles)", ["discord_admin"]),
|
|
"yuanbao": _ts("Yuanbao platform tools - group info, member queries, DM, stickers", _YUANBAO_TOOLS),
|
|
"feishu_doc": _ts("Read Feishu/Lark document content", ["feishu_doc_read"]),
|
|
"feishu_drive": _ts("Feishu/Lark document comment operations (list, reply, add)", _FEISHU_TOOLS[1:]),
|
|
"spotify": _ts(
|
|
"Native Spotify playback, search, playlist, album, and library tools",
|
|
["spotify_playback", "spotify_devices", "spotify_queue", "spotify_search",
|
|
"spotify_playlists", "spotify_albums", "spotify_library"],
|
|
),
|
|
|
|
# Scenario-specific toolsets
|
|
"debugging": _ts("Debugging and troubleshooting toolkit", ["terminal", "process_manage"], includes=["web", "file"]),
|
|
"safe": _ts("Safe toolkit without terminal access", [], includes=["web", "vision", "image_gen"]),
|
|
|
|
# Coding posture, auto-selected in a code workspace (agent/coding_context.py).
|
|
# `desktop_ui` is folded in separately by the GUI gateway for desktop sessions.
|
|
# posture=True: per-session posture, never auto-recovered into platform tool
|
|
# config (see the non-configurable-toolset recovery loop in hermes_cli/tools_config.py).
|
|
"coding": _ts(
|
|
"Coding-focused toolset: files, terminal, search, web docs, skills, todo, "
|
|
"delegate, vision, browser",
|
|
_CODING_TOOLS,
|
|
posture=True,
|
|
),
|
|
|
|
# Full Hermes toolsets (CLI + messaging platforms). All share the core tools;
|
|
# there is deliberately no agent-callable send_message tool. hermes-acp is the
|
|
# coding posture minus the interactive clarify UI.
|
|
"hermes-acp": _ts(
|
|
"Editor integration (VS Code, Zed, JetBrains) — coding-focused tools without "
|
|
"messaging, audio, or clarify UI",
|
|
[t for t in _CODING_TOOLS if t != "clarify"],
|
|
),
|
|
"hermes-api-server": _ts(
|
|
"OpenAI-compatible API server — full agent tools accessible via HTTP (no "
|
|
"interactive UI tools like clarify or send_message)",
|
|
_core_without("text_to_speech", "clarify", "computer_use", kanban=False),
|
|
),
|
|
"hermes-cli": _bundle("Full interactive CLI toolset - all default tools plus cronjob management"),
|
|
|
|
# Mirrors hermes-cli; `hermes tools` platform config filters it down and
|
|
# _get_platform_tools() drops _DEFAULT_OFF_TOOLSETS unless user-enabled.
|
|
"hermes-cron": _bundle("Default cron toolset - same core tools as hermes-cli; gated by `hermes tools`"),
|
|
"hermes-telegram": _bundle("Telegram bot toolset - full access for personal use (terminal has safety checks)"),
|
|
"hermes-discord": _bundle(
|
|
"Discord bot toolset - full access (terminal has safety checks via dangerous "
|
|
"command approval)",
|
|
["discord", "discord_admin"],
|
|
),
|
|
"hermes-whatsapp": _bundle("WhatsApp bot toolset - similar to Telegram (personal messaging, more trusted)"),
|
|
"hermes-slack": _bundle("Slack bot toolset - full access for workspace use (terminal has safety checks)"),
|
|
"hermes-signal": _bundle("Signal bot toolset - encrypted messaging platform (full access)"),
|
|
"hermes-bluebubbles": _bundle("BlueBubbles iMessage bot toolset - Apple iMessage via local BlueBubbles server"),
|
|
"hermes-homeassistant": _bundle("Home Assistant bot toolset - smart home event monitoring and control"),
|
|
"hermes-email": _bundle("Email bot toolset - interact with Hermes via email (IMAP/SMTP)"),
|
|
"hermes-mattermost": _bundle("Mattermost bot toolset - self-hosted team messaging (full access)"),
|
|
"hermes-matrix": _bundle("Matrix bot toolset - decentralized encrypted messaging (full access)"),
|
|
"hermes-dingtalk": _bundle("DingTalk bot toolset - enterprise messaging platform (full access)"),
|
|
"hermes-feishu": _bundle("Feishu/Lark bot toolset - enterprise messaging via Feishu/Lark (full access)", _FEISHU_TOOLS),
|
|
"hermes-weixin": _bundle("Weixin bot toolset - personal WeChat messaging via iLink (full access)"),
|
|
"hermes-qqbot": _bundle("QQBot toolset - QQ messaging via Official Bot API v2 (full access)"),
|
|
"hermes-wecom": _bundle("WeCom bot toolset - enterprise WeChat messaging (full access)"),
|
|
"hermes-wecom-callback": _bundle("WeCom callback toolset - enterprise self-built app messaging (full access)"),
|
|
"hermes-yuanbao": {
|
|
"description": "Yuanbao Bot 元宝消息平台工具集 - 群信息、成员查询、私聊、贴纸表情",
|
|
"tools": _HERMES_CORE_TOOLS + _YUANBAO_TOOLS,
|
|
"module": "tools.yuanbao_tools",
|
|
"includes": [],
|
|
},
|
|
"hermes-sms": _bundle("SMS bot toolset - interact with Hermes via SMS (Twilio)"),
|
|
"hermes-webhook": _ts("Webhook toolset - receive and process external webhook events", _HERMES_WEBHOOK_SAFE_TOOLS),
|
|
"hermes-gateway": _ts(
|
|
"Gateway toolset - union of all messaging platform tools",
|
|
[],
|
|
includes=[
|
|
"hermes-telegram", "hermes-discord", "hermes-whatsapp", "hermes-slack",
|
|
"hermes-signal", "hermes-bluebubbles", "hermes-homeassistant", "hermes-email",
|
|
"hermes-sms", "hermes-mattermost", "hermes-matrix", "hermes-dingtalk",
|
|
"hermes-feishu", "hermes-wecom", "hermes-wecom-callback", "hermes-weixin",
|
|
"hermes-qqbot", "hermes-webhook", "hermes-yuanbao",
|
|
],
|
|
),
|
|
}
|
|
|
|
|
|
def _registry():
|
|
"""Live tool registry, or None when tools.registry can't be imported."""
|
|
try:
|
|
from tools.registry import registry
|
|
return registry
|
|
except Exception:
|
|
return None
|
|
|
|
|
|
def _registry_call(method: str, default):
|
|
"""registry.<method>() or *default* when the registry is unavailable or the call fails."""
|
|
try:
|
|
return getattr(_registry(), method)()
|
|
except Exception: # registry None (AttributeError) or the call failed
|
|
return default
|
|
|
|
|
|
def _registry_generation() -> Tuple[int, int]:
|
|
reg = _registry()
|
|
return (id(reg), getattr(reg, "_generation", 0)) if reg is not None else (0, 0)
|
|
|
|
|
|
def get_toolset(name: str, *, include_registry: bool = True) -> Optional[Dict[str, Any]]:
|
|
"""Toolset definition, or None if unknown.
|
|
|
|
include_registry=True merges plugin/overlay tools registered into this toolset
|
|
and resolves registry-only (plugin/MCP) toolsets and aliases; False returns a
|
|
copy of the static TOOLSETS entry only, so platform reverse-mapping is
|
|
unaffected by registry additions.
|
|
|
|
Args: name (str): Name of the toolset include_registry (bool): When True (default), merge in tools that
|
|
plugins/overlays registered into this toolset via the registry. Platform reverse-mapping in
|
|
``_get_platform_tools`` uses False so that a tool registered into a toolset but absent from a platform's
|
|
static composite does not drop the whole toolset from inference. See issue #49622.
|
|
"""
|
|
toolset = TOOLSETS.get(name)
|
|
if not include_registry:
|
|
return {**toolset, "tools": list(toolset.get("tools", [])), "includes": list(toolset.get("includes", []))} if toolset else None
|
|
|
|
registry = _registry()
|
|
if registry is None:
|
|
return toolset if toolset else None
|
|
|
|
if toolset:
|
|
merged_tools = set(toolset.get("tools", [])) | set(registry.get_tool_names_for_toolset(name))
|
|
# An MCP server named like a built-in toolset ("homeassistant", "browser") registers a bare
|
|
# alias to its `mcp-<name>` toolset; without this union the static entry shadows it and the
|
|
# server's tools never reach the model even though discovery registered them.
|
|
alias_target = registry.get_toolset_alias_target(name)
|
|
if alias_target and alias_target != name:
|
|
merged_tools |= set(registry.get_tool_names_for_toolset(alias_target))
|
|
return {**toolset, "tools": sorted(merged_tools)}
|
|
|
|
if name in _get_plugin_toolset_names():
|
|
# Plugin toolset; shown as its MCP server alias when one exists.
|
|
registry_toolset = name
|
|
alias = _display_alias(name, _get_registry_toolset_aliases())
|
|
description = f"MCP server '{alias}' tools" if alias else f"Plugin toolset: {name}"
|
|
else:
|
|
registry_toolset = registry.get_toolset_alias_target(name)
|
|
if not registry_toolset:
|
|
return None
|
|
description = f"MCP server '{name}' tools"
|
|
return {"description": description, "tools": registry.get_tool_names_for_toolset(registry_toolset), "includes": []}
|
|
|
|
|
|
def bundle_non_core_tools(toolset_name: str) -> Set[str]:
|
|
"""A bundle's tools minus _HERMES_CORE_TOOLS (one level of includes).
|
|
|
|
Disabling a `core + extras` bundle must not strip the core tools every other
|
|
toolset shares. One `includes` pass suffices (only hermes-gateway nests
|
|
bundles). Unknown names: full resolution minus core.
|
|
"""
|
|
core = set(_HERMES_CORE_TOOLS)
|
|
ts_def = get_toolset(toolset_name)
|
|
if not (ts_def and "tools" in ts_def):
|
|
return set(resolve_toolset(toolset_name)) - core
|
|
to_remove = set(ts_def["tools"])
|
|
for inc_def in map(get_toolset, ts_def.get("includes", [])):
|
|
if inc_def and "tools" in inc_def:
|
|
to_remove.update(inc_def["tools"])
|
|
return to_remove - core
|
|
|
|
|
|
# Memo keyed on (name, include_registry, id(registry), registry generation, profile scope);
|
|
# engages only at the public entry (visited is None). The scope is part of the key because a
|
|
# multiplexed process resolves ``mcp-<server>`` per profile overlay: without it profile B got
|
|
# profile A's tool names for a server B never connected (#106005).
|
|
_resolve_toolset_memo: Dict[Tuple[str, bool, int, int, str], List[str]] = {}
|
|
|
|
|
|
def _plugin_platform_bundle(name: str) -> List[str]:
|
|
"""Implicit `hermes-<platform>` bundle for a registered plugin platform: core
|
|
tools plus whatever the plugin registered under the platform name. [] otherwise."""
|
|
if not name.startswith("hermes-"):
|
|
return []
|
|
platform_name = name[len("hermes-"):]
|
|
try:
|
|
from gateway.platform_registry import platform_registry
|
|
if not platform_registry.is_registered(platform_name):
|
|
return []
|
|
except Exception:
|
|
return []
|
|
tools = set(_HERMES_CORE_TOOLS)
|
|
try:
|
|
tools.update(e.name for e in _registry_call("get_all_entries", ()) if e.toolset == platform_name)
|
|
except Exception:
|
|
pass
|
|
return list(tools)
|
|
|
|
|
|
def resolve_toolset(name: str, visited: Set[str] = None, *, include_registry: bool = True) -> List[str]:
|
|
"""Recursively resolve a toolset (and its includes) to a sorted tool-name list.
|
|
include_registry=False resolves the static TOOLSETS view only.
|
|
|
|
Args: name (str): Name of the toolset to resolve visited (Set[str]): Set of already visited toolsets
|
|
(for cycle detection) include_registry (bool): When True (default), include tools that plugins/overlays
|
|
registered into a toolset. Platform reverse-mapping uses False so a registry-added tool cannot drop the
|
|
whole toolset from inference (see #49622 and ``_get_platform_tools``).
|
|
"""
|
|
external_call = visited is None
|
|
if external_call:
|
|
memo_key = (name, include_registry, *_registry_generation(), _registry_call("current_scope_key", ""))
|
|
cached = _resolve_toolset_memo.get(memo_key)
|
|
if cached is not None:
|
|
return list(cached)
|
|
visited = set()
|
|
|
|
# "all"/"*" span every toolset so new toolsets are included automatically.
|
|
if name in {"all", "*"}:
|
|
all_tools: Set[str] = set()
|
|
for toolset_name in get_toolset_names():
|
|
all_tools.update(resolve_toolset(toolset_name, visited.copy(), include_registry=include_registry))
|
|
return sorted(all_tools)
|
|
|
|
# Diamond include or cycle: [] silently — the tools are collected via another path.
|
|
if name in visited:
|
|
return []
|
|
visited.add(name)
|
|
|
|
toolset = get_toolset(name, include_registry=include_registry)
|
|
if not toolset:
|
|
return _plugin_platform_bundle(name) if include_registry else []
|
|
|
|
tools = set(toolset.get("tools", []))
|
|
for included_name in toolset.get("includes", []):
|
|
tools.update(resolve_toolset(included_name, visited, include_registry=include_registry))
|
|
|
|
result = sorted(tools)
|
|
if external_call:
|
|
if len(_resolve_toolset_memo) >= 256: # stale-generation entries are never hit again
|
|
_resolve_toolset_memo.clear()
|
|
_resolve_toolset_memo[memo_key] = list(result)
|
|
return result
|
|
|
|
|
|
def _get_plugin_toolset_names() -> Set[str]:
|
|
"""Registry toolset names absent from the static TOOLSETS dict."""
|
|
return {n for n in _registry_call("get_registered_toolset_names", ()) if n not in TOOLSETS}
|
|
|
|
|
|
def _get_registry_toolset_aliases() -> Dict[str, str]:
|
|
return _registry_call("get_registered_toolset_aliases", {})
|
|
|
|
|
|
def _display_alias(ts_name: str, aliases: Dict[str, str]) -> Optional[str]:
|
|
"""First non-static alias pointing at *ts_name*, or None."""
|
|
return next((a for a, canonical in aliases.items() if canonical == ts_name and a not in TOOLSETS), None)
|
|
|
|
|
|
def _plugin_display_names() -> List[str]:
|
|
"""Plugin toolset names, shown under their first non-static alias when one exists."""
|
|
aliases = _get_registry_toolset_aliases()
|
|
return [_display_alias(n, aliases) or n for n in _get_plugin_toolset_names()]
|
|
|
|
|
|
def get_all_toolsets() -> Dict[str, Dict[str, Any]]:
|
|
"""All toolset definitions: static plus plugin-registered."""
|
|
result = dict(TOOLSETS)
|
|
aliases = _get_registry_toolset_aliases()
|
|
for display_name in _plugin_display_names():
|
|
toolset = None if display_name in result else get_toolset(display_name)
|
|
if toolset:
|
|
result[display_name] = toolset
|
|
# Static names an MCP server also aliases show the merged view get_toolset() resolves.
|
|
for name in TOOLSETS.keys() & aliases.keys():
|
|
result[name] = get_toolset(name) or result[name]
|
|
return result
|
|
|
|
|
|
def get_toolset_names() -> List[str]:
|
|
"""Sorted names of all toolsets (static + plugin), excluding aliases."""
|
|
return sorted(set(TOOLSETS.keys()) | set(_plugin_display_names()))
|
|
|
|
|
|
def validate_toolset(name: str) -> bool:
|
|
return (name in {"all", "*"} or name in TOOLSETS
|
|
or name in _get_plugin_toolset_names() or name in _get_registry_toolset_aliases())
|
|
|
|
|
|
def create_custom_toolset(name: str, description: str, tools: List[str] = None, includes: List[str] = None) -> None:
|
|
"""Register a runtime toolset in TOOLSETS."""
|
|
TOOLSETS[name] = _ts(description, tools or [], includes or [])
|
|
|
|
|
|
def get_toolset_info(name: str) -> Dict[str, Any]:
|
|
"""Toolset definition plus its resolved tools, or None if unknown."""
|
|
toolset = get_toolset(name)
|
|
if not toolset:
|
|
return None
|
|
resolved_tools = resolve_toolset(name)
|
|
return {
|
|
"name": name, "description": toolset["description"],
|
|
"direct_tools": toolset["tools"], "includes": toolset["includes"],
|
|
"resolved_tools": resolved_tools, "tool_count": len(resolved_tools),
|
|
"is_composite": bool(toolset["includes"]),
|
|
}
|
|
|
|
|
|
# ---- BEGIN PLUGIN-COMPAT (revert-scheduled; see COMPAT_MANIFEST.md) ----
|
|
# Names external plugins imported from this module before the Sep 2026 decomposition.
|
|
# Internal code MUST NOT use these (scripts/check_compat_pointers.py fails CI if it does).
|
|
# The whole block is removed by reverting the commit that added it.
|
|
|
|
def resolve_multiple_toolsets(toolset_names: List[str]) -> List[str]:
|
|
"""
|
|
Resolve multiple toolsets and combine their tools.
|
|
|
|
Args:
|
|
toolset_names (List[str]): List of toolset names to resolve
|
|
|
|
Returns:
|
|
List[str]: Combined list of all tool names (deduplicated)
|
|
"""
|
|
all_tools = set()
|
|
|
|
for name in toolset_names:
|
|
tools = resolve_toolset(name)
|
|
all_tools.update(tools)
|
|
|
|
return sorted(all_tools)
|
|
# ---- END PLUGIN-COMPAT ----
|