RomanNum3ral
/
hermes-agent
mirror of https://github.com/NousResearch/hermes-agent.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: resolve semantic merge conflict — startHermes update-wait moved into runPrimaryBackendStartup (waitForLocalStart); drop duplicated waitForUpdateToFinish call, keep login-shell PATH merge before backend resolve

This commit is contained in:
teknium1 2026-08-05 17:11:57 -07:00
parent 35f972978b
commit 4e4c7c0b48
No known key found for this signature in database
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/desktop/electron/main.ts
View File

@ -8433,14 +8433,6 @@ async function startHermes() {
// Resolve for the desktop's primary profile so a per-profile remote
// override on the active profile is honored (falls back to env / global).
// Mutual exclusion with an in-app update (#50238). If this instance was
// relaunched while the Tauri updater is still applying an update, spawning
// a local backend now re-locks the venv shim and gets killed by the
// updater's straggler cleanup — looping. Park until the update finishes (or
// is detected stale), THEN start the backend. Local backends only; remote
// connections returned above and never touch the install tree.
await waitForUpdateToFinish()
// GUI launches (Finder/Dock, desktop launchers) inherit a minimal PATH
// that skips the user's shell profiles. Merge the login-shell PATH into
// process.env BEFORE resolving the runtime or spawning the backend, so