Timmy_Foundation/hermes-agent
15
0
Fork 0
Code Issues 247 Pull Requests 14 Actions 1 Packages Projects Releases Wiki Activity

fix: pass enabled_tools through handle_function_call to avoid global race

Browse Source 
The process-global _last_resolved_tool_names gets overwritten when
subagents resolve their own toolsets, causing execute_code in the
parent agent to generate imports for the wrong set of tools.

Fix: handle_function_call() now accepts an enabled_tools parameter.
run_agent.py already passes self.valid_tool_names at both call sites.
This change makes model_tools.py actually use it, falling back to the
global only when the caller doesn't provide a list (backward compat).
This commit is contained in:
teknium1
2026-03-10 06:32:08 -07:00
parent 8ef3c815e7
commit 8318a519e6
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
model_tools.py
View File

@@ -266,6 +266,7 @@ def handle_function_call(
function_args: Dict[str, Any], function_args: Dict[str, Any],
task_id: Optional[str] = None, task_id: Optional[str] = None,
user_task: Optional[str] = None, user_task: Optional[str] = None,
enabled_tools: Optional[List[str]] = None,
) -> str: ) -> str:
""" """
Main function call dispatcher that routes calls to the tool registry. Main function call dispatcher that routes calls to the tool registry.
@@ -275,6 +276,10 @@ def handle_function_call(
function_args: Arguments for the function. function_args: Arguments for the function.
task_id: Unique identifier for terminal/browser session isolation. task_id: Unique identifier for terminal/browser session isolation.
user_task: The user's original task (for browser_snapshot context). user_task: The user's original task (for browser_snapshot context).
enabled_tools: Tool names enabled for this session. When provided,
execute_code uses this list to determine which sandbox
tools to generate. Falls back to the process-global
``_last_resolved_tool_names`` for backward compat.
Returns: Returns:
Function result as a JSON string. Function result as a JSON string.
@@ -284,10 +289,13 @@ def handle_function_call(
return json.dumps({"error": f"{function_name} must be handled by the agent loop"}) return json.dumps({"error": f"{function_name} must be handled by the agent loop"})
if function_name == "execute_code": if function_name == "execute_code":
# Prefer the caller-provided list so subagents can't overwrite
# the parent's tool set via the process-global.
sandbox_enabled = enabled_tools if enabled_tools is not None else _last_resolved_tool_names
return registry.dispatch( return registry.dispatch(
function_name, function_args, function_name, function_args,
task_id=task_id, task_id=task_id,
enabled_tools=_last_resolved_tool_names, enabled_tools=sandbox_enabled,
) )
return registry.dispatch( return registry.dispatch(