Skip to content

refactor: remove P generic from Agent, SemanticMemory, CodeRetriever (M24) #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bug-ops merged 2 commits into from
Feb 17, 2026
Merged

refactor: remove P generic from Agent, SemanticMemory, CodeRetriever (M24) #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bec443e
refactor: remove P generic from Agent, SemanticMemory, CodeRetriever …
bug-ops Feb 17, 2026
36319a9
fix: migrate test files to Agent<C,T> and centralized MockProvider
bug-ops Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ daemon = ["zeph-core/daemon"]
scheduler = ["dep:zeph-scheduler"]
vault-age = ["zeph-core/vault-age"]
otel = ["dep:opentelemetry", "dep:opentelemetry_sdk", "dep:opentelemetry-otlp", "dep:tracing-opentelemetry"]
mock = ["zeph-llm/mock"]

[dependencies]
anyhow.workspace = true
Expand Down
1 change: 1 addition & 0 deletions crates/zeph-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ harness = false
criterion.workspace = true
serial_test.workspace = true
tempfile.workspace = true
zeph-llm = { workspace = true, features = ["mock"] }

[lints]
workspace = true
79 changes: 41 additions & 38 deletions crates/zeph-core/src/agent/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use super::{
build_system_prompt, format_skills_prompt,
};

impl<P: LlmProvider + Clone + 'static, C: Channel, T: ToolExecutor> Agent<P, C, T> {
impl<C: Channel, T: ToolExecutor> Agent<C, T> {
#[allow(
clippy::cast_precision_loss,
clippy::cast_possible_truncation,
Expand Down Expand Up @@ -111,6 +111,7 @@ impl<P: LlmProvider + Clone + 'static, C: Channel, T: ToolExecutor> Agent<P, C,
"compacted context"
);

self.recompute_prompt_tokens();
self.update_metrics(|m| {
m.context_compactions += 1;
});
Expand Down Expand Up @@ -311,7 +312,7 @@ impl<P: LlmProvider + Clone + 'static, C: Channel, T: ToolExecutor> Agent<P, C,
}

async fn fetch_semantic_recall(
memory_state: &super::MemoryState<P>,
memory_state: &super::MemoryState,
query: &str,
token_budget: usize,
) -> Result<Option<Message>, super::error::AgentError> {
Expand Down Expand Up @@ -424,7 +425,7 @@ impl<P: LlmProvider + Clone + 'static, C: Channel, T: ToolExecutor> Agent<P, C,
}

async fn fetch_cross_session(
memory_state: &super::MemoryState<P>,
memory_state: &super::MemoryState,
query: &str,
token_budget: usize,
) -> Result<Option<Message>, super::error::AgentError> {
Expand Down Expand Up @@ -487,7 +488,7 @@ impl<P: LlmProvider + Clone + 'static, C: Channel, T: ToolExecutor> Agent<P, C,
}

