Skip to content

fix(desktop): retry shell env probe after timeout #49268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lazyayuan wants to merge 1 commit into
base: dev
Choose a base branch
from
+17 −6
Open

fix(desktop): retry shell env probe after timeout #49268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion packages/desktop/src/main/shell-env.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, expect, test } from "bun:test"

import { isNushell, mergeShellEnv, parseShellEnv, resolveUserShell } from "./shell-env"
import { isNushell, loadShellEnv, mergeShellEnv, parseShellEnv, resolveUserShell } from "./shell-env"

describe("shell env", () => {
test("parseShellEnv supports null-delimited pairs", () => {
Expand Down Expand Up @@ -47,4 +47,16 @@ describe("shell env", () => {
expect(isNushell("C:\\Program Files\\nu.exe")).toBe(true)
expect(isNushell("/bin/zsh")).toBe(false)
})

test("loadShellEnv falls back to login shell after interactive timeout", () => {
const modes: string[] = []
const env = loadShellEnv("/bin/zsh", { log() {} }, (_shell, mode) => {
modes.push(mode)
if (mode === "-il") return { type: "Timeout" }
return { type: "Loaded", value: { PATH: "/usr/local/bin" } }
})

expect(modes).toEqual(["-il", "-l"])
expect(env?.PATH).toBe("/usr/local/bin")
})
})
9 changes: 4 additions & 5 deletions packages/desktop/src/main/shell-env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,22 @@ export function isNushell(shell: string) {
return name === "nu" || name === "nu.exe" || raw.endsWith("\\nu.exe")
}

export function loadShellEnv(shell: string, logger: ShellEnvLogger) {
export function loadShellEnv(shell: string, logger: ShellEnvLogger, probeShell = probe) {
if (isNushell(shell)) {
logger.log(`[server] Skipping shell env probe for nushell: ${shell}`)
return null
}

const interactive = probe(shell, "-il")
const interactive = probeShell(shell, "-il")
if (interactive.type === "Loaded") {
logger.log(`[server] Loaded shell environment with -il (${Object.keys(interactive.value).length} vars)`)
return interactive.value
}
if (interactive.type === "Timeout") {
logger.log(`[server] Interactive shell env probe timed out: ${shell}`)
return null
logger.log(`[server] Interactive shell env probe timed out, retrying with -l: ${shell}`)
}

const login = probe(shell, "-l")
const login = probeShell(shell, "-l")
if (login.type === "Loaded") {
logger.log(`[server] Loaded shell environment with -l (${Object.keys(login.value).length} vars)`)
return login.value
Expand Down
Loading