From ff38bbeeeb64c7f2faaae54430b5bfa3a2f5435f Mon Sep 17 00:00:00 2001
From: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Date: Tue, 12 May 2026 16:39:56 +0800
Subject: [PATCH] refactor(desktop): remove configureEnv callback from
 spawnLocalServer (#27022)

---
 packages/desktop/src/main/index.ts  | 28 +++++++++++-----------------
 packages/desktop/src/main/server.ts |  2 --
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/packages/desktop/src/main/index.ts b/packages/desktop/src/main/index.ts
index 1b624800e8..23f2d7027a 100644
--- a/packages/desktop/src/main/index.ts
+++ b/packages/desktop/src/main/index.ts
@@ -291,25 +291,19 @@ const main = Effect.gen(function* () {
       if (mainWindow) sendSqliteMigrationProgress(mainWindow, progress)
     })
 
+    ensureLoopbackNoProxy()
+    useEnvProxy()
+
     logger.log("spawning sidecar", { url })
     const { listener, health } = yield* Effect.promise(() =>
-      spawnLocalServer(
-        hostname,
-        port,
-        password,
-        () => {
-          ensureLoopbackNoProxy()
-          useEnvProxy()
-        },
-        {
-          needsMigration,
-          userDataPath: app.getPath("userData"),
-          onSqliteProgress: (progress) => initEmitter.emit("sqlite", progress),
-          onStdout: (message) => logger.log("sidecar stdout", { message }),
-          onStderr: (message) => logger.warn("sidecar stderr", { message }),
-          onExit: (code) => logger.warn("sidecar exited", { code }),
-        },
-      ),
+      spawnLocalServer(hostname, port, password, {
+        needsMigration,
+        userDataPath: app.getPath("userData"),
+        onSqliteProgress: (progress) => initEmitter.emit("sqlite", progress),
+        onStdout: (message) => logger.log("sidecar stdout", { message }),
+        onStderr: (message) => logger.warn("sidecar stderr", { message }),
+        onExit: (code) => logger.warn("sidecar exited", { code }),
+      }),
     )
     server = listener
     yield* Deferred.succeed(serverReady, {
diff --git a/packages/desktop/src/main/server.ts b/packages/desktop/src/main/server.ts
index 909138b89c..cfdafdc67b 100644
--- a/packages/desktop/src/main/server.ts
+++ b/packages/desktop/src/main/server.ts
@@ -70,10 +70,8 @@ export async function spawnLocalServer(
   hostname: string,
   port: number,
   password: string,
-  configureEnv: () => void,
   options: SpawnLocalServerOptions,
 ) {
-  configureEnv?.()
   const sidecar = join(dirname(fileURLToPath(import.meta.url)), "sidecar.js")
   const child = utilityProcess.fork(sidecar, [], {
     cwd: process.cwd(),