Skip to content

Fix context progress bar not resetting after /clear command #5652

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
katzdave merged 4 commits into from
Nov 13, 2025
Merged

Fix context progress bar not resetting after /clear command #5652

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f11da5c
Fix context progress bar not resetting after /clear command
catbilyeu Nov 10, 2025
dea65c5
Fix: Ensure consistent state when clearing session (#5652)
catbilyeu Nov 11, 2025
82894bc
Address PR feedback: simplify clear logic and improve formatting
catbilyeu Nov 11, 2025
eb32491
Fix formatting of chat context cleared message
katzdave Nov 13, 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
26 changes: 26 additions & 0 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 @@ -618,6 +618,10 @@ impl CliSession {
input::InputResult::Clear => {
save_history(&mut editor);

// Perform all database operations first, only clear in-memory state if both succeed
// This ensures consistency: if any DB operation fails, the session remains unchanged

// Step 1: Clear conversation in database (uses transaction, will rollback on failure)
if let Err(e) = SessionManager::replace_conversation(
&self.session_id,
&Conversation::default(),
Expand All @@ -628,7 +632,29 @@ impl CliSession {
continue;
}

// Step 2: Reset token counts in session metadata
if let Err(e) = SessionManager::update_session(&self.session_id)
.total_tokens(Some(0))
.input_tokens(Some(0))
.output_tokens(Some(0))
.accumulated_total_tokens(Some(0))
.accumulated_input_tokens(Some(0))
.accumulated_output_tokens(Some(0))
.apply()
.await
{
output::render_error(&format!("Failed to reset token counts: {}", e));
// Token reset failed, but conversation was already cleared in DB
// Restore consistency by syncing in-memory state with DB (empty conversation)
if let Ok(session) = SessionManager::get_session(&self.session_id, true).await {
self.messages = session.conversation.unwrap_or_default();
}
continue;
}

// Step 3: Only after both DB operations succeed, clear in-memory state
self.messages.clear();

tracing::info!("Chat context cleared by user.");
output::render_message(
&Message::assistant().with_text("Chat context cleared."),
Expand Down
Loading