mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
39975613b1
Second, deeper pass over tools/gateway/hermes_cli plus first pass over the trees wave 1 missed (acp, acp_adapter, skills, computer_use, docker, dashboard, conformance, monitoring, secret_sources, hermes_state, providers). Same rubric as wave 1 (AGENTS.md test policy); security, alternation/caching invariants, issue-number regressions, and E2E kept. Real test-quality fixes found and rooted out along the way: - tests/tools/test_command_guards.py made real auxiliary-LLM HTTPS calls (DEFAULT_CONFIG smart-approval leaked in) — pinned approval mode=manual via autouse fixture: 17.4s → 0.4s. - test_model_switch_custom_providers.py / test_user_providers_model_switch.py silently probed live provider catalogs (~2s/test) — stubbed cached_provider_model_ids/provider_model_ids/fetch_api_models. - test_telegram_noise_filter.py: 15-platform copy-paste matrix over shared gateway.run logic → 3 representative platforms (55s → 3.9s). - test_gateway_shutdown.py: stop()'s 5s interrupt-deadline loop spun on MagicMock agents — interrupt.side_effect now clears _running_agents (22s → 1.0s). - test_gateway_inactivity_timeout.py poll-harness timings shrunk 3-5x (24s → 1.1s); test_mcp_stability.py backoff/SIGTERM-grace sleeps patched (15.4s → 2.5s); test_async_delegation.py negative-drain wait 5s → 0.5s. - test_telegram_init_deadline.py: loop-block margin restored to 1.0s with rationale comment — the watchdog-dump assertion needs the loop blocked well past deadline+grace under parallel load (flaked once in the 40-worker verification run at a 0.2s margin). Verification: full hermetic suite via scripts/run_tests.sh — 2,438 files, 21,718 tests passed, 0 failed, 293.9s wall. Suite totals vs original baseline: 46,820 → 19,757 test functions (−57.8%), wall 583.5s → 293.9s (−50%), subprocess CPU 13,564s → 11,623s.
256 lines
11 KiB
Python
256 lines
11 KiB
Python
"""Regression tests for file-tool path resolution base correctness.
|
|
|
|
The bug (observed in a worktree dev session, May 2026): when the resolution
|
|
base for a relative path is itself RELATIVE — e.g. ``TERMINAL_CWD="."`` from a
|
|
stale config — ``_resolve_path_for_task`` resolved the path against the agent's
|
|
PROCESS cwd instead of the intended workspace. In a git-worktree session this
|
|
silently routed ``patch``/``write_file`` edits into the *main* checkout: the
|
|
write landed, self-verified, and reported success — against the wrong file.
|
|
The agent then grepped the worktree, saw nothing, and concluded the patch tool
|
|
had silently no-op'd. It hadn't; it wrote to the wrong place.
|
|
|
|
Core invariant these tests pin:
|
|
The resolution base for a relative path MUST always be absolute. A relative
|
|
``TERMINAL_CWD`` (``.``, ``./sub``, ``..``) must be anchored deterministically,
|
|
never left to resolve against whatever the process cwd happens to be.
|
|
"""
|
|
|
|
import os
|
|
from pathlib import Path, PurePosixPath
|
|
|
|
import pytest
|
|
|
|
import tools.file_tools as ft
|
|
import tools.terminal_tool as terminal_tool
|
|
|
|
|
|
@pytest.fixture
|
|
def _isolated_cwd(tmp_path, monkeypatch):
|
|
"""Two checkouts: workspace (intended) + decoy (process cwd)."""
|
|
workspace = tmp_path / "workspace"
|
|
decoy = tmp_path / "decoy"
|
|
workspace.mkdir()
|
|
decoy.mkdir()
|
|
(workspace / "target.py").write_text("WORKSPACE_ORIGINAL\n")
|
|
(decoy / "target.py").write_text("DECOY_ORIGINAL\n")
|
|
# Process cwd = decoy, analogous to "main repo" while the terminal is in
|
|
# the worktree.
|
|
monkeypatch.chdir(decoy)
|
|
# No session cwd recorded yet (fresh-session condition).
|
|
monkeypatch.setattr(terminal_tool, "_session_cwd", {})
|
|
return workspace, decoy
|
|
|
|
|
|
def test_relative_terminal_cwd_anchors_to_absolute_not_process_cwd(_isolated_cwd, monkeypatch):
|
|
"""TERMINAL_CWD='.' must NOT silently mean 'the agent process cwd'.
|
|
|
|
A relative base is meaningless as a resolution anchor. The resolver must
|
|
make it absolute deterministically. We assert the resolved path is
|
|
absolute and stable regardless of where os.getcwd() points.
|
|
"""
|
|
workspace, decoy = _isolated_cwd
|
|
# Poison config: literal relative '.'
|
|
monkeypatch.setenv("TERMINAL_CWD", ".")
|
|
|
|
resolved = ft._resolve_path_for_task("target.py", task_id="default")
|
|
|
|
assert resolved.is_absolute(), f"resolution base leaked a relative path: {resolved}"
|
|
# The exact anchor for a bare '.' is the process cwd resolved to absolute —
|
|
# that is acceptable as long as it is ABSOLUTE and stable. The bug was that
|
|
# a relative base produced surprising results; the fix is that the base is
|
|
# always absolutised. (We do not require it to point at the workspace here —
|
|
# that's what live-cwd tracking is for; see the next test.)
|
|
assert str(resolved) == str((Path(os.getcwd()) / "target.py").resolve())
|
|
|
|
|
|
def test_live_tracking_cwd_wins_over_relative_terminal_cwd(_isolated_cwd, monkeypatch):
|
|
"""When the terminal reports its absolute cwd, that is authoritative.
|
|
|
|
This is the real-world fix: the terminal's tracked absolute cwd (the
|
|
worktree) must override a stale relative TERMINAL_CWD so edits land where
|
|
the agent is actually working.
|
|
"""
|
|
workspace, decoy = _isolated_cwd
|
|
monkeypatch.setenv("TERMINAL_CWD", ".")
|
|
terminal_tool.record_session_cwd("default", str(workspace))
|
|
|
|
resolved = ft._resolve_path_for_task("target.py", task_id="default")
|
|
|
|
assert resolved == (workspace / "target.py")
|
|
|
|
|
|
def test_absolute_terminal_cwd_used_verbatim(_isolated_cwd, monkeypatch):
|
|
"""An absolute TERMINAL_CWD is the resolution base (no live tracking)."""
|
|
workspace, decoy = _isolated_cwd
|
|
monkeypatch.setenv("TERMINAL_CWD", str(workspace))
|
|
|
|
resolved = ft._resolve_path_for_task("target.py", task_id="default")
|
|
|
|
assert resolved == (workspace / "target.py")
|
|
|
|
|
|
def test_container_absolute_input_path_does_not_follow_host_symlink(tmp_path, monkeypatch):
|
|
"""Docker paths are sandbox-local and must not be host-dereferenced.
|
|
|
|
A user may have a host symlink at a container-looking path such as
|
|
``/workspace/projects``. For Docker file ops, resolving that symlink on the
|
|
host rewrites the path before Docker sees it, making file tools and terminal
|
|
disagree about where the file lives.
|
|
"""
|
|
host_project = tmp_path / "host-project"
|
|
host_project.mkdir()
|
|
container_mount = tmp_path / "workspace-projects"
|
|
container_mount.symlink_to(host_project, target_is_directory=True)
|
|
monkeypatch.setattr(terminal_tool, "_get_env_config", lambda: {"env_type": "docker"})
|
|
monkeypatch.setattr(terminal_tool, "_active_environments", {})
|
|
|
|
container_path = container_mount / "oilsands-sim" / "README.md"
|
|
resolved = ft._resolve_path_for_task(str(container_path), task_id="default")
|
|
|
|
assert resolved == container_path
|
|
assert resolved != (host_project / "oilsands-sim" / "README.md")
|
|
|
|
|
|
def test_container_path_normalization_uses_posix_path_syntax():
|
|
resolved = ft._normalize_without_host_deref("/workspace/projects/foo/../bar")
|
|
|
|
assert resolved == PurePosixPath("/workspace/projects/bar")
|
|
assert str(resolved) == "/workspace/projects/bar"
|
|
|
|
|
|
def test_container_relative_path_keeps_container_cwd_symlink(tmp_path, monkeypatch):
|
|
"""Relative Docker paths should stay under the container cwd textually."""
|
|
host_project = tmp_path / "host-project"
|
|
host_project.mkdir()
|
|
container_mount = tmp_path / "workspace-projects"
|
|
container_mount.symlink_to(host_project, target_is_directory=True)
|
|
monkeypatch.setattr(terminal_tool, "_get_env_config", lambda: {"env_type": "docker"})
|
|
monkeypatch.setattr(terminal_tool, "_active_environments", {})
|
|
terminal_tool.record_session_cwd("default", str(container_mount))
|
|
|
|
resolved = ft._resolve_path_for_task("oilsands-sim/README.md", task_id="default")
|
|
|
|
assert resolved == container_mount / "oilsands-sim" / "README.md"
|
|
assert resolved != host_project / "oilsands-sim" / "README.md"
|
|
|
|
|
|
class _DummyDockerEnvironment:
|
|
cwd = "/workspace"
|
|
cwd_owner = "default"
|
|
|
|
|
|
def test_resolution_base_always_absolute_no_terminal_cwd(_isolated_cwd, monkeypatch):
|
|
"""With TERMINAL_CWD unset, the base falls back to an ABSOLUTE process cwd."""
|
|
workspace, decoy = _isolated_cwd
|
|
monkeypatch.delenv("TERMINAL_CWD", raising=False)
|
|
|
|
resolved = ft._resolve_path_for_task("target.py", task_id="default")
|
|
|
|
assert resolved.is_absolute()
|
|
assert str(resolved) == str((Path(os.getcwd()) / "target.py").resolve())
|
|
|
|
|
|
# ── B-(ii): workspace-divergence warning ────────────────────────────────────
|
|
|
|
|
|
def test_warning_fires_when_relative_path_escapes_workspace(_isolated_cwd, monkeypatch):
|
|
"""Relative path resolving outside the live workspace must warn."""
|
|
workspace, decoy = _isolated_cwd
|
|
# Live cwd = workspace, but the relative path resolves to decoy (process cwd)
|
|
# because TERMINAL_CWD is the poison '.'. Simulate by recording workspace
|
|
# as the session cwd while the resolved path is under decoy.
|
|
terminal_tool.record_session_cwd("default", str(workspace))
|
|
resolved_in_decoy = decoy / "target.py"
|
|
|
|
warn = ft._path_resolution_warning("target.py", resolved_in_decoy, task_id="default")
|
|
|
|
assert warn is not None
|
|
assert "OUTSIDE the active workspace" in warn
|
|
assert str(decoy) in warn
|
|
assert str(workspace) in warn
|
|
|
|
|
|
# ── Fix C: sentinel TERMINAL_CWD + empty-registry worktree anchoring ─────────
|
|
# (May 2026 follow-up: PR #35399 made misroutes visible via resolved_path but
|
|
# the divergence warning only fired when the live terminal cwd was known. A
|
|
# worktree session whose terminal registry is still empty — no `cd` run yet —
|
|
# got neither a worktree anchor nor a warning, so a relative edit silently
|
|
# landed in main. These tests pin the sentinel handling + empty-registry
|
|
# anchoring + early warning.)
|
|
|
|
|
|
def test_warning_fires_from_terminal_cwd_when_registry_empty(_isolated_cwd, monkeypatch):
|
|
"""Divergence warning must fire even before any terminal command runs.
|
|
|
|
PR #35399's warning required a live terminal cwd; a fresh worktree session
|
|
(empty registry) silently misrouted with no warning. Now the warning falls
|
|
back to the absolute TERMINAL_CWD anchor, so an edit aimed outside the
|
|
worktree is flagged on the very first write.
|
|
"""
|
|
workspace, decoy = _isolated_cwd
|
|
monkeypatch.setattr(terminal_tool, "_session_cwd", {})
|
|
monkeypatch.setenv("TERMINAL_CWD", str(workspace))
|
|
|
|
# Relative path that escapes the worktree into the decoy/main checkout.
|
|
escaping = os.path.relpath(str(decoy / "target.py"), str(workspace))
|
|
resolved = ft._resolve_path_for_task(escaping, task_id="default")
|
|
|
|
warn = ft._path_resolution_warning(escaping, resolved, task_id="default")
|
|
|
|
assert warn is not None
|
|
assert "OUTSIDE the active workspace" in warn
|
|
assert str(workspace) in warn
|
|
|
|
|
|
# ── Fix A: write_file / patch report the resolved ABSOLUTE path ──────────────
|
|
|
|
|
|
# ── Cross-session isolation: one session's cwd never leaks into another ──────
|
|
# (June 2026 bug class: two desktop sessions, each on its own worktree, shared
|
|
# the single "default" terminal environment and could inherit each other's cwd.
|
|
# The per-session record store solves this structurally: each session's cd
|
|
# state lives in its own record, keyed by the raw session id.)
|
|
|
|
|
|
@pytest.fixture
|
|
def _two_worktree_sessions(tmp_path, monkeypatch):
|
|
"""Two worktree sessions: B has cd'd (record), both registered overrides."""
|
|
wt_a = tmp_path / "wt_a"
|
|
wt_b = tmp_path / "wt_b"
|
|
main = tmp_path / "main"
|
|
for d in (wt_a, wt_b, main):
|
|
d.mkdir()
|
|
(d / "target.py").write_text(f"{d.name}\n")
|
|
monkeypatch.chdir(main)
|
|
monkeypatch.delenv("TERMINAL_CWD", raising=False)
|
|
monkeypatch.setattr(terminal_tool, "_task_env_overrides", {})
|
|
monkeypatch.setattr(terminal_tool, "_session_cwd", {})
|
|
monkeypatch.setattr(ft, "_file_ops_cache", {})
|
|
# Both sessions register their worktree cwd (TUI/desktop registration path;
|
|
# registration seeds each session's record).
|
|
terminal_tool.register_task_env_overrides("sess-a", {"cwd": str(wt_a)})
|
|
terminal_tool.register_task_env_overrides("sess-b", {"cwd": str(wt_b)})
|
|
# Session B ran the last command; the shared env's live cwd is wt_b but
|
|
# only B's RECORD carries it.
|
|
monkeypatch.setattr(
|
|
terminal_tool,
|
|
"_active_environments",
|
|
{"default": _FakeEnv(str(wt_b))},
|
|
)
|
|
return wt_a, wt_b, main
|
|
|
|
|
|
class _FakeEnv:
|
|
def __init__(self, cwd: str):
|
|
self.cwd = cwd
|
|
|
|
|
|
def test_unregistered_session_never_inherits_another_sessions_record(
|
|
_two_worktree_sessions, monkeypatch
|
|
):
|
|
"""Session C: no record, no override. Must NOT inherit A's or B's cwd."""
|
|
wt_a, wt_b, main = _two_worktree_sessions
|
|
resolved = ft._resolve_path_for_task("target.py", task_id="sess-c")
|
|
assert not str(resolved).startswith(str(wt_a))
|
|
assert not str(resolved).startswith(str(wt_b))
|
|
assert resolved == (main / "target.py").resolve()
|