Memory scores on entries, not a separate Vec
ConversationEntry::Memory gains score: Option<f64>. The scorer writes scores directly onto entries when results arrive. Removes Agent.memory_scores Vec and the memory_scores parameter from context_state_summary(). Scores are serialized to/from the conversation log as memory_score. Co-Authored-By: Proof of Concept <poc@bcachefs.org>
This commit is contained in:
parent
93f5f8b0c7
commit
39dcf27bd0
6 changed files with 36 additions and 50 deletions
|
|
@ -29,7 +29,6 @@ use tools::{summarize_args, working_stack};
|
|||
|
||||
use crate::mind::log::ConversationLog;
|
||||
use crate::agent::context::ContextSection;
|
||||
use crate::subconscious::learn;
|
||||
|
||||
// --- Activity tracking (RAII guards) ---
|
||||
|
||||
|
|
@ -175,8 +174,6 @@ pub struct Agent {
|
|||
pub generation: u64,
|
||||
/// Whether incremental memory scoring is currently running.
|
||||
pub memory_scoring_in_flight: bool,
|
||||
/// Latest per-memory scores from incremental scoring.
|
||||
pub memory_scores: Vec<(String, f64)>,
|
||||
/// Shared active tools — Agent writes, TUI reads.
|
||||
pub active_tools: tools::SharedActiveTools,
|
||||
/// Fires when agent state changes — UI wakes on this instead of polling.
|
||||
|
|
@ -225,7 +222,6 @@ impl Agent {
|
|||
session_id,
|
||||
generation: 0,
|
||||
memory_scoring_in_flight: false,
|
||||
memory_scores: Vec::new(),
|
||||
active_tools,
|
||||
changed: Arc::new(tokio::sync::Notify::new()),
|
||||
};
|
||||
|
|
@ -265,7 +261,6 @@ impl Agent {
|
|||
session_id: self.session_id.clone(),
|
||||
generation: 0,
|
||||
memory_scoring_in_flight: false,
|
||||
memory_scores: Vec::new(),
|
||||
active_tools: tools::shared_active_tools(),
|
||||
changed: Arc::new(tokio::sync::Notify::new()),
|
||||
}
|
||||
|
|
@ -648,7 +643,7 @@ impl Agent {
|
|||
if let Some(key) = args.get("key").and_then(|v| v.as_str()) {
|
||||
let mut msg = Message::tool_result(&call.id, &output);
|
||||
msg.stamp();
|
||||
self.push_entry(ConversationEntry::Memory { key: key.to_string(), message: msg });
|
||||
self.push_entry(ConversationEntry::Memory { key: key.to_string(), message: msg, score: None });
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -657,7 +652,7 @@ impl Agent {
|
|||
}
|
||||
|
||||
/// Build context state summary for the debug screen.
|
||||
pub fn context_state_summary(&self, memory_scores: Option<&learn::MemoryScore>) -> Vec<ContextSection> {
|
||||
pub fn context_state_summary(&self) -> Vec<ContextSection> {
|
||||
let count_msg = |m: &Message| context::msg_token_count(&self.tokenizer, m);
|
||||
|
||||
let mut sections = Vec::new();
|
||||
|
|
@ -699,23 +694,13 @@ impl Agent {
|
|||
if !memory_entries.is_empty() {
|
||||
let node_children: Vec<ContextSection> = memory_entries.iter()
|
||||
.map(|entry| {
|
||||
let key = match entry {
|
||||
ConversationEntry::Memory { key, .. } => key.as_str(),
|
||||
let (key, score) = match entry {
|
||||
ConversationEntry::Memory { key, score, .. } => (key.as_str(), *score),
|
||||
_ => unreachable!(),
|
||||
};
|
||||
// Show node weight from graph (updated by incremental scorer)
|
||||
let graph_weight = crate::hippocampus::store::Store::load().ok()
|
||||
.and_then(|s| s.nodes.get(key).map(|n| n.weight));
|
||||
// Show full matrix score if available
|
||||
let matrix_score = memory_scores
|
||||
.and_then(|s| s.memory_weights.iter()
|
||||
.find(|(k, _)| k == key)
|
||||
.map(|(_, v)| *v));
|
||||
let label = match (graph_weight, matrix_score) {
|
||||
(Some(w), Some(s)) => format!("{} (w:{:.2} score:{:.1})", key, w, s),
|
||||
(Some(w), None) => format!("{} (w:{:.2})", key, w),
|
||||
(None, Some(s)) => format!("{} (score:{:.1})", key, s),
|
||||
(None, None) => key.to_string(),
|
||||
let label = match score {
|
||||
Some(s) => format!("{} (score:{:.1})", key, s),
|
||||
None => key.to_string(),
|
||||
};
|
||||
ContextSection {
|
||||
name: label,
|
||||
|
|
@ -772,27 +757,11 @@ impl Agent {
|
|||
Role::System => "system".to_string(),
|
||||
}
|
||||
};
|
||||
// Show which memories were important for this response
|
||||
let children = if m.role == Role::Assistant {
|
||||
memory_scores
|
||||
.map(|s| s.important_memories_for_entry(i))
|
||||
.unwrap_or_default()
|
||||
.into_iter()
|
||||
.map(|(key, score)| ContextSection {
|
||||
name: format!("← {} ({:.1})", key, score),
|
||||
tokens: 0,
|
||||
content: String::new(),
|
||||
children: Vec::new(),
|
||||
})
|
||||
.collect()
|
||||
} else {
|
||||
Vec::new()
|
||||
};
|
||||
ContextSection {
|
||||
name: format!("[{}] {}: {}", i, role_name, label),
|
||||
tokens,
|
||||
content: text,
|
||||
children,
|
||||
children: Vec::new(),
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
|
|
@ -986,7 +955,7 @@ impl Agent {
|
|||
self.generation += 1;
|
||||
self.last_prompt_tokens = 0;
|
||||
|
||||
let sections = self.context_state_summary(None);
|
||||
let sections = self.context_state_summary();
|
||||
dbglog!("[compact] budget: {}", context::sections_budget_string(§ions));
|
||||
}
|
||||
|
||||
|
|
@ -1015,7 +984,7 @@ impl Agent {
|
|||
self.compact();
|
||||
// Estimate prompt tokens from sections so status bar isn't 0 on startup
|
||||
self.last_prompt_tokens = context::sections_used(
|
||||
&self.context_state_summary(None)) as u32;
|
||||
&self.context_state_summary()) as u32;
|
||||
true
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue