Skip to content

fix: spinner not being cleaned up properly #3282

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
dingfeli merged 1 commit into from
Oct 27, 2025
Merged

fix: spinner not being cleaned up properly #3282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 0 additions & 67 deletions crates/chat-cli/src/cli/chat/custom_spinner.rs
View file
Open in desktop

This file was deleted.

84 changes: 70 additions & 14 deletions crates/chat-cli/src/cli/chat/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
use spinners::{
Spinner,
Spinners,
};

use crate::theme::StyledText;
use crate::util::ui::should_send_structured_message;
pub mod cli;
mod consts;
pub mod context;
mod conversation;
mod custom_spinner;
mod input_source;
mod message;
mod parse;
Expand Down Expand Up @@ -83,7 +87,6 @@ use crossterm::{
style,
terminal,
};
use custom_spinner::Spinners;
use eyre::{
Report,
Result,
Expand Down Expand Up @@ -576,7 +579,7 @@ pub struct ChatSession {
input_source: InputSource,
/// Width of the terminal, required for [ParseState].
terminal_width_provider: fn() -> Option<usize>,
spinner: Option<Spinners>,
spinner: Option<Spinner>,
/// [ConversationState].
conversation: ConversationState,
/// Tool uses requested by the model that are actively being handled.
Expand Down Expand Up @@ -829,6 +832,11 @@ impl ChatSession {

if self.spinner.is_some() {
drop(self.spinner.take());
queue!(
self.stderr,
terminal::Clear(terminal::ClearType::CurrentLine),
cursor::MoveToColumn(0),
)?;
}

let (context, report, display_err_message) = match err {
Expand Down Expand Up @@ -1138,6 +1146,10 @@ impl ChatSession {

impl Drop for ChatSession {
fn drop(&mut self) {
if let Some(spinner) = &mut self.spinner {
spinner.stop();
}

execute!(
self.stderr,
cursor::MoveToColumn(0),
Expand Down Expand Up @@ -1435,7 +1447,7 @@ impl ChatSession {
.await?;

if self.interactive {
self.spinner = Some(Spinners::new("Creating summary...".to_string()));
self.spinner = Some(Spinner::new(Spinners::Dots, "Creating summary...".to_string()));
}

let mut response = match self
Expand All @@ -1451,6 +1463,12 @@ impl ChatSession {
Err(err) => {
if self.interactive {
self.spinner.take();
execute!(
self.stderr,
terminal::Clear(terminal::ClearType::CurrentLine),
cursor::MoveToColumn(0),
StyledText::reset_attributes()
)?;
}

// If the request fails due to context window overflow, then we'll see if it's
Expand Down Expand Up @@ -1548,6 +1566,11 @@ impl ChatSession {

if self.spinner.is_some() {
drop(self.spinner.take());
queue!(
self.stderr,
terminal::Clear(terminal::ClearType::CurrentLine),
cursor::MoveToColumn(0),
)?;
}

self.conversation
Expand Down Expand Up @@ -1718,10 +1741,10 @@ impl ChatSession {

if self.interactive {
execute!(self.stderr, cursor::Hide, style::Print("\n"))?;
self.spinner = Some(Spinners::new(format!(
"Generating agent config for '{}'...",
agent_name
)));
self.spinner = Some(Spinner::new(
Spinners::Dots,
format!("Generating agent config for '{}'...", agent_name),
));
}

let mut response = match self
Expand All @@ -1737,6 +1760,12 @@ impl ChatSession {
Err(err) => {
if self.interactive {
self.spinner.take();
execute!(
self.stderr,
terminal::Clear(terminal::ClearType::CurrentLine),
cursor::MoveToColumn(0),
StyledText::reset_attributes()
)?;
}
return Err(err);
},
Expand Down Expand Up @@ -1783,6 +1812,11 @@ impl ChatSession {

if self.spinner.is_some() {
drop(self.spinner.take());
queue!(
self.stderr,
terminal::Clear(terminal::ClearType::CurrentLine),
cursor::MoveToColumn(0),
)?;
}
// Parse and validate the initial generated config
let initial_agent_config = match serde_json::from_str::<Agent>(&agent_config_json) {
Expand Down Expand Up @@ -2174,7 +2208,7 @@ impl ChatSession {
queue!(self.stderr, cursor::Hide)?;

if self.interactive {
self.spinner = Some(Spinners::new("Thinking...".to_owned()));
self.spinner = Some(Spinner::new(Spinners::Dots, "Thinking...".to_owned()));
}

Ok(ChatState::HandleResponseStream(conv_state))
Expand Down Expand Up @@ -2326,6 +2360,12 @@ impl ChatSession {

if let Some(spinner) = self.spinner.take() {
drop(spinner);
queue!(
self.stderr,
terminal::Clear(terminal::ClearType::CurrentLine),
cursor::MoveToColumn(0),
cursor::Show
)?;
}

// Handle checkpoint after tool execution - store tag for later display
Expand Down Expand Up @@ -2601,7 +2641,7 @@ impl ChatSession {
execute!(self.stderr, cursor::Hide)?;
execute!(self.stderr, style::Print("\n"), StyledText::reset_attributes())?;
if self.interactive {
self.spinner = Some(Spinners::new("Thinking...".to_string()));
self.spinner = Some(Spinner::new(Spinners::Dots, "Thinking...".to_string()));
}

self.send_chat_telemetry(os, TelemetryResult::Succeeded, None, None, None, false)
Expand Down Expand Up @@ -2657,6 +2697,11 @@ impl ChatSession {

if self.spinner.is_some() {
drop(self.spinner.take());
queue!(
self.stderr,
terminal::Clear(terminal::ClearType::CurrentLine),
cursor::MoveToColumn(0),
)?;
}

loop {
Expand Down Expand Up @@ -2699,6 +2744,11 @@ impl ChatSession {
parser::ResponseEvent::ToolUse(tool_use) => {
if self.spinner.is_some() {
drop(self.spinner.take());
queue!(
self.stderr,
terminal::Clear(terminal::ClearType::CurrentLine),
cursor::MoveToColumn(0),
)?;
}
tool_uses.push(tool_use);
tool_name_being_recvd = None;
Expand Down Expand Up @@ -2748,7 +2798,7 @@ impl ChatSession {
);

execute!(self.stderr, cursor::Hide)?;
self.spinner = Some(Spinners::new("Dividing up the work...".to_string()));
self.spinner = Some(Spinner::new(Spinners::Dots, "Dividing up the work...".to_string()));

// For stream timeouts, we'll tell the model to try and split its response into
// smaller chunks.
Expand Down Expand Up @@ -2887,6 +2937,12 @@ impl ChatSession {

if tool_name_being_recvd.is_none() && !buf.is_empty() && self.spinner.is_some() {
drop(self.spinner.take());
queue!(
self.stderr,
terminal::Clear(terminal::ClearType::CurrentLine),
cursor::MoveToColumn(0),
cursor::Show
)?;
}

info!("## control end: buf: {:?}", buf);
Expand Down Expand Up @@ -2940,7 +2996,7 @@ impl ChatSession {
if tool_name_being_recvd.is_some() {
queue!(self.stderr, cursor::Hide)?;
if self.interactive {
self.spinner = Some(Spinners::new("Thinking...".to_string()));
self.spinner = Some(Spinner::new(Spinners::Dots, "Thinking...".to_string()));
}
}

Expand Down Expand Up @@ -3263,7 +3319,7 @@ impl ChatSession {
}

if self.interactive {
self.spinner = Some(Spinners::new("Thinking...".to_owned()));
self.spinner = Some(Spinner::new(Spinners::Dots, "Thinking...".to_owned()));
}

Ok(ChatState::HandleResponseStream(
Expand Down Expand Up @@ -3708,7 +3764,7 @@ where
Fut: std::future::Future<Output = Result<T, E>>,
{
queue!(output, cursor::Hide,).ok();
let spinner = Spinners::new(spinner_text.to_owned());
let spinner = Spinner::new(Spinners::Dots, spinner_text.to_owned());

let result = f().await;

Expand Down