Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions crates/goose-cli/src/session/output.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
use anstream::println;
use bat::WrappingMode;
use console::{style, Color};
use console::{measure_text_width, style, Color, Term};
use goose::config::Config;
use goose::conversation::message::{Message, MessageContent, ToolRequest, ToolResponse};
use goose::providers::pricing::get_model_pricing;
use goose::providers::pricing::parse_model_id;
use goose::utils::safe_truncate;
use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
use mcp_core::tool::ToolCall;
use regex::Regex;
Expand Down Expand Up @@ -539,22 +540,22 @@ fn print_markdown(content: &str, theme: Theme) {

const INDENT: &str = " ";

fn get_tool_params_max_length() -> usize {
Config::global()
.get_param::<usize>("GOOSE_CLI_TOOL_PARAMS_TRUNCATION_MAX_LENGTH")
.ok()
.unwrap_or(40)
fn print_value_with_prefix(prefix: &String, value: &Value, debug: bool) {
let prefix_width = measure_text_width(prefix.as_str());
print!("{}", prefix);
print_value(value, debug, prefix_width)
}

fn print_value(value: &Value, debug: bool) {
fn print_value(value: &Value, debug: bool, reserve_width: usize) {
let max_width = Term::stdout()
.size_checked()
.map(|(_h, w)| (w as usize).saturating_sub(reserve_width));
let formatted = match value {
Value::String(s) => {
if !debug && s.len() > get_tool_params_max_length() {
style(format!("[REDACTED: {} chars]", s.len())).yellow()
} else {
style(s.to_string()).green()
}
Value::String(s) => match (max_width, debug) {
(Some(w), false) if s.len() > w => style(safe_truncate(s, w)),
_ => style(s.to_string()),
}
.green(),
Value::Number(n) => style(n.to_string()).yellow(),
Value::Bool(b) => style(b.to_string()).yellow(),
Value::Null => style("null".to_string()).dim(),
Expand Down Expand Up @@ -596,9 +597,11 @@ fn print_params(value: &Value, depth: usize, debug: bool) {
})
.collect();
let joined_values = values.join(", ");
print!("{}{}: ", indent, style(key).dim());
// Use print_value to handle truncation consistently
print_value(&Value::String(joined_values), debug);
print_value_with_prefix(
&format!("{}{}: ", indent, style(key).dim()),
&Value::String(joined_values),
debug,
);
} else {
// Use the original multi-line format for complex arrays
println!("{}{}:", indent, style(key).dim());
Expand All @@ -609,8 +612,11 @@ fn print_params(value: &Value, depth: usize, debug: bool) {
}
}
_ => {
print!("{}{}: ", indent, style(key).dim());
print_value(val, debug);
print_value_with_prefix(
&format!("{}{}: ", indent, style(key).dim()),
val,
debug,
);
}
}
}
Expand All @@ -621,7 +627,7 @@ fn print_params(value: &Value, depth: usize, debug: bool) {
print_params(item, depth + 1, debug);
}
}
_ => print_value(value, debug),
_ => print_value(value, debug, 0),
}
}

Expand Down
Loading