Skip to content

fix(desktop): main window close on non-macOS and Windows process cleanup #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GCWing merged 2 commits into from
May 11, 2026
Merged

fix(desktop): main window close on non-macOS and Windows process cleanup #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a392c8c
fix(desktop): repair main window close on non-macOS and Windows proce…
G-CWing May 11, 2026
3093dab
fix(desktop): use log::info for macOS-only app_click logging
G-CWing May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/apps/desktop/src/computer_use/desktop_host.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use bitfun_core::util::errors::{BitFunError, BitFunResult};
use enigo::{Axis, Button, Coordinate, Direction, Enigo, Key, Keyboard, Mouse, Settings};
use image::codecs::jpeg::JpegEncoder;
use image::{DynamicImage, Rgb, RgbImage};
use log::{debug, info, warn};
use log::{debug, warn};
use resvg::tiny_skia::{Pixmap, Transform};
use resvg::usvg;
use screenshots::display_info::DisplayInfo;
Expand Down Expand Up @@ -3718,7 +3718,7 @@ tell application "System Events" to get unix id of first process whose frontmost
{
let pid = resolve_pid_macos(self, &params.app).await?;
let self_pid = std::process::id() as i32;
info!(
log::info!(
target: "computer_use::app_click",
"app_click.enter pid={} self_pid={} same_process={} target={:?} button={} click_count={} modifier_keys={:?}",
pid,
Expand Down Expand Up @@ -3894,7 +3894,7 @@ tell application "System Events" to get unix id of first process whose frontmost
_ => crate::computer_use::macos_bg_input::BgMouseButton::Left,
};
let cnt = params.click_count.max(1) as u32;
info!(
log::info!(
target: "computer_use::app_click",
"app_click.bg_dispatch pid={} self_pid={} same_process={} resolved_x={:.2} resolved_y={:.2} click_count={}",
pid, self_pid, pid == self_pid, x, y, cnt
Expand Down Expand Up @@ -4020,7 +4020,7 @@ tell application "System Events" to get unix id of first process whose frontmost
let _ = self.app_click(click).await?;
}
require_macos_background_input()?;
info!(
log::info!(
target: "computer_use::app_type_text",
"app_type_text.bg_dispatch pid={} char_count={}",
pid,
Expand Down
109 changes: 57 additions & 52 deletions src/apps/desktop/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,48 +487,48 @@ pub async fn run() {
})
.on_window_event({
move |window, event| {
#[cfg(target_os = "macos")]
if let tauri::WindowEvent::CloseRequested { api, .. } = event {
if window.label() == "main" {
#[cfg(target_os = "macos")]
{
api.prevent_close();
if !begin_main_window_close_request_on_macos() {
return;
}

if let Err(error) = window.emit(MAIN_WINDOW_CLOSE_REQUESTED_EVENT, ()) {
log::warn!(
"Failed to emit macOS main window close request event: {}",
error
);
}
api.prevent_close();
if !begin_main_window_close_request_on_macos() {
return;
}

let app_handle = window.app_handle().clone();
tauri::async_runtime::spawn(async move {
tokio::time::sleep(std::time::Duration::from_millis(
MAIN_WINDOW_CLOSE_FALLBACK_HIDE_MS,
))
.await;

if take_main_window_close_request_on_macos() {
if let Err(error) =
hide_main_window_on_macos(&app_handle, "frontend_timeout")
{
log::warn!(
"macOS close fallback hide failed after frontend timeout: {}",
error
);
}
}
});
if let Err(error) = window.emit(MAIN_WINDOW_CLOSE_REQUESTED_EVENT, ()) {
log::warn!(
"Failed to emit macOS main window close request event: {}",
error
);
}

#[cfg(not(target_os = "macos"))]
{
if perform_process_exit_cleanup() {
log::info!("Main window close requested, cleaning up");
window.app_handle().exit(0);
let app_handle = window.app_handle().clone();
tauri::async_runtime::spawn(async move {
tokio::time::sleep(std::time::Duration::from_millis(
MAIN_WINDOW_CLOSE_FALLBACK_HIDE_MS,
))
.await;

if take_main_window_close_request_on_macos() {
if let Err(error) =
hide_main_window_on_macos(&app_handle, "frontend_timeout")
{
log::warn!(
"macOS close fallback hide failed after frontend timeout: {}",
error
);
}
}
});
}
}

#[cfg(not(target_os = "macos"))]
if let tauri::WindowEvent::CloseRequested { .. } = event {
if window.label() == "main" {
if perform_process_exit_cleanup() {
log::info!("Main window close requested, cleaning up");
window.app_handle().exit(0);
}
}
}
Expand Down Expand Up @@ -1002,23 +1002,28 @@ pub async fn run() {

match app {
Ok(app) => {
app.run(|app_handle, event| match event {
tauri::RunEvent::ExitRequested { .. } | tauri::RunEvent::Exit => {
perform_process_exit_cleanup();
}
#[cfg(target_os = "macos")]
tauri::RunEvent::Reopen {
has_visible_windows,
..
} => {
let reason = if has_visible_windows {
"dock_reopen_with_visible_aux_window"
} else {
"dock_reopen_no_visible_windows"
};
show_main_window_on_macos(app_handle, reason);
app.run(|app_handle, event| {
#[cfg(not(target_os = "macos"))]
let _ = app_handle;

match event {
tauri::RunEvent::ExitRequested { .. } | tauri::RunEvent::Exit => {
perform_process_exit_cleanup();
}
#[cfg(target_os = "macos")]
tauri::RunEvent::Reopen {
has_visible_windows,
..
} => {
let reason = if has_visible_windows {
"dock_reopen_with_visible_aux_window"
} else {
"dock_reopen_no_visible_windows"
};
show_main_window_on_macos(app_handle, reason);
}
_ => {}
}
_ => {}
});
}
Err(e) => {
Expand Down
11 changes: 10 additions & 1 deletion src/crates/core/src/util/process_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ use std::io;
use std::process::Command;
use std::sync::LazyLock;
use tokio::process::{Child, Command as TokioCommand};
use tokio::time::{timeout, Duration};
use tokio::time::Duration;
#[cfg(unix)]
use tokio::time::timeout;

#[cfg(windows)]
use log::warn;
Expand Down Expand Up @@ -119,11 +121,18 @@ pub fn configure_process_group(command: &mut TokioCommand) {
{
command.process_group(0);
}
#[cfg(not(unix))]
{
let _ = command;
}
}

pub async fn terminate_child_process_tree(
child: &mut Child,
#[cfg(unix)]
graceful_timeout: Duration,
#[cfg(not(unix))]
_graceful_timeout: Duration,
) -> io::Result<()> {
let pid = child.id();

Expand Down
Loading