fix(agent): use config max_tool_iterations, add memory relevance filtering, rebalance search weights

Three fixes for conversation quality issues:

1. loop_.rs and channels now read max_tool_iterations from AgentConfig
   instead of using a hardcoded constant of 10, making it configurable.

2. Memory recall now filters entries below a configurable
   min_relevance_score threshold (default 0.4), preventing unrelated
   memories from bleeding into conversation context.

3. Default hybrid search weights rebalanced from 70/30 vector/keyword
   to 40/60, reducing cross-topic semantic bleed.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Edvard 2026-02-17 20:09:06 -05:00 committed by Chummy
parent 21c5f58363
commit 8a1e7cc7ef
6 changed files with 90 additions and 24 deletions

View file

@ -271,7 +271,10 @@ impl Agent {
.memory(memory)
.observer(observer)
.tool_dispatcher(tool_dispatcher)
.memory_loader(Box::new(DefaultMemoryLoader::default()))
.memory_loader(Box::new(DefaultMemoryLoader::new(
5,
config.memory.min_relevance_score,
)))
.prompt_builder(SystemPromptBuilder::with_defaults())
.config(config.agent.clone())
.model_name(model_name)

View file

@ -16,8 +16,7 @@ use std::time::Instant;
use uuid::Uuid;
/// Default maximum agentic tool-use iterations per user message to prevent runaway loops.
/// Prefer passing the config-driven value via `run_tool_call_loop`; this constant is only
/// used when callers omit the parameter.
/// Used as a safe fallback when `max_tool_iterations` is unset or configured as zero.
const DEFAULT_MAX_TOOL_ITERATIONS: usize = 10;
static SENSITIVE_KEY_PATTERNS: LazyLock<RegexSet> = LazyLock::new(|| {
@ -202,15 +201,25 @@ async fn auto_compact_history(
Ok(true)
}
/// Build context preamble by searching memory for relevant entries
async fn build_context(mem: &dyn Memory, user_msg: &str) -> String {
/// Build context preamble by searching memory for relevant entries.
/// Entries with a hybrid score below `min_relevance_score` are dropped to
/// prevent unrelated memories from bleeding into the conversation.
async fn build_context(mem: &dyn Memory, user_msg: &str, min_relevance_score: f64) -> String {
let mut context = String::new();
// Pull relevant memories for this message
if let Ok(entries) = mem.recall(user_msg, 5, None).await {
if !entries.is_empty() {
let relevant: Vec<_> = entries
.iter()
.filter(|e| match e.score {
Some(score) => score >= min_relevance_score,
None => true,
})
.collect();
if !relevant.is_empty() {
context.push_str("[Memory context]\n");
for entry in &entries {
for entry in &relevant {
let _ = writeln!(context, "- {}: {}", entry.key, entry.content);
}
context.push('\n');
@ -598,6 +607,7 @@ pub(crate) async fn agent_turn(
model: &str,
temperature: f64,
silent: bool,
max_tool_iterations: usize,
) -> Result<String> {
run_tool_call_loop(
provider,
@ -610,7 +620,7 @@ pub(crate) async fn agent_turn(
silent,
None,
"channel",
DEFAULT_MAX_TOOL_ITERATIONS,
max_tool_iterations,
)
.await
}
@ -631,6 +641,12 @@ pub(crate) async fn run_tool_call_loop(
channel_name: &str,
max_tool_iterations: usize,
) -> Result<String> {
let max_iterations = if max_tool_iterations == 0 {
DEFAULT_MAX_TOOL_ITERATIONS
} else {
max_tool_iterations
};
// Build native tool definitions once if the provider supports them.
let use_native_tools = provider.supports_native_tools() && !tools_registry.is_empty();
let tool_definitions = if use_native_tools {
@ -639,7 +655,7 @@ pub(crate) async fn run_tool_call_loop(
Vec::new()
};
for _iteration in 0..max_tool_iterations {
for _iteration in 0..max_iterations {
observer.record_event(&ObserverEvent::LlmRequest {
provider: provider_name.to_string(),
model: model.to_string(),
@ -857,7 +873,7 @@ pub(crate) async fn run_tool_call_loop(
}
}
anyhow::bail!("Agent exceeded maximum tool iterations ({max_tool_iterations})")
anyhow::bail!("Agent exceeded maximum tool iterations ({max_iterations})")
}
/// Build the tool instruction block for the system prompt so the LLM knows
@ -1142,7 +1158,8 @@ pub async fn run(
}
// Inject memory + hardware RAG context into user message
let mem_context = build_context(mem.as_ref(), &msg).await;
let mem_context =
build_context(mem.as_ref(), &msg, config.memory.min_relevance_score).await;
let rag_limit = if config.agent.compact_context { 2 } else { 5 };
let hw_context = hardware_rag
.as_ref()
@ -1270,7 +1287,8 @@ pub async fn run(
}
// Inject memory + hardware RAG context into user message
let mem_context = build_context(mem.as_ref(), &user_input).await;
let mem_context =
build_context(mem.as_ref(), &user_input, config.memory.min_relevance_score).await;
let rag_limit = if config.agent.compact_context { 2 } else { 5 };
let hw_context = hardware_rag
.as_ref()
@ -1487,7 +1505,7 @@ pub async fn process_message(config: Config, message: &str) -> Result<String> {
);
system_prompt.push_str(&build_tool_instructions(&tools_registry));
let mem_context = build_context(mem.as_ref(), message).await;
let mem_context = build_context(mem.as_ref(), message, config.memory.min_relevance_score).await;
let rag_limit = if config.agent.compact_context { 2 } else { 5 };
let hw_context = hardware_rag
.as_ref()
@ -1514,6 +1532,7 @@ pub async fn process_message(config: Config, message: &str) -> Result<String> {
&model_name,
config.default_temperature,
true,
config.agent.max_tool_iterations,
)
.await
}

View file

@ -10,18 +10,23 @@ pub trait MemoryLoader: Send + Sync {
pub struct DefaultMemoryLoader {
limit: usize,
min_relevance_score: f64,
}
impl Default for DefaultMemoryLoader {
fn default() -> Self {
Self { limit: 5 }
Self {
limit: 5,
min_relevance_score: 0.4,
}
}
}
impl DefaultMemoryLoader {
pub fn new(limit: usize) -> Self {
pub fn new(limit: usize, min_relevance_score: f64) -> Self {
Self {
limit: limit.max(1),
min_relevance_score,
}
}
}
@ -40,8 +45,19 @@ impl MemoryLoader for DefaultMemoryLoader {
let mut context = String::from("[Memory context]\n");
for entry in entries {
if let Some(score) = entry.score {
if score < self.min_relevance_score {
continue;
}
}
let _ = writeln!(context, "- {}: {}", entry.key, entry.content);
}
// If all entries were below threshold, return empty
if context == "[Memory context]\n" {
return Ok(String::new());
}
context.push('\n');
Ok(context)
}