Solution for long term memory for agent coding CLIs and to facilitate handoff between different agent vendors
Rust
fix(mcp): accept workspace arg in memory_handoff_begin/accept
Djalma Júniord7917906bcc5
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 29a826ab..f491f2a5 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).## [Unreleased]+### Fixed+- `memory_handoff_begin` and `memory_handoff_accept` now accept an optional+ `workspace` argument alongside `project`, resolving through the same+ workspace+project path as `memory_write_page` (begin, create-if-missing) and+ `memory_handoff_cancel` (accept, find-only). They previously took `project`+ only, so a cross-workspace handoff was routed by the per-actor active-project+ fallback and could be written to — or read from — the wrong project.+ `memory_handoff_cancel` already carried `workspace`.## [1.0.3] - 2026-06-13### Addeddiff --git a/crates/ai-memory-mcp/src/server.rs b/crates/ai-memory-mcp/src/server.rsindex 603a6aed..2ce71472 100644--- a/crates/ai-memory-mcp/src/server.rs+++ b/crates/ai-memory-mcp/src/server.rs@@ -332,9 +332,19 @@ struct HandoffBeginArgs {#[serde(default)]cwd: Option<String>,/// Project to scope the handoff to. Omit to target the project you're- /// currently working in (resolved from recent hook activity). **Omit unless the user explicitly names a *different* project.**+ /// currently working in (resolved from recent hook activity). When set to a+ /// name that doesn't exist yet, the project is **created** — so the handoff+ /// always lands where you asked, never silently in the current project.+ /// **Omit unless the user explicitly names a *different* project.**#[serde(default)]project: Option<String>,+ /// Workspace to scope the handoff to, together with `project`; created if it+ /// doesn't exist. Omit for the current workspace. Provide both to leave a+ /// handoff in a *different* workspace (e.g. a sibling project on a shared+ /// server) — without it the workspace is resolved from hook activity, which+ /// can route a cross-workspace handoff to the wrong project.+ #[serde(default)]+ workspace: Option<String>,}#[derive(Debug, Serialize, Deserialize, schemars::JsonSchema)]@@ -349,6 +359,12 @@ struct HandoffAcceptArgs {/// currently working in (resolved from recent hook activity). **Omit unless the user explicitly names a *different* project.**#[serde(default)]project: Option<String>,+ /// Workspace to accept from, together with `project`. Omit for the+ /// current/default workspace resolution chain. Provide both to read a+ /// handoff left in a *different* workspace (e.g. a sibling project on a+ /// shared server).+ #[serde(default)]+ workspace: Option<String>,}#[derive(Debug, Serialize, Deserialize, schemars::JsonSchema)]@@ -1437,9 +1453,18 @@ impl AiMemoryServer {// path-pattern regexes already cover when applicable, but we// pass each entry through anyway as defence-in-depth.let s = &self.sanitizer;+ // Mirror memory_write_page: a handoff is a write, so resolve through the+ // create-if-missing write path and honour an explicit workspace. Using+ // the project-only `effective_ids_with_actor` here dropped the+ // workspace arg, so a cross-workspace handoff landed in whatever project+ // the contaminable active-project slot pointed at (the scope-bleed bug).let (ws, proj) = self- .effective_ids_with_actor(args.project.as_deref(), &aps_actor)- .await;+ .write_target_ids_with_actor(+ args.workspace.as_deref(),+ args.project.as_deref(),+ &aps_actor,+ )+ .await?;let handoff = NewHandoff {workspace_id: ws,project_id: proj,@@ -1486,8 +1511,12 @@ impl AiMemoryServer {) -> Result<CallToolResult, McpError> {let aps_actor = Self::actor_key_from_parts(Some(&parts));let (ws, proj) = self- .effective_ids_with_actor(args.project.as_deref(), &aps_actor)- .await;+ .effective_ids_for_read_args_with_actor(+ args.workspace.as_deref(),+ args.project.as_deref(),+ &aps_actor,+ )+ .await?;let handoff = self.reader.latest_open_handoff(ws, proj, args.cwd)@@ -3428,6 +3457,7 @@ mod tests {files_touched: vec![],cwd: Some(r"C:\GIT\ai-memory".into()),project: None,+ workspace: None,}),rmcp::handler::server::tool::Extension(test_parts_default()),)@@ -3469,6 +3499,7 @@ mod tests {files_touched: vec!["crates/ai-memory-store/src/writer.rs".into()],cwd: Some("/tmp/aim".into()),project: None,+ workspace: None,}),rmcp::handler::server::tool::Extension(test_parts_default()),)@@ -3488,6 +3519,7 @@ mod tests {Parameters(HandoffAcceptArgs {cwd: Some("/tmp/aim".into()),project: None,+ workspace: None,}),rmcp::handler::server::tool::Extension(test_parts_default()),)@@ -3508,6 +3540,7 @@ mod tests {Parameters(HandoffAcceptArgs {cwd: Some("/tmp/aim".into()),project: None,+ workspace: None,}),rmcp::handler::server::tool::Extension(test_parts_default()),)@@ -3522,6 +3555,78 @@ mod tests {assert!(again_text.contains("\"handoff\": null"));}+ #[tokio::test]+ async fn handoff_begin_accept_honour_explicit_workspace() {+ // Regression for the scope-bleed facet: memory_handoff_begin/accept used+ // to ignore `workspace` (project-only resolution), so a cross-workspace+ // handoff landed in whatever project the contaminable active-project+ // slot pointed at instead of the named (workspace, project). Begin into+ // an explicit sibling workspace, then prove it's there — and NOT in the+ // current (default) project.+ let (_tmp, _store, server, _ws, _pj) = setup_server().await;+ server+ .memory_handoff_begin(+ Parameters(HandoffBeginArgs {+ summary: "cross-workspace handoff".into(),+ open_questions: vec![],+ next_steps: vec![],+ files_touched: vec![],+ cwd: None,+ project: Some("sibling-app".into()),+ workspace: Some("djalmajr".into()),+ }),+ rmcp::handler::server::tool::Extension(test_parts_default()),+ )+ .await+ .unwrap();++ // The current (default) project must NOT see it.+ let in_default = server+ .memory_handoff_accept(+ Parameters(HandoffAcceptArgs {+ cwd: None,+ project: None,+ workspace: None,+ }),+ rmcp::handler::server::tool::Extension(test_parts_default()),+ )+ .await+ .unwrap();+ let in_default_text = in_default+ .content+ .first()+ .and_then(|c| c.as_text())+ .map(|t| t.text.clone())+ .unwrap();+ assert!(+ in_default_text.contains("\"handoff\": null"),+ "cross-workspace handoff must not bleed into the current project"+ );++ // The explicit (workspace, project) does see it.+ let in_sibling = server+ .memory_handoff_accept(+ Parameters(HandoffAcceptArgs {+ cwd: None,+ project: Some("sibling-app".into()),+ workspace: Some("djalmajr".into()),+ }),+ rmcp::handler::server::tool::Extension(test_parts_default()),+ )+ .await+ .unwrap();+ let in_sibling_text = in_sibling+ .content+ .first()+ .and_then(|c| c.as_text())+ .map(|t| t.text.clone())+ .unwrap();+ assert!(+ in_sibling_text.contains("cross-workspace handoff"),+ "handoff must be retrievable from its explicit (workspace, project)"+ );+ }+#[tokio::test]async fn handoff_cancel_expires_open_handoff_and_clears_briefing_count() {let (_tmp, store, server, _ws, _pj) = setup_server().await;@@ -3534,6 +3639,7 @@ mod tests {files_touched: vec![],cwd: Some("/tmp/aim".into()),project: None,+ workspace: None,}),rmcp::handler::server::tool::Extension(test_parts_default()),)@@ -3611,6 +3717,7 @@ mod tests {Parameters(HandoffAcceptArgs {cwd: Some("/tmp/aim".into()),project: None,+ workspace: None,}),rmcp::handler::server::tool::Extension(test_parts_default()),)@@ -3791,6 +3898,7 @@ mod tests {Parameters(HandoffAcceptArgs {cwd: None,project: None,+ workspace: None,}),rmcp::handler::server::tool::Extension(test_parts_default()),)