f3b1399211
Merge fallout (my resolution errors, all caught by CI): - hermes_cli/backup.py + gateway.py: `theirs` on those hunks re-imported clusters HEAD had already moved to backup_restore.py / kept in the facade. backup.py loses the 349-line duplicate (main's #110179 fix is ported into backup_restore._import_db_member); the systemd service-unit cluster returns to gateway.py (PM's _prepare_service_launcher / _pm_managed_node_dirs / _systemd_command have no home in main's extraction) with main's utf-8-sig read. gateway_service_unit.py is dropped. - gateway/run.py: main's plugin-update chore is not profile-scoped (the housekeeping ordering test pins the scope/drain sequence). - pyproject + 30 test files: `import yaml` -> `import hermes_yaml as yaml` (pm-clean has no pyyaml); gateway/config._bundled_platform_manifest_name reads through hermes_yaml. - tests re-seamed onto pm-clean's shape: residency admission (installed_engine), supervisor child env (binary is a constructor argument), update import guard (update_cmd_deps is gone; our probe already scrubs PYTHONPATH — both #115032 invariants pass), shallow-count git responses (stash path asks `status --porcelain -z`); dropped tests for retired code (_run_node_bootstrap/_ensure_tui_node, Windows resume demotion). - tests/tools/test_local_env_blocklist.py: restore the two helpers the suite-reduction commit dropped and the blocklist import. Real fixes: - pm: classify_uv_failure/ResolutionConflict move beside the uv runner (pm.environment, stdlib-only). pm.workspace imports tomllib at module level and cannot load on the 3.10 bootstrap python that streams uv output in the Docker arm64 image. - tools/browser_tool.warm_agent_browser_npx_cache: back as a permanent definition — it is on the frozen old-updater surface, and the revert-scheduled compat pointer does not count. - hermes_cli/memory_setup: the dashboard's pip row uses pm.environments. running_from_selected_environment for installed vs restart_required. - scripts/windows-build-deps.ps1: export DISTUTILS_USE_SDK/MSSdk so setuptools trusts the primed MSVC environment instead of asking vswhere (`env -i` test runner on win32-arm64 compiling ruamel-yaml-clib); run_tests.sh forwards them. - tests/pm/test_windows_build_deps.py: start the protocol test from a parent env without the toolchain variables the runner job already exports. - tests/conftest.py scrubs HERMES_BUNDLED_PLUGINS (Nix-wrapped hermes on the dev host); tests/home_io_guard.py treats sys.path site-packages under the real home as the interpreter's installation (PM-activated developer shell). - tests-js: four `curly` lint errors from main's new scripts.
50 lines
1.7 KiB
Python
50 lines
1.7 KiB
Python
"""`hermes vault sources --disable` must not crash on a hand-edited non-dict
|
|
``vault:`` section in config.yaml (the same YAML-shape hazard class
|
|
``_voice_cfg_dict`` guards for voice.*, #19835): the malformed section is
|
|
coerced to a dict before the opt-out is written."""
|
|
|
|
from types import SimpleNamespace
|
|
|
|
import hermes_yaml as yaml
|
|
|
|
from agent.vault_store import VaultStore
|
|
from hermes_cli.vault import _cmd_sources, vault_command
|
|
|
|
|
|
def _corrupt_vault(home):
|
|
store = VaultStore(home / "vault")
|
|
store.add_item(
|
|
"login",
|
|
"site",
|
|
{"identifier_type": "email", "identifier": "u", "password": "p"},
|
|
origin="https://x.example",
|
|
)
|
|
store._vault_path.write_bytes(store._fernet().encrypt(b"{not json"))
|
|
|
|
|
|
def test_sources_disable_tolerates_scalar_vault_section(tmp_path, monkeypatch):
|
|
home = tmp_path / ".hermes"
|
|
home.mkdir()
|
|
monkeypatch.setenv("HERMES_HOME", str(home))
|
|
(home / "config.yaml").write_text("vault: true\n")
|
|
|
|
_cmd_sources(SimpleNamespace(enable=None, disable="bitwarden"))
|
|
|
|
saved = yaml.safe_load((home / "config.yaml").read_text())
|
|
assert saved["vault"]["bitwarden"]["enabled"] is False
|
|
|
|
|
|
def test_vault_command_surfaces_corrupt_store_as_clean_error(tmp_path, monkeypatch, capsys):
|
|
"""A decryptable-but-malformed vault file surfaces through the VaultError
|
|
contract as a clean error line on every subcommand, not a traceback."""
|
|
home = tmp_path / ".hermes"
|
|
home.mkdir()
|
|
monkeypatch.setenv("HERMES_HOME", str(home))
|
|
_corrupt_vault(home)
|
|
|
|
vault_command(SimpleNamespace()) # bare `hermes vault` -> _cmd_list
|
|
|
|
out = capsys.readouterr().out
|
|
assert "Error" in out
|
|
assert "corrupted" in out
|