From af4c4b24e65638cb676b948d6c0d750e04820d2d Mon Sep 17 00:00:00 2001
From: lohit <lohit@usebruno.com>
Date: Fri, 6 Mar 2026 16:39:19 +0000
Subject: [PATCH] fix: preserve existing process.env values in
 initializeShellEnv (#7390)

---
 .../src/utils/shell-env.spec.ts               | 67 +++++++++++++++++++
 .../bruno-requests/src/utils/shell-env.ts     |  6 +-
 2 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 packages/bruno-requests/src/utils/shell-env.spec.ts

diff --git a/packages/bruno-requests/src/utils/shell-env.spec.ts b/packages/bruno-requests/src/utils/shell-env.spec.ts
new file mode 100644
index 000000000..cd0307844
--- /dev/null
+++ b/packages/bruno-requests/src/utils/shell-env.spec.ts
@@ -0,0 +1,67 @@
+import { initializeShellEnv } from './shell-env';
+
+let mockShellEnvResult: Record<string, string> = {};
+
+jest.mock('shell-env', () => ({
+  shellEnv: () => Promise.resolve(mockShellEnvResult)
+}));
+
+const originalPlatform = process.platform;
+
+afterEach(() => {
+  Object.defineProperty(process, 'platform', { value: originalPlatform });
+});
+
+describe('initializeShellEnv', () => {
+  test('should add shell env vars that are not in process.env', async () => {
+    delete process.env.TEST_SHELL_VAR;
+    mockShellEnvResult = { TEST_SHELL_VAR: 'from_shell_config' };
+
+    await initializeShellEnv();
+
+    expect(process.env.TEST_SHELL_VAR).toBe('from_shell_config');
+    delete process.env.TEST_SHELL_VAR;
+  });
+
+  test('should not overwrite existing process.env values', async () => {
+    process.env.http_proxy = 'updated_value';
+    mockShellEnvResult = { http_proxy: 'config_file_value' };
+
+    await initializeShellEnv();
+
+    expect(process.env.http_proxy).toBe('updated_value');
+    delete process.env.http_proxy;
+  });
+
+  test('should preserve multiple existing env vars while adding new ones', async () => {
+    process.env.EXISTING_VAR = 'existing';
+    delete process.env.NEW_VAR;
+    mockShellEnvResult = { EXISTING_VAR: 'overwritten', NEW_VAR: 'new_value' };
+
+    await initializeShellEnv();
+
+    expect(process.env.EXISTING_VAR).toBe('existing');
+    expect(process.env.NEW_VAR).toBe('new_value');
+    delete process.env.EXISTING_VAR;
+    delete process.env.NEW_VAR;
+  });
+
+  test('should return the shell env vars (not the merged result)', async () => {
+    mockShellEnvResult = { SOME_VAR: 'value' };
+
+    const result = await initializeShellEnv();
+
+    expect(result).toEqual({ SOME_VAR: 'value' });
+    delete process.env.SOME_VAR;
+  });
+
+  test('should return empty object on Windows', async () => {
+    Object.defineProperty(process, 'platform', { value: 'win32' });
+    mockShellEnvResult = { SHOULD_NOT_APPEAR: 'value' };
+
+    const result = await initializeShellEnv();
+
+    expect(result).toEqual({});
+    expect(process.env.SHOULD_NOT_APPEAR).toBeUndefined();
+  });
+});
diff --git a/packages/bruno-requests/src/utils/shell-env.ts b/packages/bruno-requests/src/utils/shell-env.ts
index 7f3d44830..82933880c 100644
--- a/packages/bruno-requests/src/utils/shell-env.ts
+++ b/packages/bruno-requests/src/utils/shell-env.ts
@@ -28,6 +28,10 @@ const fetchShellEnv = async (): Promise<Record<string, string>> => {
  */
 export const initializeShellEnv = async (): Promise<Record<string, string>> => {
   const shellEnvVars = await fetchShellEnv();
-  Object.assign(process.env, shellEnvVars);
+  for (const [key, value] of Object.entries(shellEnvVars)) {
+    if (!(key in process.env)) {
+      process.env[key] = value;
+    }
+  }
   return shellEnvVars;
 };