From d473b7e9712f4989755e7b0f182ff4e3f1e19cb9 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Thu, 19 Mar 2026 21:22:06 -0400
Subject: [PATCH] chore: extract which/global changes into #18320

---
 packages/opencode/src/global/index.ts | 2 +-
 packages/opencode/src/util/which.ts   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/opencode/src/global/index.ts b/packages/opencode/src/global/index.ts
index 869019e2ce..2913ac90fe 100644
--- a/packages/opencode/src/global/index.ts
+++ b/packages/opencode/src/global/index.ts
@@ -18,7 +18,7 @@ export namespace Global {
       return process.env.OPENCODE_TEST_HOME || os.homedir()
     },
     data,
-    bin: path.join(cache, "bin"),
+    bin: path.join(data, "bin"),
     log: path.join(data, "log"),
     cache,
     config,
diff --git a/packages/opencode/src/util/which.ts b/packages/opencode/src/util/which.ts
index 2e40739148..81da257217 100644
--- a/packages/opencode/src/util/which.ts
+++ b/packages/opencode/src/util/which.ts
@@ -1,13 +1,9 @@
 import whichPkg from "which"
-import path from "path"
-import { Global } from "../global"
 
 export function which(cmd: string, env?: NodeJS.ProcessEnv) {
-  const base = env?.PATH ?? env?.Path ?? process.env.PATH ?? process.env.Path ?? ""
-  const full = base ? base + path.delimiter + Global.Path.bin : Global.Path.bin
   const result = whichPkg.sync(cmd, {
     nothrow: true,
-    path: full,
+    path: env?.PATH ?? env?.Path ?? process.env.PATH ?? process.env.Path,
     pathExt: env?.PATHEXT ?? env?.PathExt ?? process.env.PATHEXT ?? process.env.PathExt,
   })
   return typeof result === "string" ? result : null