fix(acp): remove boxfnonce dependency in favor of Box<dyn FnOnce> (#137)

* refactor(acp): remove boxfnonce dependency in favor of Box<dyn FnOnce>

Signed-off-by: Sachin Bhat <sachubhat17@gmail.com>

* chore(deps): bump tokio, rmcp, clap, hyper, and other workspace dependencies

Signed-off-by: Sachin Bhat <sachubhat17@gmail.com>

* style(acp): remove redundant wildcard patterns flagged by clippy

Signed-off-by: Sachin Bhat <sachubhat17@gmail.com>

* Revert unnecessary changes

---------

Signed-off-by: Sachin Bhat <sachubhat17@gmail.com>
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>

Author: Sachin-Bhat

Cargo.lock

@@ -72,7 +72,6 @@ tower-http = { version = "0.6", features = ["fs"] }
 async-broadcast = "0.7"
 async-stream = "0.3.6"
 async-trait = "0.1"
-boxfnonce = "0.1.1"
 chrono = "0.4"
 derive_more = { version = "2", features = ["from"] }
 futures = "0.3.32"

Cargo.toml

@@ -42,7 +42,6 @@ unstable_session_usage = ["agent-client-protocol-schema/unstable_session_usage"]
 agent-client-protocol-schema.workspace = true
 agent-client-protocol-derive.workspace = true
 anyhow.workspace = true
-boxfnonce.workspace = true
 futures.workspace = true
 futures-concurrency.workspace = true
 rustc-hash.workspace = true

src/agent-client-protocol/Cargo.toml

@@ -11,7 +11,6 @@ use std::panic::Location;
 use std::pin::pin;
 use uuid::Uuid;
 
-use boxfnonce::SendBoxFnOnce;
 use futures::channel::{mpsc, oneshot};
 use futures::future::{self, BoxFuture, Either};
 use futures::{AsyncRead, AsyncWrite, StreamExt};
@@ -1900,7 +1899,7 @@ pub struct Responder<T: JsonRpcResponse = serde_json::Value> {
     ///
     /// For incoming requests: serializes to JSON and sends over the wire.
     /// For incoming responses: sends to the waiting oneshot channel.
-    send_fn: SendBoxFnOnce<'static, (Result<T, crate::Error>,), Result<(), crate::Error>>,
+    send_fn: Box<dyn FnOnce(Result<T, crate::Error>) -> Result<(), crate::Error> + Send>,
 }
 
 impl<T: JsonRpcResponse> std::fmt::Debug for Responder<T> {
@@ -1922,17 +1921,15 @@ impl Responder<serde_json::Value> {
         Self {
             method,
             id,
-            send_fn: SendBoxFnOnce::new(
-                move |response: Result<serde_json::Value, crate::Error>| {
-                    send_raw_message(
-                        &message_tx,
-                        OutgoingMessage::Response {
-                            id: id_clone,
-                            response,
-                        },
-                    )
-                },
-            ),
+            send_fn: Box::new(move |response: Result<serde_json::Value, crate::Error>| {
+                send_raw_message(
+                    &message_tx,
+                    OutgoingMessage::Response {
+                        id: id_clone,
+                        response,
+                    },
+                )
+            }),
         }
     }
 
@@ -1988,9 +1985,9 @@ impl<T: JsonRpcResponse> Responder<T> {
         Responder {
             method: self.method,
             id: self.id,
-            send_fn: SendBoxFnOnce::new(move |input: Result<U, crate::Error>| {
+            send_fn: Box::new(move |input: Result<U, crate::Error>| {
                 let t_value = wrap_fn(&method, input);
-                self.send_fn.call(t_value)
+                (self.send_fn)(t_value)
             }),
         }
     }
@@ -2001,7 +1998,7 @@ impl<T: JsonRpcResponse> Responder<T> {
         response: Result<T, crate::Error>,
     ) -> Result<(), crate::Error> {
         tracing::debug!(id = ?self.id, "respond called");
-        self.send_fn.call(response)
+        (self.send_fn)(response)
     }
 
     /// Respond to the JSON-RPC request with a value.
@@ -2042,7 +2039,7 @@ pub struct ResponseRouter<T: JsonRpcResponse = serde_json::Value> {
     role_id: RoleId,
 
     /// Function to send the response to the waiting task.
-    send_fn: SendBoxFnOnce<'static, (Result<T, crate::Error>,), Result<(), crate::Error>>,
+    send_fn: Box<dyn FnOnce(Result<T, crate::Error>) -> Result<(), crate::Error> + Send>,
 }
 
 impl<T: JsonRpcResponse> std::fmt::Debug for ResponseRouter<T> {
@@ -2070,18 +2067,16 @@ impl ResponseRouter<serde_json::Value> {
             method,
             id,
             role_id,
-            send_fn: SendBoxFnOnce::new(
-                move |response: Result<serde_json::Value, crate::Error>| {
-                    sender
-                        .send(ResponsePayload {
-                            result: response,
-                            ack_tx: None,
-                        })
-                        .map_err(|_| {
-                            crate::util::internal_error("failed to send response, receiver dropped")
-                        })
-                },
-            ),
+            send_fn: Box::new(move |response: Result<serde_json::Value, crate::Error>| {
+                sender
+                    .send(ResponsePayload {
+                        result: response,
+                        ack_tx: None,
+                    })
+                    .map_err(|_| {
+                        crate::util::internal_error("failed to send response, receiver dropped")
+                    })
+            }),
         }
     }
 
@@ -2137,9 +2132,9 @@ impl<T: JsonRpcResponse> ResponseRouter<T> {
             method: self.method,
             id: self.id,
             role_id: self.role_id,
-            send_fn: SendBoxFnOnce::new(move |input: Result<U, crate::Error>| {
+            send_fn: Box::new(move |input: Result<U, crate::Error>| {
                 let t_value = wrap_fn(&method, input);
-                self.send_fn.call(t_value)
+                (self.send_fn)(t_value)
             }),
         }
     }
@@ -2150,7 +2145,7 @@ impl<T: JsonRpcResponse> ResponseRouter<T> {
         response: Result<T, crate::Error>,
     ) -> Result<(), crate::Error> {
         tracing::debug!(id = ?self.id, "response routed to awaiter");
-        self.send_fn.call(response)
+        (self.send_fn)(response)
     }
 
     /// Complete the response by sending a value to the waiting task.

src/agent-client-protocol/src/jsonrpc.rs

@@ -565,11 +565,7 @@ where
                 PromptRequest::new(self.session_id.clone(), vec![prompt.to_string().into()]),
             )
             .on_receiving_result(async move |result| {
-                let PromptResponse {
-                    stop_reason,
-                    meta: _,
-                    ..
-                } = result?;
+                let PromptResponse { stop_reason, .. } = result?;
 
                 update_tx
                     .unbounded_send(SessionMessage::StopReason(stop_reason))
@@ -602,7 +598,6 @@ where
                     .if_notification(async |notif: SessionNotification| match notif.update {
                         SessionUpdate::AgentMessageChunk(ContentChunk {
                             content: ContentBlock::Text(text),
-                            meta: _,
                             ..
                         }) => {
                             output.push_str(&text.text);