more effiency improvements

Author: harryalbert

crates/warp_tui/benches/transcript_bench.rs

@@ -17,6 +17,20 @@ fn benchmark_clipped_terminal_block(criterion: &mut Criterion) {
     group.finish();
 }
 
+fn benchmark_running_agent_command(criterion: &mut Criterion) {
+    let mut group = criterion.benchmark_group("tui_transcript/running_agent_command");
+    for rows in [100, 1_000] {
+        let mut benchmark =
+            TranscriptBenchmark::new(TranscriptDataset::RunningAgentCommand { rows }, 120, 50);
+        group.bench_with_input(
+            BenchmarkId::new("retained_unchanged_frame", rows),
+            &rows,
+            |b, _| b.iter(|| black_box(benchmark.present())),
+        );
+    }
+    group.finish();
+}
+
 fn benchmark_many_small_blocks(criterion: &mut Criterion) {
     let mut group = criterion.benchmark_group("tui_transcript/many_small_blocks");
     for blocks in [100, 1_000, 10_000] {
@@ -107,6 +121,7 @@ criterion_group! {
         .measurement_time(Duration::from_secs(1));
     targets =
         benchmark_clipped_terminal_block,
+        benchmark_running_agent_command,
         benchmark_many_small_blocks,
         benchmark_long_agent_response,
         benchmark_offscreen_streaming_tail

crates/warp_tui/src/benchmark_support.rs

@@ -7,10 +7,11 @@ use std::sync::Arc;
 
 use parking_lot::FairMutex;
 use warp::tui_export::{
-    AIAgentExchangeId, AIAgentInput, AIAgentOutput, AIAgentOutputMessage, AIAgentOutputMessageType,
-    AIAgentText, AIAgentTextSection, AIBlockModel, AIBlockOutputStatus, AIConversationId,
-    AIRequestType, Appearance, BlockId, LLMId, MessageId, OutputStatusUpdateCallback,
-    RichContentItem, RichContentType, ServerOutputId, Shared, TerminalModel,
+    AIAgentAction, AIAgentActionId, AIAgentActionType, AIAgentExchangeId, AIAgentInput,
+    AIAgentOutput, AIAgentOutputMessage, AIAgentOutputMessageType, AIAgentText, AIAgentTextSection,
+    AIBlockModel, AIBlockOutputStatus, AIConversationId, AIRequestType, Appearance, BlockId, LLMId,
+    MessageId, OutputStatusUpdateCallback, RichContentItem, RichContentType, ServerOutputId,
+    Shared, TaskId, TerminalModel,
 };
 use warpui::platform::WindowStyle;
 use warpui::{
@@ -30,6 +31,7 @@ use crate::tui_block_list_viewport_source::{
     AgentBlockRegistry, CLISubagentBlockRegistry, HandoffBlockRegistry, TuiBlockListViewportSource,
 };
 use crate::tui_builder::TuiUiBuilder;
+use crate::tui_shell_command_view::TuiShellCommandViewAction;
 
 /// Shape of the retained transcript fixture.
 #[derive(Clone, Copy, Debug)]
@@ -38,6 +40,8 @@ pub enum TranscriptDataset {
     ManySmallBlocks { blocks: usize },
     /// One rich agent response containing `rows` hard lines.
     LongAgentResponse { rows: usize },
+    /// One expanded agent-requested command that remains active at `rows` output rows.
+    RunningAgentCommand { rows: usize },
     /// A streaming rich response below `preceding_rows` of fixed history.
     OffscreenStreamingTail {
         preceding_rows: usize,
@@ -130,6 +134,24 @@ impl TranscriptBenchmark {
                     .lock()
                     .simulate_block("history", output.as_str());
             }
+            let running_command_action =
+                if let TranscriptDataset::RunningAgentCommand { rows } = dataset {
+                    let action = benchmark_command_action();
+                    let output = "running command output\r\n".repeat(rows);
+                    let mut model = terminal_model.lock();
+                    model.simulate_long_running_block("printf benchmark", output.as_str());
+                    model
+                        .block_list_mut()
+                        .active_block_mut()
+                        .set_agent_interaction_mode_for_requested_command(
+                            action.id.clone(),
+                            None,
+                            AIConversationId::new(),
+                        );
+                    Some(action)
+                } else {
+                    None
+                };
 
             let agent_blocks = AgentBlockRegistry::new(RefCell::new(HashMap::new()));
             let cli_subagent_blocks = CLISubagentBlockRegistry::new(RefCell::new(HashMap::new()));
@@ -167,7 +189,8 @@ impl TranscriptBenchmark {
                         TranscriptDataset::OffscreenStreamingTail { .. } => {
                             streaming_text_status(text)
                         }
-                        TranscriptDataset::ManySmallBlocks { .. } => unreachable!(),
+                        TranscriptDataset::ManySmallBlocks { .. }
+                        | TranscriptDataset::RunningAgentCommand { .. } => unreachable!(),
                     };
                     let terminal_model_for_block = terminal_model.clone();
                     let agent_block = app.update(|ctx| {
@@ -191,6 +214,48 @@ impl TranscriptBenchmark {
                     );
                     Some(view_id)
                 }
+                TranscriptDataset::RunningAgentCommand { .. } => {
+                    let (action_model, model_events) = add_test_action_model_and_events(&mut app);
+                    let action =
+                        running_command_action.expect("running command dataset has an action");
+                    let status = running_command_status(action);
+                    let terminal_model_for_block = terminal_model.clone();
+                    let agent_block = app.update(|ctx| {
+                        ctx.add_typed_action_tui_view(window_id, move |ctx| {
+                            TuiAIBlock::new(
+                                (AIConversationId::new(), AIAgentExchangeId::new()),
+                                Rc::new(BenchmarkAgentBlockModel { status }),
+                                action_model,
+                                &model_events,
+                                terminal_model_for_block,
+                                false,
+                                ctx,
+                            )
+                        })
+                    });
+                    let view_id = agent_block.id();
+                    agent_blocks
+                        .borrow_mut()
+                        .insert(view_id, agent_block.clone());
+                    terminal_model.lock().block_list_mut().append_rich_content(
+                        RichContentItem::new(Some(RichContentType::AIBlock), view_id, None, false),
+                        false,
+                    );
+                    app.update(|ctx| {
+                        let shell_view_id = agent_block
+                            .as_ref(ctx)
+                            .child_view_ids(ctx)
+                            .into_iter()
+                            .next()
+                            .expect("running command agent block has a shell child");
+                        ctx.dispatch_typed_action_for_view(
+                            window_id,
+                            shell_view_id,
+                            &TuiShellCommandViewAction::ToggleExpanded,
+                        );
+                    });
+                    Some(view_id)
+                }
             };
 
             let mut benchmark = Self {
@@ -346,6 +411,36 @@ impl AIBlockModel for BenchmarkAgentBlockModel {
     }
 }
 
+fn benchmark_command_action() -> AIAgentAction {
+    AIAgentAction {
+        id: AIAgentActionId::from("benchmark-command".to_owned()),
+        task_id: TaskId::new("benchmark-task".to_owned()),
+        action: AIAgentActionType::RequestCommandOutput {
+            command: "printf benchmark".to_owned(),
+            is_read_only: Some(true),
+            is_risky: Some(false),
+            wait_until_completion: true,
+            uses_pager: Some(false),
+            rationale: None,
+            citations: Vec::new(),
+        },
+        requires_result: true,
+    }
+}
+
+fn running_command_status(action: AIAgentAction) -> AIBlockOutputStatus {
+    AIBlockOutputStatus::Complete {
+        output: Shared::new(AIAgentOutput {
+            messages: vec![AIAgentOutputMessage {
+                id: MessageId::new("benchmark-command-message".to_owned()),
+                message: AIAgentOutputMessageType::Action(action),
+                citations: Vec::new(),
+            }],
+            ..Default::default()
+        }),
+    }
+}
+
 fn completed_text_status(text: String) -> AIBlockOutputStatus {
     AIBlockOutputStatus::Complete {
         output: Shared::new(AIAgentOutput {