kent/consciousness
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unify conversation persistence to append-only jsonl

Browse source 
Log ConversationEntry (with Memory/Message typing) instead of
raw Message. restore_from_log reads typed entries directly,
preserving Memory vs Message distinction across restarts.

Remove current.json snapshot and save_session — the append-only
log is the single source of truth. Remove dead read_all and
message_count methods. Add push_entry for logging typed entries.

Co-Authored-By: Proof of Concept <poc@bcachefs.org>
This commit is contained in:
Kent Overstreet 2026-04-02 14:31:19 -04:00
parent 1f7b585d41
commit a21cf31ad2
3 changed files with 47 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/agent/runner.rs
View file

@ -168,12 +168,17 @@ impl Agent {
/// Push a conversation message — stamped and logged.
fn push_message(&mut self, mut msg: Message) {
msg.stamp();
let entry = ConversationEntry::Message(msg);
self.push_entry(entry);
}
fn push_entry(&mut self, entry: ConversationEntry) {
if let Some(ref log) = self.conversation_log {
if let Err(e) = log.append(&msg) {
eprintln!("warning: failed to log message: {:#}", e);
if let Err(e) = log.append(&entry) {
eprintln!("warning: failed to log entry: {:#}", e);
}
}
self.context.entries.push(ConversationEntry::Message(msg));
self.context.entries.push(entry);
}
/// Push a context-only message (system prompt, identity context,
@ -1000,11 +1005,11 @@ impl Agent {
self.context.system_prompt = system_prompt;
self.context.personality = personality;
let all_messages = match &self.conversation_log {
let entries = match &self.conversation_log {
Some(log) => match log.read_tail(512 * 1024) {
Ok(msgs) if !msgs.is_empty() => {
dbglog!("[restore] read {} messages from log tail", msgs.len());
msgs
Ok(entries) if !entries.is_empty() => {
dbglog!("[restore] read {} entries from log tail", entries.len());
entries
}
Ok(_) => {
dbglog!("[restore] log exists but is empty");
@ -1021,29 +1026,31 @@ impl Agent {
}
};
// Filter out system/context messages — we only want the
// actual conversation (user prompts, assistant responses,
// tool calls/results)
let conversation: Vec<Message> = all_messages
// Filter out system messages, keep everything else (including Memory entries)
let entries: Vec<ConversationEntry> = entries
.into_iter()
.filter(|m| m.role != Role::System)
.filter(|e| e.message().role != Role::System)
.collect();
dbglog!("[restore] {} messages after filtering system", conversation.len());
let messages = crate::agent::context::trim_conversation(
// Trim to fit context budget
let n = entries.len();
let conversation: Vec<Message> = entries.iter()
.map(|e| e.api_message().clone()).collect();
let trimmed = crate::agent::context::trim_conversation(
&self.context,
&conversation,
&self.client.model,
&self.tokenizer,
);
dbglog!("[restore] journal preserved: {} entries",
self.context.journal.len());
// Don't overwrite journal — already loaded from memory graph
self.context.entries = messages.into_iter()
.map(ConversationEntry::Message).collect();
dbglog!("[restore] built context window: {} entries", self.context.entries.len());
// Keep only the entries that survived trimming (by count from the end)
let keep = trimmed.len();
self.context.entries = entries.into_iter()
.skip(n.saturating_sub(keep))
.collect();
dbglog!("[restore] {} entries, journal: {} entries",
self.context.entries.len(), self.context.journal.len());
self.last_prompt_tokens = 0;
self.publish_context_state();
true
}
@ -1068,10 +1075,6 @@ impl Agent {
&mut self.context.entries
}
/// Restore from saved conversation entries.
pub fn restore(&mut self, entries: Vec<ConversationEntry>) {
self.context.entries = entries;
}
}
// Context window building, token counting, and error classification