mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-29 06:31:32 +00:00
Pre-s6, `docker run nousresearch/hermes-agent gateway run` was the
standard invocation: gateway ran as the container's main process,
tini reaped zombies, container exit code matched gateway exit code,
no supervision. With s6-overlay as PID 1, the same invocation now
auto-upgrades to supervised semantics — auto-restart on crash,
dashboard supervised alongside (when HERMES_DASHBOARD=1 is set),
multiple profile gateways under the same /init.
Users get the new behavior with zero changes to their docker run
command. A loud one-line breadcrumb on stderr explains the upgrade
and points at the opt-out for users who genuinely want pre-s6
foreground semantics.
How it works:
1. `_gateway_command_inner` (the `gateway run` handler) checks if
we're inside a container with s6 as PID 1.
2. If yes, dispatches `start` to the s6 service manager (registers
and starts gateway-default), then `exec sleep infinity` to keep
the CMD process alive without binding container lifetime to
gateway PID lifetime. The supervised gateway can flap freely;
`docker stop` still tears everything down via /init stage 3.
3. If no, falls through to the existing foreground code path
unchanged. Host runs of `hermes gateway run` are unaffected.
Three gates make the redirect inert outside the intended scope:
* `detect_service_manager() != "s6"` — host/non-s6-container runs.
* `HERMES_S6_SUPERVISED_CHILD=1` env var (recursion guard) —
exported by `S6ServiceManager._render_run_script` for the
s6-supervised invocation itself. Without this guard, the
supervised `gateway run --replace` would re-enter the redirect
and recurse (run → start → run → start → ...) infinitely.
* `--no-supervise` CLI flag OR `HERMES_GATEWAY_NO_SUPERVISE=1` env
var — explicit user opt-out for CI smoke tests, debugging the
foreground startup path, or any case wanting "CMD exit =
container exit" semantics. Strict truthiness (1/true/yes,
case-insensitive); typos like `=0` do NOT silently opt out.
Tests:
* Unit tests in tests/hermes_cli/test_gateway_s6_dispatch.py
cover all five paths (host no-op, supervised fire, sentinel
recursion guard, CLI flag, env var truthy + falsy). The two
load-bearing gates (sentinel + opt-out) were mutation-tested
by removing each gate in isolation and confirming the dedicated
test fails with the expected error.
* Docker harness tests in tests/docker/test_gateway_run_supervised.py
cover the round trips end-to-end against a built image: redirect
fires (sleep-infinity heartbeat + supervised gateway-default
slot + breadcrumb), --no-supervise opt-out (foreground gateway,
no want-up on the slot), HERMES_GATEWAY_NO_SUPERVISE env var
works identically, recursion is impossible (≤1 supervised
python gateway-run + exactly 1 sleep-infinity parented to the
CMD wrapper), and HERMES_DASHBOARD=1 produces both supervised
gateway and supervised dashboard.
Docs:
* Added a `:::tip Gateway runs supervised` admonition near the
main docker.md example explaining the upgrade and pointing at
the opt-out. Pre-s6 (tini-based) images still run gateway run
as the foreground main process, so the note is scoped to the
s6 image only.
Trade-off documented in the helper docstring: container exit code
under the redirect is sleep's exit code (always 0 on SIGTERM), not
the gateway's. That was an explicit design call — the supervised
gateway is allowed to flap without taking the container with it,
which is what "supervision" means. CI users who want exit-code
forwarding can pass --no-supervise.
329 lines
14 KiB
Python
329 lines
14 KiB
Python
"""Harness: `docker run <image> gateway run` redirects to supervised mode.
|
|
|
|
Before the s6 migration, ``docker run nousresearch/hermes-agent gateway
|
|
run`` was the standard pattern — the gateway ran as the container's
|
|
main process, container exit code matched gateway exit code, no
|
|
supervision. With s6 as PID 1, the same invocation now auto-redirects
|
|
to the supervised path (`gateway start`) so users get auto-restart on
|
|
crash and a supervised dashboard alongside (when ``HERMES_DASHBOARD=1``).
|
|
|
|
These tests verify the three load-bearing properties of that redirect:
|
|
|
|
1. The default invocation **does** redirect (container stays up via
|
|
``sleep infinity`` while s6 supervises ``gateway-default``).
|
|
2. ``--no-supervise`` / ``HERMES_GATEWAY_NO_SUPERVISE=1`` opts out.
|
|
3. The supervised process itself does NOT recurse — the
|
|
``HERMES_S6_SUPERVISED_CHILD`` sentinel breaks the loop.
|
|
|
|
Every ``docker exec`` runs as ``hermes`` per the conftest module
|
|
docstring; see ``tests/docker/conftest.py`` for rationale.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
import time
|
|
|
|
from tests.docker.conftest import docker_exec_sh
|
|
|
|
|
|
def _sh(container: str, command: str, timeout: int = 30):
|
|
return docker_exec_sh(container, command, timeout=timeout)
|
|
|
|
|
|
def _svstat(container: str, slot: str = "gateway-default") -> str:
|
|
r = _sh(container, f"/command/s6-svstat /run/service/{slot}")
|
|
return r.stdout if r.returncode == 0 else ""
|
|
|
|
|
|
def _svstat_wants_up(container: str, slot: str = "gateway-default") -> bool:
|
|
"""See test_profile_gateway._svstat_wants_up for the format rules."""
|
|
state = _svstat(container, slot)
|
|
if not state:
|
|
return False
|
|
head = state.split()[0] if state.split() else ""
|
|
if head == "up":
|
|
return "want down" not in state
|
|
return "want up" in state
|
|
|
|
|
|
def test_gateway_run_redirects_to_supervised(
|
|
built_image: str, container_name: str,
|
|
) -> None:
|
|
"""``docker run <image> gateway run`` (the historical invocation)
|
|
should now register and start the ``gateway-default`` s6 slot.
|
|
|
|
The CMD process itself shouldn't be the gateway — it should be
|
|
blocked on ``sleep infinity``, leaving s6 to supervise the actual
|
|
gateway process. We verify by:
|
|
|
|
* Confirming the CMD process is sleeping (not python/gateway).
|
|
* Confirming ``s6-svstat gateway-default`` reports want-up.
|
|
"""
|
|
# Start the container detached using the historical gateway-run
|
|
# pattern. The redirect should fire and the container should NOT
|
|
# exit immediately (which is what would happen pre-this-PR on the
|
|
# s6 image — the foreground gateway would crash without config,
|
|
# the CMD would exit, /init would shut down).
|
|
subprocess.run(
|
|
["docker", "run", "-d", "--name", container_name, built_image,
|
|
"gateway", "run"],
|
|
check=True, capture_output=True, timeout=30,
|
|
)
|
|
|
|
# Give /init time to run cont-init.d, the wrapper time to dispatch
|
|
# the redirect, and s6-supervise time to spin up the slot.
|
|
time.sleep(5)
|
|
|
|
# Container should still be running. If the redirect didn't fire,
|
|
# the foreground gateway would have crashed and the container
|
|
# would be in `Exited` state by now.
|
|
r = subprocess.run(
|
|
["docker", "inspect", "-f", "{{.State.Status}}", container_name],
|
|
capture_output=True, text=True, timeout=10,
|
|
)
|
|
assert r.returncode == 0 and r.stdout.strip() == "running", (
|
|
f"container exited prematurely: {r.stdout!r}; "
|
|
f"docker logs:\n{subprocess.run(['docker', 'logs', container_name], capture_output=True, text=True).stdout}"
|
|
)
|
|
|
|
# s6's intent for the default-profile gateway slot should be up.
|
|
# Same accept-either rule as test_profile_gateway: the supervised
|
|
# gateway may or may not be currently up depending on whether the
|
|
# harness profile has a configured model, but the want-intent
|
|
# contract holds either way.
|
|
assert _svstat_wants_up(container_name), (
|
|
f"gateway-default slot want-state not up: {_svstat(container_name)!r}"
|
|
)
|
|
|
|
# The CMD process (PID under /init that the wrapper exec'd into)
|
|
# should be sleeping, not the gateway. We grep `ps` for the
|
|
# `sleep infinity` heartbeat.
|
|
r = _sh(container_name, "ps -eo pid,cmd | grep -v grep | grep 'sleep infinity'")
|
|
assert r.returncode == 0 and "sleep infinity" in r.stdout, (
|
|
f"expected `sleep infinity` heartbeat process; got ps:\n{r.stdout}\n"
|
|
f"stderr: {r.stderr}"
|
|
)
|
|
|
|
# And the loud breadcrumb should be in `docker logs` so users see
|
|
# the upgrade explanation.
|
|
r = subprocess.run(
|
|
["docker", "logs", container_name],
|
|
capture_output=True, text=True, timeout=10,
|
|
)
|
|
logs = r.stdout + r.stderr
|
|
assert "s6 supervision" in logs, (
|
|
f"expected loud breadcrumb in docker logs; got:\n{logs}"
|
|
)
|
|
assert "--no-supervise" in logs, (
|
|
f"breadcrumb missing opt-out hint; got:\n{logs}"
|
|
)
|
|
|
|
|
|
def test_gateway_run_no_supervise_flag_preserves_legacy_behavior(
|
|
built_image: str, container_name: str,
|
|
) -> None:
|
|
"""``docker run <image> gateway run --no-supervise`` opts out of
|
|
the redirect and runs the gateway as the foreground CMD process
|
|
(pre-s6 semantics).
|
|
|
|
With the redirect in place, the container's CMD process would be
|
|
``sleep infinity`` and the supervised gateway would be a separate
|
|
process under ``s6-supervise gateway-default``. WITHOUT the
|
|
redirect (opt-out path), there's no supervised gateway slot at
|
|
all — the gateway IS the CMD process.
|
|
|
|
Three positive assertions confirm we took the pre-s6 path:
|
|
|
|
* The CMD process is a python ``hermes gateway run`` invocation
|
|
(not ``sleep infinity``).
|
|
* The ``gateway-default`` s6 service slot is NOT created.
|
|
* No supervision-redirect breadcrumb appears in docker logs.
|
|
"""
|
|
subprocess.run(
|
|
["docker", "run", "-d", "--name", container_name, built_image,
|
|
"gateway", "run", "--no-supervise"],
|
|
check=True, capture_output=True, timeout=30,
|
|
)
|
|
# Give startup time. The unconfigured-profile case used to fail
|
|
# fast; with a config bind-mounted profile (and a real volume on
|
|
# most realistic deployments) the gateway just runs.
|
|
time.sleep(6)
|
|
|
|
# Container should still be running OR have exited cleanly with
|
|
# the gateway's status code. Either is correct for pre-s6
|
|
# semantics — what's NOT correct is the supervised behavior
|
|
# (sleep infinity heartbeat + supervised gateway slot).
|
|
inspect = subprocess.run(
|
|
["docker", "inspect", "-f", "{{.State.Status}}", container_name],
|
|
capture_output=True, text=True, timeout=10,
|
|
)
|
|
status = inspect.stdout.strip()
|
|
|
|
# No redirect breadcrumb anywhere.
|
|
logs = subprocess.run(
|
|
["docker", "logs", container_name],
|
|
capture_output=True, text=True, timeout=10,
|
|
).stdout + subprocess.run(
|
|
["docker", "logs", container_name],
|
|
capture_output=True, text=True, timeout=10,
|
|
).stderr
|
|
assert "s6 supervision" not in logs, (
|
|
f"--no-supervise should have skipped the redirect; "
|
|
f"breadcrumb in logs:\n{logs}"
|
|
)
|
|
|
|
if status == "running":
|
|
# Gateway running in foreground — the CMD process should be
|
|
# the gateway itself, NOT a sleep-infinity heartbeat.
|
|
r = _sh(
|
|
container_name,
|
|
"ps -eo pid,ppid,cmd | grep -v grep | awk '/main-wrapper.sh|rc.init top/ { wrapper_pid=$1 } "
|
|
"$3==\"sleep\" && $4==\"infinity\" && $2==wrapper_pid { c++ } END { print c+0 }'",
|
|
)
|
|
assert r.returncode == 0
|
|
redirected_sleeps = int(r.stdout.strip() or 0)
|
|
assert redirected_sleeps == 0, (
|
|
f"--no-supervise: expected NO `sleep infinity` parented to "
|
|
f"the CMD wrapper (foreground gateway should be the CMD), "
|
|
f"found {redirected_sleeps}. "
|
|
f"ps:\n{_sh(container_name, 'ps -eo pid,ppid,cmd').stdout}"
|
|
)
|
|
|
|
# The gateway-default s6 slot exists (the cont-init.d
|
|
# reconciler creates it on every boot regardless of opt-out)
|
|
# but should NOT have its want-state set to "up" — the
|
|
# opt-out path doesn't dispatch `start` to s6.
|
|
assert not _svstat_wants_up(container_name, "gateway-default"), (
|
|
"--no-supervise: gateway-default slot has want-state up, "
|
|
"implying the redirect dispatched `start` despite the "
|
|
f"opt-out. svstat:\n{_svstat(container_name)!r}"
|
|
)
|
|
# If status == "exited" instead, the gateway exited (also valid
|
|
# pre-s6 semantics). The breadcrumb-absence check above is
|
|
# already enough to confirm the redirect didn't fire.
|
|
|
|
|
|
def test_gateway_run_no_supervise_env_var(
|
|
built_image: str, container_name: str,
|
|
) -> None:
|
|
"""Env-var opt-out works identically to the CLI flag.
|
|
|
|
Useful when users can't easily change their `docker run` args
|
|
(orchestration templates, K8s manifests) but can set env vars.
|
|
"""
|
|
subprocess.run(
|
|
["docker", "run", "-d", "--name", container_name,
|
|
"-e", "HERMES_GATEWAY_NO_SUPERVISE=1",
|
|
built_image, "gateway", "run"],
|
|
check=True, capture_output=True, timeout=30,
|
|
)
|
|
time.sleep(6)
|
|
|
|
logs = subprocess.run(
|
|
["docker", "logs", container_name],
|
|
capture_output=True, text=True, timeout=10,
|
|
)
|
|
combined = logs.stdout + logs.stderr
|
|
assert "s6 supervision" not in combined, (
|
|
f"env-var opt-out should have skipped the redirect; "
|
|
f"breadcrumb in logs:\n{combined}"
|
|
)
|
|
|
|
# Same as the CLI-flag test: the slot exists (reconciler creates
|
|
# it) but should not have want-state up.
|
|
inspect = subprocess.run(
|
|
["docker", "inspect", "-f", "{{.State.Status}}", container_name],
|
|
capture_output=True, text=True, timeout=10,
|
|
)
|
|
if inspect.stdout.strip() == "running":
|
|
assert not _svstat_wants_up(container_name, "gateway-default"), (
|
|
"HERMES_GATEWAY_NO_SUPERVISE=1: gateway-default has "
|
|
"want-state up, implying the redirect dispatched `start` "
|
|
f"despite the env-var opt-out. svstat:\n{_svstat(container_name)!r}"
|
|
)
|
|
|
|
|
|
def test_supervised_gateway_does_not_recurse(
|
|
built_image: str, container_name: str,
|
|
) -> None:
|
|
"""The HERMES_S6_SUPERVISED_CHILD sentinel must prevent the
|
|
supervised ``hermes gateway run`` from re-entering the redirect.
|
|
|
|
If recursion happened, every supervised gateway start would itself
|
|
re-dispatch to s6 and exec ``sleep infinity`` — so the supervised
|
|
gateway slot would never actually run a python ``hermes gateway
|
|
run`` process. The slot would oscillate or settle into a state
|
|
with no python in the supervise tree at all.
|
|
|
|
We verify by counting python processes whose argv contains
|
|
``gateway run``: there should be at most one (the legitimately
|
|
supervised gateway). Two or more would imply recursive spawning
|
|
via the redirect → start → run → redirect → ... loop.
|
|
"""
|
|
subprocess.run(
|
|
["docker", "run", "-d", "--name", container_name, built_image,
|
|
"gateway", "run"],
|
|
check=True, capture_output=True, timeout=30,
|
|
)
|
|
time.sleep(6)
|
|
|
|
# Count python processes running `hermes gateway run`. If the
|
|
# recursion guard fails, s6 would respawn fresh `gateway run`
|
|
# processes on every cycle, leaving multiple Python-process
|
|
# descendants under the gateway-default supervise tree.
|
|
r = _sh(container_name, "ps -eo pid,cmd | grep -v grep | grep -E 'python.*hermes.*gateway run' | wc -l")
|
|
assert r.returncode == 0
|
|
n = int(r.stdout.strip() or 0)
|
|
assert n <= 1, (
|
|
f"expected at most one supervised python `hermes gateway run` "
|
|
f"process (the legitimately-supervised gateway); found {n}. "
|
|
f"Recursion guard may have failed. "
|
|
f"ps:\n{_sh(container_name, 'ps -eo pid,ppid,cmd').stdout}"
|
|
)
|
|
|
|
# Stronger positive assertion: there should be exactly one
|
|
# `sleep infinity` process whose parent is the main-wrapper.sh
|
|
# CMD process (PID 17 typically). The static `main-hermes`
|
|
# service has its own `sleep infinity` child; THAT one is fine
|
|
# and unrelated to our redirect.
|
|
r = _sh(
|
|
container_name,
|
|
# Find PID of the CMD process (main-wrapper.sh or its sh
|
|
# parent), then count `sleep infinity` children.
|
|
"ps -eo pid,ppid,cmd | grep -v grep | awk '/main-wrapper.sh|rc.init top/ { wrapper_pid=$1 } "
|
|
"$3==\"sleep\" && $4==\"infinity\" && $2==wrapper_pid { c++ } END { print c+0 }'",
|
|
)
|
|
assert r.returncode == 0
|
|
redirected = int(r.stdout.strip() or 0)
|
|
assert redirected == 1, (
|
|
f"expected exactly one `sleep infinity` parented to the CMD "
|
|
f"wrapper (the redirect heartbeat); found {redirected}. "
|
|
f"ps:\n{_sh(container_name, 'ps -eo pid,ppid,cmd').stdout}"
|
|
)
|
|
|
|
|
|
def test_dashboard_supervised_when_env_set(
|
|
built_image: str, container_name: str,
|
|
) -> None:
|
|
"""When ``HERMES_DASHBOARD=1`` is set, ``docker run <image> gateway
|
|
run`` should result in BOTH the gateway and the dashboard being
|
|
supervised by s6 — the dashboard slot was always there but only
|
|
activates with the env var. This is the headline benefit of the
|
|
redirect: one container = supervised gateway + supervised
|
|
dashboard, with zero extra user effort.
|
|
"""
|
|
subprocess.run(
|
|
["docker", "run", "-d", "--name", container_name,
|
|
"-e", "HERMES_DASHBOARD=1",
|
|
built_image, "gateway", "run"],
|
|
check=True, capture_output=True, timeout=30,
|
|
)
|
|
time.sleep(5)
|
|
|
|
# Both slots should report want-up.
|
|
assert _svstat_wants_up(container_name, "gateway-default"), (
|
|
f"gateway-default slot not up: {_svstat(container_name)!r}"
|
|
)
|
|
assert _svstat_wants_up(container_name, "dashboard"), (
|
|
f"dashboard slot not up: {_svstat(container_name, 'dashboard')!r}"
|
|
)
|