From e403899cc115596ea4516d7c779b63a15733d48b Mon Sep 17 00:00:00 2001
From: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>
Date: Thu, 26 Mar 2026 09:31:08 -0500
Subject: [PATCH] test: fix portable stderr capture and env leakage (#55184)

---
 scripts/committer                  | 8 +++++++-
 test/scripts/test-parallel.test.ts | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/committer b/scripts/committer
index e11a20d8624..28589b1900d 100755
--- a/scripts/committer
+++ b/scripts/committer
@@ -104,12 +104,18 @@ last_commit_error=''
 run_git_command() {
   local stderr_log
   stderr_log=$(mktemp)
-  if "$@" 2> >(tee "$stderr_log" >&2); then
+  if "$@" 2>"$stderr_log"; then
+    if [ -s "$stderr_log" ]; then
+      cat "$stderr_log" >&2
+    fi
     rm -f "$stderr_log"
     last_commit_error=''
     return 0
   fi
 
+  if [ -s "$stderr_log" ]; then
+    cat "$stderr_log" >&2
+  fi
   last_commit_error=$(cat "$stderr_log")
   rm -f "$stderr_log"
   return 1
diff --git a/test/scripts/test-parallel.test.ts b/test/scripts/test-parallel.test.ts
index 7e568e94e09..434895141a9 100644
--- a/test/scripts/test-parallel.test.ts
+++ b/test/scripts/test-parallel.test.ts
@@ -18,6 +18,10 @@ const clearPlannerShardEnv = (env) => {
   const nextEnv = { ...env };
   delete nextEnv.OPENCLAW_TEST_SHARDS;
   delete nextEnv.OPENCLAW_TEST_SHARD_INDEX;
+  delete nextEnv.OPENCLAW_TEST_FORCE_THREADS;
+  delete nextEnv.OPENCLAW_TEST_FORCE_FORKS;
+  delete nextEnv.OPENCLAW_TEST_DISABLE_THREAD_EXPANSION;
+  delete nextEnv.OPENCLAW_TEST_SHOW_POOL_DECISION;
   return nextEnv;
 };