* feat(memory): add session_id isolation to Memory trait Add optional session_id parameter to store(), recall(), and list() methods across the Memory trait and all four backends (sqlite, markdown, lucid, none). This enables per-session memory isolation so different agent sessions cannot cross-read each other's stored memories. Changes: - traits.rs: Add session_id: Option<&str> to store/recall/list - sqlite.rs: Schema migration (ALTER TABLE ADD COLUMN session_id), index, persist/filter by session_id in all query paths - markdown.rs, lucid.rs, none.rs: Updated signatures - All callers pass None for backward compatibility - 5 new tests: session-filtered recall, cross-session isolation, session-filtered list, no-filter returns all, migration idempotency Closes #518 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(channels): fix discord _channel_id typo and lark missing reply_to Pre-existing compilation errors on main after reply_to was added to ChannelMessage: discord.rs used _channel_id (underscore prefix) but referenced channel_id, and lark.rs was missing the reply_to field. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
167 lines
5 KiB
Rust
167 lines
5 KiB
Rust
use super::traits::{Tool, ToolResult};
|
|
use crate::memory::Memory;
|
|
use async_trait::async_trait;
|
|
use serde_json::json;
|
|
use std::fmt::Write;
|
|
use std::sync::Arc;
|
|
|
|
/// Let the agent search its own memory
|
|
pub struct MemoryRecallTool {
|
|
memory: Arc<dyn Memory>,
|
|
}
|
|
|
|
impl MemoryRecallTool {
|
|
pub fn new(memory: Arc<dyn Memory>) -> Self {
|
|
Self { memory }
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl Tool for MemoryRecallTool {
|
|
fn name(&self) -> &str {
|
|
"memory_recall"
|
|
}
|
|
|
|
fn description(&self) -> &str {
|
|
"Search long-term memory for relevant facts, preferences, or context. Returns scored results ranked by relevance."
|
|
}
|
|
|
|
fn parameters_schema(&self) -> serde_json::Value {
|
|
json!({
|
|
"type": "object",
|
|
"properties": {
|
|
"query": {
|
|
"type": "string",
|
|
"description": "Keywords or phrase to search for in memory"
|
|
},
|
|
"limit": {
|
|
"type": "integer",
|
|
"description": "Max results to return (default: 5)"
|
|
}
|
|
},
|
|
"required": ["query"]
|
|
})
|
|
}
|
|
|
|
async fn execute(&self, args: serde_json::Value) -> anyhow::Result<ToolResult> {
|
|
let query = args
|
|
.get("query")
|
|
.and_then(|v| v.as_str())
|
|
.ok_or_else(|| anyhow::anyhow!("Missing 'query' parameter"))?;
|
|
|
|
#[allow(clippy::cast_possible_truncation)]
|
|
let limit = args
|
|
.get("limit")
|
|
.and_then(serde_json::Value::as_u64)
|
|
.map_or(5, |v| v as usize);
|
|
|
|
match self.memory.recall(query, limit, None).await {
|
|
Ok(entries) if entries.is_empty() => Ok(ToolResult {
|
|
success: true,
|
|
output: "No memories found matching that query.".into(),
|
|
error: None,
|
|
}),
|
|
Ok(entries) => {
|
|
let mut output = format!("Found {} memories:\n", entries.len());
|
|
for entry in &entries {
|
|
let score = entry
|
|
.score
|
|
.map_or_else(String::new, |s| format!(" [{s:.0}%]"));
|
|
let _ = writeln!(
|
|
output,
|
|
"- [{}] {}: {}{score}",
|
|
entry.category, entry.key, entry.content
|
|
);
|
|
}
|
|
Ok(ToolResult {
|
|
success: true,
|
|
output,
|
|
error: None,
|
|
})
|
|
}
|
|
Err(e) => Ok(ToolResult {
|
|
success: false,
|
|
output: String::new(),
|
|
error: Some(format!("Memory recall failed: {e}")),
|
|
}),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::memory::{MemoryCategory, SqliteMemory};
|
|
use tempfile::TempDir;
|
|
|
|
fn seeded_mem() -> (TempDir, Arc<dyn Memory>) {
|
|
let tmp = TempDir::new().unwrap();
|
|
let mem = SqliteMemory::new(tmp.path()).unwrap();
|
|
(tmp, Arc::new(mem))
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn recall_empty() {
|
|
let (_tmp, mem) = seeded_mem();
|
|
let tool = MemoryRecallTool::new(mem);
|
|
let result = tool.execute(json!({"query": "anything"})).await.unwrap();
|
|
assert!(result.success);
|
|
assert!(result.output.contains("No memories found"));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn recall_finds_match() {
|
|
let (_tmp, mem) = seeded_mem();
|
|
mem.store("lang", "User prefers Rust", MemoryCategory::Core, None)
|
|
.await
|
|
.unwrap();
|
|
mem.store("tz", "Timezone is EST", MemoryCategory::Core, None)
|
|
.await
|
|
.unwrap();
|
|
|
|
let tool = MemoryRecallTool::new(mem);
|
|
let result = tool.execute(json!({"query": "Rust"})).await.unwrap();
|
|
assert!(result.success);
|
|
assert!(result.output.contains("Rust"));
|
|
assert!(result.output.contains("Found 1"));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn recall_respects_limit() {
|
|
let (_tmp, mem) = seeded_mem();
|
|
for i in 0..10 {
|
|
mem.store(
|
|
&format!("k{i}"),
|
|
&format!("Rust fact {i}"),
|
|
MemoryCategory::Core,
|
|
None,
|
|
)
|
|
.await
|
|
.unwrap();
|
|
}
|
|
|
|
let tool = MemoryRecallTool::new(mem);
|
|
let result = tool
|
|
.execute(json!({"query": "Rust", "limit": 3}))
|
|
.await
|
|
.unwrap();
|
|
assert!(result.success);
|
|
assert!(result.output.contains("Found 3"));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn recall_missing_query() {
|
|
let (_tmp, mem) = seeded_mem();
|
|
let tool = MemoryRecallTool::new(mem);
|
|
let result = tool.execute(json!({})).await;
|
|
assert!(result.is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn name_and_schema() {
|
|
let (_tmp, mem) = seeded_mem();
|
|
let tool = MemoryRecallTool::new(mem);
|
|
assert_eq!(tool.name(), "memory_recall");
|
|
assert!(tool.parameters_schema()["properties"]["query"].is_object());
|
|
}
|
|
}
|