fix(memory): reject memory tools that shadow core tool names (#40902)

A memory provider tool whose name collides with a built-in core tool
(e.g. clarify, delegate_task) was skipped from agent.tools at init but
lingered in MemoryManager._tool_to_provider, where the has_tool dispatch
branch could route a call to a tool that was never registered (#40466).

Block the collision at registration instead of patching dispatch:
- MemoryManager.add_provider rejects any tool whose name is in
  _HERMES_CORE_TOOLS (warn + skip), so it never enters the routing table.
- get_all_tool_schemas applies the same filter, so the manager never
  advertises a schema it would refuse to route.

Built-ins always win, matching the invariant used by the TTS/browser/
search provider registries. Makes the dispatch-hijack structurally
impossible regardless of branch ordering.

Closes #40466.
This commit is contained in:
Teknium
2026-06-06 18:44:09 -07:00
committed by GitHub
parent 887295ba54
commit fe8920db18
2 changed files with 73 additions and 1 deletions
+31 -1
View File
@@ -281,9 +281,28 @@ class MemoryManager:
self._providers.append(provider)
# Core tool names are reserved — a memory provider must never register
# a tool that shadows a built-in (e.g. ``clarify``, ``delegate_task``).
# Built-ins always win, so such a tool is dropped at agent init and
# would otherwise linger in ``_tool_to_provider`` and hijack dispatch
# (#40466). Reject it here, at the door, so it never enters the routing
# table at all — matching the built-ins-always-win invariant used by
# the TTS/browser/search provider registries.
from toolsets import _HERMES_CORE_TOOLS
_core_tool_names = set(_HERMES_CORE_TOOLS)
# Index tool names → provider for routing
for schema in provider.get_tool_schemas():
tool_name = schema.get("name", "")
if tool_name in _core_tool_names:
logger.warning(
"Memory provider '%s' tool '%s' shadows a reserved core "
"tool name; registration ignored. Core tools always win — "
"rename the provider's tool to something unique.",
provider.name, tool_name,
)
continue
if tool_name and tool_name not in self._tool_to_provider:
self._tool_to_provider[tool_name] = provider
elif tool_name in self._tool_to_provider:
@@ -413,13 +432,24 @@ class MemoryManager:
# -- Tools ---------------------------------------------------------------
def get_all_tool_schemas(self) -> List[Dict[str, Any]]:
"""Collect tool schemas from all providers."""
"""Collect tool schemas from all providers.
Reserved core tool names (``clarify``, ``delegate_task``, etc.) are
skipped — they are rejected from the routing table in
:meth:`add_provider`, so the manager must not advertise a schema it
will never route. Built-ins always win (#40466).
"""
from toolsets import _HERMES_CORE_TOOLS
_core_tool_names = set(_HERMES_CORE_TOOLS)
schemas = []
seen = set()
for provider in self._providers:
try:
for schema in provider.get_tool_schemas():
name = schema.get("name", "")
if name in _core_tool_names:
continue
if name and name not in seen:
schemas.append(schema)
seen.add(name)