Files
hermes-agent/agent/inline_tool_executors.py
alt-glitch 31e59b9441 feat: setup agent can search the catalog and install plugins and skills through the approval card
The setup profile's `setup` toolset was empty. It now carries one tool, manage_catalog:

- search: catalog plugins (the Plugins tab's live catalog resolver) and hub skills, with
  whether each is already installed in the default profile. Read-only.
- install: opens the same connection operation manage_connections opens, with rows of kind
  plugin / skill. Nothing installs until the user approves a row. An approved row installs
  into `default` (or the profile the Advanced modal named) through dashboard_install_plugin /
  the hub's headless install, so the catalog pin, kill list, security scan and live
  activation (#119644) are the host's. The row settles with the live MCP tool names and the
  plugin's skill.

The model sends catalog ids and an action only; every other key is refused before anything
runs. An unknown id or a plugin this OS cannot run is drawn failed with the installer's own
text. Anywhere a catalog card cannot be drawn (TUI, CLI, messaging, registry dispatch) the
result is the `hermes plugins install` / `hermes skills install` pointer.

- contract: plugin/skill targets follow the MCP transitions.
- run.apply_answer / reissue route a card answer to the module that owns the operation.
- tool_search: `setup` joins the direct-surface toolsets, so the guide's one tool is never
  deferred behind tool_search.
- docs: tools reference, toolsets reference, plugin catalog page.

Linear NS-964.
2026-09-23 08:04:33 +05:30

302 lines
13 KiB
Python

"""Agent-level ("inline") tool executors shared by the sequential and concurrent tool paths.
These tools need live ``AIAgent`` state (stores, callbacks, session DB) and therefore
bypass the tool registry. Each executor is ``fn(agent, args, ctx) -> result``; the
table replaces two hand-maintained if/elif chains (``invoke_tool`` and
``execute_tool_calls_sequential``) that had drifted apart. Tool modules are imported
lazily at call time so ``patch("tools.x.y")`` in tests keeps working.
"""
from __future__ import annotations
import json
from dataclasses import dataclass
from importlib import import_module
from typing import Any, Callable, Dict, Optional, Tuple
def tool_hook_ids(agent, effective_task_id: str, tool_call_id: Optional[str]) -> Dict[str, str]:
"""Identity kwargs every tool hook/middleware call carries (all coerced to ``""``)."""
return {
"task_id": effective_task_id or "",
"session_id": getattr(agent, "session_id", "") or "",
"tool_call_id": tool_call_id or "",
"turn_id": getattr(agent, "_current_turn_id", "") or "",
"api_request_id": getattr(agent, "_current_api_request_id", "") or "",
}
def emit_terminal_post_tool_call(
agent,
*,
function_name: str,
function_args: dict,
result: Any,
effective_task_id: str,
tool_call_id: Optional[str],
duration_ms: int = 0,
status: Optional[str] = None,
error_type: Optional[str] = None,
error_message: Optional[str] = None,
middleware_trace: Optional[list] = None,
) -> None:
"""Emit the one terminal ``post_tool_call`` hook for a tool_call_id (best-effort)."""
try:
from model_tools import _emit_post_tool_call_hook
_emit_post_tool_call_hook(
function_name=function_name,
function_args=function_args,
result=result,
**tool_hook_ids(agent, effective_task_id, tool_call_id),
duration_ms=duration_ms,
status=status,
error_type=error_type,
error_message=error_message,
middleware_trace=list(middleware_trace or []),
)
except Exception:
pass
def apply_transform_tool_result(
agent,
*,
function_name: str,
function_args: dict,
result: Any,
effective_task_id: str,
tool_call_id: Optional[str],
duration_ms: int = 0,
) -> Any:
"""Apply ``transform_tool_result`` to an inline-dispatched tool's result.
Registry tools get this inside ``handle_function_call``; inline executors never
reach it, so the agent paths call the same helper (after the terminal
``post_tool_call``) to keep the hook's "every tool" contract. Fail-open."""
try:
from model_tools import _CallIds, _apply_transform_tool_result_hook
return _apply_transform_tool_result_hook(
function_name, function_args, result, duration_ms,
_CallIds(**tool_hook_ids(agent, effective_task_id, tool_call_id)),
)
except Exception:
return result
@dataclass
class InlineToolContext:
"""Per-call state an inline executor may need beyond its arguments."""
effective_task_id: str
tool_call_id: Optional[str] = None
messages: Optional[list] = None
InlineToolExecutor = Callable[[Any, dict, InlineToolContext], Any]
# ``(kwarg, args_key)`` → ``args.get(key)``; ``(kwarg, args_key, default)`` → ``args.get(key, default)``.
_ArgSpec = Tuple[Any, ...]
def _call_tool(module: str, func: str, args: dict, arg_specs: Tuple[_ArgSpec, ...], **fixed: Any) -> Any:
"""Import ``module.func`` lazily and call it with args mapped per ``arg_specs`` plus ``fixed``."""
fn = getattr(import_module(module), func)
return fn(**{spec[0]: args.get(*spec[1:]) for spec in arg_specs}, **fixed)
def _tool(
module: str, func: str, *arg_specs: _ArgSpec, **fixed: Callable[[Any, InlineToolContext], Any],
) -> InlineToolExecutor:
"""Executor calling ``module.func`` with mapped args plus ``fixed`` kwargs computed from ``(agent, ctx)``."""
def _exec(agent, args: dict, ctx: InlineToolContext) -> Any:
return _call_tool(module, func, args, arg_specs, **{k: f(agent, ctx) for k, f in fixed.items()})
return _exec
def _callback_tool(module: str, func: str, callback_attr: str, *arg_specs: _ArgSpec) -> InlineToolExecutor:
"""Executor for a GUI-callback tool: mapped args plus ``callback=getattr(agent, callback_attr, None)``."""
return _tool(module, func, *arg_specs, callback=lambda agent, ctx: getattr(agent, callback_attr, None))
def _session_search(agent, args: dict, ctx: InlineToolContext) -> Any:
session_db = agent._get_session_db_for_recall()
if not session_db:
from hermes_state import format_session_db_unavailable
return json.dumps({"success": False, "error": format_session_db_unavailable()})
return _call_tool(
"tools.session_search_tool", "session_search", args,
(
("query", "query", ""), ("role_filter", "role_filter"), ("limit", "limit", 3),
("session_id", "session_id"), ("around_message_id", "around_message_id"),
("window", "window", 5), ("sort", "sort"), ("profile", "profile"),
("detail", "detail", "adaptive"), ("after", "after"), ("before", "before"),
("exclude_session_ids", "exclude_session_ids"),
),
db=session_db, current_session_id=agent.session_id,
)
def _memory(agent, args: dict, ctx: InlineToolContext) -> Any:
result = _call_tool(
"tools.memory_tool", "memory_tool", args,
(
("action", "action"), ("target", "target", "memory"), ("content", "content"),
("old_text", "old_text"), ("new_text", "new_text"), ("operations", "operations"),
),
store=agent._memory_store,
)
# Mirror built-in memory writes to external providers; gating lives in
# MemoryManager.notify_memory_tool_write.
if agent._memory_manager:
agent._memory_manager.notify_memory_tool_write(
result,
args,
build_metadata=lambda: agent._build_memory_write_metadata(
task_id=ctx.effective_task_id,
tool_call_id=ctx.tool_call_id,
),
)
return result
_read_preview = _callback_tool(
"tools.read_preview_tool", "read_preview_tool", "read_preview_callback",
("start", "start"), ("count", "count"),
)
def _desktop_preview(agent, args: dict, ctx: InlineToolContext) -> Any:
# action=read needs the GUI callback (agent-level); open/close go through the
# registry handler like any other tool.
if (args.get("action") or "").strip() == "read":
return _read_preview(agent, args, ctx)
from tools.preview_tool import _handle_preview
return _handle_preview(args)
def _manage_connections(agent, args: dict, ctx: InlineToolContext) -> Any:
# The GUI callback lives on the agent; registry dispatch never forwards it.
from tools.connectors import manage_connections
from tools.connectors.gateway import config as gateway_config
result = manage_connections(
args, session_id=getattr(agent, "session_id", None), tool_call_id=ctx.tool_call_id,
connection_callback=getattr(agent, "connection_callback", None),
connectors_available=gateway_config.connectors_available,
)
_scope_in_connected_mcp_servers(agent, result)
return result
def _scope_in_connected_mcp_servers(agent, result: Any) -> None:
"""Add the MCP servers this call connected to the agent's toolset selection.
``tool_describe``/``tool_call`` resolve names inside that selection, and it was fixed when the
agent was built, so a server registered a moment ago is otherwise "not found" for the rest of
the turn the result calls it available in. Only the selection changes; ``agent.tools`` does
not, so the sent tool schema bytes stay the same."""
enabled = getattr(agent, "enabled_toolsets", None)
if enabled is None or "no_mcp" in enabled: # None already means every toolset
return
try:
targets = json.loads(result).get("targets") or []
except (AttributeError, TypeError, ValueError):
return
connected = [str(t.get("name")) for t in targets if isinstance(t, dict)
and t.get("kind") == "mcp" and t.get("state") == "connected" and t.get("tools")]
added = [name for name in connected if name not in enabled]
if added:
agent.enabled_toolsets = [*enabled, *added]
def _manage_catalog(agent, args: dict, ctx: InlineToolContext) -> Any:
# The card callback lives on the agent; only a desktop chat draws catalog rows.
from tools.connectors.catalog_tool import manage_catalog
return manage_catalog(
args, session_id=getattr(agent, "session_id", None), tool_call_id=ctx.tool_call_id,
connection_callback=getattr(agent, "connection_callback", None),
card_surface=getattr(agent, "platform", None) == "desktop",
)
def _setup_mcp_shim(agent, args: dict, ctx: InlineToolContext) -> Any:
# Replay shim for conversations whose cached prompt still names setup_mcp.
# Not in _LEGACY_TOOL_ALIASES: inline tools bypass handle_function_call.
return _manage_connections(agent, {
"action": args.get("action", "install"),
"connectors": [{"name": args.get("server", ""), "mcp": True}],
}, ctx)
# Order is the historical if/elif order of ``execute_tool_calls_sequential``.
INLINE_TOOL_EXECUTORS: Dict[str, InlineToolExecutor] = {
"todo_list": _tool(
"tools.todo_tool", "todo_tool", ("todos", "todos"), ("merge", "merge", False),
store=lambda agent, ctx: agent._todo_store,
),
# Bot Mode teammate DM is injected, not registered: only a canonical Bot
# Chat session carries the schema, and the tool re-gates on the title.
"message_agent": _tool(
"tools.bot_mode_dm", "message_agent_tool", ("target", "target", ""), ("message", "message", ""),
task_id=lambda agent, ctx: ctx.effective_task_id, agent=lambda agent, ctx: agent,
),
"session_search": _session_search,
"memory": _memory,
"clarify": _tool(
"tools.clarify_tool", "clarify_tool",
("question", "question", ""), ("choices", "choices"), ("multi_select", "multi_select", False),
("questions", "questions"),
callback=lambda agent, ctx: agent.clarify_callback,
),
"read_terminal": _callback_tool(
"tools.read_terminal_tool", "read_terminal_tool", "read_terminal_callback",
("start_line", "start_line"), ("count", "count"),
),
"desktop_preview": _desktop_preview,
"drive_preview": _callback_tool(
"tools.drive_preview_tool", "drive_preview_tool", "drive_preview_callback",
("action", "action", ""), ("ref", "ref"), ("selector", "selector"), ("text", "text"),
("key", "key"), ("submit", "submit"), ("amount", "amount"), ("to", "to"), ("limit", "max"),
),
"annotate_preview": _callback_tool(
"tools.annotate_preview_tool", "annotate_preview_tool", "drive_preview_callback",
("action", "action", "add"), ("ref", "ref"), ("selector", "selector"), ("label", "label"),
),
"read_window_below": _callback_tool(
"tools.read_window_tool", "read_window_below_tool", "read_window_below_callback",
),
"gui_tour": _callback_tool(
"tools.tour_tool", "tour_tool", "tour_callback",
("action", "action", ""), ("surface", "surface"), ("selector", "selector"), ("title", "title"),
("text", "text"), ("side", "side"), ("steps", "steps"), ("step_index", "step_index"),
),
"manage_connections": _manage_connections,
"manage_catalog": _manage_catalog,
"setup_mcp": _setup_mcp_shim,
"delegate_task": lambda agent, args, ctx: agent._dispatch_delegate_task(args),
}
# ``invoke_tool`` (concurrent path) consults the memory manager right after these three
# names and before the remaining inline tools; ``message_agent`` falls through to the
# registry there (Bot Mode DM is only injected into the sequential path's schema).
INVOKE_TOOL_PRE_MEMORY_MANAGER_NAMES = frozenset({"todo_list", "session_search", "memory"})
def resolve_invoke_tool_executor(agent, function_name: str) -> Optional[InlineToolExecutor]:
"""Inline executor for ``invoke_tool`` (concurrent path), or None for registry dispatch.
Precedence: todo_list/session_search/memory, then memory-manager tools, then the
remaining inline tools (``message_agent`` excluded).
"""
if function_name in INVOKE_TOOL_PRE_MEMORY_MANAGER_NAMES:
return INLINE_TOOL_EXECUTORS[function_name]
memory_manager = agent._memory_manager
if memory_manager and memory_manager.has_tool(function_name):
return lambda agent, args, ctx: agent._memory_manager.handle_tool_call(function_name, args)
if function_name == "message_agent":
return None
return INLINE_TOOL_EXECUTORS.get(function_name)