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

Move conversation messages into ContextState

Browse source 
ContextState now owns everything in the context window:
system_prompt, personality, journal, working_stack, loaded_nodes,
and conversation messages. No duplication — each piece exists once
in its typed form.

assemble_api_messages() renders the full message list on the fly
from typed sources. measure_budget() counts each bucket from its
source directly. push_context() removed — identity/journal are
never pushed as messages.

Co-Authored-By: Proof of Concept <poc@bcachefs.org>
This commit is contained in:
Kent Overstreet 2026-04-02 02:47:32 -04:00
parent 4580f5dade
commit a0aacfc552
2 changed files with 44 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/agent/runner.rs
View file

@ -53,7 +53,6 @@ struct DispatchState {
pub struct Agent { pub struct Agent {
client: ApiClient, client: ApiClient,
messages: Vec<Message>,
tool_defs: Vec<ToolDef>, tool_defs: Vec<ToolDef>,
/// Last known prompt token count from the API (tracks context size). /// Last known prompt token count from the API (tracks context size).
last_prompt_tokens: u32, last_prompt_tokens: u32,
@ -79,6 +78,7 @@ pub struct Agent {
} }
fn render_journal(entries: &[journal::JournalEntry]) -> String { fn render_journal(entries: &[journal::JournalEntry]) -> String {
if entries.is_empty() { return String::new(); }
let mut text = String::from("[Earlier — from your journal]\n\n"); let mut text = String::from("[Earlier — from your journal]\n\n");
for entry in entries { for entry in entries {
use std::fmt::Write; use std::fmt::Write;
@ -105,12 +105,12 @@ impl Agent {
journal: Vec::new(), journal: Vec::new(),
working_stack: Vec::new(), working_stack: Vec::new(),
loaded_nodes: Vec::new(), loaded_nodes: Vec::new(),
messages: Vec::new(),
}; };
let session_id = format!("poc-agent-{}", chrono::Utc::now().format("%Y%m%d-%H%M%S")); let session_id = format!("poc-agent-{}", chrono::Utc::now().format("%Y%m%d-%H%M%S"));
let agent_cycles = crate::subconscious::subconscious::AgentCycleState::new(&session_id); let agent_cycles = crate::subconscious::subconscious::AgentCycleState::new(&session_id);
let mut agent = Self { let mut agent = Self {
client, client,
messages: Vec::new(),
tool_defs, tool_defs,
last_prompt_tokens: 0, last_prompt_tokens: 0,
process_tracker: ProcessTracker::new(), process_tracker: ProcessTracker::new(),
@ -124,23 +124,30 @@ impl Agent {
agent_cycles, agent_cycles,
}; };
// Load recent journal entries at startup for orientation
agent.load_startup_journal(); agent.load_startup_journal();
agent.load_working_stack(); agent.load_working_stack();
agent.push_context(Message::system(system_prompt));
let rendered = agent.context.render_context_message();
if !rendered.is_empty() {
agent.push_context(Message::user(rendered));
}
if !agent.context.journal.is_empty() {
agent.push_context(Message::user(render_journal(&agent.context.journal)));
}
agent.measure_budget(); agent.measure_budget();
agent.publish_context_state(); agent.publish_context_state();
agent agent
} }
/// Assemble the full message list for the API call from typed sources.
/// System prompt + personality context + journal + conversation messages.
fn assemble_api_messages(&self) -> Vec<Message> {
let mut msgs = Vec::new();
msgs.push(Message::system(&self.context.system_prompt));
let ctx = self.context.render_context_message();
if !ctx.is_empty() {
msgs.push(Message::user(ctx));
}
let jnl = render_journal(&self.context.journal);
if !jnl.is_empty() {
msgs.push(Message::user(jnl));
}
msgs.extend(self.context.messages.iter().cloned());
msgs
}
/// Run agent orchestration cycle and return formatted output to inject. /// Run agent orchestration cycle and return formatted output to inject.
fn run_agent_cycle(&mut self) -> Option<String> { fn run_agent_cycle(&mut self) -> Option<String> {
let transcript_path = self.conversation_log.as_ref() let transcript_path = self.conversation_log.as_ref()
@ -170,16 +177,12 @@ impl Agent {
eprintln!("warning: failed to log message: {:#}", e); eprintln!("warning: failed to log message: {:#}", e);
} }
} }
self.messages.push(msg); self.context.messages.push(msg);
} }
/// Push a context-only message (system prompt, identity context, /// Push a context-only message (system prompt, identity context,
/// journal summaries). Not logged — these are reconstructed on /// journal summaries). Not logged — these are reconstructed on
/// every startup/compaction. /// every startup/compaction.
fn push_context(&mut self, msg: Message) {
self.messages.push(msg);
}
/// Measure context window usage by category. Uses the BPE tokenizer /// Measure context window usage by category. Uses the BPE tokenizer
/// for direct token counting (no chars/4 approximation). /// for direct token counting (no chars/4 approximation).
fn measure_budget(&mut self) { fn measure_budget(&mut self) {
@ -192,9 +195,8 @@ impl Agent {
.map(|e| count(&e.content)).sum(); .map(|e| count(&e.content)).sum();
let mem_tokens: usize = self.context.loaded_nodes.iter() let mem_tokens: usize = self.context.loaded_nodes.iter()
.map(|node| count(&node.render())).sum(); .map(|node| count(&node.render())).sum();
let total: usize = self.messages.iter() let conv_tokens: usize = self.context.messages.iter()
.map(|m| crate::agent::context::msg_token_count(&self.tokenizer, m)).sum(); .map(|m| crate::agent::context::msg_token_count(&self.tokenizer, m)).sum();
let conv_tokens = total.saturating_sub(id_tokens + jnl_tokens);
self.context_budget = ContextBudget { self.context_budget = ContextBudget {
identity_tokens: id_tokens, identity_tokens: id_tokens,
@ -239,8 +241,9 @@ impl Agent {
// Stream events from the API — we route each event to the // Stream events from the API — we route each event to the
// appropriate UI pane rather than letting the API layer do it. // appropriate UI pane rather than letting the API layer do it.
let api_messages = self.assemble_api_messages();
let mut rx = self.client.start_stream( let mut rx = self.client.start_stream(
&self.messages, &api_messages,
Some(&self.tool_defs), Some(&self.tool_defs),
ui_tx, ui_tx,
&self.reasoning_effort, &self.reasoning_effort,
@ -691,10 +694,10 @@ impl Agent {
} }
// Conversation — each message as a child // Conversation — each message as a child
let conv_start = self.messages.iter() let conv_start = self.context.messages.iter()
.position(|m| m.role == Role::Assistant || m.role == Role::Tool) .position(|m| m.role == Role::Assistant || m.role == Role::Tool)
.unwrap_or(self.messages.len()); .unwrap_or(self.context.messages.len());
let conv_messages = &self.messages[conv_start..]; let conv_messages = &self.context.messages[conv_start..];
let conv_children: Vec<ContextSection> = conv_messages.iter().enumerate() let conv_children: Vec<ContextSection> = conv_messages.iter().enumerate()
.map(|(i, msg)| { .map(|(i, msg)| {
let text = msg.content.as_ref() let text = msg.content.as_ref()
@ -824,13 +827,13 @@ impl Agent {
dbg_log!("[journal] context.journal now has {} entries", self.context.journal.len()); dbg_log!("[journal] context.journal now has {} entries", self.context.journal.len());
} }
/// Re-render the context message in self.messages from live ContextState. /// Re-render the context message in self.context.messages from live ContextState.
/// Called after any change to context state (working stack, etc). /// Called after any change to context state (working stack, etc).
fn refresh_context_message(&mut self) { fn refresh_context_message(&mut self) {
let rendered = self.context.render_context_message(); let rendered = self.context.render_context_message();
// The context message is the first user message (index 1, after system prompt) // The context message is the first user message (index 1, after system prompt)
if self.messages.len() >= 2 && self.messages[1].role == Role::User { if self.context.messages.len() >= 2 && self.context.messages[1].role == Role::User {
self.messages[1] = Message::user(rendered); self.context.messages[1] = Message::user(rendered);
} }
self.publish_context_state(); self.publish_context_state();
self.save_working_stack(); self.save_working_stack();
@ -864,7 +867,7 @@ impl Agent {
/// all previous ones. The tool result message (right before each image /// all previous ones. The tool result message (right before each image
/// message) already records what was loaded, so no info is lost. /// message) already records what was loaded, so no info is lost.
fn age_out_images(&mut self) { fn age_out_images(&mut self) {
for msg in &mut self.messages { for msg in &mut self.context.messages {
if let Some(MessageContent::Parts(parts)) = &msg.content { if let Some(MessageContent::Parts(parts)) = &msg.content {
let has_images = parts.iter().any(|p| matches!(p, ContentPart::ImageUrl { .. })); let has_images = parts.iter().any(|p| matches!(p, ContentPart::ImageUrl { .. }));
if !has_images { if !has_images {
@ -909,7 +912,7 @@ impl Agent {
let mut strip_ids: Vec<String> = Vec::new(); let mut strip_ids: Vec<String> = Vec::new();
let mut strip_msg_indices: Vec<usize> = Vec::new(); let mut strip_msg_indices: Vec<usize> = Vec::new();
for (i, msg) in self.messages.iter().enumerate() { for (i, msg) in self.context.messages.iter().enumerate() {
if msg.role != Role::Assistant { if msg.role != Role::Assistant {
continue; continue;
} }
@ -935,7 +938,7 @@ impl Agent {
} }
// Remove in reverse order to preserve indices // Remove in reverse order to preserve indices
self.messages.retain(|msg| { self.context.messages.retain(|msg| {
// Strip the assistant messages we identified // Strip the assistant messages we identified
if msg.role == Role::Assistant { if msg.role == Role::Assistant {
if let Some(calls) = &msg.tool_calls { if let Some(calls) = &msg.tool_calls {
@ -973,14 +976,7 @@ impl Agent {
/// Internal compaction — rebuilds context window from current messages. /// Internal compaction — rebuilds context window from current messages.
fn do_compact(&mut self) { fn do_compact(&mut self) {
// Find where actual conversation starts (after system + context) let conversation: Vec<Message> = self.context.messages.clone();
let conv_start = self
.messages
.iter()
.position(|m| m.role == Role::Assistant || m.role == Role::Tool)
.unwrap_or(self.messages.len());
let conversation: Vec<Message> = self.messages[conv_start..].to_vec();
let (messages, journal) = crate::agent::context::build_context_window( let (messages, journal) = crate::agent::context::build_context_window(
&self.context, &self.context,
&conversation, &conversation,
@ -988,7 +984,7 @@ impl Agent {
&self.tokenizer, &self.tokenizer,
); );
self.context.journal = journal::parse_journal_text(&journal); self.context.journal = journal::parse_journal_text(&journal);
self.messages = messages; self.context.messages = messages;
self.last_prompt_tokens = 0; self.last_prompt_tokens = 0;
self.measure_budget(); self.measure_budget();
self.publish_context_state(); self.publish_context_state();
@ -1050,8 +1046,8 @@ impl Agent {
dbglog!("[restore] journal text: {} chars, {} lines", dbglog!("[restore] journal text: {} chars, {} lines",
journal.len(), journal.lines().count()); journal.len(), journal.lines().count());
self.context.journal = journal::parse_journal_text(&journal); self.context.journal = journal::parse_journal_text(&journal);
self.messages = messages; self.context.messages = messages;
dbglog!("[restore] built context window: {} messages", self.messages.len()); dbglog!("[restore] built context window: {} messages", self.context.messages.len());
self.last_prompt_tokens = 0; self.last_prompt_tokens = 0;
self.measure_budget(); self.measure_budget();
self.publish_context_state(); self.publish_context_state();
@ -1070,17 +1066,17 @@ impl Agent {
/// Get the conversation history for persistence. /// Get the conversation history for persistence.
pub fn messages(&self) -> &[Message] { pub fn messages(&self) -> &[Message] {
&self.messages &self.context.messages
} }
/// Mutable access to conversation history (for /retry). /// Mutable access to conversation history (for /retry).
pub fn messages_mut(&mut self) -> &mut Vec<Message> { pub fn messages_mut(&mut self) -> &mut Vec<Message> {
&mut self.messages &mut self.context.messages
} }
/// Restore from a saved conversation. /// Restore from a saved conversation.
pub fn restore(&mut self, messages: Vec<Message>) { pub fn restore(&mut self, messages: Vec<Message>) {
self.messages = messages; self.context.messages = messages;
} }
} }

7
src/agent/types.rs
View file

@ -329,9 +329,12 @@ pub struct ContextState {
pub journal: Vec<crate::agent::journal::JournalEntry>, pub journal: Vec<crate::agent::journal::JournalEntry>,
pub working_stack: Vec<String>, pub working_stack: Vec<String>,
/// Memory nodes currently loaded in the context window. /// Memory nodes currently loaded in the context window.
/// Tracked so the agent knows what it's "seeing" and can
/// refresh nodes after writes.
pub loaded_nodes: Vec<crate::hippocampus::memory::MemoryNode>, pub loaded_nodes: Vec<crate::hippocampus::memory::MemoryNode>,
/// Conversation messages (user, assistant, tool turns).
/// Does NOT include system prompt, personality, or journal —
/// those are rendered from their typed sources when assembling
/// the API call.
pub messages: Vec<Message>,
} }
// TODO: these should not be hardcoded absolute paths // TODO: these should not be hardcoded absolute paths