1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
//! Bash execution component — streaming display port of `bash-execution.ts`.
//!
//! This is a **display-only** consumer of the bash tool's existing `on_update`
//! stream: it renders a command header, a spinner while running, a tailed
//! preview of captured output, and a status/truncation line on completion.
//! There is no `!`-prefix direct shell mode (per the session scope) and no
//! async/signal plumbing — the caller drives lifecycle via `append_output` /
//! `set_complete`.
use std::any::Any;
use std::sync::Mutex;
use std::time::Duration;
use super::component::Component;
use crate::ansi::bold;
use crate::ansi::strip_ansi;
use crate::dynamic_border::DynamicBorder;
use crate::loader::Loader;
use crate::spacer::Spacer;
use crate::theme::theme;
use crate::utils::truncate_to_width;
use crate::visual_truncate::truncate_to_visual_lines;
/// Preview line limit when collapsed (matches the TS `PREVIEW_LINES`).
const PREVIEW_LINES: usize = 20;
/// After this long without a result, a running bash panel shows the
/// "Esc / Ctrl+C 中止" hint (the tool has no default timeout — the model must
/// pass one, and a stuck command otherwise looks frozen).
const LONG_RUNNING_HINT_AFTER: Duration = Duration::from_secs(60);
/// Bash execution status.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum BashStatus {
Running,
Complete,
Cancelled,
Error,
}
/// Truncation info extracted from `BashToolDetails` at completion.
#[derive(Debug, Clone, Default)]
pub struct BashTruncation {
/// Whether the captured output was truncated for context limits.
pub truncated: bool,
/// Path to the full output file, if truncation wrote one.
pub full_output_path: Option<String>,
}
/// Component that displays a bash command execution with streaming output.
pub struct BashExecutionComponent {
command: Mutex<String>,
output_lines: Mutex<Vec<String>>,
status: Mutex<BashStatus>,
exit_code: Mutex<Option<i32>>,
expanded: Mutex<bool>,
truncation: Mutex<BashTruncation>,
loader: Loader,
}
impl BashExecutionComponent {
/// Create a new component for the given command (without the leading `$`).
pub fn new(command: impl Into<String>) -> Self {
let loader = Loader::with_text("Running...");
loader.start();
Self {
command: Mutex::new(command.into()),
output_lines: Mutex::new(Vec::new()),
status: Mutex::new(BashStatus::Running),
exit_code: Mutex::new(None),
expanded: Mutex::new(false),
truncation: Mutex::new(BashTruncation::default()),
loader,
}
}
/// Backfill the command header when the panel was created from a
/// ToolExecutionUpdate (command unknown at that point) and the
/// ToolExecutionStart arrives later — replaces the empty `$ ` header.
pub fn set_command(&self, command: &str) {
let mut c = self.command.lock().unwrap();
if c.is_empty() {
*c = command.to_string();
}
}
/// Replace the displayed output with the latest streamed snapshot.
///
/// The bash tool's `on_update` contract sends the complete captured output
/// so far, not a delta. Appending each update duplicated all prior lines
/// (`a`, then `a\nb` became `aa\nb`). Keep the latest snapshot instead.
pub fn append_output(&self, chunk: &str) {
let clean = strip_ansi(chunk).replace("\r\n", "\n").replace('\r', "\n");
if let Ok(mut out) = self.output_lines.lock() {
*out = if clean.is_empty() {
Vec::new()
} else {
clean
.split('\n')
.map(|line| line.replace('\t', " "))
.collect()
};
}
}
/// Mark execution complete.
pub fn set_complete(
&self,
exit_code: Option<i32>,
cancelled: bool,
truncation: BashTruncation,
) {
if let Ok(mut e) = self.exit_code.lock() {
*e = exit_code;
}
let new_status = if cancelled {
BashStatus::Cancelled
} else if exit_code.map(|c| c != 0).unwrap_or(false) {
BashStatus::Error
} else {
BashStatus::Complete
};
if let Ok(mut s) = self.status.lock() {
*s = new_status;
}
if let Ok(mut t) = self.truncation.lock() {
*t = truncation;
}
self.loader.stop();
}
/// Toggle expanded (full output) vs collapsed (preview) display.
pub fn set_expanded(&self, expanded: bool) {
if let Ok(mut e) = self.expanded.lock() {
*e = expanded;
}
}
/// Whether currently expanded.
pub fn is_expanded(&self) -> bool {
*self.expanded.lock().unwrap()
}
/// Get the raw joined output.
pub fn get_output(&self) -> String {
self.output_lines
.lock()
.map(|o| o.join("\n"))
.unwrap_or_default()
}
/// Build the trailing status/truncation line(s), if any.
fn status_line(&self, hidden: usize) -> Vec<String> {
let status = *self.status.lock().unwrap();
let truncation = self.truncation.lock().unwrap().clone();
let exit_code = *self.exit_code.lock().unwrap();
let expanded = *self.expanded.lock().unwrap();
let colors = theme().colors;
let mut parts: Vec<String> = Vec::new();
if hidden > 0 {
if expanded {
parts.push(colors.muted.fg("(Ctrl+T to collapse)"));
} else {
parts.push(
colors
.muted
.fg(&format!("... {} more lines (Ctrl+T to expand)", hidden)),
);
}
}
match status {
BashStatus::Cancelled => parts.push(colors.warning.fg("(cancelled)")),
BashStatus::Error => {
parts.push(
colors
.error
.fg(&format!("(exit {})", exit_code.unwrap_or(-1))),
);
}
_ => {}
}
if truncation.truncated {
let path = truncation.full_output_path.as_deref().unwrap_or("");
parts.push(
colors
.warning
.fg(&format!("Output truncated. Full output: {}", path)),
);
}
if parts.is_empty() {
Vec::new()
} else {
vec![format!(" {}", parts.join(" "))]
}
}
}
impl Component for BashExecutionComponent {
fn render(&self, width: usize) -> Vec<String> {
let colors = theme().colors;
let mut lines: Vec<String> = Vec::new();
// Spacer + a faint command separator (distinct from the editor border).
lines.extend(Spacer::new(1).render(width));
lines.extend(DynamicBorder::new().render(width));
// Command header: "$ {command}" in accent.
let command = self.command.lock().unwrap().clone();
let header_text = format!("$ {command}");
let header_line = format!(" {}", colors.bash_mode.fg(&bold(&header_text)));
lines.push(truncate_to_width(&header_line, width, "…"));
// Output preview (collapsed: last PREVIEW_LINES visual lines;
// expanded: all wrapped lines). Built from the captured raw output,
// themed with the muted color and a leading newline for spacing.
let (display_lines, hidden) = {
let out = self.output_lines.lock().unwrap();
let expanded = *self.expanded.lock().unwrap();
if out.is_empty() {
(Vec::new(), 0usize)
} else {
let muted = colors.muted;
let styled = format!(
"\n{}",
out.iter()
.map(|l| muted.fg(l))
.collect::<Vec<_>>()
.join("\n")
);
if expanded {
let all = crate::text::Text::new(&styled, 1, 0).render(width);
(all, 0)
} else {
let r = truncate_to_visual_lines(&styled, PREVIEW_LINES, width, 1);
(r.visual_lines, r.skipped_count)
}
}
};
lines.extend(display_lines);
// Spinner (while running) or status line (when complete)
let status = *self.status.lock().unwrap();
if status == BashStatus::Running {
lines.extend(self.loader.render(width));
// Long-running hint: after a minute, tell the user how to abort so
// a command without a tool-level timeout (model didn't pass one)
// never looks stuck with no recourse.
if self.loader.elapsed() > LONG_RUNNING_HINT_AFTER {
let colors = theme().colors;
let hint = format!(" {} Esc / Ctrl+C 中止", colors.muted.fg("⏸"));
lines.push(truncate_to_width(&hint, width, "…"));
}
} else {
let sl = self.status_line(hidden);
if !sl.is_empty() {
lines.push(String::new());
lines.extend(sl);
}
}
// Bottom command separator uses the same muted hierarchy.
lines.extend(DynamicBorder::new().render(width));
lines
}
fn invalidate(&self) {
self.loader.invalidate();
}
fn as_any(&self) -> &dyn Any {
self
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_new_renders_header_and_spinner() {
let c = BashExecutionComponent::new("ls -la");
let lines = c.render(40);
let joined = lines.join("\n");
assert!(joined.contains("ls -la"));
assert!(joined.contains('─'));
}
#[test]
fn test_append_and_complete() {
let c = BashExecutionComponent::new("echo hi");
c.append_output("hi\n");
c.set_complete(Some(0), false, BashTruncation::default());
let lines = c.render(40);
let joined = lines.join("\n");
// After completion the spinner is gone; output "hi" is visible.
assert!(strip_ansi(&joined).contains("hi"), "joined: {joined}");
}
#[test]
fn streamed_output_updates_replace_snapshots_instead_of_duplicating() {
let c = BashExecutionComponent::new("printf test");
c.append_output("one\n");
c.append_output("one\ntwo\n");
assert_eq!(c.get_output(), "one\ntwo\n");
}
#[test]
fn test_error_exit_status() {
let c = BashExecutionComponent::new("false");
c.set_complete(Some(1), false, BashTruncation::default());
let lines = c.render(40);
let joined = lines.join("\n");
assert!(joined.contains("exit 1"));
}
#[test]
fn test_truncation_path_shown() {
let c = BashExecutionComponent::new("big-output");
c.set_complete(
Some(0),
false,
BashTruncation {
truncated: true,
full_output_path: Some("/tmp/out.log".to_string()),
},
);
let lines = c.render(40);
let joined = lines.join("\n");
assert!(joined.contains("/tmp/out.log"), "joined: {joined}");
}
}