mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-17 04:11:35 +00:00
The Wayland launcher (#121377) passes --ozone-platform=wayland on every local Wayland session. On the NVIDIA proprietary driver (615.x) the GPU process dies under Wayland ozone with the bundled Chromium, while x11 launches. Default to x11 when /proc/driver/nvidia/version exists and the user set no platform or x11/wayland hint; explicit choices still win. Fixes #126013
81 lines
2.9 KiB
TypeScript
81 lines
2.9 KiB
TypeScript
import { detectRemoteDisplay } from './bootstrap-platform'
|
|
|
|
// Ozone is selected before application JavaScript. Never appendSwitch here:
|
|
// that leaves the browser on X11 while GPU children receive Wayland.
|
|
export function wslgLaunchArgs(
|
|
argv: readonly string[],
|
|
env: NodeJS.ProcessEnv,
|
|
platform: NodeJS.Platform,
|
|
electronFlags: readonly string[] = [],
|
|
nvidiaProprietaryDriver = false
|
|
): string[] | null {
|
|
const displayEnv = { ...env, HERMES_DESKTOP_DISABLE_GPU: undefined }
|
|
|
|
// Remote/forwarded displays stay on the software-rendering path. A local
|
|
// Wayland session — native Linux or WSLg — otherwise defaults to XWayland
|
|
// unless the platform is on argv before application JavaScript.
|
|
if (platform !== 'linux' || detectRemoteDisplay({ env: displayEnv, platform })) {
|
|
return null
|
|
}
|
|
|
|
// WSLg always exports WAYLAND_DISPLAY, so it is covered by the same check.
|
|
const wayland = env.XDG_SESSION_TYPE === 'wayland' || Boolean(env.WAYLAND_DISPLAY)
|
|
|
|
if (!wayland || hasOzonePlatform(argv)) {
|
|
return null
|
|
}
|
|
|
|
// desktop.electron_flags are not always on argv yet (.desktop entry, source
|
|
// launches). An explicit platform there wins over the automatic default, and
|
|
// must be on the relaunch command line or appendSwitch applies it too late.
|
|
const flagged = explicitOzonePlatform(electronFlags)
|
|
|
|
if (flagged !== null) {
|
|
return flagged ? [...argv, `--ozone-platform=${flagged}`] : null
|
|
}
|
|
|
|
const hintArg = findOzoneHint(argv) ?? findOzoneHint(electronFlags)
|
|
const hint = hintArg ?? env.ELECTRON_OZONE_PLATFORM_HINT
|
|
|
|
return [...argv, `--ozone-platform=${defaultBackend(hint, nvidiaProprietaryDriver)}`]
|
|
}
|
|
|
|
// An explicit x11/wayland hint always wins. Without one, the NVIDIA proprietary
|
|
// driver stays on XWayland: its GPU process dies on Wayland ozone under the
|
|
// bundled Chromium (615.x, #126013) while x11 launches. Everyone else gets
|
|
// native Wayland (#83578).
|
|
function defaultBackend(hint: string | undefined, nvidiaProprietaryDriver: boolean): 'wayland' | 'x11' {
|
|
if (hint === 'x11' || hint === 'wayland') {
|
|
return hint
|
|
}
|
|
|
|
return nvidiaProprietaryDriver ? 'x11' : 'wayland'
|
|
}
|
|
|
|
function hasOzonePlatform(args: readonly string[]): boolean {
|
|
return args.some(arg => arg === '--ozone-platform' || arg.startsWith('--ozone-platform='))
|
|
}
|
|
|
|
function explicitOzonePlatform(args: readonly string[]): string | null {
|
|
for (let i = 0; i < args.length; i += 1) {
|
|
const arg = args[i] ?? ''
|
|
|
|
if (arg === '--ozone-platform') {
|
|
const next = args[i + 1]
|
|
|
|
return next && !next.startsWith('-') ? next : ''
|
|
}
|
|
|
|
if (arg.startsWith('--ozone-platform=')) {
|
|
return arg.slice('--ozone-platform='.length)
|
|
}
|
|
}
|
|
|
|
return null
|
|
}
|
|
|
|
function findOzoneHint(args: readonly string[]): string | undefined {
|
|
const hintArg = args.findLast(arg => arg.startsWith('--ozone-platform-hint='))
|
|
|
|
return hintArg?.slice('--ozone-platform-hint='.length)
|
|
}
|