mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-09 03:11:58 +00:00
3601e20f47
Three real bugs from teknium1's first Windows install run:
1. **MinGit has no bash.exe.** MinGit is the minimal-automation Git for Windows
distribution — it ships git.exe but deliberately strips bash and the POSIX
coreutils. Installer logged "Could not locate bash.exe" and Hermes would
fail to run any shell command. Switched to PortableGit — the full Git for
Windows minus the installer UI. PortableGit ships bash.exe at
<root>\bin\bash.exe plus sh, awk, sed, grep, curl, ssh in usr\bin\. ARM64
variant is detected separately (PortableGit-*-arm64.7z.exe). 32-bit falls
back to MinGit-32-bit with a warning (PortableGit is 64-bit only).
PortableGit ships as a 7z self-extractor (56MB vs MinGit's 38MB). We
invoke it with `-o<target> -y` to extract silently — no 7z install needed,
it's self-contained.
Updated tools/environments/local.py::_find_bash candidate order to prefer
the PortableGit layout (<root>\bin\bash.exe) with the MinGit layout
(<root>\usr\bin\bash.exe) as a fallback so existing installs keep working.
2. **os.execvp "Exec format error" on Windows.** Setup wizard's "Launch
hermes chat now? Y" called `os.execvp(["hermes", "chat"])` which on
Windows can only swap to real Win32 .exe files — chokes with OSError(8)
on .cmd batch shims and Python console-script wrappers. Added a
win32 branch in hermes_cli/relaunch.py::relaunch() that uses
subprocess.run + sys.exit — functionally identical (user sees "hermes
exited, then new hermes started") with one extra PID in play. POSIX
path is UNCHANGED — still uses os.execvp for in-place replacement.
Catches OSError in the Windows branch and surfaces a "open a new
terminal so PATH picks up, then re-run hermes" hint instead of a
cryptic traceback.
3. **npm install failures silent on Windows.** The install.ps1 was invoking
`npm install --silent 2>&1 | Out-Null` inside a try/catch. PowerShell's
try/catch does NOT trigger on non-zero process exit codes — only on
unhandled .NET exceptions — so npm failing printed a generic "npm
install failed" with zero information about WHY. The silent pipe ate
the stderr.
Rewrote Install-NodeDeps to:
- Resolve npm.cmd via Get-Command (respects PATHEXT) instead of
relying on bare `npm` name resolution.
- Use Start-Process with -PassThru to capture the actual exit code.
- Redirect stderr to a temp log and surface the first ~800 chars of
the real npm error when install fails, plus the log path for the
full text.
- Fail loudly with the right exit code instead of a misleading success.
- Bail cleanly with a helpful message when npm isn't on PATH at all.
4. **"True" printing to console after Node check.** `Test-Node` returns $true;
installer called it as a bare statement (no assignment, no cast). PowerShell
prints bare return values. Wrapped the call in `[void](Test-Node)`.
## Tests
- Added 3 new tests in tests/hermes_cli/test_relaunch.py covering the
Windows branch: subprocess is called (not execvp), child exit code
propagates, OSError surfaces a helpful message. All 23 tests pass
(20 existing + 3 new).
- 77 Windows-compat tests still pass, POSIX behaviour unchanged.
232 lines
No EOL
9.6 KiB
Python
232 lines
No EOL
9.6 KiB
Python
"""Tests for hermes_cli.relaunch — unified self-relaunch utility."""
|
|
|
|
import sys
|
|
|
|
import pytest
|
|
|
|
from hermes_cli import relaunch as relaunch_mod
|
|
|
|
|
|
class TestResolveHermesBin:
|
|
def test_prefers_absolute_argv0_when_executable(self, monkeypatch):
|
|
fake = "/nix/store/abc/bin/hermes"
|
|
monkeypatch.setattr(sys, "argv", [fake])
|
|
monkeypatch.setattr(relaunch_mod.os.path, "isfile", lambda p: p == fake)
|
|
monkeypatch.setattr(relaunch_mod.os, "access", lambda p, mode: p == fake)
|
|
assert relaunch_mod.resolve_hermes_bin() == fake
|
|
|
|
def test_resolves_relative_argv0(self, monkeypatch, tmp_path):
|
|
fake = tmp_path / "hermes"
|
|
fake.write_text("#!/bin/sh\n")
|
|
fake.chmod(0o755)
|
|
monkeypatch.setattr(sys, "argv", [str(fake.name)])
|
|
monkeypatch.chdir(tmp_path)
|
|
# Ensure we don't accidentally match a real 'hermes' on PATH
|
|
monkeypatch.setattr(relaunch_mod.shutil, "which", lambda _name: None)
|
|
assert relaunch_mod.resolve_hermes_bin() == str(fake)
|
|
|
|
def test_falls_back_to_path_which(self, monkeypatch):
|
|
monkeypatch.setattr(sys, "argv", ["-c"]) # not a real path
|
|
monkeypatch.setattr(
|
|
relaunch_mod.shutil, "which", lambda name: "/usr/bin/hermes" if name == "hermes" else None
|
|
)
|
|
assert relaunch_mod.resolve_hermes_bin() == "/usr/bin/hermes"
|
|
|
|
def test_returns_none_when_unresolvable(self, monkeypatch):
|
|
monkeypatch.setattr(sys, "argv", ["-c"])
|
|
monkeypatch.setattr(relaunch_mod.shutil, "which", lambda _name: None)
|
|
assert relaunch_mod.resolve_hermes_bin() is None
|
|
|
|
|
|
class TestExtractInheritedFlags:
|
|
def test_extracts_tui_and_dev(self):
|
|
argv = ["--tui", "--dev", "chat"]
|
|
assert relaunch_mod._extract_inherited_flags(argv) == ["--tui", "--dev"]
|
|
|
|
def test_extracts_profile_with_value(self):
|
|
argv = ["--profile", "work", "chat"]
|
|
assert relaunch_mod._extract_inherited_flags(argv) == ["--profile", "work"]
|
|
|
|
def test_extracts_short_p_with_value(self):
|
|
argv = ["-p", "work"]
|
|
assert relaunch_mod._extract_inherited_flags(argv) == ["-p", "work"]
|
|
|
|
def test_extracts_equals_form(self):
|
|
argv = ["--profile=work", "--model=anthropic/claude-sonnet-4"]
|
|
assert relaunch_mod._extract_inherited_flags(argv) == [
|
|
"--profile=work",
|
|
"--model=anthropic/claude-sonnet-4",
|
|
]
|
|
|
|
def test_skips_unknown_flags(self):
|
|
argv = ["--foo", "bar", "--tui"]
|
|
assert relaunch_mod._extract_inherited_flags(argv) == ["--tui"]
|
|
|
|
def test_does_not_consume_flag_like_value(self):
|
|
argv = ["--tui", "--resume", "abc123"]
|
|
assert relaunch_mod._extract_inherited_flags(argv) == ["--tui"]
|
|
|
|
def test_preserves_multiple_skills(self):
|
|
argv = ["-s", "foo", "-s", "bar", "--tui"]
|
|
assert relaunch_mod._extract_inherited_flags(argv) == ["-s", "foo", "-s", "bar", "--tui"]
|
|
|
|
|
|
class TestInheritedFlagTable:
|
|
"""Sanity-check the argparse-introspected table that drives extraction."""
|
|
|
|
def test_short_and_long_aliases_are_paired(self):
|
|
table = dict(relaunch_mod._INHERITED_FLAGS_TABLE)
|
|
# Each pair declared together in the parser shares takes_value.
|
|
for short, long_ in [
|
|
("-p", "--profile"),
|
|
("-m", "--model"),
|
|
("-s", "--skills"),
|
|
]:
|
|
assert table[short] == table[long_], f"{short}/{long_} disagree"
|
|
|
|
def test_store_true_flags_do_not_take_value(self):
|
|
table = dict(relaunch_mod._INHERITED_FLAGS_TABLE)
|
|
for flag in ["--tui", "--dev", "--yolo", "--ignore-user-config", "--ignore-rules"]:
|
|
assert table[flag] is False, f"{flag} should not take a value"
|
|
|
|
def test_value_flags_take_value(self):
|
|
table = dict(relaunch_mod._INHERITED_FLAGS_TABLE)
|
|
for flag in ["--profile", "--model", "--provider", "--skills"]:
|
|
assert table[flag] is True, f"{flag} should take a value"
|
|
|
|
def test_excluded_flags_are_not_inherited(self):
|
|
table = dict(relaunch_mod._INHERITED_FLAGS_TABLE)
|
|
# --worktree creates a new worktree per process; inheriting would
|
|
# orphan the parent's. Chat-only flags (--quiet/-Q, --verbose/-v,
|
|
# --source) can't be in argv at the existing relaunch callsites.
|
|
for flag in ["-w", "--worktree", "-Q", "--quiet", "-v", "--verbose", "--source"]:
|
|
assert flag not in table, f"{flag} should not be inherited"
|
|
|
|
|
|
class TestBuildRelaunchArgv:
|
|
def test_uses_bin_when_available(self, monkeypatch):
|
|
monkeypatch.setattr(relaunch_mod, "resolve_hermes_bin", lambda: "/usr/bin/hermes")
|
|
argv = relaunch_mod.build_relaunch_argv(["--resume", "abc"])
|
|
assert argv[0] == "/usr/bin/hermes"
|
|
|
|
def test_falls_back_to_python_module(self, monkeypatch):
|
|
monkeypatch.setattr(relaunch_mod, "resolve_hermes_bin", lambda: None)
|
|
argv = relaunch_mod.build_relaunch_argv(["--resume", "abc"])
|
|
assert argv == [sys.executable, "-m", "hermes_cli.main", "--resume", "abc"]
|
|
|
|
def test_preserves_inherited_flags(self, monkeypatch):
|
|
monkeypatch.setattr(relaunch_mod, "resolve_hermes_bin", lambda: "/usr/bin/hermes")
|
|
original = ["--tui", "--dev", "--profile", "work", "sessions", "browse"]
|
|
argv = relaunch_mod.build_relaunch_argv(["--resume", "abc"], original_argv=original)
|
|
assert "--tui" in argv
|
|
assert "--dev" in argv
|
|
assert "--profile" in argv
|
|
assert "work" in argv
|
|
assert "--resume" in argv
|
|
assert "abc" in argv
|
|
# The original subcommand should not survive
|
|
assert "sessions" not in argv
|
|
assert "browse" not in argv
|
|
|
|
def test_can_disable_preserve(self, monkeypatch):
|
|
monkeypatch.setattr(relaunch_mod, "resolve_hermes_bin", lambda: "/usr/bin/hermes")
|
|
original = ["--tui", "chat"]
|
|
argv = relaunch_mod.build_relaunch_argv(
|
|
["--resume", "abc"], preserve_inherited=False, original_argv=original
|
|
)
|
|
assert "--tui" not in argv
|
|
assert argv == ["/usr/bin/hermes", "--resume", "abc"]
|
|
|
|
|
|
class TestRelaunch:
|
|
def test_calls_execvp(self, monkeypatch):
|
|
calls = []
|
|
|
|
def fake_execvp(path, argv):
|
|
calls.append((path, argv))
|
|
raise SystemExit(0)
|
|
|
|
monkeypatch.setattr(relaunch_mod.os, "execvp", fake_execvp)
|
|
monkeypatch.setattr(relaunch_mod, "resolve_hermes_bin", lambda: "/usr/bin/hermes")
|
|
|
|
with pytest.raises(SystemExit):
|
|
relaunch_mod.relaunch(["--resume", "abc"])
|
|
|
|
assert calls == [("/usr/bin/hermes", ["/usr/bin/hermes", "--resume", "abc"])]
|
|
|
|
def test_windows_uses_subprocess_not_execvp(self, monkeypatch):
|
|
"""On Windows, os.execvp raises OSError "Exec format error" when the
|
|
target is a .cmd shim or console-script wrapper (both common for
|
|
hermes). relaunch() must detect win32 and use subprocess.run +
|
|
sys.exit instead."""
|
|
monkeypatch.setattr(relaunch_mod.sys, "platform", "win32")
|
|
monkeypatch.setattr(relaunch_mod, "resolve_hermes_bin", lambda: r"C:\Users\test\hermes.exe")
|
|
|
|
import subprocess as _subprocess
|
|
|
|
captured_argv = []
|
|
|
|
def fake_subprocess_run(argv, **kwargs):
|
|
captured_argv.append(list(argv))
|
|
class _Result:
|
|
returncode = 0
|
|
return _Result()
|
|
|
|
monkeypatch.setattr(_subprocess, "run", fake_subprocess_run)
|
|
|
|
# execvp MUST NOT be called on Windows — route must go through subprocess
|
|
execvp_calls = []
|
|
|
|
def fake_execvp(*args, **kwargs):
|
|
execvp_calls.append(args)
|
|
raise AssertionError("os.execvp must not be called on Windows")
|
|
|
|
monkeypatch.setattr(relaunch_mod.os, "execvp", fake_execvp)
|
|
|
|
with pytest.raises(SystemExit) as exc_info:
|
|
relaunch_mod.relaunch(["chat"])
|
|
|
|
assert exc_info.value.code == 0
|
|
assert execvp_calls == []
|
|
assert captured_argv == [[r"C:\Users\test\hermes.exe", "chat"]]
|
|
|
|
def test_windows_propagates_child_exit_code(self, monkeypatch):
|
|
"""A non-zero exit from the child should flow through to sys.exit."""
|
|
monkeypatch.setattr(relaunch_mod.sys, "platform", "win32")
|
|
monkeypatch.setattr(relaunch_mod, "resolve_hermes_bin", lambda: r"C:\hermes.exe")
|
|
|
|
import subprocess as _subprocess
|
|
|
|
def fake_run(argv, **kwargs):
|
|
class _Result:
|
|
returncode = 42
|
|
return _Result()
|
|
|
|
monkeypatch.setattr(_subprocess, "run", fake_run)
|
|
monkeypatch.setattr(relaunch_mod.os, "execvp", lambda *a, **kw: None)
|
|
|
|
with pytest.raises(SystemExit) as exc_info:
|
|
relaunch_mod.relaunch(["chat"])
|
|
assert exc_info.value.code == 42
|
|
|
|
def test_windows_surfaces_oserror_with_help(self, monkeypatch, capsys):
|
|
"""When subprocess itself raises OSError (file-not-found / bad format),
|
|
we must NOT let it bubble up as a cryptic traceback — print a
|
|
user-readable hint and sys.exit(1)."""
|
|
monkeypatch.setattr(relaunch_mod.sys, "platform", "win32")
|
|
monkeypatch.setattr(relaunch_mod, "resolve_hermes_bin", lambda: r"C:\missing.exe")
|
|
|
|
import subprocess as _subprocess
|
|
|
|
def fake_run(argv, **kwargs):
|
|
raise OSError(2, "No such file or directory")
|
|
|
|
monkeypatch.setattr(_subprocess, "run", fake_run)
|
|
monkeypatch.setattr(relaunch_mod.os, "execvp", lambda *a, **kw: None)
|
|
|
|
with pytest.raises(SystemExit) as exc_info:
|
|
relaunch_mod.relaunch(["chat"])
|
|
assert exc_info.value.code == 1
|
|
err = capsys.readouterr().err
|
|
assert "relaunch failed" in err
|
|
assert "open a new terminal" in err.lower() or "path" in err.lower() |