From d0423ccd3fe20c2a96ced805a929a7755fd23aba Mon Sep 17 00:00:00 2001
From: Dominik Kundel <dkundel@openai.com>
Date: Tue, 7 Apr 2026 19:53:21 -0700
Subject: [PATCH] fix: respect SHELL on Windows for Git Bash

---
 plugins/codex/scripts/lib/app-server.mjs | 2 +-
 plugins/codex/scripts/lib/process.mjs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/codex/scripts/lib/app-server.mjs b/plugins/codex/scripts/lib/app-server.mjs
index fec105c5..0ca44353 100644
--- a/plugins/codex/scripts/lib/app-server.mjs
+++ b/plugins/codex/scripts/lib/app-server.mjs
@@ -190,7 +190,7 @@ class SpawnedCodexAppServerClient extends AppServerClientBase {
       cwd: this.cwd,
       env: this.options.env,
       stdio: ["pipe", "pipe", "pipe"],
-      shell: process.platform === "win32",
+      shell: process.platform === "win32" ? (process.env.SHELL || true) : false,
       windowsHide: true
     });
 
diff --git a/plugins/codex/scripts/lib/process.mjs b/plugins/codex/scripts/lib/process.mjs
index 0948dbd8..58cedf67 100644
--- a/plugins/codex/scripts/lib/process.mjs
+++ b/plugins/codex/scripts/lib/process.mjs
@@ -8,7 +8,7 @@ export function runCommand(command, args = [], options = {}) {
     encoding: "utf8",
     input: options.input,
     stdio: options.stdio ?? "pipe",
-    shell: process.platform === "win32",
+    shell: process.platform === "win32" ? (process.env.SHELL || true) : false,
     windowsHide: true
   });