mirror of
https://github.com/block/goose.git
synced 2026-07-17 12:56:20 +02:00
5f32a0b803
Resolved merge conflicts: - crates/goose/Cargo.toml: Use workspace dependencies - crates/goose/src/agents/agent.rs: Keep message merge logic and last_assistant_text tracking - crates/goose/src/providers/init.rs: Add extensions parameter to create functions - crates/goose/src/providers/lead_worker.rs: Import both MessageStream and ProviderDef - crates/goose/src/session/session_manager.rs: Keep message consolidation logic with message_id support - ui/desktop/src/components/settings/extensions/utils.ts: Use parseShellQuote and add combineCmdAndArgs Additional fixes: - Use ORDER BY id instead of created_timestamp in add_message queries to ensure consistent ordering for rapid message insertions (fixes flaky tests) - Add consolidate_fragmented_messages method to SessionManager - Update bedrock streaming tests to pass extensions parameter