Skip to content

Solution for long term memory for agent coding CLIs and to facilitate handoff between different agent vendors

Rust

fix(mcp): report concurrent merge conflicts

AkitaOnRails4d4d9ca38914
diff --git a/crates/ai-memory-mcp/src/admin.rs b/crates/ai-memory-mcp/src/admin.rs
index 30e12131..4e08fe71 100644
--- a/crates/ai-memory-mcp/src/admin.rs
+++ b/crates/ai-memory-mcp/src/admin.rs
@@ -6492,10 +6492,12 @@ async fn prepare_project_merge(
.await
.map_err(|error| internal_err(error.to_string()))?
.ok_or_else(|| {
- internal_err(format!(
- "source page '{}' disappeared while preparing merge",
- path.as_str()
- ))
+ (
+ StatusCode::CONFLICT,
+ Json(serde_json::json!({
+ "error": "project pages changed while the merge was being prepared"
+ })),
+ )
})?;
let target_page_id = state
.reader