The open source coding agent.
TypeScript
fix: include cache bin directory in which() lookups (#18320)
Dax6fcc970def14
diff --git a/packages/opencode/src/global/index.ts b/packages/opencode/src/global/index.tsindex 2913ac90fe0..869019e2ce7 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(data, "bin"),+ bin: path.join(cache, "bin"),log: path.join(data, "log"),cache,config,diff --git a/packages/opencode/src/util/which.ts b/packages/opencode/src/util/which.tsindex 81da2572170..2e40739148a 100644--- a/packages/opencode/src/util/which.ts+++ b/packages/opencode/src/util/which.ts@@ -1,9 +1,13 @@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.binconst result = whichPkg.sync(cmd, {nothrow: true,- path: env?.PATH ?? env?.Path ?? process.env.PATH ?? process.env.Path,+ path: full,pathExt: env?.PATHEXT ?? env?.PathExt ?? process.env.PATHEXT ?? process.env.PathExt,})return typeof result === "string" ? result : null