public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SQLite recovery and preserve provider conversation context

Browse Source 
Persist exact provider history and archived tool results independently of
terminal scrollback, and retain them when active run checkpoints are cleared.
Keep conversation and session saving independent of automatic reopening.

Deduplicate only committed session snapshots, retry transient SQLite write
contention, and enqueue conversation updates before writer shutdown. Recover
healthy startup data independently and protect unread records by disabling
writes with a persistent warning after an incomplete restore. Retain local
transcript pane conversation links across restarts.

Add regression coverage for SQLite failures, context round trips, legacy
fallbacks, and transcript snapshots.
This commit is contained in:
rkw6086
2026-09-20 16:40:44 -05:00
parent 316f53471b
commit d7fbc09bcf
21 changed files with 714 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/ai/agent/api/convert_conversation.rs
+2
View File
@@ -73,6 +73,7 @@ pub fn convert_conversation_data_to_ai_conversation(
let agent_conversation_data = match restoration_mode {
RestorationMode::Fork => AgentConversationData {
agent_backend: Default::default(),
provider_context: None,
active_provider_run_json: None,
local_agent_groups: Vec::new(),
tool_titles: Default::default(),
@@ -99,6 +100,7 @@ pub fn convert_conversation_data_to_ai_conversation(
},
RestorationMode::Continue => AgentConversationData {
agent_backend: Default::default(),
provider_context: None,
active_provider_run_json: None,
local_agent_groups: Vec::new(),
tool_titles: Default::default(),
app/src/ai/agent/conversation.rs
+44 -24
View File
@@ -17,7 +17,7 @@ use galaxy_core::ui::theme::GalaxyTheme;
use galaxyui::color::ColorU;
use galaxyui::{AppContext, EntityId, ModelContext, SingletonEntity};
use itertools::Itertools as _;
use persistence::model::LocalAgentGroup;
use persistence::model::{LocalAgentGroup, ProviderConversationContext};
use serde::{Deserialize, Serialize};
use uuid::Uuid;
use vec1::{Size0Error, Vec1};
@@ -69,7 +69,6 @@ use crate::persistence::model::{
};
use crate::persistence::ModelEvent;
use crate::server::ids::ServerId;
use crate::terminal::general_settings::GeneralSettings;
use crate::terminal::model::block::{
AgentInteractionMetadata, AgentViewVisibility, BlockId, SerializedAIMetadata, SerializedBlock,
};
@@ -453,11 +452,27 @@ impl AIConversation {
tasks: Vec<api::Task>,
conversation_data: Option<AgentConversationData>,
) -> Result<Self, RestoreConversationError> {
let bedrock_message_history: Vec<crate::ai::provider::convert::ConversationMessage> = tasks
.iter()
.flat_map(|task| task.messages.iter())
.filter_map(crate::ai::provider::request_translator::convert_proto_message)
.collect();
let provider_context = conversation_data
.as_ref()
.and_then(|data| data.provider_context.clone());
let (bedrock_message_history, tool_result_archive) = match provider_context {
Some(context) => (context.messages, context.tool_result_archive),
None => {
// Legacy rows have only UI task messages. Preserve that fallback, but
// do not use it for new rows, whose provider context may be compacted.
let messages: Vec<_> = tasks
.iter()
.flat_map(|task| task.messages.iter())
.filter_map(crate::ai::provider::request_translator::convert_proto_message)
.collect();
// Legacy UI messages do not share provider-message indices. Do not
// truncate them using a provider compaction count: retain everything
// recoverable and rebuild recall from the available tool messages.
let mut archive = Vec::new();
galaxy_agent_core::archive_tool_results(&mut archive, messages.clone());
(messages, archive)
}
};
let (task_store, todo_lists, status) = if tasks.is_empty() {
// Bypass `derive_status_from_root_task`: it would return `Success`
@@ -575,7 +590,6 @@ impl AIConversation {
last_event_sequence,
pinned,
progressive_summary,
messages_summarized_up_to,
) = if let Some(data) = conversation_data {
let server_conversation_token = data
.server_conversation_token
@@ -626,7 +640,6 @@ impl AIConversation {
data.last_event_sequence,
data.pinned,
data.progressive_summary.clone(),
data.messages_summarized_up_to,
)
} else {
(
@@ -647,7 +660,6 @@ impl AIConversation {
None,
false,
None,
0,
)
};
@@ -715,9 +727,10 @@ impl AIConversation {
orchestration_configs: HashMap::new(),
pinned,
bedrock_message_history,
tool_result_archive: Vec::new(),
tool_result_archive,
progressive_summary,
messages_summarized_up_to,
// The previous response stream no longer exists; its drain count cannot apply.
messages_summarized_up_to: 0,
current_context_tokens: 0,
latest_model_call_usage: ProviderUsage::default(),
has_pending_progressive_summary: false,
@@ -841,6 +854,19 @@ impl AIConversation {
&mut self.bedrock_message_history
}
pub(crate) fn provider_context(&self) -> ProviderConversationContext {
ProviderConversationContext {
messages: self.bedrock_message_history.clone(),
tool_result_archive: self.tool_result_archive.clone(),
}
}
pub(crate) fn set_provider_context(&mut self, context: ProviderConversationContext) {
self.bedrock_message_history = context.messages;
self.tool_result_archive = context.tool_result_archive;
self.messages_summarized_up_to = 0;
}
pub fn tool_result_archive(&self) -> &[crate::ai::provider::convert::ConversationMessage] {
&self.tool_result_archive
}
@@ -4016,10 +4042,8 @@ impl AIConversation {
return;
}
// Check if session restoration is enabled before writing any state.
if !*GeneralSettings::as_ref(ctx).restore_session
|| !AppExecutionMode::as_ref(ctx).can_save_session()
{
// Conversation history is durable even when automatic session reopening is disabled.
if !AppExecutionMode::as_ref(ctx).can_save_session() {
return;
}
@@ -4064,6 +4088,7 @@ impl AIConversation {
.filter_map(|task| task.source_for_persistence())
.collect(),
conversation_data: AgentConversationData {
provider_context: Some(self.provider_context()),
agent_backend: self.agent_backend.clone(),
active_provider_run_json: self.active_provider_run_json.clone(),
local_agent_groups: self.local_agent_groups.clone(),
@@ -4097,14 +4122,9 @@ impl AIConversation {
messages_summarized_up_to: self.messages_summarized_up_to,
},
};
ctx.spawn(
async move {
if let Err(e) = sqlite_sender.send(event) {
log::warn!("Failed to send updated AI tasks to sqlite writer thread: {e:?}");
}
},
|_, _, _| {},
);
if let Err(e) = sqlite_sender.send(event) {
log::error!("Failed to send updated AI tasks to sqlite writer thread: {e:?}");
}
}
pub fn rollback_transaction(&mut self, response_stream_id: &ResponseStreamId) {
app/src/ai/agent/conversation_tests.rs
+63 -1
View File
@@ -1,5 +1,6 @@
use std::collections::HashMap;
use galaxy_agent_core::{ContentPart, ConversationMessage, MessageContent, MessageRole};
use galaxy_core::features::FeatureFlag;
use warp_multi_agent_api as api;
@@ -8,7 +9,9 @@ use super::{
ConversationStatus, RestoreConversationError,
};
use crate::ai::artifacts::Artifact;
use crate::persistence::model::{AcpConversationData, AgentBackend, AgentConversationData};
use crate::persistence::model::{
AcpConversationData, AgentBackend, AgentConversationData, ProviderConversationContext,
};
fn restored_conversation(conversation_data: Option<AgentConversationData>) -> AIConversation {
AIConversation::new_restored(
@@ -706,3 +709,62 @@ fn fetched_memories_dedupes_keeping_first_position_and_latest_data() {
]
);
}
#[test]
fn restored_provider_context_preserves_compacted_history_and_tool_archive() {
let context = ProviderConversationContext {
messages: vec![ConversationMessage {
role: MessageRole::Assistant,
content: MessageContent::MultiPart(vec![
ContentPart::Reasoning {
text: "retained reasoning".into(),
signature: Some("signature".into()),
},
ContentPart::Text("retained response".into()),
]),
}],
tool_result_archive: vec![ConversationMessage {
role: MessageRole::User,
content: MessageContent::ToolResult {
tool_use_id: "old-tool".into(),
content: "original output".into(),
is_error: false,
},
}],
};
let data = AgentConversationData {
provider_context: Some(context.clone()),
progressive_summary: Some("Older history".into()),
..Default::default()
};
let data = serde_json::from_str(&serde_json::to_string(&data).unwrap()).unwrap();
let restored = restored_conversation(Some(data));
assert_eq!(restored.provider_context(), context);
assert_eq!(restored.progressive_summary(), Some("Older history"));
assert!(restored.active_provider_run_json().is_none());
}
#[test]
fn explicit_empty_provider_context_does_not_reconstruct_old_task_messages() {
let data = AgentConversationData {
provider_context: Some(ProviderConversationContext {
messages: Vec::new(),
tool_result_archive: Vec::new(),
}),
..Default::default()
};
let task = api::Task {
id: "root-task".into(),
messages: vec![user_query_message("query", "request", "old query")],
dependencies: None,
description: String::new(),
summary: String::new(),
server_data: String::new(),
};
let legacy =
AIConversation::new_restored(AIConversationId::new(), vec![task.clone()], None).unwrap();
assert!(!legacy.bedrock_message_history().is_empty());
let restored =
AIConversation::new_restored(AIConversationId::new(), vec![task], Some(data)).unwrap();
assert!(restored.bedrock_message_history().is_empty());
}
app/src/ai/blocklist/controller.rs
+22
View File
@@ -33,6 +33,7 @@ use input_context::{input_context_for_request, parse_context_attachments};
use itertools::Itertools;
use parking_lot::FairMutex;
use pending_response_streams::PendingResponseStreams;
use persistence::model::ProviderConversationContext;
use session_sharing_protocol::common::ParticipantId;
use settings::Setting;
pub use slash_command::*;
@@ -6519,9 +6520,16 @@ impl BlocklistAIController {
Err(error) => return Err(error),
};
snapshot.queued_follow_ups = queued_follow_ups;
let context = ProviderConversationContext {
messages: snapshot.run.transcript()[snapshot.persistence_offset..].to_vec(),
tool_result_archive: snapshot.run.tool_result_archive().to_vec(),
};
let json = serde_json::to_string(&snapshot)
.map_err(|error| format!("failed to serialize active provider run: {error}"))?;
BlocklistAIHistoryModel::handle(ctx).update(ctx, |history_model, ctx| {
if let Some(conversation) = history_model.conversation_mut(&conversation_id) {
conversation.set_provider_context(context);
}
history_model
.persist_active_provider_run_json(conversation_id, Some(json), ctx)
.map_err(|error| format!("failed to persist active provider run: {error:?}"))
@@ -8290,6 +8298,20 @@ impl BlocklistAIController {
let offset = run.persistence_offset.min(transcript.len());
*messages_sent = transcript[offset..].to_vec();
}
// Retain the exact context before terminal projection clears the active checkpoint.
// UI task messages are a lossy representation of tool/reasoning messages.
let transcript = run.coordinator.run().transcript();
let offset = run.persistence_offset.min(transcript.len());
let context = ProviderConversationContext {
messages: transcript[offset..].to_vec(),
tool_result_archive: run.coordinator.run().tool_result_archive().to_vec(),
};
BlocklistAIHistoryModel::handle(ctx).update(ctx, |history, ctx| {
if let Some(conversation) = history.conversation_mut(&conversation_id) {
conversation.set_provider_context(context);
conversation.write_updated_conversation_state(ctx);
}
});
let aggregate_usage = run.coordinator.run().usage().clone();
let events = match run.projector.finish(&outcome, &aggregate_usage) {
Ok(events) => events,
app/src/ai/blocklist/history_model.rs
+3
View File
@@ -1703,6 +1703,7 @@ impl BlocklistAIHistoryModel {
let conversation_data = AgentConversationData {
agent_backend: source_conversation.agent_backend().for_fork(),
provider_context: None,
active_provider_run_json: None,
local_agent_groups: Vec::new(),
tool_titles: source_conversation.tool_titles().clone(),
@@ -1870,6 +1871,7 @@ impl BlocklistAIHistoryModel {
// be recomputed based on the retained exchanges in a follow-up.
let conversation_data = AgentConversationData {
agent_backend: conversation.agent_backend().for_fork(),
provider_context: None,
active_provider_run_json: None,
local_agent_groups: Vec::new(),
tool_titles: conversation.tool_titles().clone(),
@@ -2898,6 +2900,7 @@ fn merged_remote_child_placeholder_conversation_data(
cloud_conversation: &AIConversation,
) -> AgentConversationData {
AgentConversationData {
provider_context: None,
// Placeholder authoritative.
agent_backend: placeholder.agent_backend().clone(),
app/src/ai/blocklist/history_model/conversation_loader.rs
+8 -1
View File
@@ -83,7 +83,14 @@ pub fn convert_persisted_conversation_to_ai_conversation_with_metadata(
}
};
let conversation_data = serde_json::from_str::<AgentConversationData>(&conversation_data).ok();
let conversation_data = match serde_json::from_str::<AgentConversationData>(&conversation_data)
{
Ok(data) => Some(data),
Err(error) => {
log::error!("Failed to restore conversation {conversation_id} metadata: {error}");
return None;
}
};
// Local-DB restore: an empty `agent_tasks` row is the normal shape of a
// child conversation persisted before its first server response, so