Function execWithShellEnv

src/main/lib/git/shell-env.ts:197–248

(
	cmd: string,
	args: string[],
	options?: Omit<ExecFileOptionsWithStringEncoding, "encoding">,
)

 * shell environment only when needed, then persists the fix to process.env.PATH.
 */
export async function execWithShellEnv(
	cmd: string,
	args: string[],
	options?: Omit<ExecFileOptionsWithStringEncoding, "encoding">,
): Promise<{ stdout: string; stderr: string }> {
	try {
		return await execFileAsync(cmd, args, { ...options, encoding: "utf8" });
	} catch (error) {
		// Only retry on ENOENT (command not found), only on macOS
		// Skip if we've already successfully fixed PATH, or if a fix attempt is in progress
		if (
			process.platform !== "darwin" ||
			pathFixSucceeded ||
			pathFixAttempted ||
			!(error instanceof Error) ||
			!("code" in error) ||
			error.code !== "ENOENT"
		) {
			throw error;
		}

		pathFixAttempted = true;
		console.log("[shell-env] Command not found, deriving shell environment");

		try {
			const shellEnv = await getShellEnvironment();

			// Persist the fix to process.env so all subsequent calls benefit
			if (shellEnv.PATH) {
				process.env.PATH = shellEnv.PATH;
				pathFixSucceeded = true;
				console.log("[shell-env] Fixed process.env.PATH for GUI app");
			}

			// Retry with fixed env (respect caller's other env vars, force PATH if present)
			const retryEnv = shellEnv.PATH
				? { ...shellEnv, ...options?.env, PATH: shellEnv.PATH }
				: { ...shellEnv, ...options?.env };

			return await execFileAsync(cmd, args, {
				...options,
				encoding: "utf8",
				env: retryEnv,
			});
		} catch (retryError) {
			// Shell env derivation or retry failed - allow future retries
			pathFixAttempted = false;
			console.error("[shell-env] Retry failed:", retryError);
			throw retryError;
		}
	}
}