mirrors/hermes-agent
1
0
Fork 0
mirror of https://github.com/NousResearch/hermes-agent.git synced 2026-06-21 10:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Remove is_container check when restarting over dashboard (#46290)

Browse source 
Co-authored-by: IAvecilla <ignacio.avecilla@lambdaclass.com>
This commit is contained in:
Teknium 2026-06-14 18:09:23 -07:00 • committed by GitHub
parent f3fe99863d
commit 4eb0ff639b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hermes_cli/service_manager.py
View file

@ -86,7 +86,8 @@ def detect_service_manager() -> ServiceManagerKind:
"""Detect which service manager is available in this environment.
Returns:
"s6" — inside a container when /init is s6-svscan (Phase 2+)
"s6" — s6-svscan is PID 1 (s6-overlay image; Docker, Podman, or a
Fly Firecracker microVM)
"windows" — native Windows host
"launchd" — macOS host
"systemd" — Linux host with a working user/system bus
@ -100,14 +101,20 @@ def detect_service_manager() -> ServiceManagerKind:
# Imports deferred so importing this module doesn't drag in the
# whole gateway dependency graph for callers that only need the
# Protocol type or validate_profile_name().
from hermes_constants import is_container
from hermes_cli.gateway import (
is_macos,
is_windows,
supports_systemd_services,
)
if is_container() and _s6_running():
# Gate on _s6_running() alone (PID 1 comm == s6-svscan AND /run/s6/basedir),
# NOT is_container(): the latter only detects Docker/Podman/lxc, so it is
# False on Fly's Firecracker microVMs even though s6-overlay is PID 1 there.
# That false negative made the whole s6 dispatch path inert on Fly, so
# `hermes gateway start/stop/restart` fell through to host code that spawns
# a foreground gateway competing with the supervised one. _s6_running() is
# already an s6-overlay-specific signal, so the container gate was redundant.
if _s6_running():
return "s6"
if is_windows():
return "windows"

14
tests/hermes_cli/test_service_manager.py
View file

@ -69,6 +69,20 @@ def test_detect_service_manager_returns_known_value() -> None:
assert result in ("systemd", "launchd", "windows", "s6", "none")
def test_detect_service_manager_s6_keys_off_s6_running_not_is_container(
monkeypatch: pytest.MonkeyPatch,
) -> None:
"""Regression: Fly runs s6-overlay as PID 1 in a Firecracker microVM, which
is not a Docker/Podman container. Gating s6 detection on is_container() made
the dispatch path inert on Fly, so `hermes gateway restart` spawned a
foreground gateway that fought the supervised one. Detection must key off
s6 being PID 1 (`_s6_running`) alone."""
monkeypatch.setattr(
"hermes_cli.service_manager._s6_running", lambda: True,
)
assert detect_service_manager() == "s6"
# ---------------------------------------------------------------------------
# _s6_running — must work for unprivileged users, not just root
# ---------------------------------------------------------------------------