From 4e4c7c0b48578be59cd0137c0c63193784297073 Mon Sep 17 00:00:00 2001
From: teknium1 <127238744+teknium1@users.noreply.github.com>
Date: Wed, 5 Aug 2026 17:11:57 -0700
Subject: [PATCH] =?UTF-8?q?fix:=20resolve=20semantic=20merge=20conflict=20?=
 =?UTF-8?q?=E2=80=94=20startHermes=20update-wait=20moved=20into=20runPrima?=
 =?UTF-8?q?ryBackendStartup=20(waitForLocalStart);=20drop=20duplicated=20w?=
 =?UTF-8?q?aitForUpdateToFinish=20call,=20keep=20login-shell=20PATH=20merg?=
 =?UTF-8?q?e=20before=20backend=20resolve?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/desktop/electron/main.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/apps/desktop/electron/main.ts b/apps/desktop/electron/main.ts
index 9f2bf386b1db2..de5346fa2d18b 100644
--- a/apps/desktop/electron/main.ts
+++ b/apps/desktop/electron/main.ts
@@ -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