Skip to content

fix: add timeouts to IPC operations to prevent shell hook hangs #106

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
jdx merged 1 commit into from
Jan 17, 2026
Merged

fix: add timeouts to IPC operations to prevent shell hook hangs #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 18 additions & 18 deletions src/ipc/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub struct IpcClient {
const CONNECT_ATTEMPTS: u32 = 5;
const CONNECT_MIN_DELAY: Duration = Duration::from_millis(100);
const CONNECT_MAX_DELAY: Duration = Duration::from_secs(1);
const REQUEST_TIMEOUT: Duration = Duration::from_secs(5);

impl IpcClient {
pub async fn connect(autostart: bool) -> Result<Self> {
Expand Down Expand Up @@ -79,32 +80,27 @@ impl IpcClient {
Ok(())
}

pub async fn read(&self) -> Option<IpcResponse> {
async fn read(&self, timeout: Duration) -> Result<IpcResponse> {
let mut recv = self.recv.lock().await;
let mut bytes = Vec::new();
if let Err(err) = recv.read_until(0, &mut bytes).await.into_diagnostic() {
warn!("Failed to read IPC message: {}", err);
match tokio::time::timeout(timeout, recv.read_until(0, &mut bytes)).await {
Ok(Ok(_)) => {}
Ok(Err(err)) => bail!("failed to read IPC message: {}", err),
Err(_) => bail!("IPC read timed out after {:?}", timeout),
}
if bytes.is_empty() {
None
} else {
match deserialize(&bytes) {
Ok(msg) => Some(msg),
Err(err) => {
warn!("Failed to deserialize IPC message: {}", err);
None
}
}
bail!("IPC connection closed unexpectedly");
}
deserialize(&bytes)
}

async fn request(&self, msg: IpcRequest) -> Result<IpcResponse> {
self.request_with_timeout(msg, REQUEST_TIMEOUT).await
}

async fn request_with_timeout(&self, msg: IpcRequest, timeout: Duration) -> Result<IpcResponse> {
self.send(msg).await?;
loop {
if let Some(msg) = self.read().await {
return Ok(msg);
}
}
self.read(timeout).await
}

pub async fn enable(&self, id: String) -> Result<bool> {
Expand Down Expand Up @@ -140,7 +136,11 @@ impl IpcClient {
pub async fn run(&self, opts: RunOptions) -> Result<(Vec<String>, Option<i32>)> {
info!("starting daemon {}", opts.id);
let start_time = chrono::Local::now();
let rsp = self.request(IpcRequest::Run(opts.clone())).await?;
// Use longer timeout for daemon start - ready_delay can be up to 60s+
let timeout = Duration::from_secs(opts.ready_delay.unwrap_or(3) + 60);

@cursor cursor Bot Jan 17, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Timeout calculation ignores retry backoff time

Medium Severity

The run method timeout calculation opts.ready_delay.unwrap_or(3) + 60 only accounts for a single ready_delay period. When retry > 0 is configured, the server-side run performs multiple attempts with exponential backoff between failures. The total server time can be (retry + 1) × ready_delay + (2^retry - 1) seconds, which can exceed the client timeout. For instance, retry = 5 and ready_delay = 10 yields ~91 seconds server-side but only 70 seconds client timeout, causing spurious timeout errors before the server completes.

Fix in Cursor Fix in Web

let rsp = self
.request_with_timeout(IpcRequest::Run(opts.clone()), timeout)
.await?;
let mut started_daemons = vec![];
let mut exit_code = None;
match rsp {
Expand Down
⚡