The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(desktop): no self-relaunch carries the launcher's ready-pipe fd number into the new process
Teknium5ef8f6545804
diff --git a/apps/desktop/electron/app-relaunch.test.ts b/apps/desktop/electron/app-relaunch.test.tsnew file mode 100644index 00000000000..35ea31e5d45--- /dev/null+++ b/apps/desktop/electron/app-relaunch.test.ts@@ -0,0 +1,14 @@+import { expect, test } from 'vitest'++import { relaunchApp } from './app-relaunch'+import { LAUNCHER_READY_FD_ENV } from './linux-launcher-ready'++test('a self-relaunch never hands the launcher ready-pipe fd number to the new process', () => {+ const env: NodeJS.ProcessEnv = { [LAUNCHER_READY_FD_ENV]: '4', KEEP: '1' }+ const seen: Array<{ args?: string[]; carried: string | undefined }> = []++ relaunchApp({ relaunch: options => seen.push({ args: options.args, carried: env[LAUNCHER_READY_FD_ENV] }) }, { args: ['--disable-gpu'] }, env)++ expect(seen).toEqual([{ args: ['--disable-gpu'], carried: undefined }])+ expect(env.KEEP).toBe('1')+})diff --git a/apps/desktop/electron/app-relaunch.ts b/apps/desktop/electron/app-relaunch.tsnew file mode 100644index 00000000000..a349e6cae5d--- /dev/null+++ b/apps/desktop/electron/app-relaunch.ts@@ -0,0 +1,18 @@+import type { RelaunchOptions } from 'electron'++import { LAUNCHER_READY_FD_ENV } from './linux-launcher-ready'++interface RelaunchHost {+ relaunch(options: RelaunchOptions): void+}++/**+ * Every self-relaunch (GPU or sandbox fallback, update swap) goes through here.+ * The launcher's ready pipe is not inherited by the relaunched process, so a+ * carried `HERMES_DESKTOP_READY_FD` names whatever file reuses that descriptor+ * number there, and the reveal byte would be written into it.+ */+export function relaunchApp(host: RelaunchHost, options: RelaunchOptions, env: NodeJS.ProcessEnv = process.env): void {+ delete env[LAUNCHER_READY_FD_ENV]+ host.relaunch(options)+}diff --git a/apps/desktop/electron/main.ts b/apps/desktop/electron/main.tsindex ccde52f2924..b26fda126df 100644--- a/apps/desktop/electron/main.ts+++ b/apps/desktop/electron/main.ts@@ -55,6 +55,7 @@ import {} from './api-transport'import { appIconCandidates, resolveAppIcon, shouldOverrideDockIcon } from './app-icon'import { stageAppInstallerFile } from './app-installer-file'+import { relaunchApp } from './app-relaunch'import {appVersionInfo,type AppVersionInfo,@@ -925,7 +926,7 @@ const nvidiaEglRecovery = createNvidiaEglRecovery({},relaunch: extraArgs => {// The persisted witness selects ANGLE next launch; argv carries it only when unwritable.- app.relaunch({ args: [...process.argv.slice(1), ...extraArgs] })+ relaunchApp(app, { args: [...process.argv.slice(1), ...extraArgs] })void exitAfterBackendShutdown(0)}})@@ -1106,7 +1107,7 @@ if (IS_WINDOWS || process.platform === 'linux') {)try {- app.relaunch({ args: buildNoSandboxRelaunchArgs(process.argv.slice(1)) })+ relaunchApp(app, { args: buildNoSandboxRelaunchArgs(process.argv.slice(1)) })void exitAfterBackendShutdown(0)} catch (error) {console.error(`[hermes] --no-sandbox relaunch failed: ${error?.message || error}`)@@ -1158,7 +1159,7 @@ if (IS_WINDOWS || process.platform === 'linux') {)try {- app.relaunch({ args: buildNoSandboxRelaunchArgs(process.argv.slice(1)) })+ relaunchApp(app, { args: buildNoSandboxRelaunchArgs(process.argv.slice(1)) })void exitAfterBackendShutdown(0)} catch (error) {console.error(`[hermes] --no-sandbox relaunch failed: ${error?.message || error}`)@@ -1185,7 +1186,7 @@ if (IS_WINDOWS || process.platform === 'linux') {)try {- app.relaunch({ args: buildDisableGpuRelaunchArgs(process.argv.slice(1)) })+ relaunchApp(app, { args: buildDisableGpuRelaunchArgs(process.argv.slice(1)) })void exitAfterBackendShutdown(0)} catch (error) {console.error(`[hermes] --disable-gpu relaunch failed: ${error?.message || error}`)@@ -2862,7 +2863,7 @@ async function waitForUpdateToFinish() {running: INSTALL_STAMP,resourcesPath: process.resourcesPath,relaunch: extraArgs =>- app.relaunch({ args: [...buildNoSandboxRelaunchArgs(process.argv.slice(1)), ...extraArgs] }),+ relaunchApp(app, { args: [...buildNoSandboxRelaunchArgs(process.argv.slice(1)), ...extraArgs] }),exit: () => void exitAfterBackendShutdown(0),log: rememberLog})@@ -13890,7 +13891,7 @@ function createWindow() {)try {- app.relaunch({ args: buildDisableGpuRelaunchArgs(process.argv.slice(1)) })+ relaunchApp(app, { args: buildDisableGpuRelaunchArgs(process.argv.slice(1)) })void exitAfterBackendShutdown(0)} catch (err) {rememberLog(`[renderer] GPU-disable relaunch failed: ${err?.message || err}`)@@ -13944,7 +13945,7 @@ function createWindow() {rememberLog('[renderer] Windows sandbox crash loop detected; relaunching once with --no-sandbox (#38216)')try {- app.relaunch({ args: buildNoSandboxRelaunchArgs(process.argv.slice(1)) })+ relaunchApp(app, { args: buildNoSandboxRelaunchArgs(process.argv.slice(1)) })void exitAfterBackendShutdown(0)} catch (err) {rememberLog(`[renderer] --no-sandbox relaunch failed: ${err?.message || err}`)@@ -17262,7 +17263,7 @@ ipcMain.handle('hermes:version', async (_event, scope?: { connectionId?: string;// bundle now lives there.ipcMain.handle('hermes:app:relaunch', async () => {rememberLog('[updates] renderer requested an app relaunch (swapped bundle pending)')- app.relaunch({ args: buildNoSandboxRelaunchArgs(process.argv.slice(1)) })+ relaunchApp(app, { args: buildNoSandboxRelaunchArgs(process.argv.slice(1)) })void exitAfterBackendShutdown(0)})