@@ -3070,6 +3070,96 @@ fn discovery_cards_wrap_within_narrow_transcript_width() {
30703070 ) ;
30713071}
30723072
3073+ #[ test]
3074+ fn render_tool_message_groups_duration_and_tokens ( ) {
3075+ for name in [
3076+ "bash" ,
3077+ "read" ,
3078+ "edit" ,
3079+ "webfetch" ,
3080+ "debug_socket" ,
3081+ "unknown_tool" ,
3082+ ] {
3083+ for content in [ "ok" , "Error: failed" ] {
3084+ let mut msg = DisplayMessage :: tool (
3085+ content,
3086+ crate :: message:: ToolCall {
3087+ id : "timed" . into ( ) ,
3088+ name : name. into ( ) ,
3089+ input : serde_json:: json!( { } ) ,
3090+ intent : Some ( "A completed tool call" . into ( ) ) ,
3091+ thought_signature : None ,
3092+ } ,
3093+ ) ;
3094+ msg. duration_secs = Some ( 2.4 ) ;
3095+ let tokens =
3096+ crate :: util:: format_approx_token_count ( crate :: util:: estimate_tokens ( content) ) ;
3097+ for width in [ 32 , 60 , 120 ] {
3098+ let lines = render_tool_message ( & msg, width, crate :: config:: DiffDisplayMode :: Off ) ;
3099+ let row = extract_line_text ( & lines[ 0 ] ) ;
3100+ assert ! ( row. contains( & format!( "2.4s, {tokens}" ) ) , "{name}: {row}" ) ;
3101+ assert ! ( !row. contains( "2.4s ·" ) , "{row}" ) ;
3102+ assert ! ( lines[ 0 ] . width( ) < width as usize , "{row}" ) ;
3103+ }
3104+ }
3105+ }
3106+ }
3107+
3108+ #[ test]
3109+ fn batch_subcall_groups_duration_and_tokens ( ) {
3110+ let tool = crate :: message:: ToolCall {
3111+ id : "timed-child" . into ( ) ,
3112+ name : "read" . into ( ) ,
3113+ input : serde_json:: json!( { } ) ,
3114+ intent : Some ( "Read configuration" . into ( ) ) ,
3115+ thought_signature : None ,
3116+ } ;
3117+ let line = crate :: tui:: ui:: tools_ui:: render_batch_subcall_line (
3118+ & tool,
3119+ "✓" ,
3120+ rgb ( 100 , 180 , 100 ) ,
3121+ 50 ,
3122+ Some ( 80 ) ,
3123+ Some ( "[tool timing: duration=73ms] config content" ) ,
3124+ ) ;
3125+ let text = extract_line_text ( & line) ;
3126+ assert ! ( text. contains( " · 73ms, " ) , "{text}" ) ;
3127+ assert ! ( text. ends_with( " tok" ) , "{text}" ) ;
3128+ assert ! ( line. width( ) <= 80 ) ;
3129+ }
3130+
3131+ #[ test]
3132+ fn tool_usage_label_handles_missing_and_legacy_duration ( ) {
3133+ use crate :: tui:: ui:: tools_ui:: tool_usage_label;
3134+ assert_eq ! ( tool_usage_label( "217 tok" , None , "ok" ) , "217 tok" ) ;
3135+ assert_eq ! ( tool_usage_label( "217 tok" , Some ( 0.0 ) , "ok" ) , "0ms, 217 tok" ) ;
3136+ assert_eq ! ( tool_usage_label( "217 tok" , Some ( f32 :: NAN ) , "ok" ) , "217 tok" ) ;
3137+ assert_eq ! (
3138+ tool_usage_label(
3139+ "217 tok" ,
3140+ None ,
3141+ "[tool timing: start=x finish=y duration=2.4s] ok"
3142+ ) ,
3143+ "2.4s, 217 tok"
3144+ ) ;
3145+ assert_eq ! (
3146+ tool_usage_label( "217 tok" , None , "[tool timing: duration=1m 4s] ok" ) ,
3147+ "1m 4s, 217 tok"
3148+ ) ;
3149+ assert_eq ! (
3150+ tool_usage_label( "217 tok" , None , "[tool timing: duration=73ms] ok" ) ,
3151+ "73ms, 217 tok"
3152+ ) ;
3153+ assert_eq ! (
3154+ tool_usage_label( "217 tok" , None , "[tool timing: duration=NaNs] ok" ) ,
3155+ "217 tok"
3156+ ) ;
3157+ assert_eq ! (
3158+ tool_usage_label( "217 tok" , None , "[tool timing: duration=invalid] ok" ) ,
3159+ "217 tok"
3160+ ) ;
3161+ }
3162+
30733163#[ test]
30743164fn render_tool_message_colors_high_token_badge ( ) {
30753165 let msg = DisplayMessage {
0 commit comments