Skip to content

Commit 400b93c

Browse files
committed
style: apply cargo fmt
1 parent dfc5c46 commit 400b93c

5 files changed

Lines changed: 58 additions & 45 deletions

File tree

agent-diva-agent/src/agent_loop.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -660,10 +660,9 @@ mod tests {
660660
// ── memory provider lifecycle wiring tests (Task 6) ──────────────
661661

662662
use agent_diva_core::memory::{
663-
PrefetchRequest, PrefetchResponse, PrefetchStatus, SessionEndRequest,
664-
SessionEndResponse, SessionEndStatus, StartupStatus, SyncTurnRequest,
665-
SyncTurnResponse, SyncTurnStatus, SystemPromptBlock, SystemPromptRequest,
666-
SystemPromptResponse,
663+
PrefetchRequest, PrefetchResponse, PrefetchStatus, SessionEndRequest, SessionEndResponse,
664+
SessionEndStatus, StartupStatus, SyncTurnRequest, SyncTurnResponse, SyncTurnStatus,
665+
SystemPromptBlock, SystemPromptRequest, SystemPromptResponse,
667666
};
668667
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
669668

@@ -786,8 +785,7 @@ mod tests {
786785
let memory_provider = Arc::new(TrackingMemoryProvider::new());
787786

788787
// ContextBuilder with injected provider
789-
let builder = ContextBuilder::new(workspace)
790-
.with_memory_provider(memory_provider.clone());
788+
let builder = ContextBuilder::new(workspace).with_memory_provider(memory_provider.clone());
791789

792790
let prompt = builder.build_system_prompt();
793791

@@ -840,12 +838,10 @@ mod tests {
840838

841839
assert_eq!(response.status, PrefetchStatus::Ready);
842840
assert!(response.prompt_block.is_some());
843-
assert!(
844-
response
845-
.prompt_block
846-
.unwrap()
847-
.contains("recall provider boundary")
848-
);
841+
assert!(response
842+
.prompt_block
843+
.unwrap()
844+
.contains("recall provider boundary"));
849845
}
850846

851847
#[tokio::test]

agent-diva-agent/src/agent_loop/loop_turn.rs

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -699,15 +699,30 @@ fn derive_prefetch_intent(message: &str) -> String {
699699

700700
let lower = trimmed.to_lowercase();
701701
let recall_words = [
702-
"recall", "remember", "summarize", "summary", "review",
703-
"history", "memory", "previous", "last", "recent",
704-
"what", "how", "why", "when", "where", "who",
705-
"list", "find", "search", "look", "check",
702+
"recall",
703+
"remember",
704+
"summarize",
705+
"summary",
706+
"review",
707+
"history",
708+
"memory",
709+
"previous",
710+
"last",
711+
"recent",
712+
"what",
713+
"how",
714+
"why",
715+
"when",
716+
"where",
717+
"who",
718+
"list",
719+
"find",
720+
"search",
721+
"look",
722+
"check",
706723
];
707724

708-
let has_recall_signal = recall_words.iter().any(|word| {
709-
lower.contains(word)
710-
});
725+
let has_recall_signal = recall_words.iter().any(|word| lower.contains(word));
711726

712727
if has_recall_signal {
713728
// Use a truncated version as the search intent.

agent-diva-agent/src/context.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,9 @@ fn default_identity_header() -> String {
415415
mod tests {
416416
use super::*;
417417
use agent_diva_core::memory::{
418-
PrefetchRequest, PrefetchResponse, PrefetchStatus, SessionEndRequest,
419-
SessionEndResponse, SessionEndStatus, SyncTurnRequest, SyncTurnResponse,
420-
SyncTurnStatus, SystemPromptBlock, SystemPromptRequest, SystemPromptResponse,
418+
PrefetchRequest, PrefetchResponse, PrefetchStatus, SessionEndRequest, SessionEndResponse,
419+
SessionEndStatus, SyncTurnRequest, SyncTurnResponse, SyncTurnStatus, SystemPromptBlock,
420+
SystemPromptRequest, SystemPromptResponse,
421421
};
422422
use std::fs;
423423
use std::sync::Arc;
@@ -528,9 +528,8 @@ mod tests {
528528

529529
#[test]
530530
fn test_build_system_prompt_renders_degraded_startup_state() {
531-
let rendered = render_startup_injection(SystemPromptResponse::degraded(
532-
"wakeup generation failed",
533-
));
531+
let rendered =
532+
render_startup_injection(SystemPromptResponse::degraded("wakeup generation failed"));
534533

535534
assert!(rendered.contains("status: degraded"));
536535
assert!(rendered.contains("wakeup generation failed"));

agent-diva-core/src/memory/manager.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
33
use super::provider::{
44
MemoryProvider, PrefetchRequest, PrefetchResponse, PrefetchStatus, SessionEndRequest,
5-
SessionEndResponse, SessionEndStatus, StartupInjectionShape, SyncTurnRequest,
6-
SyncTurnResponse, SyncTurnStatus, SystemPromptBlock, SystemPromptRequest,
7-
SystemPromptResponse,
5+
SessionEndResponse, SessionEndStatus, StartupInjectionShape, SyncTurnRequest, SyncTurnResponse,
6+
SyncTurnStatus, SystemPromptBlock, SystemPromptRequest, SystemPromptResponse,
87
};
98
use super::storage::{DailyNote, Memory};
109
use parking_lot::Mutex;
@@ -220,7 +219,6 @@ impl MemoryManager {
220219
format!("## Long-term Memory\n{}", memory.content)
221220
}
222221
}
223-
224222
}
225223

226224
#[async_trait::async_trait]
@@ -383,7 +381,10 @@ mod tests {
383381
.unwrap();
384382

385383
assert_eq!(result.status, SyncTurnStatus::Persisted);
386-
assert_eq!(manager.load_memory().content, "Updated memory from sync_turn");
384+
assert_eq!(
385+
manager.load_memory().content,
386+
"Updated memory from sync_turn"
387+
);
387388
assert!(manager.load_history().contains("synchronized turn"));
388389
}
389390

agent-diva-core/src/memory/provider.rs

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,8 @@ pub trait MemoryProvider: Send + Sync {
382382
async fn sync_turn(&self, request: SyncTurnRequest) -> crate::Result<SyncTurnResponse>;
383383

384384
/// Trigger shutdown/session-end rhythm work if needed.
385-
async fn on_session_end(
386-
&self,
387-
request: SessionEndRequest,
388-
) -> crate::Result<SessionEndResponse>;
385+
async fn on_session_end(&self, request: SessionEndRequest)
386+
-> crate::Result<SessionEndResponse>;
389387
}
390388

391389
#[cfg(test)]
@@ -419,7 +417,8 @@ mod tests {
419417

420418
async fn sync_turn(&self, request: SyncTurnRequest) -> crate::Result<SyncTurnResponse> {
421419
Ok(SyncTurnResponse {
422-
status: if request.memory_update_markdown.is_some() || request.history_entry.is_some()
420+
status: if request.memory_update_markdown.is_some()
421+
|| request.history_entry.is_some()
423422
{
424423
SyncTurnStatus::Persisted
425424
} else {
@@ -461,29 +460,32 @@ mod tests {
461460
intent: "recall-project-status".to_string(),
462461
current_room: Some("roadmap".to_string()),
463462
user_message: Some("what changed?".to_string()),
464-
})
465-
.await
466-
.unwrap();
463+
})
464+
.await
465+
.unwrap();
467466
assert_eq!(prefetch.status, PrefetchStatus::Ready);
468-
assert_eq!(prefetch.prompt_block.as_deref(), Some("intent=recall-project-status room=roadmap"));
467+
assert_eq!(
468+
prefetch.prompt_block.as_deref(),
469+
Some("intent=recall-project-status room=roadmap")
470+
);
469471

470472
let sync = provider
471473
.sync_turn(SyncTurnRequest {
472474
workspace_root: PathBuf::from("/tmp/diva"),
473475
memory_update_markdown: Some("updated".to_string()),
474476
history_entry: None,
475-
})
476-
.await
477-
.unwrap();
477+
})
478+
.await
479+
.unwrap();
478480
assert_eq!(sync.status, SyncTurnStatus::Persisted);
479481

480482
let shutdown = provider
481483
.on_session_end(SessionEndRequest {
482484
workspace_root: PathBuf::from("/tmp/diva"),
483485
session_id: Some("session-42".to_string()),
484-
})
485-
.await
486-
.unwrap();
486+
})
487+
.await
488+
.unwrap();
487489
assert_eq!(shutdown.status, SessionEndStatus::Triggered);
488490
}
489491

0 commit comments

Comments
 (0)