From 11d1eb5ccf165934684e17c632b9b46c3d132555 Mon Sep 17 00:00:00 2001 From: Aiden Cline Date: Wed, 15 Oct 2025 15:20:14 -0500 Subject: [PATCH] Revert "fix: spawns hanging (#3192)" This reverts commit 18fb335e6d4ff9e5183f9c0b1e90cc8e60b6692f. --- packages/opencode/src/tool/bash.ts | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/packages/opencode/src/tool/bash.ts b/packages/opencode/src/tool/bash.ts index af1610d567..d4e8ce85a0 100644 --- a/packages/opencode/src/tool/bash.ts +++ b/packages/opencode/src/tool/bash.ts @@ -145,26 +145,14 @@ export const BashTool = Tool.define("bash", { }) } - const proc = spawn(params.command, { + const process = spawn(params.command, { shell: true, cwd: Instance.directory, signal: ctx.abort, stdio: ["ignore", "pipe", "pipe"], timeout, - detached: process.platform !== "win32", }) - if (!ctx.abort.aborted) { - ctx.abort.addEventListener("abort", () => { - if (!proc.pid) return - if (process.platform === "win32") { - proc.kill() - return - } - process.kill(-proc.pid) - }) - } - let output = "" // Initialize metadata with empty output @@ -175,7 +163,7 @@ export const BashTool = Tool.define("bash", { }, }) - proc.stdout?.on("data", (chunk) => { + process.stdout?.on("data", (chunk) => { output += chunk.toString() ctx.metadata({ metadata: { @@ -185,7 +173,7 @@ export const BashTool = Tool.define("bash", { }) }) - proc.stderr?.on("data", (chunk) => { + process.stderr?.on("data", (chunk) => { output += chunk.toString() ctx.metadata({ metadata: { @@ -196,7 +184,7 @@ export const BashTool = Tool.define("bash", { }) await new Promise((resolve) => { - proc.on("close", () => { + process.on("close", () => { resolve() }) }) @@ -204,7 +192,7 @@ export const BashTool = Tool.define("bash", { ctx.metadata({ metadata: { output: output, - exit: proc.exitCode, + exit: process.exitCode, description: params.description, }, }) @@ -214,7 +202,7 @@ export const BashTool = Tool.define("bash", { output += "\n\n(Output was truncated due to length limit)" } - if (proc.signalCode === "SIGTERM" && params.timeout) { + if (process.signalCode === "SIGTERM" && params.timeout) { output += `\n\n(Command timed out after ${timeout} ms)` } @@ -222,7 +210,7 @@ export const BashTool = Tool.define("bash", { title: params.command, metadata: { output, - exit: proc.exitCode, + exit: process.exitCode, description: params.description, }, output,