@@ -6,6 +6,7 @@ use crate::clone;
66use crate :: exe:: { resolve_exe, verify_pin} ;
77use crate :: folders;
88use crate :: humantime;
9+ use crate :: limit;
910use crate :: login;
1011use crate :: objectmodes;
1112use crate :: orchestrator;
@@ -69,6 +70,7 @@ const SHIM_QUEUE: usize = 1024;
6970const SHIM_INPUT_CAP : usize = 1 << 20 ;
7071const SHIM_INPUT_FRAMES : usize = 512 ;
7172const SHIM_CREDIT_FRAMES : u64 = 1024 ;
73+ const LIMIT_CONFIRM : Duration = Duration :: from_secs ( 3 ) ;
7274const SHIM_LINK_SILENT : Duration = Duration :: from_secs ( 5 ) ;
7375const ATTACH_INPUT_WAIT : Duration = Duration :: from_secs ( 2 ) ;
7476// A note typed into the agent only shows on screen after its next redraw; wait that long before the next one.
@@ -421,6 +423,8 @@ struct Meta {
421423 team : Option < TeamLink > ,
422424 #[ serde( default , skip_serializing_if = "Option::is_none" ) ]
423425 agent_session_id : Option < String > ,
426+ #[ serde( default , skip_serializing_if = "Option::is_none" ) ]
427+ limit : Option < tmgr_ipc:: api:: LimitHit > ,
424428}
425429
426430#[ derive( Serialize , Deserialize , Clone ) ]
@@ -495,6 +499,7 @@ struct Inner {
495499 fixed : Option < State > ,
496500 size_owner : Option < u64 > ,
497501 input_sent_at : Option < Instant > ,
502+ limit_first : Option < Instant > ,
498503}
499504
500505#[ derive( Default ) ]
@@ -731,6 +736,7 @@ impl Session {
731736 SessionInfo {
732737 team : m. team . clone ( ) ,
733738 agent_session_id : m. agent_session_id . clone ( ) ,
739+ limit : m. limit . clone ( ) ,
734740 id : m. id . clone ( ) ,
735741 name : m. name . clone ( ) ,
736742 argv : m. argv . clone ( ) ,
@@ -992,13 +998,50 @@ impl Session {
992998 }
993999 } ) ;
9941000 self . version . fetch_add ( 1 , Ordering :: SeqCst ) ;
1001+ if live {
1002+ self . watch_limit ( None ) ;
1003+ }
9951004 for reply in replies {
9961005 if self . reply_allowed ( ) {
9971006 let _ = self . shim_input ( & reply) ;
9981007 }
9991008 }
10001009 }
10011010
1011+ fn watch_limit ( & self , exit : Option < Option < i32 > > ) {
1012+ let mut hit = None ;
1013+ {
1014+ let mut i = lock ( & self . inner ) ;
1015+ if i. meta . limit . is_some ( ) {
1016+ return ;
1017+ }
1018+ let Some ( profile) = i. meta . profile . clone ( ) else {
1019+ return ;
1020+ } ;
1021+ let found = limit:: detect ( & profile, & i. screen . bottom_text ( 12 ) ) ;
1022+ match ( found, exit) {
1023+ ( Some ( line) , Some ( code) ) if code != Some ( 0 ) => hit = Some ( line) ,
1024+ ( Some ( line) , None ) => {
1025+ let first = * i. limit_first . get_or_insert_with ( Instant :: now) ;
1026+ if first. elapsed ( ) >= LIMIT_CONFIRM {
1027+ hit = Some ( line) ;
1028+ }
1029+ }
1030+ ( None , _) | ( Some ( _) , Some ( _) ) => i. limit_first = None ,
1031+ }
1032+ if let Some ( line) = & hit {
1033+ i. meta . limit = Some ( tmgr_ipc:: api:: LimitHit {
1034+ line : line. clone ( ) ,
1035+ at_ms : now_ms ( ) ,
1036+ } ) ;
1037+ }
1038+ }
1039+ if hit. is_some ( ) {
1040+ self . persist ( ) ;
1041+ self . version . fetch_add ( 1 , Ordering :: SeqCst ) ;
1042+ }
1043+ }
1044+
10021045 fn card_agent ( & self ) -> Option < permit:: Agent > {
10031046 let i = lock ( & self . inner ) ;
10041047 i. meta
@@ -1226,6 +1269,7 @@ impl Session {
12261269 }
12271270 out. extend ( changed)
12281271 } ) ;
1272+ self . watch_limit ( Some ( e. code ) ) ;
12291273 self . worklog . exited ( at, e. code , e. signal ) ;
12301274 self . learn_trust ( ) ;
12311275 finish_seeds ( & self . dir , & self . id ) ;
@@ -1289,6 +1333,9 @@ impl Session {
12891333
12901334 fn tick ( self : & Arc < Self > ) {
12911335 self . change ( |i, now, out| out. extend ( i. det . tick ( now) ) ) ;
1336+ if !self . is_exited ( ) {
1337+ self . watch_limit ( None ) ;
1338+ }
12921339 self . cp_tick ( ) ;
12931340 self . agent_work ( ) ;
12941341 }
@@ -4602,6 +4649,7 @@ impl Runner {
46024649 permission_cards : extra. permission_cards ,
46034650 team : extra. team . clone ( ) ,
46044651 agent_session_id : extra. agent_session_id . clone ( ) ,
4652+ limit : None ,
46054653 } ;
46064654 write_meta ( sdir, & meta) ;
46074655 let session = self . new_session ( meta, matcher, sdir) ;
@@ -4649,6 +4697,7 @@ impl Runner {
46494697 fixed : None ,
46504698 size_owner : None ,
46514699 input_sent_at : None ,
4700+ limit_first : None ,
46524701 } ) ,
46534702 version : AtomicU64 :: new ( 0 ) ,
46544703 shim : Mutex :: new ( None ) ,
@@ -5872,6 +5921,62 @@ mod tests {
58725921 Instant :: now ( ) + SEND_SETTLE
58735922 }
58745923
5924+ const LIMIT_SCREEN : & [ u8 ] = "\r \n 5-hour limit reached \u{2219} resets 3pm\r \n " . as_bytes ( ) ;
5925+
5926+ fn backdate_limit ( s : & Session ) {
5927+ lock ( & s. inner ) . limit_first = Some ( Instant :: now ( ) - LIMIT_CONFIRM - Duration :: from_secs ( 1 ) ) ;
5928+ }
5929+
5930+ #[ test]
5931+ fn a_limit_message_counts_only_after_it_stayed_on_screen ( ) {
5932+ let ( _t, s, _rx) = lone_session ( ) ;
5933+ s. feed ( LIMIT_SCREEN , true ) ;
5934+ assert ! ( s. info( ) . limit. is_none( ) ) ;
5935+ backdate_limit ( & s) ;
5936+ s. watch_limit ( None ) ;
5937+ let hit = s. info ( ) . limit . expect ( "limit hit" ) ;
5938+ assert ! ( hit. line. starts_with( "5-hour limit reached" ) ) ;
5939+ assert ! ( lock( & s. inner) . meta. limit. is_some( ) ) ;
5940+ }
5941+
5942+ #[ test]
5943+ fn a_limit_message_that_goes_away_resets_the_wait ( ) {
5944+ let ( _t, s, _rx) = lone_session ( ) ;
5945+ s. feed ( LIMIT_SCREEN , true ) ;
5946+ s. feed ( b"\x1b [2J\x1b [Hworking again\r \n " , true ) ;
5947+ backdate_limit ( & s) ;
5948+ s. watch_limit ( None ) ;
5949+ assert ! ( s. info( ) . limit. is_none( ) ) ;
5950+ }
5951+
5952+ #[ test]
5953+ fn prose_that_mentions_a_limit_is_not_a_hit ( ) {
5954+ let ( _t, s, _rx) = lone_session ( ) ;
5955+ s. feed (
5956+ b"\r \n I added a check for 5-hour limit reached in limit.rs\r \n " ,
5957+ true ,
5958+ ) ;
5959+ backdate_limit ( & s) ;
5960+ s. watch_limit ( None ) ;
5961+ assert ! ( s. info( ) . limit. is_none( ) ) ;
5962+ }
5963+
5964+ #[ test]
5965+ fn a_failed_exit_with_the_message_on_screen_counts_at_once ( ) {
5966+ let ( _t, s, _rx) = lone_session ( ) ;
5967+ s. feed ( LIMIT_SCREEN , true ) ;
5968+ s. watch_limit ( Some ( Some ( 1 ) ) ) ;
5969+ assert ! ( s. info( ) . limit. is_some( ) ) ;
5970+ }
5971+
5972+ #[ test]
5973+ fn a_clean_exit_never_counts ( ) {
5974+ let ( _t, s, _rx) = lone_session ( ) ;
5975+ s. feed ( LIMIT_SCREEN , true ) ;
5976+ s. watch_limit ( Some ( Some ( 0 ) ) ) ;
5977+ assert ! ( s. info( ) . limit. is_none( ) ) ;
5978+ }
5979+
58755980 #[ test]
58765981 fn a_second_send_right_after_the_first_is_refused_even_after_an_echo ( ) {
58775982 let ( _t, s, rx) = lone_session ( ) ;
0 commit comments