Skip to content

fix: cli tool logging #3749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamadeo merged 4 commits into from
Aug 1, 2025
Merged

fix: cli tool logging #3749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
446d2d9
fix: cli tool logging
jamadeo Jul 31, 2025
002534b
Don't .unwrap notification type either
jamadeo Jul 31, 2025
f6ac4bf
Restore the old behavior
jamadeo Jul 31, 2025
18b72b0
Please the clippy
jamadeo Jul 31, 2025
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
28 changes: 11 additions & 17 deletions crates/goose-cli/src/session/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,23 +1039,21 @@ impl Session {
if let Some(Value::String(msg)) = o.get("message") {
// Extract subagent info for better display
let subagent_id = o.get("subagent_id")
.and_then(|v| v.as_str())
.unwrap_or("unknown");
.and_then(|v| v.as_str());
let notification_type = o.get("type")
.and_then(|v| v.as_str())
.unwrap_or("");
.and_then(|v| v.as_str());

let formatted = match notification_type {
"subagent_created" | "completed" | "terminated" => {
Some("subagent_created") | Some("completed") | Some("terminated") => {
format!("🤖 {}", msg)
}
"tool_usage" | "tool_completed" | "tool_error" => {
Some("tool_usage") | Some("tool_completed") | Some("tool_error") => {
format!("🔧 {}", msg)
}
"message_processing" | "turn_progress" => {
Some("message_processing") | Some("turn_progress") => {
format!("💭 {}", msg)
}
"response_generated" => {
Some("response_generated") => {
// Check verbosity setting for subagent response content
let config = Config::global();
let min_priority = config
Expand All @@ -1079,7 +1077,7 @@ impl Session {
msg.to_string()
}
};
(formatted, Some(subagent_id.to_string()), Some(notification_type.to_string()))
(formatted, subagent_id.map(str::to_string), notification_type.map(str::to_string))
} else if let Some(Value::String(output)) = o.get("output") {
// Fallback for other MCP notification types
(output.to_owned(), None, None)
Expand Down Expand Up @@ -1115,14 +1113,10 @@ impl Session {
}
}
}
else {
// Non-subagent notification, display immediately with compact spacing
if interactive {
let _ = progress_bars.hide();
println!("{}", console::style(&formatted_message).green().dim());
} else {
progress_bars.log(&formatted_message);
}
else if output::is_showing_thinking() {
output::set_thinking_message(&formatted_message);
} else {
progress_bars.log(&formatted_message);
}
},
ServerNotification::ProgressNotification(notification) => {
Expand Down
9 changes: 8 additions & 1 deletion crates/goose-cli/src/session/output.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ impl ThinkingIndicator {
spinner.stop("");
}
}

pub fn is_shown(&self) -> bool {
self.spinner.is_some()
}
}

#[derive(Debug, Clone)]
Expand All @@ -138,7 +142,10 @@ pub fn hide_thinking() {
THINKING.with(|t| t.borrow_mut().hide());
}

#[allow(dead_code)]
pub fn is_showing_thinking() -> bool {
THINKING.with(|t| t.borrow().is_shown())
}

pub fn set_thinking_message(s: &String) {
THINKING.with(|t| {
if let Some(spinner) = t.borrow_mut().spinner.as_mut() {
Expand Down
Loading