mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-27 11:22:03 +00:00
fix(delegate): strip cronjob toolset from delegated children (#43466)
_strip_blocked_tools used a hardcoded set missing 'cronjob'. Children on gateway platforms could inherit the cronjob toolset, scheduling persistent jobs that outlive the delegation despite DELEGATE_BLOCKED_TOOLS. Fix: derive the strip set from DELEGATE_BLOCKED_TOOLS at runtime so the two lists can never drift. Add 'cronjob' to DELEGATE_BLOCKED_TOOLS for documentation consistency. Two regression tests lock the invariant. Salvaged from #43687 by @riyas22. Adapted test to current main (no 'messaging' toolset exists -- send_message is intentionally not registered as an agent tool). Closes #43466
This commit is contained in:
parent
ed1fdb5b61
commit
1e4df599ec
2 changed files with 46 additions and 5 deletions
|
|
@ -156,6 +156,37 @@ class TestStripBlockedTools(unittest.TestCase):
|
|||
result = _strip_blocked_tools([])
|
||||
self.assertEqual(result, [])
|
||||
|
||||
def test_strips_cronjob_toolset(self):
|
||||
"""Regression for issue #43466: child subagents must not inherit
|
||||
the cronjob toolset from a parent running on a gateway platform.
|
||||
Without this guard, a delegated child could schedule new cron jobs
|
||||
under the parent's identity.
|
||||
"""
|
||||
result = _strip_blocked_tools(
|
||||
["terminal", "file", "cronjob", "web"]
|
||||
)
|
||||
self.assertNotIn("cronjob", result)
|
||||
self.assertIn("terminal", result)
|
||||
self.assertIn("file", result)
|
||||
self.assertIn("web", result)
|
||||
|
||||
def test_strip_set_derived_from_blocklist(self):
|
||||
"""The strip set must be derived from DELEGATE_BLOCKED_TOOLS so a
|
||||
new blocked tool can't silently leak through as a toolset name
|
||||
(regression for issue #43466's 'more robust variant' suggestion).
|
||||
"""
|
||||
from tools.delegate_tool import TOOLSETS, _strip_blocked_tools
|
||||
# Every toolset whose tools are ALL in the blocklist should be stripped
|
||||
for name, defn in TOOLSETS.items():
|
||||
tools = defn.get("tools", [])
|
||||
if tools and all(t in DELEGATE_BLOCKED_TOOLS for t in tools):
|
||||
self.assertNotIn(
|
||||
name,
|
||||
_strip_blocked_tools([name, "terminal"]),
|
||||
f"Toolset {name!r} (tools={tools}) is fully blocked "
|
||||
f"but was not stripped",
|
||||
)
|
||||
|
||||
|
||||
class TestDelegateTask(unittest.TestCase):
|
||||
def test_no_parent_agent(self):
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ DELEGATE_BLOCKED_TOOLS = frozenset(
|
|||
"memory", # no writes to shared MEMORY.md
|
||||
"send_message", # no cross-platform side effects
|
||||
"execute_code", # children should reason step-by-step, not write scripts
|
||||
"cronjob", # no scheduling more work in the parent's name
|
||||
]
|
||||
)
|
||||
|
||||
|
|
@ -766,12 +767,21 @@ def _resolve_workspace_hint(parent_agent) -> Optional[str]:
|
|||
|
||||
|
||||
def _strip_blocked_tools(toolsets: List[str]) -> List[str]:
|
||||
"""Remove toolsets that contain only blocked tools."""
|
||||
"""Remove toolsets that contain only blocked tools.
|
||||
|
||||
The strip set is derived from DELEGATE_BLOCKED_TOOLS plus the explicit
|
||||
composite/scenario toolsets (delegation, code_execution) that have no
|
||||
one-to-one tool. This keeps the blocklist and the strip set in lockstep
|
||||
so new blocked tools can't silently leak through as toolset names.
|
||||
"""
|
||||
# Composite toolsets that should never pass through to children, even
|
||||
# though their individual tools aren't all in DELEGATE_BLOCKED_TOOLS.
|
||||
_COMPOSITE_BLOCKED_TOOLSETS = frozenset({"delegation", "code_execution"})
|
||||
blocked_toolset_names = {
|
||||
"delegation",
|
||||
"clarify",
|
||||
"memory",
|
||||
"code_execution",
|
||||
name
|
||||
for name, defn in TOOLSETS.items()
|
||||
if name in _COMPOSITE_BLOCKED_TOOLSETS
|
||||
or all(t in DELEGATE_BLOCKED_TOOLS for t in defn.get("tools", []))
|
||||
}
|
||||
return [t for t in toolsets if t not in blocked_toolset_names]
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue