Skip to content

fix(worktree): use login-shell PATH when running setup scripts #29

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

Merged
aletc1 merged 1 commit into from
Apr 20, 2026
Merged

fix(worktree): use login-shell PATH when running setup scripts #29

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
8 changes: 8 additions & 0 deletions src/main/lib/git/worktree-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { readFile, writeFile, mkdir, access } from "node:fs/promises"
import { join, dirname, isAbsolute } from "node:path"
import { exec } from "node:child_process"
import { promisify } from "node:util"
import { getShellEnvironment } from "./shell-env"

const execAsync = promisify(exec)

Expand Down Expand Up @@ -206,6 +207,11 @@ export async function executeWorktreeSetup(

console.log(`[worktree-setup] Running ${commandList.length} setup commands in ${worktreePath}`)

// Resolve the user's login-shell PATH so commands like `bun`, `pnpm`, homebrew
// binaries etc. are found when the app is launched from Finder/Dock (Electron
// GUI processes inherit a stripped PATH).
const shellEnv = await getShellEnvironment()

// Execute each command
for (const cmd of commandList) {
if (!cmd.trim()) continue
Expand All @@ -217,6 +223,8 @@ export async function executeWorktreeSetup(
cwd: worktreePath,
env: {
...process.env,
...shellEnv,
PATH: shellEnv.PATH ?? process.env.PATH,
ROOT_WORKTREE_PATH: mainRepoPath,
},
timeout: 300_000, // 5 minutes per command
Expand Down