abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-21 01:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaks to shell abort logic based on feedback (#618)

Browse Source
This commit is contained in:
Olcan
2025-05-30 01:35:03 -07:00
committed by GitHub
parent 094b9dc474
commit a3b557222a
4 changed files with 38 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/server/src/tools/shell.ts
View File

@@ -200,21 +200,16 @@ export class ShellTool extends BaseTool<ShellToolParams, ToolResult> {
};
shell.on('exit', exitHandler);
const abortHandler = () => {
const abortHandler = async () => {
if (shell.pid && !exited) {
try {
// attempt to SIGTERM process group (negative PID)
// if SIGTERM fails after 200ms, attempt SIGKILL
// fall back to SIGKILL (to group) after 200ms
process.kill(-shell.pid, 'SIGTERM');
setTimeout(() => {
try {
if (shell.pid && !exited) {
process.kill(-shell.pid, 'SIGKILL');
}
} catch (_e) {
console.error(`failed to kill shell process ${shell.pid}: ${_e}`);
}
}, 200);
await new Promise((resolve) => setTimeout(resolve, 200));
if (shell.pid && !exited) {
process.kill(-shell.pid, 'SIGKILL');
}
} catch (_e) {
// if group kill fails, fall back to killing just the main process
try {