679e9cd294
The installer staged the hermes/hermes-acp launcher copies at
hermes-agent\bin -- inside the git working tree -- and put that dir on
the user PATH (#84452). The update command's pre-pull autostash
(git stash push --include-untracked) swept those untracked, unignored
copies off disk, and once the desktop updater stopped re-applying
stashes (--keep-stash, 5dd221d442) nothing restored them: `hermes`
stopped resolving in every new terminal on every desktop-updated
install.
Move the canonical launcher home to the managed binary dir
(%LOCALAPPDATA%\hermes\bin, next to the managed uv) -- outside the
checkout, where no git operation can ever touch it. The dir is
per-machine and shared by every profile, so all anchoring uses
get_default_hermes_root(), never HERMES_HOME (which points inside
profiles\<name> under `hermes -p`).
The copy design also had a second latent break: managed-uv rebuilds
create relocatable venvs, and a relocatable venv's exe trampoline
resolves relative to its own location -- a copy outside venv\Scripts
dies with 'uv trampoline failed to canonicalize script path'. Launcher
form now depends on the venv (lockstep in install.ps1 and
_install_repair.py): exe copy for normal venvs, a .cmd delegator
invoking the in-venv exe by absolute path for relocatable ones. Either
form counts as present, so pre-rebuild exe copies are left alone.
Delivery to the existing fleet, per cohort:
- already-broken installs cannot run the CLI, so an import-time heal in
hermes_cli.main (ensure_windows_bin_launchers) re-stages missing
launchers when the desktop app spawns its backend -- the one channel
that still reaches them. Gates fail toward inaction: canonical dir
only for the managed clone, legacy hermes-agent\bin only while the
user PATH still resolves through it (some pre-managed-uv installs
have no hermes\bin PATH entry; the legacy re-stage is what fixes
those). Staging-name + os.replace keeps concurrent process starts
from tearing a launcher; the helper never raises.
- healthy old-layout installs migrate in the update tail
(migrate_windows_bin_path): stage canonical launchers, verify them
BEFORE touching the registry, prepend hermes\bin to the user PATH,
strip the legacy entries (hermes-agent\bin and venv\Scripts, #83797),
preserving REG_EXPAND_SZ and raw %VARS%. The legacy dir's files stay
on purpose -- configs holding absolute launcher paths keep working;
only the sweepable PATH resolution route goes.
- fresh installs get the new layout from install.ps1 directly.
/bin/ is gitignored so the one update that DELIVERS this fix cannot
sweep pre-migration launchers a final time under the old rules; the
gitignore line, the legacy re-stage branch, and the update-tail call
are transition machinery with a named expiry once the fleet has
migrated.
Also rewrites _ensure_acp_launcher's stale Windows paragraph to match
(raw docstring fixes its invalid \S escape) and updates the Windows
native docs to the new layout, with a docs<->installer parity test.
23 lines
1.1 KiB
Python
23 lines
1.1 KiB
Python
from pathlib import Path
|
|
|
|
|
|
def test_windows_native_install_path_docs_match_installer() -> None:
|
|
doc = Path("website/docs/user-guide/windows-native.md").read_text()
|
|
install = Path("scripts/install.ps1").read_text()
|
|
|
|
# The launchers live in the managed binary dir OUTSIDE the git checkout
|
|
# (HERMES_HOME\bin, next to the managed uv) — NOT the whole venv\Scripts
|
|
# (which would shadow the user's python, #83797) and NOT a dir inside
|
|
# the checkout (which `hermes update`'s autostash swept off disk).
|
|
assert "%LOCALAPPDATA%\\hermes\\bin" in doc
|
|
assert (
|
|
"Get-Command hermes # should print "
|
|
"C:\\Users\\<you>\\AppData\\Local\\hermes\\bin\\hermes.exe"
|
|
) in doc
|
|
# Installer exposes $HermesHome\bin, and must copy the launchers into it.
|
|
assert '$hermesBin = "$HermesHome\\bin"' in install
|
|
assert "hermes.exe" in install and "hermes-acp.exe" in install
|
|
# Guard against regressions to either legacy layout.
|
|
assert '$hermesBin = "$InstallDir\\venv\\Scripts"' not in install
|
|
assert '$hermesBin = "$InstallDir\\bin"' not in install
|