feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
"""Tests for hermes_cli.container_boot — the cont-init.d-time
|
|
|
|
|
|
reconciliation that recreates per-profile gateway s6 service slots
|
|
|
|
|
|
from the persistent profiles directory.
|
|
|
|
|
|
|
|
|
|
|
|
These tests run against a fake $HERMES_HOME under tmp_path; no real
|
|
|
|
|
|
s6 supervision tree is required. The in-container integration test
|
|
|
|
|
|
covering end-to-end "docker restart" survival lives in
|
|
|
|
|
|
tests/docker/test_container_restart.py.
|
|
|
|
|
|
"""
|
|
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
|
|
|
|
|
|
import json
|
|
|
|
|
|
from pathlib import Path
|
|
|
|
|
|
|
|
|
|
|
|
import pytest
|
|
|
|
|
|
|
|
|
|
|
|
from hermes_cli.container_boot import (
|
|
|
|
|
|
ReconcileAction,
|
|
|
|
|
|
reconcile_profile_gateways,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
# Fixtures + helpers
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-06-22 15:35:38 +10:00
|
|
|
|
@pytest.fixture(autouse=True)
|
|
|
|
|
|
def _hermetic_container_argv(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
|
|
|
|
"""Default ``_read_container_argv()`` to empty for the whole module.
|
|
|
|
|
|
|
|
|
|
|
|
``_read_container_argv()`` walks the entire ``/proc`` table looking for
|
|
|
|
|
|
a process whose argv contains ``main-wrapper.sh`` (the s6-overlay v3
|
|
|
|
|
|
fallback). On a host that is *also* running hermes containers, those
|
|
|
|
|
|
containers' ``main-wrapper.sh`` processes are visible in the host's
|
|
|
|
|
|
``/proc`` (shared PID view), so the scan would pick up a foreign
|
|
|
|
|
|
``gateway run`` argv and make ``_maybe_migrate_legacy_gateway_run_state``
|
|
|
|
|
|
synthesize ``running`` state — flaking any test that reconciles without
|
|
|
|
|
|
injecting ``container_argv``. Inside the real container ``/proc`` is the
|
|
|
|
|
|
container's own PID namespace, so production is unaffected; this fixture
|
|
|
|
|
|
just makes the unit suite hermetic. Tests that need a specific argv
|
|
|
|
|
|
either pass ``container_argv=`` to ``reconcile_profile_gateways`` or
|
|
|
|
|
|
monkeypatch ``_read_container_argv`` themselves (both override this).
|
|
|
|
|
|
"""
|
|
|
|
|
|
monkeypatch.setattr(
|
|
|
|
|
|
"hermes_cli.container_boot._read_container_argv",
|
|
|
|
|
|
lambda: (),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
def _make_profile(
|
|
|
|
|
|
hermes_home: Path,
|
|
|
|
|
|
name: str,
|
|
|
|
|
|
*,
|
|
|
|
|
|
state: str | None,
|
2026-06-14 21:02:10 -07:00
|
|
|
|
desired_state: str | None = None,
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
with_pid: bool = False,
|
|
|
|
|
|
config: bool = True,
|
|
|
|
|
|
) -> Path:
|
|
|
|
|
|
"""Create a fake profile directory under hermes_home/profiles/<name>/."""
|
|
|
|
|
|
p = hermes_home / "profiles" / name
|
|
|
|
|
|
p.mkdir(parents=True)
|
|
|
|
|
|
if config:
|
|
|
|
|
|
# SOUL.md is what the reconciler keys on — it's always seeded by
|
|
|
|
|
|
# `hermes profile create`. See container_boot._render_run_script.
|
|
|
|
|
|
(p / "SOUL.md").write_text("# fake profile\n")
|
2026-06-14 21:02:10 -07:00
|
|
|
|
if state is not None or desired_state is not None:
|
|
|
|
|
|
payload: dict[str, object] = {"timestamp": 1234567890}
|
|
|
|
|
|
if state is not None:
|
|
|
|
|
|
payload["gateway_state"] = state
|
|
|
|
|
|
if desired_state is not None:
|
|
|
|
|
|
payload["desired_state"] = desired_state
|
|
|
|
|
|
(p / "gateway_state.json").write_text(json.dumps(payload))
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
if with_pid:
|
|
|
|
|
|
(p / "gateway.pid").write_text(json.dumps(
|
|
|
|
|
|
{"pid": 99999, "host": "old-container"},
|
|
|
|
|
|
))
|
|
|
|
|
|
(p / "processes.json").write_text("[]")
|
|
|
|
|
|
return p
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-05-23 15:16:35 +10:00
|
|
|
|
def _seed_default_root(
|
|
|
|
|
|
hermes_home: Path,
|
|
|
|
|
|
*,
|
|
|
|
|
|
state: str | None = None,
|
|
|
|
|
|
with_pid: bool = False,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""Populate gateway_state.json / stale runtime files at the
|
|
|
|
|
|
HERMES_HOME root (the implicit default profile)."""
|
|
|
|
|
|
if state is not None:
|
|
|
|
|
|
(hermes_home / "gateway_state.json").write_text(json.dumps({
|
|
|
|
|
|
"gateway_state": state, "timestamp": 1234567890,
|
|
|
|
|
|
}))
|
|
|
|
|
|
if with_pid:
|
|
|
|
|
|
(hermes_home / "gateway.pid").write_text(json.dumps(
|
|
|
|
|
|
{"pid": 99999, "host": "old-container"},
|
|
|
|
|
|
))
|
|
|
|
|
|
(hermes_home / "processes.json").write_text("[]")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _named_actions(actions: list[ReconcileAction]) -> list[ReconcileAction]:
|
|
|
|
|
|
"""Drop the always-present default-profile action so tests that
|
|
|
|
|
|
only care about named profiles can assert against a clean list."""
|
|
|
|
|
|
return [a for a in actions if a.profile != "default"]
|
|
|
|
|
|
|
|
|
|
|
|
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
# Tests
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_running_profile_is_registered_and_autostarted(tmp_path: Path) -> None:
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "coder", state="running")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2026-05-23 15:16:35 +10:00
|
|
|
|
assert _named_actions(actions) == [ReconcileAction(
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
profile="coder", prior_state="running", action="started",
|
|
|
|
|
|
)]
|
|
|
|
|
|
svc = scandir / "gateway-coder"
|
|
|
|
|
|
assert (svc / "run").exists()
|
|
|
|
|
|
assert (svc / "run").stat().st_mode & 0o111 # executable
|
|
|
|
|
|
assert (svc / "type").read_text().strip() == "longrun"
|
|
|
|
|
|
# Auto-start means no down-marker.
|
|
|
|
|
|
assert not (svc / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-06-23 14:38:06 +02:00
|
|
|
|
def test_registered_profile_has_finish_script(tmp_path: Path) -> None:
|
|
|
|
|
|
"""The finish script must be written so s6 stops restarting on
|
|
|
|
|
|
fatal config errors (exit 78 → exit 125). See #51228."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "coder", state="running")
|
|
|
|
|
|
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
finish = scandir / "gateway-coder" / "finish"
|
|
|
|
|
|
assert finish.exists()
|
|
|
|
|
|
assert finish.stat().st_mode & 0o111 # executable
|
|
|
|
|
|
text = finish.read_text()
|
|
|
|
|
|
assert "78" in text
|
|
|
|
|
|
assert "125" in text
|
|
|
|
|
|
|
|
|
|
|
|
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
def test_stopped_profile_is_registered_but_not_started(tmp_path: Path) -> None:
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "writer", state="stopped")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2026-05-23 15:16:35 +10:00
|
|
|
|
assert _named_actions(actions) == [ReconcileAction(
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
profile="writer", prior_state="stopped", action="registered",
|
|
|
|
|
|
)]
|
|
|
|
|
|
# down marker tells s6-svscan to NOT start the service.
|
|
|
|
|
|
assert (scandir / "gateway-writer" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_startup_failed_does_not_autostart(tmp_path: Path) -> None:
|
|
|
|
|
|
"""Avoid crash-loop on restart when the gateway was failing to boot."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "broken", state="startup_failed")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2026-05-23 15:16:35 +10:00
|
|
|
|
named = _named_actions(actions)
|
|
|
|
|
|
assert named[0].action == "registered"
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
assert (scandir / "gateway-broken" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-06-14 21:02:10 -07:00
|
|
|
|
def test_desired_state_running_autostarts_even_if_runtime_failed(tmp_path: Path) -> None:
|
|
|
|
|
|
"""Persisted operator intent wins over transient runtime failures."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(
|
|
|
|
|
|
tmp_path,
|
|
|
|
|
|
"resilient",
|
|
|
|
|
|
state="startup_failed",
|
|
|
|
|
|
desired_state="running",
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert _named_actions(actions) == [ReconcileAction(
|
|
|
|
|
|
profile="resilient", prior_state="running", action="started",
|
|
|
|
|
|
)]
|
|
|
|
|
|
assert not (scandir / "gateway-resilient" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_desired_state_stopped_blocks_legacy_running_runtime(tmp_path: Path) -> None:
|
|
|
|
|
|
"""Explicit stop must survive a stale legacy runtime state of running."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(
|
|
|
|
|
|
tmp_path,
|
|
|
|
|
|
"quiet",
|
|
|
|
|
|
state="running",
|
|
|
|
|
|
desired_state="stopped",
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert _named_actions(actions) == [ReconcileAction(
|
|
|
|
|
|
profile="quiet", prior_state="stopped", action="registered",
|
|
|
|
|
|
)]
|
|
|
|
|
|
assert (scandir / "gateway-quiet" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
def test_starting_state_does_not_autostart(tmp_path: Path) -> None:
|
|
|
|
|
|
"""`starting` means the gateway died mid-boot last time; treat as
|
|
|
|
|
|
failed, not as a candidate for auto-restart."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "unlucky", state="starting")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2026-05-23 15:16:35 +10:00
|
|
|
|
named = _named_actions(actions)
|
|
|
|
|
|
assert named[0].action == "registered"
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
|
|
|
|
|
|
|
2026-06-29 15:46:54 +10:00
|
|
|
|
def test_draining_runtime_state_autostarts(tmp_path: Path) -> None:
|
|
|
|
|
|
"""A gateway hard-killed mid-drain leaves `gateway_state=draining` as its
|
|
|
|
|
|
last persisted value (the recreate SIGTERMs it before `_stop_impl` can
|
|
|
|
|
|
write a terminal `stopped`/`running`). `draining` is a transient sub-state
|
|
|
|
|
|
of RUNNING, not an operator stop, so with no explicit `desired_state` it
|
|
|
|
|
|
must normalise to running-intent and auto-start — otherwise the gateway
|
|
|
|
|
|
stays DOWN forever and messaging silently goes dark (the relay-opted-in
|
|
|
|
|
|
staging wedge, 2026-06)."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "drained", state="draining")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert _named_actions(actions) == [ReconcileAction(
|
|
|
|
|
|
profile="drained", prior_state="running", action="started",
|
|
|
|
|
|
)]
|
|
|
|
|
|
# Autostart means NO down-marker — the gateway comes back up.
|
|
|
|
|
|
assert not (scandir / "gateway-drained" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-06-29 20:46:22 -07:00
|
|
|
|
def test_degraded_runtime_state_autostarts(tmp_path: Path) -> None:
|
|
|
|
|
|
"""`degraded` is the same wedge class as `draining`: the gateway came up
|
|
|
|
|
|
with some platforms queued for retry, then fell through to the normal
|
|
|
|
|
|
running state (gateway/run.py #5196) and is serving cron + connected
|
|
|
|
|
|
platforms. A hard-kill there strands `gateway_state=degraded`, which is
|
|
|
|
|
|
NOT an operator stop and NOT a failed boot. With no explicit
|
|
|
|
|
|
`desired_state` it must normalise to running-intent and auto-start —
|
|
|
|
|
|
otherwise the gateway stays DOWN forever exactly like the draining wedge."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "degraded-box", state="degraded")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert _named_actions(actions) == [ReconcileAction(
|
|
|
|
|
|
profile="degraded-box", prior_state="running", action="started",
|
|
|
|
|
|
)]
|
|
|
|
|
|
assert not (scandir / "gateway-degraded-box" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-06-29 15:46:54 +10:00
|
|
|
|
def test_draining_default_root_autostarts(tmp_path: Path) -> None:
|
|
|
|
|
|
"""The hosted-agent path: the default (root) profile, not a named one.
|
|
|
|
|
|
A managed Fly instance runs the root profile; a stranded `draining` there
|
|
|
|
|
|
is exactly what wedged the relay-opted-in staging instance. Mirror the
|
|
|
|
|
|
named-profile case for the default slot."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_seed_default_root(tmp_path, state="draining")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
default_action = next(a for a in actions if a.profile == "default")
|
|
|
|
|
|
assert default_action.prior_state == "running"
|
|
|
|
|
|
assert default_action.action == "started"
|
|
|
|
|
|
assert not (scandir / "gateway-default" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_desired_state_stopped_overrides_draining_runtime(tmp_path: Path) -> None:
|
|
|
|
|
|
"""An explicit operator stop must survive even when the transient runtime
|
|
|
|
|
|
state is `draining`. The `desired_state` is the durable intent and is
|
|
|
|
|
|
honoured verbatim — the draining→running normalisation only applies to the
|
|
|
|
|
|
legacy/transient `gateway_state` fallback, never over an explicit
|
|
|
|
|
|
`desired_state`."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(
|
|
|
|
|
|
tmp_path,
|
|
|
|
|
|
"stopped-while-draining",
|
|
|
|
|
|
state="draining",
|
|
|
|
|
|
desired_state="stopped",
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert _named_actions(actions) == [ReconcileAction(
|
|
|
|
|
|
profile="stopped-while-draining",
|
|
|
|
|
|
prior_state="stopped",
|
|
|
|
|
|
action="registered",
|
|
|
|
|
|
)]
|
|
|
|
|
|
assert (scandir / "gateway-stopped-while-draining" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
def test_stale_runtime_files_are_removed(tmp_path: Path) -> None:
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
profile = _make_profile(tmp_path, "coder", state="running", with_pid=True)
|
|
|
|
|
|
assert (profile / "gateway.pid").exists()
|
|
|
|
|
|
assert (profile / "processes.json").exists()
|
|
|
|
|
|
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert not (profile / "gateway.pid").exists()
|
|
|
|
|
|
assert not (profile / "processes.json").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_profile_without_state_file_is_registered_but_not_started(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""A freshly-created profile that's never been started: register
|
|
|
|
|
|
its slot but don't auto-start."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "fresh", state=None)
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2026-05-23 15:16:35 +10:00
|
|
|
|
assert _named_actions(actions) == [ReconcileAction(
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
profile="fresh", prior_state=None, action="registered",
|
|
|
|
|
|
)]
|
|
|
|
|
|
assert (scandir / "gateway-fresh" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_directory_without_marker_file_is_skipped(tmp_path: Path) -> None:
|
|
|
|
|
|
"""A stray dir under profiles/ that isn't actually a profile (no
|
|
|
|
|
|
SOUL.md — the marker the reconciler keys on) should be skipped."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
# Create a profile dir but without SOUL.md
|
|
|
|
|
|
(tmp_path / "profiles" / "stray").mkdir(parents=True)
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2026-05-23 15:16:35 +10:00
|
|
|
|
assert _named_actions(actions) == []
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
assert not (scandir / "gateway-stray").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_corrupt_state_file_treated_as_no_prior_state(tmp_path: Path) -> None:
|
|
|
|
|
|
"""If gateway_state.json is malformed JSON, don't blow up the whole
|
|
|
|
|
|
reconciliation — register the slot in the down state."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
profile = _make_profile(tmp_path, "junk", state="running")
|
|
|
|
|
|
(profile / "gateway_state.json").write_text("{ not valid json")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2026-05-23 15:16:35 +10:00
|
|
|
|
named = _named_actions(actions)
|
|
|
|
|
|
assert named[0].action == "registered" # not "started"
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
assert (scandir / "gateway-junk" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_reconcile_log_is_written(tmp_path: Path) -> None:
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "a", state="running")
|
|
|
|
|
|
_make_profile(tmp_path, "b", state="stopped")
|
|
|
|
|
|
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
log = (tmp_path / "logs" / "container-boot.log").read_text()
|
|
|
|
|
|
assert "profile=a" in log
|
|
|
|
|
|
assert "action=started" in log
|
|
|
|
|
|
assert "profile=b" in log
|
|
|
|
|
|
assert "action=registered" in log
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-05-23 15:33:11 +10:00
|
|
|
|
def test_reconcile_log_rotates_when_size_exceeded(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""When container-boot.log exceeds _LOG_ROTATE_BYTES, the existing
|
|
|
|
|
|
file is rotated to .1 before the new entries are appended."""
|
|
|
|
|
|
from hermes_cli import container_boot
|
|
|
|
|
|
|
|
|
|
|
|
# Tighten the threshold so we don't have to write 256 KiB.
|
|
|
|
|
|
monkeypatch.setattr(container_boot, "_LOG_ROTATE_BYTES", 200)
|
|
|
|
|
|
|
|
|
|
|
|
log_path = tmp_path / "logs" / "container-boot.log"
|
|
|
|
|
|
log_path.parent.mkdir()
|
|
|
|
|
|
log_path.write_text("X" * 300) # already over the threshold
|
|
|
|
|
|
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "coder", state="running")
|
|
|
|
|
|
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
rotated = tmp_path / "logs" / "container-boot.log.1"
|
|
|
|
|
|
assert rotated.exists(), "expected previous log to be rotated to .1"
|
|
|
|
|
|
assert rotated.read_text().startswith("X" * 300)
|
|
|
|
|
|
# The new entries land in a fresh container-boot.log (no leftover Xs).
|
|
|
|
|
|
new_contents = log_path.read_text()
|
|
|
|
|
|
assert "X" not in new_contents
|
|
|
|
|
|
assert "profile=coder" in new_contents
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_reconcile_log_does_not_rotate_below_threshold(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""A small existing log is appended to in place; no .1 is created."""
|
|
|
|
|
|
from hermes_cli import container_boot
|
|
|
|
|
|
monkeypatch.setattr(container_boot, "_LOG_ROTATE_BYTES", 10_000_000)
|
|
|
|
|
|
|
|
|
|
|
|
log_path = tmp_path / "logs" / "container-boot.log"
|
|
|
|
|
|
log_path.parent.mkdir()
|
|
|
|
|
|
log_path.write_text("previous entry\n")
|
|
|
|
|
|
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "coder", state="running")
|
|
|
|
|
|
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert not (tmp_path / "logs" / "container-boot.log.1").exists()
|
|
|
|
|
|
contents = log_path.read_text()
|
|
|
|
|
|
assert contents.startswith("previous entry\n")
|
|
|
|
|
|
assert "profile=coder" in contents
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_reconcile_log_rotation_overwrites_existing_dot1(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""Rotating again replaces the prior .1 — we keep at most one
|
|
|
|
|
|
rotated file (soft cap of ~2 × threshold)."""
|
|
|
|
|
|
from hermes_cli import container_boot
|
|
|
|
|
|
monkeypatch.setattr(container_boot, "_LOG_ROTATE_BYTES", 200)
|
|
|
|
|
|
|
|
|
|
|
|
log_dir = tmp_path / "logs"; log_dir.mkdir()
|
|
|
|
|
|
(log_dir / "container-boot.log.1").write_text("OLD ROTATION")
|
|
|
|
|
|
(log_dir / "container-boot.log").write_text("Y" * 300)
|
|
|
|
|
|
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "coder", state="running")
|
|
|
|
|
|
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
# .1 now contains the previous .log (Ys), not OLD ROTATION.
|
|
|
|
|
|
rotated = (log_dir / "container-boot.log.1").read_text()
|
|
|
|
|
|
assert "OLD ROTATION" not in rotated
|
|
|
|
|
|
assert rotated.startswith("Y" * 300)
|
|
|
|
|
|
|
|
|
|
|
|
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
def test_dry_run_makes_no_filesystem_changes(tmp_path: Path) -> None:
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
profile = _make_profile(tmp_path, "coder", state="running", with_pid=True)
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=True,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
# The action list is still produced...
|
2026-05-23 15:16:35 +10:00
|
|
|
|
assert _named_actions(actions) == [ReconcileAction(
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
profile="coder", prior_state="running", action="started",
|
|
|
|
|
|
)]
|
|
|
|
|
|
# ...but nothing on disk was touched.
|
|
|
|
|
|
assert (profile / "gateway.pid").exists() # not removed under dry_run
|
|
|
|
|
|
assert not (scandir / "gateway-coder").exists()
|
|
|
|
|
|
assert not (tmp_path / "logs" / "container-boot.log").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-05-23 15:16:35 +10:00
|
|
|
|
def test_missing_profiles_root_still_registers_default_slot(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
) -> None:
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
"""When $HERMES_HOME/profiles doesn't exist (fresh install), the
|
2026-05-23 15:16:35 +10:00
|
|
|
|
reconciliation should still register a gateway-default slot for
|
|
|
|
|
|
the root profile and return without raising. Previously this
|
|
|
|
|
|
returned an empty list; the default slot is now always present
|
|
|
|
|
|
so `hermes gateway start` (no -p) has somewhere to land."""
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
2026-05-23 15:16:35 +10:00
|
|
|
|
assert actions == [ReconcileAction(
|
|
|
|
|
|
profile="default", prior_state=None, action="registered",
|
|
|
|
|
|
)]
|
|
|
|
|
|
assert (scandir / "gateway-default").is_dir()
|
|
|
|
|
|
assert (scandir / "gateway-default" / "down").exists()
|
feat(docker): per-profile s6 supervision + container-restart reconciliation
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
2026-05-21 16:56:51 +10:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_invalid_profile_name_in_directory_raises(tmp_path: Path) -> None:
|
|
|
|
|
|
"""A profile dir whose name doesn't match validate_profile_name's
|
|
|
|
|
|
rules (uppercase, etc.) must surface as a hard error rather than
|
|
|
|
|
|
silently produce an invalid s6 service dir."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "BadName", state="running")
|
|
|
|
|
|
with pytest.raises(ValueError):
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
2026-05-23 15:16:35 +10:00
|
|
|
|
|
|
|
|
|
|
|
2026-05-23 15:34:51 +10:00
|
|
|
|
def test_register_service_publishes_atomically(tmp_path: Path) -> None:
|
|
|
|
|
|
"""The reconciler should build the new service dir in a sibling
|
|
|
|
|
|
tmp directory and rename it into place — never leaving a half-
|
|
|
|
|
|
populated slot visible to a concurrent s6-svscan rescan.
|
|
|
|
|
|
|
|
|
|
|
|
We verify the invariant indirectly: after a clean reconcile, the
|
|
|
|
|
|
target directory exists with all required files, and no sibling
|
|
|
|
|
|
.tmp leftovers remain. (Atomic publication is the only way to
|
|
|
|
|
|
achieve both with mkdir + write.)
|
|
|
|
|
|
"""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "coder", state="running")
|
|
|
|
|
|
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
# No leftover tmp dir.
|
|
|
|
|
|
leftover = list(scandir.glob("*.tmp"))
|
|
|
|
|
|
assert leftover == [], f"leftover tmp directories: {leftover}"
|
|
|
|
|
|
|
|
|
|
|
|
# Target is fully populated.
|
|
|
|
|
|
svc = scandir / "gateway-coder"
|
|
|
|
|
|
assert (svc / "type").exists()
|
|
|
|
|
|
assert (svc / "run").exists()
|
|
|
|
|
|
assert (svc / "log" / "run").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_register_service_overwrites_existing_slot(tmp_path: Path) -> None:
|
|
|
|
|
|
"""A second reconciliation pass cleanly replaces an existing
|
|
|
|
|
|
slot (the tmp+rename publication overwrites the previous one)."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
profile = _make_profile(tmp_path, "coder", state="running")
|
|
|
|
|
|
|
|
|
|
|
|
# First pass.
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
first_run = (scandir / "gateway-coder" / "run").read_text()
|
|
|
|
|
|
|
|
|
|
|
|
# Mutate the profile state so the run-script changes (extra_env
|
|
|
|
|
|
# rendering would differ if we wired profile config through, but
|
|
|
|
|
|
# for now just exercise the overwrite path).
|
|
|
|
|
|
(profile / "gateway_state.json").write_text(
|
|
|
|
|
|
'{"gateway_state": "stopped"}',
|
|
|
|
|
|
)
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2026-06-29 21:33:00 +10:00
|
|
|
|
# Slot still exists, no .tmp remnants (staging dir is dot-prefixed,
|
|
|
|
|
|
# so match it explicitly — a leading-`*` glob won't catch dotfiles).
|
2026-05-23 15:34:51 +10:00
|
|
|
|
assert (scandir / "gateway-coder" / "run").read_text() == first_run
|
|
|
|
|
|
assert list(scandir.glob("*.tmp")) == []
|
2026-06-29 21:33:00 +10:00
|
|
|
|
assert list(scandir.glob(".*.tmp")) == []
|
2026-05-23 15:34:51 +10:00
|
|
|
|
# Down marker now present (state went from running → stopped).
|
|
|
|
|
|
assert (scandir / "gateway-coder" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_register_service_cleans_up_stale_tmp_dir(tmp_path: Path) -> None:
|
2026-06-29 21:33:00 +10:00
|
|
|
|
"""If a previous interrupted run left a staging sibling directory,
|
|
|
|
|
|
a fresh reconcile must clean it up rather than failing on mkdir.
|
|
|
|
|
|
|
|
|
|
|
|
The staging dir is dot-prefixed (``.gateway-<profile>.tmp``) so a
|
|
|
|
|
|
concurrent s6-svscan rescan can't supervise it half-built; the
|
|
|
|
|
|
cleanup must target that same dot-prefixed name.
|
|
|
|
|
|
"""
|
2026-05-23 15:34:51 +10:00
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
2026-06-29 21:33:00 +10:00
|
|
|
|
# Simulate a leftover from an interrupted run (current staging name).
|
|
|
|
|
|
stale_tmp = scandir / ".gateway-coder.tmp"
|
2026-05-23 15:34:51 +10:00
|
|
|
|
stale_tmp.mkdir()
|
|
|
|
|
|
(stale_tmp / "stale-file").write_text("garbage")
|
|
|
|
|
|
|
|
|
|
|
|
_make_profile(tmp_path, "coder", state="running")
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert not stale_tmp.exists()
|
|
|
|
|
|
assert (scandir / "gateway-coder" / "run").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-05-23 15:16:35 +10:00
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
# Default-profile slot — always registered (PR #30136 review item I1)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_default_slot_always_registered_on_empty_home(tmp_path: Path) -> None:
|
|
|
|
|
|
"""Bare HERMES_HOME with nothing under it still produces a
|
|
|
|
|
|
gateway-default slot (down state)."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert actions == [ReconcileAction(
|
|
|
|
|
|
profile="default", prior_state=None, action="registered",
|
|
|
|
|
|
)]
|
|
|
|
|
|
svc = scandir / "gateway-default"
|
|
|
|
|
|
assert svc.is_dir()
|
|
|
|
|
|
assert (svc / "run").exists()
|
|
|
|
|
|
assert (svc / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_default_slot_run_script_omits_profile_flag(tmp_path: Path) -> None:
|
|
|
|
|
|
"""The default slot's run script must NOT pass `-p default` —
|
|
|
|
|
|
that would resolve to $HERMES_HOME/profiles/default/ instead of
|
|
|
|
|
|
the root profile. It must call `hermes gateway run` directly."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
run = (scandir / "gateway-default" / "run").read_text()
|
|
|
|
|
|
assert "hermes gateway run" in run
|
|
|
|
|
|
assert "-p default" not in run
|
|
|
|
|
|
assert "-p 'default'" not in run
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_default_slot_autostarts_when_root_state_running(tmp_path: Path) -> None:
|
|
|
|
|
|
"""gateway_state.json at the HERMES_HOME root with state=running
|
|
|
|
|
|
means the default slot auto-starts on container boot."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_seed_default_root(tmp_path, state="running")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
default_action = next(a for a in actions if a.profile == "default")
|
|
|
|
|
|
assert default_action.prior_state == "running"
|
|
|
|
|
|
assert default_action.action == "started"
|
|
|
|
|
|
assert not (scandir / "gateway-default" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-05-31 21:28:56 -04:00
|
|
|
|
@pytest.mark.parametrize(
|
|
|
|
|
|
"container_argv",
|
|
|
|
|
|
[
|
|
|
|
|
|
("gateway", "run"),
|
|
|
|
|
|
("/init", "/opt/hermes/docker/main-wrapper.sh", "gateway", "run"),
|
|
|
|
|
|
],
|
|
|
|
|
|
)
|
|
|
|
|
|
def test_legacy_gateway_run_cmd_seeds_default_running_state(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
container_argv: tuple[str, ...],
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""Pre-s6 Docker users often ran `gateway run` as the container
|
|
|
|
|
|
command. With no persisted gateway_state.json yet, s6 reconciliation
|
|
|
|
|
|
must migrate that legacy intent into a running default gateway slot."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path,
|
|
|
|
|
|
scandir=scandir,
|
|
|
|
|
|
dry_run=False,
|
|
|
|
|
|
container_argv=container_argv,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
default_action = next(a for a in actions if a.profile == "default")
|
|
|
|
|
|
assert default_action.prior_state == "running"
|
|
|
|
|
|
assert default_action.action == "started"
|
|
|
|
|
|
assert not (scandir / "gateway-default" / "down").exists()
|
|
|
|
|
|
state = json.loads((tmp_path / "gateway_state.json").read_text())
|
|
|
|
|
|
assert state["gateway_state"] == "running"
|
2026-06-14 21:02:10 -07:00
|
|
|
|
assert state["desired_state"] == "running"
|
2026-05-31 21:28:56 -04:00
|
|
|
|
assert state["migrated_from"] == "legacy-container-cmd"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
|
|
|
|
"container_argv",
|
|
|
|
|
|
[
|
|
|
|
|
|
("gateway", "run", "--no-supervise"),
|
|
|
|
|
|
("/init", "/opt/hermes/docker/main-wrapper.sh", "gateway", "run", "--no-supervise"),
|
|
|
|
|
|
],
|
|
|
|
|
|
)
|
|
|
|
|
|
def test_legacy_gateway_run_no_supervise_does_not_seed_s6_state(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
container_argv: tuple[str, ...],
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""`gateway run --no-supervise` is an explicit opt-out from s6 migration."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path,
|
|
|
|
|
|
scandir=scandir,
|
|
|
|
|
|
dry_run=False,
|
|
|
|
|
|
container_argv=container_argv,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
default_action = next(a for a in actions if a.profile == "default")
|
|
|
|
|
|
assert default_action.prior_state is None
|
|
|
|
|
|
assert default_action.action == "registered"
|
|
|
|
|
|
assert (scandir / "gateway-default" / "down").exists()
|
|
|
|
|
|
assert not (tmp_path / "gateway_state.json").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_legacy_gateway_run_env_no_supervise_does_not_seed_s6_state(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""Env opt-out matches the CLI `--no-supervise` flag."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
monkeypatch.setenv("HERMES_GATEWAY_NO_SUPERVISE", "1")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path,
|
|
|
|
|
|
scandir=scandir,
|
|
|
|
|
|
dry_run=False,
|
|
|
|
|
|
container_argv=("gateway", "run"),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
default_action = next(a for a in actions if a.profile == "default")
|
|
|
|
|
|
assert default_action.prior_state is None
|
|
|
|
|
|
assert default_action.action == "registered"
|
|
|
|
|
|
assert (scandir / "gateway-default" / "down").exists()
|
|
|
|
|
|
assert not (tmp_path / "gateway_state.json").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
2026-05-23 15:16:35 +10:00
|
|
|
|
def test_default_slot_does_not_autostart_when_root_state_stopped(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_seed_default_root(tmp_path, state="stopped")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
2026-05-31 21:28:56 -04:00
|
|
|
|
hermes_home=tmp_path,
|
|
|
|
|
|
scandir=scandir,
|
|
|
|
|
|
dry_run=False,
|
|
|
|
|
|
container_argv=("gateway", "run"),
|
2026-05-23 15:16:35 +10:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
default_action = next(a for a in actions if a.profile == "default")
|
|
|
|
|
|
assert default_action.action == "registered"
|
|
|
|
|
|
assert (scandir / "gateway-default" / "down").exists()
|
2026-05-31 21:28:56 -04:00
|
|
|
|
state = json.loads((tmp_path / "gateway_state.json").read_text())
|
|
|
|
|
|
assert state["gateway_state"] == "stopped"
|
2026-05-23 15:16:35 +10:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_default_slot_does_not_autostart_when_root_state_startup_failed(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""Crash-loop guard applies to the default slot too."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_seed_default_root(tmp_path, state="startup_failed")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
default_action = next(a for a in actions if a.profile == "default")
|
|
|
|
|
|
assert default_action.action == "registered"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_default_slot_cleans_up_stale_runtime_files_at_root(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""gateway.pid and processes.json at the HERMES_HOME root (left
|
|
|
|
|
|
over from the previous container's default gateway) must be
|
|
|
|
|
|
swept the same way as for named profiles."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_seed_default_root(tmp_path, state="running", with_pid=True)
|
|
|
|
|
|
assert (tmp_path / "gateway.pid").exists()
|
|
|
|
|
|
|
|
|
|
|
|
reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert not (tmp_path / "gateway.pid").exists()
|
|
|
|
|
|
assert not (tmp_path / "processes.json").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_default_slot_appears_before_named_profiles(tmp_path: Path) -> None:
|
|
|
|
|
|
"""The action list is ordered: default first, then named profiles
|
|
|
|
|
|
in directory order. Operators and the boot-log reader rely on
|
|
|
|
|
|
this ordering being stable."""
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "z-last-alphabetically", state="stopped")
|
|
|
|
|
|
_make_profile(tmp_path, "a-first-alphabetically", state="stopped")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
assert [a.profile for a in actions] == [
|
|
|
|
|
|
"default",
|
|
|
|
|
|
"a-first-alphabetically",
|
|
|
|
|
|
"z-last-alphabetically",
|
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_profiles_default_subdir_is_skipped_with_warning(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
caplog: pytest.LogCaptureFixture,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""A user-created profiles/default/ collides with the reserved
|
|
|
|
|
|
root-profile slot — the named entry is skipped (with a warning)
|
|
|
|
|
|
so we don't double-register gateway-default."""
|
|
|
|
|
|
import logging
|
|
|
|
|
|
caplog.set_level(logging.WARNING)
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "default", state="running")
|
|
|
|
|
|
|
|
|
|
|
|
actions = reconcile_profile_gateways(
|
|
|
|
|
|
hermes_home=tmp_path, scandir=scandir, dry_run=False,
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
# Only the root-profile default slot appears — not the colliding
|
|
|
|
|
|
# named profile.
|
|
|
|
|
|
default_actions = [a for a in actions if a.profile == "default"]
|
|
|
|
|
|
assert len(default_actions) == 1
|
|
|
|
|
|
# And the warning surfaces so operators know the named profile
|
|
|
|
|
|
# was ignored.
|
|
|
|
|
|
assert any(
|
|
|
|
|
|
"profiles/default/" in record.message for record in caplog.records
|
|
|
|
|
|
)
|
2026-06-15 03:51:48 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
# Dashboard-container role detection (skip reconcile on the dashboard)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
|
|
|
|
"container_argv",
|
|
|
|
|
|
[
|
|
|
|
|
|
# Bare subcommand (docker run ... dashboard ...).
|
|
|
|
|
|
("dashboard",),
|
|
|
|
|
|
("dashboard", "--host", "127.0.0.1", "--no-open"),
|
|
|
|
|
|
# Through s6 /init + the main-wrapper that re-execs `hermes`.
|
|
|
|
|
|
("/init", "/opt/hermes/docker/main-wrapper.sh", "dashboard"),
|
|
|
|
|
|
(
|
|
|
|
|
|
"/init",
|
|
|
|
|
|
"/opt/hermes/docker/main-wrapper.sh",
|
|
|
|
|
|
"dashboard",
|
|
|
|
|
|
"--host",
|
|
|
|
|
|
"127.0.0.1",
|
|
|
|
|
|
"--no-open",
|
|
|
|
|
|
),
|
|
|
|
|
|
# Wrapper that kept the explicit `hermes` argv0.
|
|
|
|
|
|
("/init", "/opt/hermes/docker/main-wrapper.sh", "hermes", "dashboard"),
|
2026-06-22 15:35:38 +10:00
|
|
|
|
# s6-overlay v3: PID 1 is s6-svscan, so the role is read off the
|
|
|
|
|
|
# rc.init-launched process whose argv is
|
|
|
|
|
|
# `/bin/sh -e .../rc.init top .../main-wrapper.sh dashboard ...`.
|
|
|
|
|
|
# This is the exact shape that regressed in issue #49196.
|
|
|
|
|
|
(
|
|
|
|
|
|
"/bin/sh",
|
|
|
|
|
|
"-e",
|
|
|
|
|
|
"/run/s6/basedir/scripts/rc.init",
|
|
|
|
|
|
"top",
|
|
|
|
|
|
"/opt/hermes/docker/main-wrapper.sh",
|
|
|
|
|
|
"dashboard",
|
|
|
|
|
|
"--host",
|
|
|
|
|
|
"0.0.0.0",
|
|
|
|
|
|
"--port",
|
|
|
|
|
|
"9119",
|
|
|
|
|
|
"--no-open",
|
|
|
|
|
|
"--insecure",
|
|
|
|
|
|
),
|
2026-06-15 03:51:48 -07:00
|
|
|
|
],
|
|
|
|
|
|
)
|
|
|
|
|
|
def test_is_dashboard_container_true_for_dashboard_argv(
|
|
|
|
|
|
container_argv: tuple[str, ...],
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""A dashboard command is detected across every wrapper prefix shape."""
|
|
|
|
|
|
from hermes_cli.container_boot import _is_dashboard_container
|
|
|
|
|
|
|
|
|
|
|
|
assert _is_dashboard_container(container_argv) is True
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
|
|
|
|
"container_argv",
|
|
|
|
|
|
[
|
|
|
|
|
|
(), # empty (/proc/1/cmdline unreadable) — not the dashboard
|
|
|
|
|
|
("gateway", "run"),
|
|
|
|
|
|
("/init", "/opt/hermes/docker/main-wrapper.sh", "gateway", "run"),
|
|
|
|
|
|
("/init", "/opt/hermes/docker/main-wrapper.sh", "hermes", "gateway", "run"),
|
|
|
|
|
|
("chat",),
|
|
|
|
|
|
# A profile literally named "dashboard" must NOT match — the token
|
|
|
|
|
|
# we key on is the SUBCOMMAND, and `gateway run -p dashboard` is a
|
|
|
|
|
|
# gateway container.
|
|
|
|
|
|
("gateway", "run", "-p", "dashboard"),
|
2026-06-22 15:35:38 +10:00
|
|
|
|
# s6-overlay v3 gateway container — the rc.init-launched argv for a
|
|
|
|
|
|
# gateway role must still read as non-dashboard (issue #49196 shape).
|
|
|
|
|
|
(
|
|
|
|
|
|
"/bin/sh",
|
|
|
|
|
|
"-e",
|
|
|
|
|
|
"/run/s6/basedir/scripts/rc.init",
|
|
|
|
|
|
"top",
|
|
|
|
|
|
"/opt/hermes/docker/main-wrapper.sh",
|
|
|
|
|
|
"gateway",
|
|
|
|
|
|
"run",
|
|
|
|
|
|
),
|
2026-06-15 03:51:48 -07:00
|
|
|
|
],
|
|
|
|
|
|
)
|
|
|
|
|
|
def test_is_dashboard_container_false_for_non_dashboard_argv(
|
|
|
|
|
|
container_argv: tuple[str, ...],
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""Gateway / other commands (and empty argv) are not the dashboard."""
|
|
|
|
|
|
from hermes_cli.container_boot import _is_dashboard_container
|
|
|
|
|
|
|
|
|
|
|
|
assert _is_dashboard_container(container_argv) is False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_main_skips_reconcile_in_dashboard_container(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
|
|
|
|
capsys: pytest.CaptureFixture[str],
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""main() must NOT reconcile when PID 1 argv is the dashboard command.
|
|
|
|
|
|
|
|
|
|
|
|
A running profile is seeded so that, if reconcile ran, it would create
|
|
|
|
|
|
the gateway-<profile> slot. Asserting the slot is absent proves the
|
|
|
|
|
|
skip is real, not just a log line.
|
|
|
|
|
|
"""
|
|
|
|
|
|
from hermes_cli import container_boot
|
|
|
|
|
|
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "worker", state="running")
|
|
|
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
|
monkeypatch.setenv("S6_PROFILE_GATEWAY_SCANDIR", str(scandir))
|
|
|
|
|
|
monkeypatch.setattr(
|
|
|
|
|
|
container_boot,
|
|
|
|
|
|
"_read_container_argv",
|
|
|
|
|
|
lambda: ("/init", "/opt/hermes/docker/main-wrapper.sh", "dashboard"),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
rc = container_boot.main()
|
|
|
|
|
|
|
|
|
|
|
|
assert rc == 0
|
|
|
|
|
|
assert not (scandir / "gateway-worker").exists()
|
|
|
|
|
|
assert not (scandir / "gateway-default").exists()
|
2026-06-22 15:35:38 +10:00
|
|
|
|
assert "skipping (dashboard container" in capsys.readouterr().out
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_main_skips_reconcile_in_dashboard_container_s6v3(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
|
|
|
|
capsys: pytest.CaptureFixture[str],
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""The dashboard skip must fire under the s6-overlay v3 argv shape.
|
|
|
|
|
|
|
|
|
|
|
|
Regression test for issue #49196: under s6-overlay v3 the container
|
|
|
|
|
|
command is read off the rc.init-launched process, whose argv is
|
|
|
|
|
|
``/bin/sh -e .../rc.init top .../main-wrapper.sh dashboard ...`` — not a
|
|
|
|
|
|
bare ``/init`` prefix. Before the fix, the prefix-strip left ``/bin/sh``
|
|
|
|
|
|
at args[0], so the role read as non-dashboard, the dashboard container
|
|
|
|
|
|
reconciled, and it started its own gateway-default (dual Telegram
|
|
|
|
|
|
getUpdates 409). Asserting the slot is absent proves the skip fires.
|
|
|
|
|
|
"""
|
|
|
|
|
|
from hermes_cli import container_boot
|
|
|
|
|
|
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "worker", state="running")
|
|
|
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
|
monkeypatch.setenv("S6_PROFILE_GATEWAY_SCANDIR", str(scandir))
|
|
|
|
|
|
monkeypatch.setattr(
|
|
|
|
|
|
container_boot,
|
|
|
|
|
|
"_read_container_argv",
|
|
|
|
|
|
lambda: (
|
|
|
|
|
|
"/bin/sh",
|
|
|
|
|
|
"-e",
|
|
|
|
|
|
"/run/s6/basedir/scripts/rc.init",
|
|
|
|
|
|
"top",
|
|
|
|
|
|
"/opt/hermes/docker/main-wrapper.sh",
|
|
|
|
|
|
"dashboard",
|
|
|
|
|
|
"--host",
|
|
|
|
|
|
"0.0.0.0",
|
|
|
|
|
|
"--port",
|
|
|
|
|
|
"9119",
|
|
|
|
|
|
"--no-open",
|
|
|
|
|
|
"--insecure",
|
|
|
|
|
|
),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
rc = container_boot.main()
|
|
|
|
|
|
|
|
|
|
|
|
assert rc == 0
|
|
|
|
|
|
assert not (scandir / "gateway-worker").exists()
|
|
|
|
|
|
assert not (scandir / "gateway-default").exists()
|
2026-06-15 03:51:48 -07:00
|
|
|
|
assert "skipping (dashboard container" in capsys.readouterr().out
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_main_reconciles_in_gateway_container(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""main() reconciles normally when PID 1 argv is the gateway command —
|
|
|
|
|
|
the dashboard skip is scoped strictly to the dashboard role."""
|
|
|
|
|
|
from hermes_cli import container_boot
|
|
|
|
|
|
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "worker", state="running")
|
|
|
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
|
monkeypatch.setenv("S6_PROFILE_GATEWAY_SCANDIR", str(scandir))
|
|
|
|
|
|
monkeypatch.setattr(
|
|
|
|
|
|
container_boot,
|
|
|
|
|
|
"_read_container_argv",
|
|
|
|
|
|
lambda: ("/init", "/opt/hermes/docker/main-wrapper.sh", "gateway", "run"),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
rc = container_boot.main()
|
|
|
|
|
|
|
|
|
|
|
|
assert rc == 0
|
|
|
|
|
|
# The worker slot was registered + started (prior_state running).
|
|
|
|
|
|
assert (scandir / "gateway-worker").exists()
|
|
|
|
|
|
assert not (scandir / "gateway-worker" / "down").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_main_ignores_removed_skip_reconcile_env_var(
|
|
|
|
|
|
tmp_path: Path,
|
|
|
|
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
|
|
|
|
) -> None:
|
|
|
|
|
|
"""The legacy HERMES_SKIP_PROFILE_RECONCILE flag is gone: setting it on a
|
|
|
|
|
|
gateway container must NOT suppress reconciliation. Role is decided by
|
|
|
|
|
|
PID 1 argv alone, so a stale flag in someone's manifest is inert."""
|
|
|
|
|
|
from hermes_cli import container_boot
|
|
|
|
|
|
|
|
|
|
|
|
scandir = tmp_path / "run-service"; scandir.mkdir()
|
|
|
|
|
|
_make_profile(tmp_path, "worker", state="running")
|
|
|
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
|
monkeypatch.setenv("S6_PROFILE_GATEWAY_SCANDIR", str(scandir))
|
|
|
|
|
|
monkeypatch.setenv("HERMES_SKIP_PROFILE_RECONCILE", "1")
|
|
|
|
|
|
monkeypatch.setattr(
|
|
|
|
|
|
container_boot,
|
|
|
|
|
|
"_read_container_argv",
|
|
|
|
|
|
lambda: ("/init", "/opt/hermes/docker/main-wrapper.sh", "gateway", "run"),
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
rc = container_boot.main()
|
|
|
|
|
|
|
|
|
|
|
|
assert rc == 0
|
|
|
|
|
|
# Reconcile still ran despite the stale env var.
|
|
|
|
|
|
assert (scandir / "gateway-worker").exists()
|