284dbaf537
Activation reaches plugin discovery before the application dependencies exist. Give PM its own locked Python project and runtime so it can install or repair the application without importing that dependency tree. Keep PM outside the application workspace. A shared uv workspace resolves the application graph and cannot provide this isolation. Route mutations through an isolated worker and preserve transaction callbacks, cancellation, custom package registrations, and correlated receipts. Use the same runtime builder for source installs and packaged payloads. Keep offline wheelhouse support in that builder. Nix builds the independent PM lock as a separate derivation. Refuse lazy-disabled bootstrap before installing tools or dependencies. Move first-party YAML readers and writers to ruamel. Keep the application lock's transitive PyYAML requirements for third-party packages. Verification: - Focused canonical Python suite: 177 passed, 1 host-gated skip. - Electron backend probes: 12 passed. Electron typecheck passed. - Both uv locks, scoped lint, Bash syntax, and whitespace checks passed. - Cold activation, corrupt-app repair, offline staging, and relocation ran. - Built and exercised the Nix PM runtime and standalone YAML merge script. Six broader caller test files retain the same 24 failing test IDs as an archive of HEAD. The existing real-home guard blocks those tests before they can exercise the affected paths. No full-suite pass is claimed. Native Windows signing and full Bionic package execution remain unverified.
85 lines
3.2 KiB
Python
85 lines
3.2 KiB
Python
"""Each standalone config loader (gateway, TUI/desktop, cron) must honor managed scope.
|
|
|
|
These loaders build their own config dict instead of routing through
|
|
hermes_cli.config.load_config, so the managed overlay has to be wired into each.
|
|
This is the regression guard for the whole bug class (a managed display.skin was
|
|
silently ignored by the TUI; the same gap existed in the gateway and cron).
|
|
"""
|
|
import textwrap
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture
|
|
def homes(tmp_path, monkeypatch):
|
|
home = tmp_path / "home"
|
|
home.mkdir()
|
|
managed = tmp_path / "managed"
|
|
managed.mkdir()
|
|
monkeypatch.setenv("HERMES_HOME", str(home))
|
|
monkeypatch.setenv("HERMES_MANAGED_DIR", str(managed))
|
|
import hermes_cli.config as cfg
|
|
from hermes_cli import managed_scope
|
|
|
|
cfg._LOAD_CONFIG_CACHE.clear()
|
|
cfg._RAW_CONFIG_CACHE.clear()
|
|
managed_scope.invalidate_managed_cache()
|
|
return home, managed
|
|
|
|
|
|
def _seed(home, managed, *, user, mgd):
|
|
(home / "config.yaml").write_text(textwrap.dedent(user), encoding="utf-8")
|
|
(managed / "config.yaml").write_text(textwrap.dedent(mgd), encoding="utf-8")
|
|
import hermes_cli.config as cfg
|
|
from hermes_cli import managed_scope
|
|
|
|
cfg._LOAD_CONFIG_CACHE.clear()
|
|
cfg._RAW_CONFIG_CACHE.clear()
|
|
managed_scope.invalidate_managed_cache()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_timezone_honors_managed(homes, monkeypatch):
|
|
home, managed = homes
|
|
# hermes_time checks an env override first; ensure it's unset so config wins.
|
|
monkeypatch.delenv("HERMES_TIMEZONE", raising=False)
|
|
monkeypatch.delenv("TZ", raising=False)
|
|
_seed(home, managed, user="timezone: America/New_York\n", mgd="timezone: Asia/Tokyo\n")
|
|
import hermes_time
|
|
|
|
assert hermes_time._resolve_timezone_name() == "Asia/Tokyo"
|
|
|
|
|
|
def test_gateway_env_bridge_honors_managed(homes, monkeypatch):
|
|
"""The gateway config→env bridge must bridge MANAGED values, not user ones.
|
|
|
|
gateway/run.py bridges config.yaml settings into os.environ at startup and on
|
|
every turn (HERMES_TIMEZONE, HERMES_REDACT_SECRETS, HERMES_MAX_ITERATIONS,
|
|
...). A managed value must win at that env layer too — otherwise the bridge
|
|
writes the user's value into the env that the whole process then reads. This
|
|
is the regression that manual verification caught (managed timezone was
|
|
overridden by the user's value via the env bridge).
|
|
|
|
We assert on the managed-overlaid config the bridge consumes (rather than the
|
|
os.environ side effect, which leaks across same-process tests under the
|
|
runner) — the bridge writes whatever this dict carries, so a managed value
|
|
here proves the env var gets the managed value.
|
|
"""
|
|
home, managed = homes
|
|
_seed(home, managed, user="timezone: America/New_York\n", mgd="timezone: Asia/Tokyo\n")
|
|
from hermes_cli import managed_scope
|
|
|
|
managed_scope.invalidate_managed_cache()
|
|
# The bridge loads config.yaml, expands env, then applies this overlay before
|
|
# writing HERMES_TIMEZONE = cfg["timezone"]. Prove the overlay flips the value.
|
|
import hermes_yaml as yaml
|
|
|
|
raw = yaml.safe_load((home / "config.yaml").read_text())
|
|
bridged = managed_scope.apply_managed_overlay(raw)
|
|
assert bridged.get("timezone") == "Asia/Tokyo"
|