async fn fetch_summaries(
memory_state: &super::MemoryState<P>,
memory_state: &super::MemoryState,
token_budget: usize,
) -> Result<Option<Message>, super::error::AgentError> {
let (Some(memory), Some(cid)) = (&memory_state.memory, memory_state.conversation_id) else {
Expand Down Expand Up @@ -558,6 +559,7 @@ impl<P: LlmProvider + Clone + 'static, C: Channel, T: ToolExecutor> Agent<P, C,
if keep_from > history_start {
let removed = keep_from - history_start;
self.messages.drain(history_start..keep_from);
self.recompute_prompt_tokens();
tracing::info!(
removed,
token_budget,
Expand Down Expand Up @@ -621,6 +623,7 @@ impl<P: LlmProvider + Clone + 'static, C: Channel, T: ToolExecutor> Agent<P, C,
}

self.trim_messages_to_budget(alloc.recent_history);
self.recompute_prompt_tokens();

Ok(())
}
Expand Down Expand Up @@ -783,7 +786,7 @@ mod tests {

#[test]
fn should_compact_disabled_without_budget() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -801,7 +804,7 @@ mod tests {

#[test]
fn should_compact_below_threshold() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -813,7 +816,7 @@ mod tests {

#[test]
fn should_compact_above_threshold() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -833,7 +836,7 @@ mod tests {

#[tokio::test]
async fn compact_context_preserves_system_and_tail() {
let provider = MockProvider::new(vec!["compacted summary".to_string()]);
let provider = mock_provider(vec!["compacted summary".to_string()]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand Down Expand Up @@ -871,7 +874,7 @@ mod tests {

#[tokio::test]
async fn compact_context_too_few_messages() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -897,7 +900,7 @@ mod tests {

#[test]
fn with_context_budget_zero_disables() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -909,7 +912,7 @@ mod tests {

#[test]
fn with_context_budget_nonzero_enables() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -928,7 +931,7 @@ mod tests {

#[tokio::test]
async fn compact_context_increments_metric() {
let provider = MockProvider::new(vec!["summary".to_string()]);
let provider = mock_provider(vec!["summary".to_string()]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -952,7 +955,7 @@ mod tests {

#[tokio::test]
async fn test_prepare_context_no_budget_is_noop() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -966,7 +969,7 @@ mod tests {

#[tokio::test]
async fn test_recall_injection_removed_between_turns() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -990,7 +993,7 @@ mod tests {

#[tokio::test]
async fn test_recall_without_qdrant_returns_empty() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -1004,7 +1007,7 @@ mod tests {

#[tokio::test]
async fn test_trim_messages_preserves_system() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -1028,7 +1031,7 @@ mod tests {

#[tokio::test]
async fn test_trim_messages_keeps_recent() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -1051,7 +1054,7 @@ mod tests {

#[tokio::test]
async fn test_trim_zero_budget_is_noop() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -1072,9 +1075,9 @@ mod tests {
}

async fn create_memory_with_summaries(
provider: MockProvider,
provider: zeph_llm::any::AnyProvider,
summaries: &[&str],
) -> (SemanticMemory<MockProvider>, zeph_memory::ConversationId) {
) -> (SemanticMemory, zeph_memory::ConversationId) {
let memory = SemanticMemory::new(":memory:", "http://127.0.0.1:1", provider, "test")
.await
.unwrap();
Expand All @@ -1101,7 +1104,7 @@ mod tests {

#[tokio::test]
async fn test_inject_summaries_no_memory_noop() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -1115,7 +1118,7 @@ mod tests {

#[tokio::test]
async fn test_inject_summaries_zero_budget_noop() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let (memory, cid) = create_memory_with_summaries(provider.clone(), &["summary text"]).await;

let channel = MockChannel::new(vec![]);
Expand All @@ -1132,7 +1135,7 @@ mod tests {

#[tokio::test]
async fn test_inject_summaries_empty_summaries_noop() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let (memory, cid) = create_memory_with_summaries(provider.clone(), &[]).await;

let channel = MockChannel::new(vec![]);
Expand All @@ -1149,7 +1152,7 @@ mod tests {

#[tokio::test]
async fn test_inject_summaries_inserts_at_position_1() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let (memory, cid) =
create_memory_with_summaries(provider.clone(), &["User asked about Rust ownership"])
.await;
Expand Down Expand Up @@ -1182,7 +1185,7 @@ mod tests {

#[tokio::test]
async fn test_inject_summaries_removes_old_before_inject() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let (memory, cid) =
create_memory_with_summaries(provider.clone(), &["new summary data"]).await;

Expand Down Expand Up @@ -1222,7 +1225,7 @@ mod tests {

#[tokio::test]
async fn test_inject_summaries_respects_token_budget() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
// Each summary entry is "- Messages X-Y: <content>\n" (~prefix overhead + content)
let (memory, cid) = create_memory_with_summaries(
provider.clone(),
Expand Down Expand Up @@ -1263,7 +1266,7 @@ mod tests {

#[tokio::test]
async fn test_remove_summary_messages_preserves_other_system() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand Down Expand Up @@ -1295,7 +1298,7 @@ mod tests {

#[test]
fn test_prune_frees_tokens() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand Down Expand Up @@ -1332,7 +1335,7 @@ mod tests {

#[test]
fn test_prune_respects_protection_zone() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand Down Expand Up @@ -1362,7 +1365,7 @@ mod tests {

#[tokio::test]
async fn test_tier2_after_insufficient_prune() {
let provider = MockProvider::new(vec!["summary".to_string()]);
let provider = mock_provider(vec!["summary".to_string()]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -1386,7 +1389,7 @@ mod tests {

#[tokio::test]
async fn test_inject_cross_session_no_memory_noop() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -1403,7 +1406,7 @@ mod tests {

#[tokio::test]
async fn test_inject_cross_session_zero_budget_noop() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let (memory, cid) = create_memory_with_summaries(provider.clone(), &["summary"]).await;

let channel = MockChannel::new(vec![]);
Expand All @@ -1420,7 +1423,7 @@ mod tests {

#[tokio::test]
async fn test_remove_cross_session_messages() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -1444,7 +1447,7 @@ mod tests {

#[tokio::test]
async fn test_remove_cross_session_preserves_other_system() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand Down Expand Up @@ -1478,7 +1481,7 @@ mod tests {

#[tokio::test]
async fn test_store_session_summary_on_compaction() {
let provider = MockProvider::new(vec!["compacted summary".to_string()]);
let provider = mock_provider(vec!["compacted summary".to_string()]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand Down Expand Up @@ -1564,7 +1567,7 @@ mod tests {

#[test]
fn prune_stale_tool_outputs_clears_old() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand Down Expand Up @@ -1611,7 +1614,7 @@ mod tests {

#[test]
fn prune_stale_tool_outputs_noop_when_few_messages() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand All @@ -1633,7 +1636,7 @@ mod tests {

#[test]
fn prune_stale_prunes_tool_result_too() {
let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand Down
8 changes: 4 additions & 4 deletions crates/zeph-core/src/agent/index.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use super::{Agent, Channel, LlmProvider, ToolExecutor};
use super::{Agent, Channel, ToolExecutor};

impl<P: LlmProvider + Clone + 'static, C: Channel, T: ToolExecutor> Agent<P, C, T> {
impl<C: Channel, T: ToolExecutor> Agent<C, T> {
pub(super) async fn fetch_code_rag(
index: &super::IndexState<P>,
index: &super::IndexState,
query: &str,
token_budget: usize,
) -> Result<Option<String>, super::error::AgentError> {
Expand Down Expand Up @@ -44,7 +44,7 @@ mod tests {
fn test_repo_map_cache_hit() {
use std::time::{Duration, Instant};

let provider = MockProvider::new(vec![]);
let provider = mock_provider(vec![]);
let channel = MockChannel::new(vec![]);
let registry = create_test_registry();
let executor = MockToolExecutor::no_tools();
Expand Down
Loading
Loading