CRT/storebound
1
0
Fork 0
Code Issues Pull requests Releases 1 Packages 1 Activity Actions

desktop AI fix: kill only the agent's own process group with killpg (never pgid <= 1 or our own group) instead of the external kill command; a Forgejo ci run of bc85dab died of SIGTERM in the middle of these tests

Browse source
This commit is contained in:
CRTkafa 2026-10-15 19:45:00 +08:00
parent bc85dabf90
commit f898d642d0
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/desktop/src-tauri/Cargo.lock generated
View file

@ -4016,6 +4016,7 @@ dependencies = [
"getrandom 0.3.4",
"hmac",
"keyring",
"libc",
"reqwest",
"rusqlite",
"rustls",

3
apps/desktop/src-tauri/Cargo.toml
View file

@ -57,3 +57,6 @@ lto = true
opt-level = "s"
panic = "abort"
strip = true
[target.'cfg(unix)'.dependencies]
libc = "0.2"

12
apps/desktop/src-tauri/src/ai_fix.rs
View file

@ -304,9 +304,17 @@ fn running() -> &'static Running {
pub fn kill_tree(pid: u32) {
#[cfg(unix)]
{
let _ = Command::new("kill").args(["-TERM", &format!("-{pid}")]).status();
// the agent runs in its own process group (pgid = its pid); never signal any other group, least of all ours
// (a CI run once died of SIGTERM in the middle of these tests)
let pgid = pid as libc::pid_t;
// SAFETY: getpgrp has no preconditions; killpg only sends a signal to the group named
let own = unsafe { libc::getpgrp() };
if pgid <= 1 || pgid == own {
return;
}
unsafe { libc::killpg(pgid, libc::SIGTERM) };
std::thread::sleep(Duration::from_millis(300));
let _ = Command::new("kill").args(["-KILL", &format!("-{pid}")]).status();
unsafe { libc::killpg(pgid, libc::SIGKILL) };
}
#[cfg(windows)]
{