Skip to content

Fix out of order messages #7472

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
DOsinga merged 2 commits into from
Feb 24, 2026
Merged

Fix out of order messages #7472

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
581065e
Fix out of order messages
Feb 24, 2026
845df2d
Sort by id
Feb 24, 2026
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
5 changes: 4 additions & 1 deletion crates/goose/src/session/session_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,10 @@ impl SessionStorage {
async fn get_conversation(&self, session_id: &str) -> Result<Conversation> {
let pool = self.pool().await?;
let rows = sqlx::query_as::<_, (String, String, i64, Option<String>, Option<String>)>(
"SELECT role, content_json, created_timestamp, metadata_json, message_id FROM messages WHERE session_id = ? ORDER BY timestamp",
// Order by created_timestamp, then by id to break ties. created_timestamp is in seconds,
// so messages created in the same second (e.g., tool request and response) need to
// maintain their insertion order via the auto-increment id.
"SELECT role, content_json, created_timestamp, metadata_json, message_id FROM messages WHERE session_id = ? ORDER BY created_timestamp, id",
)
.bind(session_id)
.fetch_all(pool)
Expand Down
Loading