From 2cbbf3ab153b574a0fc2c8314779f7d345153405 Mon Sep 17 00:00:00 2001
From: Mayuresh Kadu <23300+mskadu@users.noreply.github.com>
Date: Sat, 20 Jun 2026 09:16:49 +0100
Subject: [PATCH] review fixes: align reproduction script timeout, tighten
 comments

---
 .../web/server/lib/opencode/env-runtime.js    | 21 +++++++++++--------
 scripts/reproduce-issue-1720.mjs              |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/web/server/lib/opencode/env-runtime.js b/packages/web/server/lib/opencode/env-runtime.js
index a9b919cf..1ee396c7 100644
--- a/packages/web/server/lib/opencode/env-runtime.js
+++ b/packages/web/server/lib/opencode/env-runtime.js
@@ -362,9 +362,10 @@ export const createOpenCodeEnvRuntime = (deps) => {
       return null;
     }
 
-    // Fast path: 'command -v' via plain sh (no login shell, no .zshrc sourcing).
-    // This is much faster than the full login shell probe below and catches
-    // standard brew paths even when launched with minimal PATH.
+// Fast path: 'command -v' via plain sh (no login shell, no .zshrc sourcing).
+// This is much faster than the full login shell probe below and catches
+// brew paths when the Electron login shell env merge already augmented PATH
+// or when /bin/sh has a broader default PATH than the process.
     if (process.platform !== 'win32') {
       try {
         const fastResult = runSpawnSync('/bin/sh', ['-c', 'command -v opencode'], {
@@ -454,9 +455,10 @@ export const createOpenCodeEnvRuntime = (deps) => {
       return null;
     }
 
-    // Fast path: 'command -v' via plain sh (no login shell, no .zshrc sourcing).
-    // This is much faster than the full login shell probe below and catches
-    // standard brew paths even when launched with minimal PATH.
+// Fast path: 'command -v' via plain sh (no login shell, no .zshrc sourcing).
+// This is much faster than the full login shell probe below and catches
+// brew paths when the Electron login shell env merge already augmented PATH
+// or when /bin/sh has a broader default PATH than the process.
     if (process.platform !== 'win32') {
       try {
         const fastResult = runSpawnSync('/bin/sh', ['-c', 'command -v node'], {
@@ -558,9 +560,10 @@ export const createOpenCodeEnvRuntime = (deps) => {
       return null;
     }
 
-    // Fast path: 'command -v' via plain sh (no login shell, no .zshrc sourcing).
-    // This is much faster than the full login shell probe below and catches
-    // standard brew paths even when launched with minimal PATH.
+// Fast path: 'command -v' via plain sh (no login shell, no .zshrc sourcing).
+// This is much faster than the full login shell probe below and catches
+// brew paths when the Electron login shell env merge already augmented PATH
+// or when /bin/sh has a broader default PATH than the process.
     if (process.platform !== 'win32') {
       try {
         const fastResult = runSpawnSync('/bin/sh', ['-c', 'command -v bun'], {
diff --git a/scripts/reproduce-issue-1720.mjs b/scripts/reproduce-issue-1720.mjs
index 603a52bf..e4c60002 100644
--- a/scripts/reproduce-issue-1720.mjs
+++ b/scripts/reproduce-issue-1720.mjs
@@ -252,7 +252,7 @@ async function main() {
         encoding: 'utf8',
         stdio: ['ignore', 'pipe', 'pipe'],
         windowsHide: true,
-        timeout: 10000,
+        timeout: 5000,
       });
       if (result.status === 0) {
         const found = (result.stdout || '').trim().split(/\s+/).pop() || '';