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/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,