Solution for long term memory for agent coding CLIs and to facilitate handoff between different agent vendors
Rust
fix(projects): serialize merge tree inspection
AkitaOnRailsdab4c1f5d9fb
diff --git a/crates/ai-memory-mcp/tests/suite/admin_move.rs b/crates/ai-memory-mcp/tests/suite/admin_move.rsindex 3ec38070..09f5fd45 100644--- a/crates/ai-memory-mcp/tests/suite/admin_move.rs+++ b/crates/ai-memory-mcp/tests/suite/admin_move.rs@@ -3742,18 +3742,20 @@ async fn concurrent_project_merges_have_one_winner_without_losing_the_page() {post(state.clone(), "/admin/merge-project", request),);let statuses = [first.status(), second.status()];+ let bodies = [body_json(first).await, body_json(second).await];assert_eq!(statuses.iter().filter(|status| **status == StatusCode::OK).count(),1,- "exactly one concurrent merge may commit: {statuses:?}"+ "exactly one concurrent merge may commit: {statuses:?} {bodies:?}");assert!(statuses.iter()- .any(|status| matches!(*status, StatusCode::NOT_FOUND | StatusCode::CONFLICT))+ .any(|status| matches!(*status, StatusCode::NOT_FOUND | StatusCode::CONFLICT)),+ "the losing merge must fail as missing or stale: {statuses:?} {bodies:?}");assert_eq!(statediff --git a/crates/ai-memory-wiki/src/wiki.rs b/crates/ai-memory-wiki/src/wiki.rsindex 70da9e1d..1c880cec 100644--- a/crates/ai-memory-wiki/src/wiki.rs+++ b/crates/ai-memory-wiki/src/wiki.rs@@ -662,8 +662,6 @@ impl Wiki {pages: Vec<MergeProjectFile>,admission_ctx: Option<AdmissionContext>,) -> WikiResult<ai_memory_store::MergeProjectSummary> {- self.inspect_project_tree(workspace_id, source_project)?;- self.inspect_project_tree(workspace_id, target_project)?;let _guard = self.mutation_lock.write().await;self.inspect_project_tree(workspace_id, source_project)?;self.inspect_project_tree(workspace_id, target_project)?;