@@ -3,17 +3,16 @@ use super::crypto::{remote_base64_url_decode, remote_host_name};
33use super :: pairing:: remote_summary_show_pending_pairing;
44use super :: protocol:: {
55 REMOTE_AI_STATS , REMOTE_DEVICE_CONNECTED , REMOTE_DEVICE_DISCONNECTED , REMOTE_ERROR ,
6- REMOTE_FILE_DELETE , REMOTE_FILE_DELETED , REMOTE_FILE_LIST , REMOTE_FILE_READ , REMOTE_FILE_RENAME ,
7- REMOTE_FILE_RENAMED , REMOTE_FILE_WRITE , REMOTE_FILE_WRITTEN , REMOTE_GIT_STATUS ,
8- REMOTE_HOST_INFO , REMOTE_HOST_OFFLINE , REMOTE_PAIRING_CONFIRMED , REMOTE_PAIRING_REJECTED ,
9- REMOTE_PROJECT_ADD , REMOTE_PROJECT_EDIT ,
10- REMOTE_PROJECT_LIST , REMOTE_PROJECT_REMOVE , REMOTE_PROJECT_SELECT , REMOTE_PROJECT_SELECTED ,
11- REMOTE_PROJECT_UPDATED , REMOTE_RESOURCE_AI_STATS , REMOTE_RESOURCE_GIT_STATUS ,
12- REMOTE_RESOURCE_PROJECTS , REMOTE_RESOURCE_SUBSCRIBE , REMOTE_RESOURCE_TERMINALS ,
13- REMOTE_RESOURCE_UNSUBSCRIBE , REMOTE_RESOURCE_WORKTREES , REMOTE_TERMINAL_BUFFER ,
14- REMOTE_TERMINAL_BUFFER_MAX_CHARS , REMOTE_TERMINAL_CLOSE , REMOTE_TERMINAL_CLOSED ,
15- REMOTE_TERMINAL_CREATE , REMOTE_TERMINAL_CREATED , REMOTE_TERMINAL_INPUT ,
16- REMOTE_TERMINAL_INPUT_ACK , REMOTE_TERMINAL_LIST , REMOTE_TERMINAL_OUTPUT ,
6+ REMOTE_FILE_DELETE , REMOTE_FILE_DELETED , REMOTE_FILE_LIST , REMOTE_FILE_READ ,
7+ REMOTE_FILE_RENAME , REMOTE_FILE_RENAMED , REMOTE_FILE_WRITE , REMOTE_FILE_WRITTEN ,
8+ REMOTE_GIT_STATUS , REMOTE_HOST_INFO , REMOTE_HOST_OFFLINE , REMOTE_PAIRING_CONFIRMED ,
9+ REMOTE_PAIRING_REJECTED , REMOTE_PROJECT_ADD , REMOTE_PROJECT_EDIT , REMOTE_PROJECT_LIST ,
10+ REMOTE_PROJECT_REMOVE , REMOTE_PROJECT_SELECT , REMOTE_PROJECT_SELECTED , REMOTE_PROJECT_UPDATED ,
11+ REMOTE_RESOURCE_AI_STATS , REMOTE_RESOURCE_GIT_STATUS , REMOTE_RESOURCE_PROJECTS ,
12+ REMOTE_RESOURCE_SUBSCRIBE , REMOTE_RESOURCE_TERMINALS , REMOTE_RESOURCE_UNSUBSCRIBE ,
13+ REMOTE_RESOURCE_WORKTREES , REMOTE_TERMINAL_BUFFER , REMOTE_TERMINAL_BUFFER_MAX_CHARS ,
14+ REMOTE_TERMINAL_CLOSE , REMOTE_TERMINAL_CLOSED , REMOTE_TERMINAL_CREATE , REMOTE_TERMINAL_CREATED ,
15+ REMOTE_TERMINAL_INPUT , REMOTE_TERMINAL_INPUT_ACK , REMOTE_TERMINAL_LIST , REMOTE_TERMINAL_OUTPUT ,
1716 REMOTE_TERMINAL_OUTPUT_ACK , REMOTE_TERMINAL_RESIZE , REMOTE_TERMINAL_SIGNAL ,
1817 REMOTE_TERMINAL_SUBSCRIBE , REMOTE_TERMINAL_UNSUBSCRIBE , REMOTE_TERMINAL_UPLOAD ,
1918 REMOTE_TERMINAL_UPLOAD_ACK , REMOTE_TERMINAL_UPLOAD_CANCEL , REMOTE_TERMINAL_UPLOAD_CHUNK ,
@@ -31,8 +30,8 @@ use super::relay::{remote_pairing_ticket_payload, remote_server_url, remote_stun
3130use super :: transport:: RemoteTransport ;
3231use super :: transport_factory:: RemoteTransportFactory ;
3332use super :: types:: {
34- RemoteDeviceSettings , RemoteEnvelope , RemotePairingInfo , RemotePairingPollResult ,
35- RemoteHostEvent , RemoteSummary , RemoteTerminalLayoutChanged , RemoteTransportCandidate ,
33+ RemoteDeviceSettings , RemoteEnvelope , RemoteHostEvent , RemotePairingInfo ,
34+ RemotePairingPollResult , RemoteSummary , RemoteTerminalLayoutChanged , RemoteTransportCandidate ,
3635 RemoteTransportPairingRequest ,
3736} ;
3837use crate :: ai_history_indexer:: { AIHistoryIndexer , AIHistoryProjectState } ;
@@ -237,7 +236,10 @@ impl RemoteHostRuntime {
237236 }
238237
239238 fn publish_remote_terminal_layout_changed ( & self ) {
240- let generation = self . remote_terminal_layout_generation . fetch_add ( 1 , Ordering :: Relaxed ) + 1 ;
239+ let generation = self
240+ . remote_terminal_layout_generation
241+ . fetch_add ( 1 , Ordering :: Relaxed )
242+ + 1 ;
241243 self . push_event ( RemoteHostEvent :: TerminalLayoutChanged (
242244 RemoteTerminalLayoutChanged { generation } ,
243245 ) ) ;
@@ -1089,7 +1091,12 @@ impl RemoteHostRuntime {
10891091 return ;
10901092 } ;
10911093 match remote_file_read ( path) {
1092- Ok ( payload) => self . send ( REMOTE_FILE_READ , envelope. device_id . as_deref ( ) , None , payload) ,
1094+ Ok ( payload) => self . send (
1095+ REMOTE_FILE_READ ,
1096+ envelope. device_id . as_deref ( ) ,
1097+ None ,
1098+ payload,
1099+ ) ,
10931100 Err ( error) => self . send_error ( envelope, & error) ,
10941101 }
10951102 }
@@ -2455,7 +2462,12 @@ impl RemoteHostRuntime {
24552462 }
24562463 let payload = json ! ( { "terminals" : self . remote_terminals( ) } ) ;
24572464 for device_id in device_ids {
2458- self . send ( REMOTE_TERMINAL_LIST , Some ( & device_id) , None , payload. clone ( ) ) ;
2465+ self . send (
2466+ REMOTE_TERMINAL_LIST ,
2467+ Some ( & device_id) ,
2468+ None ,
2469+ payload. clone ( ) ,
2470+ ) ;
24592471 }
24602472 }
24612473
@@ -4395,10 +4407,12 @@ mod tests {
43954407 project_b. to_string_lossy( ) ,
43964408 worktree_b_path. to_string_lossy( )
43974409 ) ;
4398- assert ! ( runtime. drain_events( ) . iter( ) . any( |event| matches!(
4399- event,
4400- RemoteHostEvent :: TerminalLayoutChanged ( _)
4401- ) ) ) ;
4410+ assert ! (
4411+ runtime
4412+ . drain_events( )
4413+ . iter( )
4414+ . any( |event| matches!( event, RemoteHostEvent :: TerminalLayoutChanged ( _) ) )
4415+ ) ;
44024416
44034417 fs:: remove_dir_all ( support_dir) . ok ( ) ;
44044418 }
@@ -5130,10 +5144,12 @@ mod tests {
51305144 let layout_key = terminal_layout_storage_key ( "project-b" , "worktree-b" ) ;
51315145 let layout = TerminalLayoutService :: new ( support_dir. clone ( ) ) . load ( Some ( & layout_key) ) ;
51325146 assert_eq ! ( layout. tabs. len( ) , 1 ) ;
5133- assert ! ( runtime. drain_events( ) . iter( ) . any( |event| matches!(
5134- event,
5135- RemoteHostEvent :: TerminalLayoutChanged ( _)
5136- ) ) ) ;
5147+ assert ! (
5148+ runtime
5149+ . drain_events( )
5150+ . iter( )
5151+ . any( |event| matches!( event, RemoteHostEvent :: TerminalLayoutChanged ( _) ) )
5152+ ) ;
51375153
51385154 fs:: remove_dir_all ( support_dir) . ok ( ) ;
51395155 }
@@ -5204,10 +5220,12 @@ mod tests {
52045220 assert_eq ! ( layout. top_panes. len( ) , 1 ) ;
52055221 assert_eq ! ( layout. top_panes[ 0 ] . terminal_id, session_a) ;
52065222 assert ! ( terminals. snapshot( & session_b) . is_err( ) ) ;
5207- assert ! ( runtime. drain_events( ) . iter( ) . any( |event| matches!(
5208- event,
5209- RemoteHostEvent :: TerminalLayoutChanged ( _)
5210- ) ) ) ;
5223+ assert ! (
5224+ runtime
5225+ . drain_events( )
5226+ . iter( )
5227+ . any( |event| matches!( event, RemoteHostEvent :: TerminalLayoutChanged ( _) ) )
5228+ ) ;
52115229
52125230 runtime. handle_terminal_close ( & RemoteEnvelope {
52135231 kind : "terminal.close" . to_string ( ) ,
0 commit comments