hermes-admin/hermes-agent
1
0
Fork 0
Code Issues Pull Requests Actions 33 Packages Projects Releases Wiki Activity

fix(code-execution): remote kernels are keyed by their sandbox tool set (#97263)

Browse Source 
The hermes_tools stub module a remote kernel imports is generated from sandbox_tools once,
at spawn, but the registry key was (owner, env_type, task_env_id) only: a later
execute_code call with a different tool set (skill loaded, toolset toggled) reused the
kernel and got stale stubs. The tool set is now part of the key; a different set gets
its own kernel and the over-cap eviction keeps the newest.

Salvaged from #97265 by @Liuzikaii.
This commit is contained in:
liuzikaii
2026-09-05 18:40:09 +05:30
committed by kshitij
parent a2ff25a8b1
commit c99dbba33e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/code_kernel_remote.py
View File

@@ -146,8 +146,10 @@ class RemoteKernel:
logger.debug(failure, exc_info=True)
def _kernel_key(owner: str, env_type: str, task_env_id: str) -> Tuple:
return (owner, "remote", env_type, task_env_id)
def _kernel_key(owner: str, env_type: str, task_env_id: str, sandbox_tools: frozenset) -> Tuple:
"""The hermes_tools stub module is generated from ``sandbox_tools`` once, at spawn, so a kernel
is only reusable by calls with the SAME tool set; a different set gets its own kernel."""
return (owner, "remote", env_type, task_env_id, tuple(sorted(sandbox_tools)))
# Registry + lock shared-shape with code_kernel; teardown runs outside the lock.
@@ -243,7 +245,7 @@ def _acquire_remote_kernel(env, env_type: str, owner: str, task_env_id: str,
idle_exit: int) -> Tuple[Optional[RemoteKernel], bool, bool, bool]:
"""Find/respawn the owner's kernel: (kernel|None, reused, state_reset, state_lost); reaps
idle-expired entries on the way in."""
key = _kernel_key(owner, env_type, task_env_id)
key = _kernel_key(owner, env_type, task_env_id, sandbox_tools)
state_lost = state_reset = False
with _REGISTRY.lock:
expired = _reap_unlocked(idle_exit)
@@ -309,7 +311,7 @@ def execute_in_remote_kernel(
env, env_type, owner, task_env_id, sandbox_tools, reset=reset, idle_exit=idle_exit)
if kernel is None:
return None # fail open to per-call
key = _kernel_key(owner, env_type, task_env_id)
key = _kernel_key(owner, env_type, task_env_id, sandbox_tools)
kernel.last_used = time.monotonic()
with _REGISTRY.lock:
kernel.attached += 1