@@ -116,12 +116,15 @@ use futures::{
116116 SinkExt , StreamExt ,
117117 channel:: mpsc:: { self } ,
118118} ;
119- use sacp:: { ChainResponder , JrResponder , NullResponder , role:: { ConductorToAgent , ConductorToClient , ConductorToProxy } } ;
120119use sacp:: schema:: {
121120 McpConnectRequest , McpConnectResponse , McpDisconnectNotification , McpOverAcpMessage ,
122121 SuccessorMessage ,
123122} ;
124123use sacp:: { Agent , Client , Component , Error , JrMessage } ;
124+ use sacp:: {
125+ ChainResponder , JrResponder , NullResponder ,
126+ role:: { ConductorToAgent , ConductorToClient , ConductorToProxy } ,
127+ } ;
125128use sacp:: {
126129 HasDefaultEndpoint , JrConnectionBuilder , JrConnectionCx , JrNotification , JrRequest ,
127130 JrRequestCx , JrResponse , JrRole , MessageCx , UntypedMessage ,
@@ -156,12 +159,12 @@ pub struct Conductor {
156159
157160impl Conductor {
158161 pub fn new (
159- name : String ,
162+ name : impl ToString ,
160163 component_list : impl ComponentList + ' static ,
161164 mcp_bridge_mode : crate :: McpBridgeMode ,
162165 ) -> Self {
163166 Conductor {
164- name,
167+ name : name . to_string ( ) ,
165168 component_list : Box :: new ( component_list) ,
166169 mcp_bridge_mode,
167170 trace_writer : None ,
@@ -193,8 +196,10 @@ impl Conductor {
193196
194197 pub fn into_connection_builder (
195198 self ,
196- ) -> JrConnectionBuilder < ConductorMessageHandler , ChainResponder < NullResponder , ConductorResponder > >
197- {
199+ ) -> JrConnectionBuilder <
200+ ConductorMessageHandler ,
201+ ChainResponder < NullResponder , ConductorResponder > ,
202+ > {
198203 let ( conductor_tx, conductor_rx) = mpsc:: channel ( 128 /* chosen arbitrarily */ ) ;
199204
200205 let responder = ConductorResponder {
@@ -210,11 +215,9 @@ impl Conductor {
210215 pending_requests : Default :: default ( ) ,
211216 } ;
212217
213- JrConnectionBuilder :: new_with ( ConductorMessageHandler {
214- conductor_tx,
215- } )
216- . name ( self . name )
217- . with_responder ( responder)
218+ JrConnectionBuilder :: new_with ( ConductorMessageHandler { conductor_tx } )
219+ . name ( self . name )
220+ . with_responder ( responder)
218221 }
219222
220223 /// Convenience method to run the conductor with a transport.
@@ -244,7 +247,6 @@ pub struct ConductorMessageHandler {
244247 conductor_tx : mpsc:: Sender < ConductorMessage > ,
245248}
246249
247-
248250impl JrMessageHandler for ConductorMessageHandler {
249251 type Role = ConductorToClient ;
250252
@@ -341,8 +343,7 @@ impl JrResponder<ConductorToClient> for ConductorResponder {
341343 // This is the "central actor" of the conductor. Most other things forward messages
342344 // via `conductor_tx` into this loop. This lets us serialize the conductor's activity.
343345 while let Some ( message) = self . conductor_rx . next ( ) . await {
344- self
345- . handle_conductor_message ( & cx, message, & mut conductor_tx)
346+ self . handle_conductor_message ( & cx, message, & mut conductor_tx)
346347 . await ?;
347348 }
348349 Ok ( ( ) )
0 commit comments