scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: Kill button for execute_command tool (#6457)

Browse source
This commit is contained in:
Daniel 2025-07-30 21:24:43 -05:00 • committed by GitHub
parent 38c6c7a101
commit ccd8ab9ffc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 72 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
src/integrations/terminal/ExecaTerminalProcess.ts
View file

@ -9,6 +9,8 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
private terminalRef: WeakRef<RooTerminal>
private aborted = false
private pid?: number
private subprocess?: ReturnType<typeof execa>
private pidUpdatePromise?: Promise<void>
constructor(terminal: RooTerminal) {
super()
@ -36,7 +38,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
try {
this.isHot = true
const subprocess = execa({
this.subprocess = execa({
shell: true,
cwd: this.terminal.getCurrentWorkingDirectory(),
all: true,
@ -48,9 +50,37 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
},
})`${command}`
this.pid = subprocess.pid
const stream = subprocess.iterable({ from: "all", preserveNewlines: true })
this.terminal.setActiveStream(stream, subprocess.pid)
this.pid = this.subprocess.pid
// When using shell: true, the PID is for the shell, not the actual command
// Find the actual command PID after a small delay
if (this.pid) {
this.pidUpdatePromise = new Promise<void>((resolve) => {
setTimeout(() => {
psTree(this.pid!, (err, children) => {
if (!err && children.length > 0) {
// Update PID to the first child (the actual command)
const actualPid = parseInt(children[0].PID)
if (!isNaN(actualPid)) {
this.pid = actualPid
}
}
resolve()
})
}, 100)
})
}
const rawStream = this.subprocess.iterable({ from: "all", preserveNewlines: true })
// Wrap the stream to ensure all chunks are strings (execa can return Uint8Array)
const stream = (async function* () {
for await (const chunk of rawStream) {
yield typeof chunk === "string" ? chunk : new TextDecoder().decode(chunk)
}
})()
this.terminal.setActiveStream(stream, this.pid)
for await (const line of stream) {
if (this.aborted) {
@ -77,7 +107,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
timeoutId = setTimeout(() => {
try {
subprocess.kill("SIGKILL")
this.subprocess?.kill("SIGKILL")
} catch (e) {}
resolve()
@ -85,7 +115,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
})
try {
await Promise.race([subprocess, kill])
await Promise.race([this.subprocess, kill])
} catch (error) {
console.log(
`[ExecaTerminalProcess#run] subprocess termination error: ${error instanceof Error ? error.message : String(error)}`,
@ -109,6 +139,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
this.emit("shell_execution_complete", { exitCode: 1 })
}
this.subprocess = undefined
}
this.terminal.setActiveStream(undefined)
@ -116,6 +147,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
this.stopHotTimer()
this.emit("completed", this.fullOutput)
this.emit("continue")
this.subprocess = undefined
}
public override continue() {
@ -127,7 +159,41 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
public override abort() {
this.aborted = true
// Function to perform the kill operations
const performKill = () => {
// Try to kill using the subprocess object
if (this.subprocess) {
try {
this.subprocess.kill("SIGKILL")
} catch (e) {
console.warn(
`[ExecaTerminalProcess#abort] Failed to kill subprocess: ${e instanceof Error ? e.message : String(e)}`,
)
}
}
// Kill the stored PID (which should be the actual command after our update)
if (this.pid) {
try {
process.kill(this.pid, "SIGKILL")
} catch (e) {
console.warn(
`[ExecaTerminalProcess#abort] Failed to kill process ${this.pid}: ${e instanceof Error ? e.message : String(e)}`,
)
}
}
}
// If PID update is in progress, wait for it before killing
if (this.pidUpdatePromise) {
this.pidUpdatePromise.then(performKill).catch(() => performKill())
} else {
performKill()
}
// Continue with the rest of the abort logic
if (this.pid) {
// Also check for any child processes
psTree(this.pid, async (err, children) => {
if (!err) {
const pids = children.map((p) => parseInt(p.PID))
@ -148,15 +214,6 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
)
}
})
try {
console.error(`[ExecaTerminalProcess#abort] SIGKILL parent -> ${this.pid}`)
process.kill(this.pid, "SIGKILL")
} catch (e) {
console.warn(
`[ExecaTerminalProcess#abort] Failed to send SIGKILL to main PID ${this.pid}: ${e instanceof Error ? e.message : String(e)}`,
)
}
}
}