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.
91 lines
4.4 KiB
Python
91 lines
4.4 KiB
Python
"""Session-only tools ingress and rebuild failure preserve profile isolation."""
|
|
import threading
|
|
from types import SimpleNamespace
|
|
|
|
import pytest
|
|
import hermes_yaml as yaml
|
|
|
|
|
|
@pytest.mark.parametrize("explicit_profile", [None, "default"])
|
|
def test_tools_configure_uses_live_session_profile(tmp_path, monkeypatch, explicit_profile):
|
|
from tui_gateway import server
|
|
from hermes_constants import get_hermes_home
|
|
|
|
home = tmp_path / ".hermes"
|
|
profile = home / "profiles" / "worker"
|
|
profile.mkdir(parents=True)
|
|
monkeypatch.setenv("HERMES_HOME", str(home))
|
|
monkeypatch.setattr("pathlib.Path.home", lambda: tmp_path)
|
|
config = {"platform_toolsets": {"cli": ["terminal", "web"]}}
|
|
for path in (home, profile):
|
|
(path / "config.yaml").write_text(yaml.safe_dump(config))
|
|
launch_before = (home / "config.yaml").read_bytes()
|
|
seen = []
|
|
monkeypatch.setattr(server, "_reset_session_agent", lambda *_: seen.append(get_hermes_home()) or {})
|
|
monkeypatch.setitem(server._sessions, "profile-tools", {"profile_home": str(profile)})
|
|
params = {"session_id": "profile-tools", "action": "disable", "names": ["terminal"]}
|
|
if explicit_profile is not None:
|
|
params["profile"] = explicit_profile
|
|
response = server._methods["tools.configure"](1, params)
|
|
assert "error" not in response
|
|
assert (home / "config.yaml").read_bytes() == launch_before
|
|
assert "terminal" not in yaml.safe_load((profile / "config.yaml").read_text())["platform_toolsets"]["cli"]
|
|
assert seen == [profile]
|
|
assert get_hermes_home() == home
|
|
worker_before = (profile / "config.yaml").read_bytes()
|
|
monkeypatch.delitem(server._sessions, "profile-tools")
|
|
response = server._methods["tools.configure"](2, params)
|
|
assert response["error"]["code"] == 4001
|
|
assert (home / "config.yaml").read_bytes() == launch_before
|
|
assert (profile / "config.yaml").read_bytes() == worker_before
|
|
response = server._methods["tools.configure"](3, {"action": "disable", "names": ["terminal"]})
|
|
assert "error" not in response and not response["result"]["reset"]
|
|
assert (home / "config.yaml").read_bytes() != launch_before
|
|
assert (profile / "config.yaml").read_bytes() == worker_before
|
|
|
|
|
|
@pytest.mark.parametrize("path", ["reset", "capabilities"])
|
|
@pytest.mark.parametrize("has_agent_db", [True, False])
|
|
def test_rebuild_preparation_failure_keeps_reachable_owner(tmp_path, monkeypatch, path, has_agent_db):
|
|
from tui_gateway import server
|
|
from hermes_state import SessionDB
|
|
from hermes_constants import get_hermes_home
|
|
|
|
home = tmp_path / ".hermes"
|
|
profile = home / "profiles" / "worker"
|
|
profile.mkdir(parents=True)
|
|
monkeypatch.setenv("HERMES_HOME", str(home))
|
|
monkeypatch.setattr("pathlib.Path.home", lambda: tmp_path)
|
|
db = SessionDB(db_path=profile / "state.db")
|
|
old = SimpleNamespace(_session_db=db if has_agent_db else None,
|
|
_owns_session_db=has_agent_db, _session_title_hint="Bot Chat")
|
|
session = {"agent": old, "profile_home": str(profile), "session_key": "profile-key",
|
|
"bot_caps_seen": "before", "source": "desktop", "cwd": str(tmp_path),
|
|
"history": [], "history_lock": threading.Lock(), "history_version": 0}
|
|
built = []
|
|
def make_agent(*_args, session_db=None, **_kwargs):
|
|
replacement = SimpleNamespace(_session_db=session_db, _owns_session_db=False)
|
|
built.append(replacement)
|
|
return replacement
|
|
def fail_config():
|
|
raise RuntimeError("preparation failed")
|
|
monkeypatch.setattr(server, "_make_agent", make_agent)
|
|
monkeypatch.setattr(server, "_config_model_target", fail_config)
|
|
monkeypatch.setattr("tools.bot_mode_probe.capability_fingerprint", lambda _: "after")
|
|
try:
|
|
if path == "reset":
|
|
with pytest.raises(RuntimeError, match="preparation failed"):
|
|
server._reset_session_agent("profile-tools", session)
|
|
else:
|
|
server._sync_bot_capabilities("profile-tools", session)
|
|
assert session["agent"] is old
|
|
assert old._owns_session_db is has_agent_db
|
|
assert not built, "prepare config before allocating a replacement"
|
|
assert get_hermes_home() == home
|
|
db.create_session("still-owned", "tui")
|
|
finally:
|
|
db.close()
|
|
for agent in built:
|
|
if agent._session_db is not db and agent._owns_session_db:
|
|
agent._session_db.close()
|