The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(gateway): a stale PID file beside a held lock no longer aborts the update
686f6c61e92b507ec5a9
diff --git a/gateway/status.py b/gateway/status.pyindex ab160695016..10ee84c013e 100644--- a/gateway/status.py+++ b/gateway/status.py@@ -2043,7 +2043,19 @@ def get_running_pid_identity_strict(pid_path: Path) -> Optional[tuple[int, float# gateway.pid was unlinked (#110166) and --replace force-unlinks the old one (#123430). The# holder wrote its own identity into the lock at acquisition, so that record validated against# the live process below is the same proof — raising here blocked every following update.- records = (_read_pid_record(resolved_pid_path), lock_record) if pid_exists else (lock_record,)+ # A PID file whose process is gone is the same kind of noise when --replace rewrote the lock+ # but left the previous gateway's file behind (#143331): the dead record used to abort every+ # following `hermes update` at the pause stage. It drops out here; a record naming a LIVE+ # process still has to agree with the lock below, so two live identities stay ambiguous.+ pid_record = None+ if pid_exists:+ pid_record = _read_pid_record(resolved_pid_path)+ if pid_record is None:+ raise RuntimeError("gateway PID or lock metadata is malformed")+ recorded_pid = _pid_from_record(pid_record)+ if isinstance(recorded_pid, int) and recorded_pid > 0 and not _pid_exists(recorded_pid):+ pid_record = None+ records = (pid_record, lock_record) if pid_record is not None else (lock_record,)if not all(records):raise RuntimeError("gateway PID or lock metadata is malformed")pid = _pid_from_record(records[0])diff --git a/tests/gateway/test_status_strict_identity_live.py b/tests/gateway/test_status_strict_identity_live.pyindex b042f0c4c52..a69c9318df0 100644--- a/tests/gateway/test_status_strict_identity_live.py+++ b/tests/gateway/test_status_strict_identity_live.py@@ -20,6 +20,7 @@ import queueimport subprocessimport sysimport threading+import timefrom contextlib import suppressfrom pathlib import Path@@ -98,6 +99,19 @@ def _make_home(root: Path) -> Path:return home+def _exited_pid() -> int:+ """A PID whose process has already exited: a leftover PID file, not a rival gateway."""+ child = subprocess.run([sys.executable, "-c", "import os; print(os.getpid())"],+ capture_output=True, text=True, timeout=60, check=False)+ pid = int(child.stdout.strip())+ for _ in range(100):+ if not psutil.pid_exists(pid):+ return pid+ time.sleep(0.05)+ pytest.fail(f"child {pid} is still alive after exit")+ return pid++@pytest.fixture(scope="class")def gateway_holder(tmp_path_factory):"""One live gateway-shaped lock holder for the class; each spawn costs about a second."""@@ -151,12 +165,46 @@ class TestStrictIdentityWithLiveLock:def test_pid_file_that_disagrees_with_the_lock_still_aborts(self, home, gateway_holder):record = json.loads((home / "gateway.pid").read_text(encoding="utf-8-sig"))- record["pid"] = gateway_holder[1] + 1+ # A LIVE second identity: the disagreement is real, not a leftover file.+ record["pid"] = os.getpid()(home / "gateway.pid").write_text(json.dumps(record), encoding="utf-8")with pytest.raises(RuntimeError, match="disagree"):status.get_running_pid_identity_strict(home / "gateway.pid")+ def test_stale_pid_file_beside_a_held_lock_resolves_from_the_lock_record(+ self, home, gateway_holder,+ ):+ record = json.loads((home / "gateway.pid").read_text(encoding="utf-8-sig"))+ record["pid"] = _exited_pid()+ (home / "gateway.pid").write_text(json.dumps(record), encoding="utf-8")++ identity = status.get_running_pid_identity_strict(home / "gateway.pid")++ assert identity is not None+ assert identity[0] == gateway_holder[1]++ def test_updater_discovery_maps_the_profile_with_a_stale_pid_file(+ self, home, gateway_holder, monkeypatch,+ ):+ from hermes_cli.gateway import find_profile_gateway_processes++ monkeypatch.setattr("hermes_cli.profiles._get_default_hermes_home", lambda: home)+ monkeypatch.setattr("hermes_cli.profiles._get_profiles_root", lambda: home / "no-profiles")+ record = json.loads((home / "gateway.pid").read_text(encoding="utf-8-sig"))+ record["pid"] = _exited_pid()+ (home / "gateway.pid").write_text(json.dumps(record), encoding="utf-8")++ procs = find_profile_gateway_processes(strict=True)++ assert [(Path(p.path).resolve(), p.pid) for p in procs] == [(home.resolve(), gateway_holder[1])]++ def test_malformed_pid_file_beside_a_held_lock_still_aborts(self, home):+ (home / "gateway.pid").write_text("not a record", encoding="utf-8")++ with pytest.raises(RuntimeError, match="malformed"):+ status.get_running_pid_identity_strict(home / "gateway.pid")+def test_garbled_lock_record_without_pid_file_still_aborts(self, home):(home / "gateway.pid").unlink()with open(home / "gateway.lock", "r+b") as handle: