Skip to content

The agent that grows with you

fix(desktop-update): after a partial close, hand the Desktop only the holders still in the way

Teknium7f0c195764c2
diff --git a/hermes_cli/desktop_release_holders.py b/hermes_cli/desktop_release_holders.py
index aeaba51b070..1b9cf24efc9 100644
--- a/hermes_cli/desktop_release_holders.py
+++ b/hermes_cli/desktop_release_holders.py
@@ -201,8 +201,10 @@ def release_after_refused_rename(
holders = find_release_cwd_holders(release_dir)
if not holders:
return [], []
+ # Human lines only: the machine lines go out once, for the holders still in the way when the
+ # swap is given up (describe_block), so a holder closed here is not offered to the Desktop again.
for holder in holders:
- print(f" {holder.holder_line()}")
+ print(f" {holder.describe()}")
chosen = [h for h in holders if consent.covers(h)]
# A holder whose program path cannot be read is usually protected (another user, elevated):
# it cannot be closed from here either, so the user closes it themselves.
@@ -221,10 +223,12 @@ def release_after_refused_rename(
def describe_block(holders: list[ReleaseHolder], release_dir: Path) -> str:
+ """The final report of a refused swap; ``holders`` are the ones still holding the folder."""
names = ", ".join(h.describe() for h in holders)
pids = " ".join(f"/PID {h.pid}" for h in holders)
return (
- f"✗ Windows would not replace the desktop app: {names} is using a folder inside {release_dir}.\n"
+ "".join(f" {h.holder_line()}\n" for h in holders)
+ + f"✗ Windows would not replace the desktop app: {names} is using a folder inside {release_dir}.\n"
f" It is not part of Hermes, so it was left running. Close it (Task Manager, or `taskkill {pids}`)\n"
" and run `hermes desktop --force-build`, or run Update now in Hermes Desktop and choose to close it."
)
diff --git a/tests/hermes_cli/test_desktop_release_holder_windows_live.py b/tests/hermes_cli/test_desktop_release_holder_windows_live.py
index d73c560f07f..43083a81deb 100644
--- a/tests/hermes_cli/test_desktop_release_holder_windows_live.py
+++ b/tests/hermes_cli/test_desktop_release_holder_windows_live.py
@@ -18,7 +18,7 @@ from pathlib import Path
import psutil
import pytest
-from hermes_cli import main_desktop
+from hermes_cli import desktop_release_holders, main_desktop
pytestmark = pytest.mark.platforms("windows")
@@ -110,3 +110,37 @@ def test_consented_retry_closes_exactly_the_holder_and_promotes(swap_fixture, ca
assert not [p.pid for p in tree if p.is_running()]
assert not consent.exists(), "a consent covers one retry only"
assert "Closed with your consent: " in capsys.readouterr().out
+
+
+def test_a_partial_close_reports_only_the_holder_still_in_the_way(swap_fixture, tmp_path, capsys, monkeypatch):
+ """The consented holder closes but a protected one keeps the folder: the machine lines
+ windows.ps1 hands the Desktop must name only the protected one, or the next dialog offers
+ to close a program that already exited."""
+ desktop_dir, staging, live_root, helper = swap_fixture
+ _consent, closed_tree = _consent_for_run(desktop_dir, helper, "desktop-retry-1")
+ protected = subprocess.Popen(
+ [sys.executable, str(tmp_path / "foreign_helper.py")], cwd=live_root, stdout=subprocess.PIPE,
+ text=True, encoding="utf-8", creationflags=getattr(subprocess, "CREATE_NO_WINDOW", 0),
+ )
+ try:
+ assert protected.stdout.readline().strip() == "ready"
+ protected_pids = {protected.pid, *(p.pid for p in psutil.Process(protected.pid).children(recursive=True))}
+ real_exe = desktop_release_holders._exe_or_empty
+ # What psutil answers for a protected process (elevated, another user's): no program path.
+ monkeypatch.setattr(desktop_release_holders, "_exe_or_empty",
+ lambda proc: "" if proc.pid in protected_pids else real_exe(proc))
+ monkeypatch.setenv("HERMES_UPDATE_CORRELATION_ID", "desktop-retry-1")
+
+ promoted, error = _promote(desktop_dir, staging)
+
+ assert promoted is None and f"pid {protected.pid}" in error, error
+ assert helper.wait(10) is not None
+ reported = {int(ln.split("(pid ", 1)[1].split(",", 1)[0])
+ for ln in capsys.readouterr().out.splitlines() if "Desktop app folder held by: " in ln}
+ assert protected.pid in reported, reported
+ assert not reported & {p.pid for p in closed_tree}, f"an exited holder was reported again: {reported}"
+ assert (live_root / "Hermes.exe").read_text(encoding="utf-8") == "old"
+ finally:
+ for proc in [*psutil.Process(protected.pid).children(recursive=True), psutil.Process(protected.pid)]:
+ proc.kill()
+ protected.wait(10)
diff --git a/tests/hermes_cli/test_desktop_release_holders.py b/tests/hermes_cli/test_desktop_release_holders.py
index 8d1487b366d..2df46c8e01e 100644
--- a/tests/hermes_cli/test_desktop_release_holders.py
+++ b/tests/hermes_cli/test_desktop_release_holders.py
@@ -89,8 +89,7 @@ def test_a_consent_closes_only_what_the_user_saw_in_the_run_it_was_given_for(hol
holders, closed = release_after_refused_rename(release, consent=consent, input_fn=_never_asked)
assert proc.pid in [h.pid for h in holders], case
assert closed == [] and proc.poll() is None, f"closed without consent ({case})"
- line = f"Desktop app folder held by: {psutil.Process(proc.pid).name()} (pid {proc.pid}, started {started:.3f}, "
- assert line in capsys.readouterr().out
+ assert f"{psutil.Process(proc.pid).name()} (pid {proc.pid}, " in capsys.readouterr().out
_desktop_consent(release, proc, "desktop-retry-1")
_holders, closed = release_after_refused_rename(
@@ -115,6 +114,7 @@ def test_a_holder_whose_program_path_is_unreadable_is_left_for_the_user(holder,
assert proc.pid in [h.pid for h in holders] and closed == []
assert proc.poll() is None
- out = capsys.readouterr().out
- assert f"(pid {proc.pid}, started " in out and "path unreadable)" in out
- assert f"(pid {proc.pid}) yourself" in out
+ assert f"(pid {proc.pid}) yourself" in capsys.readouterr().out
+ line = next(ln for ln in desktop_release_holders.describe_block(holders, release).splitlines()
+ if f"(pid {proc.pid}, started " in ln)
+ assert line.endswith("path unreadable)")