Skip to content

Compaction resiliency improvements #5618

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 25 commits into from
Nov 14, 2025
Merged

Compaction resiliency improvements #5618

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
78dbfe8
first pass
katzdave Oct 28, 2025
7e7d317
fmt
katzdave Oct 28, 2025
3b050bd
change args
katzdave Nov 4, 2025
250a3bd
rm
katzdave Nov 4, 2025
9b07c51
merge conflict
katzdave Nov 6, 2025
99ee9f8
Merge remote-tracking branch 'origin/dkatz/middle-truncation' into dk…
katzdave Nov 6, 2025
4a55c3e
provider test
katzdave Nov 6, 2025
9798a49
simply mock provider
katzdave Nov 6, 2025
0cf3c94
fmt
katzdave Nov 6, 2025
ec7f2dd
more cleanup + fix manual compact bug
katzdave Nov 6, 2025
64d1f4b
fmt
katzdave Nov 6, 2025
468ce8d
lint
katzdave Nov 6, 2025
81f88fe
Merge branch 'main' of github.com:block/goose into dkatz/tool-loop-cl…
katzdave Nov 6, 2025
2109cce
small fix
katzdave Nov 7, 2025
a168f2e
fmt
katzdave Nov 7, 2025
0ddab9f
Merge branch 'main' of github.com:block/goose into dkatz/tool-loop-cl…
katzdave Nov 7, 2025
12118f7
Fix
katzdave Nov 7, 2025
bdec3cb
more testing
katzdave Nov 7, 2025
a30e48e
fmt
katzdave Nov 7, 2025
620df9f
Merge branch 'main' of github.com:block/goose into dkatz/tool-loop-cl…
katzdave Nov 13, 2025
11cd639
Update crates/goose/src/agents/agent.rs
katzdave Nov 13, 2025
b9226fb
fix import
katzdave Nov 13, 2025
c4b3708
merge confl
katzdave Nov 13, 2025
7138d35
fmt
katzdave Nov 13, 2025
821076b
Add . to messages
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
13 changes: 9 additions & 4 deletions crates/goose/src/agents/agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,8 +781,13 @@ impl Agent {
.ok_or_else(|| anyhow::anyhow!("Session {} has no conversation", session_config.id))?;

let needs_auto_compact = !is_manual_compact
&& crate::context_mgmt::check_if_compaction_needed(self, &conversation, None, &session)
.await?;
&& crate::context_mgmt::check_if_compaction_needed(

@jamadeo jamadeo Nov 11, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any particular reason to not have these imported with a use crate::context_mgmt::{...}?

@katzdave katzdave Nov 13, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

self.provider().await?.as_ref(),
&conversation,
None,
&session,
)
.await?;

let conversation_to_compact = conversation.clone();

Expand Down Expand Up @@ -817,7 +822,7 @@ impl Agent {
)
);

match crate::context_mgmt::compact_messages(self, &conversation_to_compact, false).await {
match crate::context_mgmt::compact_messages(self.provider().await?.as_ref(), &conversation_to_compact, is_manual_compact).await {

Copilot AI Nov 13, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The third parameter should be false not is_manual_compact. This is for auto-compaction (needs_auto_compact path) and should preserve the user message. Using is_manual_compact here will incorrectly preserve messages during manual compacts when this branch shouldn't even execute.

Suggested change
match crate::context_mgmt::compact_messages(self.provider().await?.as_ref(), &conversation_to_compact, is_manual_compact).await {
match crate::context_mgmt::compact_messages(self.provider().await?.as_ref(), &conversation_to_compact, false).await {

Copilot uses AI. Check for mistakes.
Ok((compacted_conversation, summarization_usage)) => {
SessionManager::replace_conversation(&session_config.id, &compacted_conversation).await?;
Self::update_session_metrics(&session_config, &summarization_usage, true).await?;
Expand Down Expand Up @@ -1138,7 +1143,7 @@ impl Agent {
)
);

match crate::context_mgmt::compact_messages(self, &conversation, true).await {
match crate::context_mgmt::compact_messages(self.provider().await?.as_ref(), &conversation, true).await {
Comment thread
katzdave marked this conversation as resolved.
Outdated
Ok((compacted_conversation, usage)) => {
SessionManager::replace_conversation(&session_config.id, &compacted_conversation).await?;
Self::update_session_metrics(&session_config, &usage, true).await?;
Expand Down
Loading