mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-01 07:01:41 +00:00
57c6e29666
Phase 4 of the s6-overlay supervision plan. Activates the Phase 3
S6ServiceManager by hooking it into the profile lifecycle and the
`hermes gateway start/stop/restart` dispatcher, and adds a cont-
init.d-time reconciliation pass that survives `docker restart`.
Task 4.0 — container-boot reconciliation:
/run/service/ is tmpfs, so every `docker restart` wipes every
per-profile gateway slot. /etc/cont-init.d/02-reconcile-profiles
invokes hermes_cli.container_boot.reconcile_profile_gateways() on
every boot, which walks $HERMES_HOME/profiles/<name>/, reads each
gateway_state.json, recreates the s6 service slot, and auto-starts
only those whose last state was 'running'. Other states
(stopped, starting, startup_failed, missing) register the slot
in the down state — avoiding crash-loops across restarts for a
gateway that was broken last boot. Per-profile outcome is recorded
to $HERMES_HOME/logs/container-boot.log.
Implementation: hermes_cli/container_boot.py + 12 unit tests.
Profile-marker is SOUL.md, not config.yaml, because `hermes profile
create` only seeds SOUL.md by default (config.yaml comes from
`hermes setup`).
Task 4.1 / 4.2 — profile create/delete hooks:
hermes_cli/profiles.py::create_profile now calls
_maybe_register_gateway_service(<canon>) at the end, which routes
through ServiceManager.register_profile_gateway when running on s6
and no-ops on host backends. delete_profile mirrors with
_maybe_unregister_gateway_service. _allocate_gateway_port produces
a deterministic SHA-256-derived port in [9200, 9800).
Task 4.3 — gateway dispatch + remove rejection arms:
_dispatch_via_service_manager_if_s6(action) intercepts
start/stop/restart at the top of each subcommand and routes them
through S6ServiceManager.{start,stop,restart}. The pre-Phase-4
`elif is_container():` rejection arms are kept as fallback for
pre-s6 containers / unsupported runtimes, but only ever fire when
detect_service_manager() != 's6'. install/uninstall under s6
print informational guidance pointing users at profile create/delete.
Removed the two xfail(strict=True) markers from
tests/docker/test_profile_gateway.py — both tests now pass strictly.
Task 4.4 — status reporting:
get_gateway_runtime_snapshot() reports
Manager: 's6 (container supervisor)' inside an s6 container instead
of 'docker (foreground)'.
Plan-vs-reality drift fixed in this commit:
- Plan's S6ServiceManager._render_run_script used
`gateway start --foreground --port {port}` — invented args; the
real CLI is `gateway run`. Switched accordingly. port arg
retained for API parity but now documented as 'currently ignored'.
- Plan's reconciler keyed on config.yaml; switched to SOUL.md
(config.yaml is created by hermes setup, not by hermes profile
create, so the original gate caught nothing).
- The plan's _dispatch helper used _profile_arg() which returns
'--profile <name>' (i.e. with the flag prefix). Switched to
_profile_suffix() which returns the bare name.
- Architecture B's docker exec doesn't get /command on PATH or
the venv on PATH; Dockerfile's runtime PATH now includes
/opt/hermes/.venv/bin so 'docker exec <c> hermes ...' works
without sourcing the venv.
- stage2-hook now chowns $HERMES_HOME/profiles to hermes on every
boot, not just on the UID-remap path. Without this, files created
by docker-exec-as-root accumulate and the next reconciler run
fails with PermissionError reading SOUL.md.
Test harness:
19 passed, 0 xfailed (the two pre-Phase-4 xfail targets flip to
passing). 78 unit tests across service_manager + container_boot +
profiles_s6_hooks + gateway_s6_dispatch. Hadolint + shellcheck
pass cleanly.
Refs: docs/plans/2026-05-07-s6-overlay-dynamic-subagent-gateways.md
105 lines
3.7 KiB
Python
105 lines
3.7 KiB
Python
"""Harness: per-profile gateway start/stop inside the container.
|
||
|
||
Phase 4 wires `hermes -p <profile> gateway start/stop` through the s6
|
||
ServiceManager dispatch path inside the container — so the lifecycle
|
||
commands now bring up an s6-supervised gateway rather than refusing
|
||
with the pre-Phase-4 informational message.
|
||
|
||
These tests were marked ``xfail(strict=True)`` through Phase 0–3 and
|
||
flip to plain ``test_…`` once Phase 4 lands (now).
|
||
|
||
NB: The harness profile created here has no model/auth configured,
|
||
so the gateway process itself will exit with code 1 on every start
|
||
attempt (s6 will keep restarting it). We assert against s6's
|
||
``want up`` / ``want down`` state — which reflects the lifecycle
|
||
command's intent, not the supervised process's health.
|
||
"""
|
||
from __future__ import annotations
|
||
|
||
import subprocess
|
||
import time
|
||
|
||
PROFILE = "test-harness-profile"
|
||
|
||
|
||
def _sh(
|
||
container: str, command: str, timeout: int = 30,
|
||
) -> subprocess.CompletedProcess[str]:
|
||
return subprocess.run(
|
||
["docker", "exec", container, "sh", "-c", command],
|
||
capture_output=True, text=True, timeout=timeout,
|
||
)
|
||
|
||
|
||
def _svstat(container: str) -> str:
|
||
"""Returns the raw s6-svstat output for the test profile's slot.
|
||
/command/s6-svstat is called by absolute path because /command/
|
||
isn't on PATH for docker-exec sessions."""
|
||
r = _sh(container, f"/command/s6-svstat /run/service/gateway-{PROFILE}")
|
||
return r.stdout if r.returncode == 0 else ""
|
||
|
||
|
||
def test_profile_create_then_gateway_start(
|
||
built_image: str, container_name: str,
|
||
) -> None:
|
||
subprocess.run(
|
||
["docker", "run", "-d", "--name", container_name, built_image,
|
||
"sleep", "120"],
|
||
check=True, capture_output=True, timeout=30,
|
||
)
|
||
time.sleep(3)
|
||
|
||
r = _sh(container_name, f"hermes profile create {PROFILE}")
|
||
assert r.returncode == 0, f"profile create failed: {r.stderr}"
|
||
|
||
# Profile create's s6-register hook should have produced a service slot.
|
||
r = _sh(container_name, f"test -d /run/service/gateway-{PROFILE}")
|
||
assert r.returncode == 0, "s6 service slot not created on profile create"
|
||
|
||
r = _sh(container_name, f"hermes -p {PROFILE} gateway start", timeout=60)
|
||
assert r.returncode == 0, (
|
||
f"gateway start failed: stderr={r.stderr!r} stdout={r.stdout!r}"
|
||
)
|
||
|
||
# After start, s6's intent is "up" — even if the supervised gateway
|
||
# process spin-fails (no model/auth in the test profile), the
|
||
# supervision-state contract holds.
|
||
time.sleep(2)
|
||
state = _svstat(container_name)
|
||
assert "want up" in state, f"want up not in svstat: {state!r}"
|
||
|
||
r = _sh(container_name, f"hermes -p {PROFILE} gateway stop", timeout=30)
|
||
assert r.returncode == 0
|
||
|
||
time.sleep(2)
|
||
state = _svstat(container_name)
|
||
assert "want up" not in state, f"want up still in svstat: {state!r}"
|
||
|
||
|
||
def test_profile_delete_stops_gateway(
|
||
built_image: str, container_name: str,
|
||
) -> None:
|
||
"""Deleting a profile should stop its gateway and remove the s6
|
||
service slot."""
|
||
subprocess.run(
|
||
["docker", "run", "-d", "--name", container_name, built_image,
|
||
"sleep", "120"],
|
||
check=True, capture_output=True, timeout=30,
|
||
)
|
||
time.sleep(3)
|
||
|
||
_sh(container_name, f"hermes profile create {PROFILE}")
|
||
_sh(container_name, f"hermes -p {PROFILE} gateway start", timeout=60)
|
||
time.sleep(3)
|
||
|
||
r = _sh(
|
||
container_name,
|
||
f"hermes profile delete {PROFILE} --yes",
|
||
timeout=30,
|
||
)
|
||
assert r.returncode == 0, f"profile delete failed: {r.stderr}"
|
||
|
||
time.sleep(2)
|
||
# Service slot should be gone.
|
||
r = _sh(container_name, f"test -d /run/service/gateway-{PROFILE}")
|
||
assert r.returncode != 0, "s6 service slot still present after profile delete"
|