Skip to content

A self-improving RLM agent for coding workflows and long-running autonomous tasks.

Rust

pa-tui: a click on a python card no longer opens its sent agent messages (#3788)

Sebastian Müller46e823d775d7
diff --git a/crates/pa-tui/src/chat/tests.rs b/crates/pa-tui/src/chat/tests.rs
index 7847028295..93fa6001a0 100644
--- a/crates/pa-tui/src/chat/tests.rs
+++ b/crates/pa-tui/src/chat/tests.rs
@@ -422,7 +422,15 @@ fn ipython_card_done_line() {
result_partial: false,
..Default::default()
};
- let rows = render_tool_card(&card, 0, Detail::Overview, &theme(), 100, true);
+ let rows = render_tool_card(
+ &card,
+ 0,
+ Detail::Overview,
+ Detail::Overview,
+ &theme(),
+ 100,
+ true,
+ );
let text = rows[0]
.iter()
.map(|s| s.content.as_str())
diff --git a/crates/pa-tui/src/snapshot/tests.rs b/crates/pa-tui/src/snapshot/tests.rs
index 90e024431c..2061a6083e 100644
--- a/crates/pa-tui/src/snapshot/tests.rs
+++ b/crates/pa-tui/src/snapshot/tests.rs
@@ -34,6 +34,7 @@ fn rendered_card_text(view: &crate::view::AgentView) -> Vec<String> {
card,
0,
crate::chat::Detail::Overview,
+ crate::chat::Detail::Overview,
&view.theme,
100,
true,
@@ -2110,6 +2111,7 @@ fn elided_image_tool_results_render_their_marker_metadata() {
card,
0,
crate::chat::Detail::All,
+ crate::chat::Detail::All,
&crate::theme::Theme::builtin("prime", crate::theme::ColorMode::TrueColor),
100,
true,
diff --git a/crates/pa-tui/src/tool_card/ipython.rs b/crates/pa-tui/src/tool_card/ipython.rs
index 98659c2c7f..4e15098ca0 100644
--- a/crates/pa-tui/src/tool_card/ipython.rs
+++ b/crates/pa-tui/src/tool_card/ipython.rs
@@ -107,18 +107,29 @@ fn cell_code(card: &ToolCallCard) -> &str {
}
/// Render the ipython cell card: the fixed summary line, then the expanded
-/// code and output rows when conversation detail is `all`.
+/// code and output rows when the card's `detail` is `all`. The sent agent
+/// messages' bodies follow the conversation `level` instead.
#[must_use]
pub fn render(
card: &ToolCallCard,
frame: usize,
detail: Detail,
+ level: Detail,
theme: &Theme,
width: usize,
show_images: bool,
) -> Vec<Line> {
let mut lines = RowOutput::paint();
- layout(card, frame, detail, theme, width, show_images, &mut lines);
+ layout(
+ card,
+ frame,
+ detail,
+ level,
+ theme,
+ width,
+ show_images,
+ &mut lines,
+ );
lines.into_lines()
}
@@ -126,19 +137,31 @@ pub(super) fn count(
card: &ToolCallCard,
frame: usize,
detail: Detail,
+ level: Detail,
theme: &Theme,
width: usize,
show_images: bool,
) -> usize {
let mut lines = RowOutput::count();
- layout(card, frame, detail, theme, width, show_images, &mut lines);
+ layout(
+ card,
+ frame,
+ detail,
+ level,
+ theme,
+ width,
+ show_images,
+ &mut lines,
+ );
lines.len()
}
+#[allow(clippy::too_many_arguments)]
fn layout(
card: &ToolCallCard,
frame: usize,
detail: Detail,
+ level: Detail,
theme: &Theme,
width: usize,
show_images: bool,
@@ -165,14 +188,16 @@ fn layout(
code,
)
});
- // TS renders the sent-message receipt rows even when the cell is
- // collapsed; the body opens up only when expanded.
+ // The sent-message receipt rows render even when the cell is collapsed. They are agent
+ // messages of their own, so their bodies follow the conversation level, not a click on
+ // the card.
+ let messages_expanded = level.tool_output_expanded();
if !detail.tool_output_expanded() {
- render_sent_agent_messages(lines, &details, false, theme, width);
+ render_sent_agent_messages(lines, &details, messages_expanded, theme, width);
return;
}
let has_code = render_code(lines, code, theme, width);
- render_sent_agent_messages(lines, &details, true, theme, width);
+ render_sent_agent_messages(lines, &details, messages_expanded, theme, width);
render_output(card, &details, lines, has_code, show_images, theme, width);
// Image blocks render below the card when shown (TS adds these rows
// for every tool shell).
diff --git a/crates/pa-tui/src/tool_card/ipython/tests.rs b/crates/pa-tui/src/tool_card/ipython/tests.rs
index 1f389733e9..0f204db3d7 100644
--- a/crates/pa-tui/src/tool_card/ipython/tests.rs
+++ b/crates/pa-tui/src/tool_card/ipython/tests.rs
@@ -22,6 +22,11 @@ fn cell_card(code: &str, details: Value, is_error: bool, partial: bool) -> ToolC
}
}
+/// Render a card whose own detail matches the conversation level, with images shown.
+fn render_card(card: &ToolCallCard, detail: Detail) -> Vec<Line> {
+ render(card, 0, detail, detail, &theme(), 100, true)
+}
+
fn text_of(line: &Line) -> String {
line.iter().map(|s| s.content.as_str()).collect()
}
@@ -38,7 +43,7 @@ fn done_cell_summary_line() {
false,
false,
);
- let lines = render(&card, 0, Detail::Overview, &theme(), 100, true);
+ let lines = render_card(&card, Detail::Overview);
assert_eq!(lines.len(), 1);
let text = text_of(&lines[0]);
assert!(
@@ -58,7 +63,7 @@ fn error_cell_summary_line() {
true,
false,
);
- let lines = render(&card, 0, Detail::Overview, &theme(), 100, true);
+ let lines = render_card(&card, Detail::Overview);
let text = text_of(&lines[0]);
assert!(text.contains("\u{2717} python"), "got: {text}");
assert!(text.contains("ValueError"), "got: {text}");
@@ -76,7 +81,7 @@ fn expanded_renders_code_and_output() {
false,
false,
);
- let lines = render(&card, 0, Detail::All, &theme(), 100, true);
+ let lines = render_card(&card, Detail::All);
let flat: Vec<String> = lines.iter().map(text_of).collect();
assert!(
flat[1].starts_with(" \u{2570}\u{2500} for i in range(3):"),
@@ -106,7 +111,7 @@ fn expanded_error_cell_shows_traceback() {
true,
false,
);
- let lines = render(&card, 0, Detail::All, &theme(), 100, true);
+ let lines = render_card(&card, Detail::All);
let flat: Vec<String> = lines.iter().map(text_of).collect();
assert!(
flat.iter().any(|row| row.contains("ValueError: boom")),
@@ -137,7 +142,7 @@ fn sent_agent_messages_render_below_the_code() {
false,
false,
);
- let collapsed = render(&card, 0, Detail::Overview, &theme(), 100, true);
+ let collapsed = render_card(&card, Detail::Overview);
let flat: Vec<String> = collapsed.iter().map(text_of).collect();
assert_eq!(flat.len(), 2, "top line + receipt summary: {flat:?}");
assert!(
@@ -148,7 +153,7 @@ fn sent_agent_messages_render_below_the_code() {
);
assert!(!flat[1].contains("Ping."), "no body when collapsed");
- let expanded = render(&card, 0, Detail::All, &theme(), 100, true);
+ let expanded = render_card(&card, Detail::All);
let flat: Vec<String> = expanded.iter().map(text_of).collect();
let summary = flat
.iter()
@@ -181,7 +186,7 @@ fn sent_agent_message_receipts_share_the_viewer_relative_arrow() {
}],
});
let card = cell_card("send()", details, false, false);
- let lines = render(&card, 0, Detail::Overview, &theme(), 100, true);
+ let lines = render_card(&card, Detail::Overview);
let text = text_of(&lines[1]);
assert!(
text.contains("\u{2709} Agent message \u{b7} \u{2191} worker-active"),
@@ -198,7 +203,7 @@ fn sent_agent_message_receipts_share_the_viewer_relative_arrow() {
}],
});
let card = cell_card("send()", details, false, false);
- let lines = render(&card, 0, Detail::Overview, &theme(), 100, true);
+ let lines = render_card(&card, Detail::Overview);
assert!(
text_of(&lines[1]).contains("Agent message \u{b7} \u{2191} peer-session"),
"got: {}",
@@ -209,7 +214,7 @@ fn sent_agent_message_receipts_share_the_viewer_relative_arrow() {
"sentAgentMessages": [{ "id": "agentmsg_4" }, { "message": 1 }],
});
let card = cell_card("send()", details, false, false);
- let lines = render(&card, 0, Detail::Overview, &theme(), 100, true);
+ let lines = render_card(&card, Detail::Overview);
assert_eq!(lines.len(), 1, "malformed receipts skipped: {lines:?}");
}
@@ -221,10 +226,10 @@ fn collapsed_stays_single_line() {
false,
false,
);
- let lines = render(&card, 0, Detail::All, &theme(), 100, true);
+ let lines = render_card(&card, Detail::All);
assert!(lines.len() > 1, "all mode expands rows");
- let collapsed = render(&card, 0, Detail::Overview, &theme(), 100, true);
- let details = render(&card, 0, Detail::Details, &theme(), 100, true);
+ let collapsed = render_card(&card, Detail::Overview);
+ let details = render_card(&card, Detail::Details);
assert_eq!(collapsed.len(), 1);
assert_eq!(details.len(), 1, "details mode keeps tool output collapsed");
}
@@ -237,7 +242,7 @@ fn bash_cell_renders_bash_mode_line() {
false,
false,
);
- let lines = render(&card, 0, Detail::All, &theme(), 100, true);
+ let lines = render_card(&card, Detail::All);
let flat: Vec<String> = lines.iter().map(text_of).collect();
assert!(flat[0].contains("bash"), "got: {flat:?}");
assert!(flat[1].contains("%%bash"), "got: {flat:?}");
@@ -310,7 +315,7 @@ fn background_shell_duration_label_and_exit() {
"result": "<BashHandle pid=421 running command='sleep 0.1'>",
});
let card = cell_card(code, details, false, false);
- let lines = render(&card, 0, Detail::Overview, &theme(), 100, true);
+ let lines = render_card(&card, Detail::Overview);
let text = text_of(&lines[0]);
assert!(text.contains("cell 12ms"), "got: {text}");
let details = json!({
@@ -319,7 +324,7 @@ fn background_shell_duration_label_and_exit() {
"result": "<BashHandle pid=421 exit_code=1 command='sleep 0.1'>",
});
let card2 = cell_card(code, details, false, false);
- let lines = render(&card2, 0, Detail::Overview, &theme(), 100, true);
+ let lines = render_card(&card2, Detail::Overview);
let text = text_of(&lines[0]);
assert!(text.contains("exit 1"), "got: {text}");
assert!(text.contains("\u{2717}"), "got: {text}");
@@ -348,7 +353,7 @@ fn aborted_cell_never_renders_done_from_a_stale_exit_code() {
#[test]
fn partial_cell_shows_waiting_for_output() {
let card = cell_card("print(2)", json!({ "status": "ok" }), false, true);
- let lines = render(&card, 0, Detail::All, &theme(), 100, true);
+ let lines = render_card(&card, Detail::All);
let flat: Vec<String> = lines.iter().map(text_of).collect();
assert!(
flat.iter().any(|row| row.contains("waiting for output...")),
@@ -381,7 +386,7 @@ fn image_cell_card() -> ToolCallCard {
#[test]
fn shown_image_counts_render_below_the_cell() {
let card = image_cell_card();
- let lines = render(&card, 0, Detail::All, &theme(), 100, true);
+ let lines = render_card(&card, Detail::All);
let flat: Vec<String> = lines.iter().map(text_of).collect();
assert!(
flat.iter()
@@ -398,7 +403,7 @@ fn shown_image_counts_render_below_the_cell() {
#[test]
fn hidden_image_counts_stay_hidden_with_no_rows() {
let card = image_cell_card();
- let lines = render(&card, 0, Detail::All, &theme(), 100, false);
+ let lines = render(&card, 0, Detail::All, Detail::All, &theme(), 100, false);
let flat: Vec<String> = lines.iter().map(text_of).collect();
assert!(
flat.iter().any(|row| row.contains("1 image hidden")),
@@ -415,7 +420,7 @@ fn no_output_placeholder() {
false,
false,
);
- let lines = render(&card, 0, Detail::All, &theme(), 100, true);
+ let lines = render_card(&card, Detail::All);
let flat: Vec<String> = lines.iter().map(text_of).collect();
assert!(
flat.iter().any(|row| row.contains("no output")),
@@ -442,7 +447,7 @@ fn bash_dominated_cell_renders_as_bash() {
false,
false,
);
- let lines = render(&card, 0, Detail::Overview, &theme(), 100, true);
+ let lines = render_card(&card, Detail::Overview);
assert_eq!(lines.len(), 1);
assert_eq!(
text_of(&lines[0]),
@@ -472,7 +477,7 @@ fn bash_minority_cell_stays_python() {
false,
false,
);
- let lines = render(&card, 0, Detail::Overview, &theme(), 100, true);
+ let lines = render_card(&card, Detail::Overview);
assert_eq!(lines.len(), 1);
assert_eq!(
text_of(&lines[0]),
diff --git a/crates/pa-tui/src/tool_card/mod.rs b/crates/pa-tui/src/tool_card/mod.rs
index 28eb2f70e9..6382adbe40 100644
--- a/crates/pa-tui/src/tool_card/mod.rs
+++ b/crates/pa-tui/src/tool_card/mod.rs
@@ -112,21 +112,23 @@ pub fn working_icon(frame: usize) -> &'static str {
crate::chat::working_icon_frame(frame)
}
-/// Render one tool-call card through its tool shell. `show_images` (the
-/// `terminal.showImages` setting) renders metadata rows or `[Image: ...]`
-/// placeholders.
+/// Render one tool-call card through its tool shell. `detail` is the card's own level (a click
+/// flips it); `level` is the conversation level, which the python card's sent agent messages
+/// follow. `show_images` (the `terminal.showImages` setting) renders metadata rows or
+/// `[Image: ...]` placeholders.
#[must_use]
pub fn render_tool_card(
card: &ToolCallCard,
frame: usize,
detail: Detail,
+ level: Detail,
theme: &Theme,
width: usize,
show_images: bool,
) -> Vec<Line> {
match card.name.as_str() {
name if pa_types::ai::is_python_tool_name(name) => {
- ipython::render(card, frame, detail, theme, width, show_images)
+ ipython::render(card, frame, detail, level, theme, width, show_images)
}
"bash" => bash::render(card, frame, detail, theme, width, show_images),
_ => generic::render(card, frame, detail, theme, width, show_images),
@@ -370,13 +372,14 @@ pub(crate) fn count_tool_card(
card: &ToolCallCard,
frame: usize,
detail: Detail,
+ level: Detail,
theme: &Theme,
width: usize,
show_images: bool,
) -> usize {
match card.name.as_str() {
name if pa_types::ai::is_python_tool_name(name) => {
- ipython::count(card, frame, detail, theme, width, show_images)
+ ipython::count(card, frame, detail, level, theme, width, show_images)
}
"bash" => bash::count(card, frame, detail, theme, width, show_images),
_ => generic::count(card, frame, detail, theme, width, show_images),
diff --git a/crates/pa-tui/src/view/geometry.rs b/crates/pa-tui/src/view/geometry.rs
index fe9633b3b3..3e4be2e26f 100644
--- a/crates/pa-tui/src/view/geometry.rs
+++ b/crates/pa-tui/src/view/geometry.rs
@@ -69,6 +69,7 @@ impl AgentView {
card,
self.pulse_frame,
detail,
+ self.detail,
&self.theme,
width,
self.show_images,
diff --git a/crates/pa-tui/src/view/rows.rs b/crates/pa-tui/src/view/rows.rs
index 5d198bf85e..cfec18cdc9 100644
--- a/crates/pa-tui/src/view/rows.rs
+++ b/crates/pa-tui/src/view/rows.rs
@@ -209,6 +209,7 @@ impl AgentView {
card,
self.pulse_frame,
detail,
+ self.detail,
&self.theme,
width,
self.show_images,
diff --git a/crates/pa-tui/tests/touch_click_headless.rs b/crates/pa-tui/tests/touch_click_headless.rs
index 5aede97a03..0010de5744 100644
--- a/crates/pa-tui/tests/touch_click_headless.rs
+++ b/crates/pa-tui/tests/touch_click_headless.rs
@@ -612,6 +612,14 @@ fn a_click_toggles_only_the_clicked_component() {
!last.contains("\u{2570}\u{2500} steering note"),
"the agent message stays collapsed: {last}"
);
+ assert!(
+ last.contains("Agent message \u{b7} \u{2191}"),
+ "the card's sent-message row renders: {last}"
+ );
+ assert!(
+ !last.contains("\u{2570}\u{2500} a queued receipt"),
+ "the card's sent message stays collapsed: {last}"
+ );
assert!(
!last.contains("before the message"),
"the thinking blocks stay hidden - the level never moved: {last}"