Skip to content

fix: Clearer error message when connection is broken before messages are sent #89

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
benbrandt merged 4 commits into from
Mar 28, 2026
Merged

fix: Clearer error message when connection is broken before messages are sent #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61a51f2
fix avoid hanging forever when send fails
anaslimem Mar 27, 2026
d3b83f7
Fix formatting
anaslimem Mar 27, 2026
3b3333d
removed the unnecessary wait
anaslimem Mar 28, 2026
a8a6d2d
Return earlier
benbrandt Mar 28, 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
46 changes: 23 additions & 23 deletions src/agent-client-protocol/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ impl Agent for ClientSideConnection {
.request(
AGENT_METHOD_NAMES.initialize,
Some(ClientRequest::InitializeRequest(args)),
)
)?
.await
}

Expand All @@ -90,7 +90,7 @@ impl Agent for ClientSideConnection {
.request::<Option<_>>(
AGENT_METHOD_NAMES.authenticate,
Some(ClientRequest::AuthenticateRequest(args)),
)
)?
.await
.map(Option::unwrap_or_default)
}
Expand All @@ -101,7 +101,7 @@ impl Agent for ClientSideConnection {
.request::<Option<_>>(
AGENT_METHOD_NAMES.logout,
Some(ClientRequest::LogoutRequest(args)),
)
)?
.await
.map(Option::unwrap_or_default)
}
Expand All @@ -111,7 +111,7 @@ impl Agent for ClientSideConnection {
.request(
AGENT_METHOD_NAMES.session_new,
Some(ClientRequest::NewSessionRequest(args)),
)
)?
.await
}

Expand All @@ -120,7 +120,7 @@ impl Agent for ClientSideConnection {
.request::<Option<_>>(
AGENT_METHOD_NAMES.session_load,
Some(ClientRequest::LoadSessionRequest(args)),
)
)?
.await
.map(Option::unwrap_or_default)
}
Expand All @@ -133,7 +133,7 @@ impl Agent for ClientSideConnection {
.request(
AGENT_METHOD_NAMES.session_set_mode,
Some(ClientRequest::SetSessionModeRequest(args)),
)
)?
.await
}

Expand All @@ -142,7 +142,7 @@ impl Agent for ClientSideConnection {
.request(
AGENT_METHOD_NAMES.session_prompt,
Some(ClientRequest::PromptRequest(args)),
)
)?
.await
}

Expand All @@ -162,7 +162,7 @@ impl Agent for ClientSideConnection {
.request(
AGENT_METHOD_NAMES.session_set_model,
Some(ClientRequest::SetSessionModelRequest(args)),
)
)?
.await
}

Expand All @@ -171,7 +171,7 @@ impl Agent for ClientSideConnection {
.request(
AGENT_METHOD_NAMES.session_list,
Some(ClientRequest::ListSessionsRequest(args)),
)
)?
.await
}

Expand All @@ -181,7 +181,7 @@ impl Agent for ClientSideConnection {
.request(
AGENT_METHOD_NAMES.session_fork,
Some(ClientRequest::ForkSessionRequest(args)),
)
)?
.await
}

Expand All @@ -191,7 +191,7 @@ impl Agent for ClientSideConnection {
.request(
AGENT_METHOD_NAMES.session_resume,
Some(ClientRequest::ResumeSessionRequest(args)),
)
)?
.await
}

Expand All @@ -201,7 +201,7 @@ impl Agent for ClientSideConnection {
.request::<Option<_>>(
AGENT_METHOD_NAMES.session_close,
Some(ClientRequest::CloseSessionRequest(args)),
)
)?
.await
.map(Option::unwrap_or_default)
}
Expand All @@ -214,7 +214,7 @@ impl Agent for ClientSideConnection {
.request(
AGENT_METHOD_NAMES.session_set_config_option,
Some(ClientRequest::SetSessionConfigOptionRequest(args)),
)
)?
.await
}

Expand All @@ -223,7 +223,7 @@ impl Agent for ClientSideConnection {
.request(
format!("_{}", args.method),
Some(ClientRequest::ExtMethodRequest(args)),
)
)?
.await
}

Expand Down Expand Up @@ -441,7 +441,7 @@ impl Client for AgentSideConnection {
.request(
CLIENT_METHOD_NAMES.session_request_permission,
Some(AgentRequest::RequestPermissionRequest(args)),
)
)?
.await
}

Expand All @@ -450,7 +450,7 @@ impl Client for AgentSideConnection {
.request::<Option<_>>(
CLIENT_METHOD_NAMES.fs_write_text_file,
Some(AgentRequest::WriteTextFileRequest(args)),
)
)?
.await
.map(Option::unwrap_or_default)
}
Expand All @@ -460,7 +460,7 @@ impl Client for AgentSideConnection {
.request(
CLIENT_METHOD_NAMES.fs_read_text_file,
Some(AgentRequest::ReadTextFileRequest(args)),
)
)?
.await
}

Expand All @@ -469,7 +469,7 @@ impl Client for AgentSideConnection {
.request(
CLIENT_METHOD_NAMES.terminal_create,
Some(AgentRequest::CreateTerminalRequest(args)),
)
)?
.await
}

Expand All @@ -478,7 +478,7 @@ impl Client for AgentSideConnection {
.request(
CLIENT_METHOD_NAMES.terminal_output,
Some(AgentRequest::TerminalOutputRequest(args)),
)
)?
.await
}

Expand All @@ -490,7 +490,7 @@ impl Client for AgentSideConnection {
.request::<Option<_>>(
CLIENT_METHOD_NAMES.terminal_release,
Some(AgentRequest::ReleaseTerminalRequest(args)),
)
)?
.await
.map(Option::unwrap_or_default)
}
Expand All @@ -503,7 +503,7 @@ impl Client for AgentSideConnection {
.request(
CLIENT_METHOD_NAMES.terminal_wait_for_exit,
Some(AgentRequest::WaitForTerminalExitRequest(args)),
)
)?
.await
}

Expand All @@ -512,7 +512,7 @@ impl Client for AgentSideConnection {
.request::<Option<_>>(
CLIENT_METHOD_NAMES.terminal_kill,
Some(AgentRequest::KillTerminalRequest(args)),
)
)?
.await
.map(Option::unwrap_or_default)
}
Expand All @@ -529,7 +529,7 @@ impl Client for AgentSideConnection {
.request(
format!("_{}", args.method),
Some(AgentRequest::ExtMethodRequest(args)),
)
)?
.await
}

Expand Down
9 changes: 6 additions & 3 deletions src/agent-client-protocol/src/rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ where
&self,
method: impl Into<Arc<str>>,
params: Option<Remote::InRequest>,
) -> impl Future<Output = Result<Out>> {
) -> Result<impl Future<Output = Result<Out>>> {
let (tx, rx) = oneshot::channel();
let id = self.next_id.fetch_add(1, Ordering::SeqCst);
let id = RequestId::Number(id);
Expand All @@ -139,16 +139,19 @@ where
.is_err()
{
self.pending_responses.lock().unwrap().remove(&id);
return Err(
Error::internal_error().data("connection closed before request could be sent")
);
}
async move {
Ok(async move {
let result = rx
.await
.map_err(|_| Error::internal_error().data("server shut down unexpectedly"))??
.downcast::<Out>()
.map_err(|_| Error::internal_error().data("failed to deserialize response"))?;

Ok(*result)
}
})
}

async fn handle_io(
Expand Down