From 6694d8a0bc72be7bd946cb04d2d1b9ff259e72bd Mon Sep 17 00:00:00 2001
From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sun, 12 Apr 2026 21:23:13 -0400
Subject: [PATCH] update to memory_rpc rename

Follows consciousness commit renaming forward_to_daemon to memory_rpc.

Co-Authored-By: Proof of Concept <poc@bcachefs.org>
---
 src/agent_cycles.rs  | 15 +++++++++++++--
 src/memory-search.rs | 16 ++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/agent_cycles.rs b/src/agent_cycles.rs
index acd596a..8bfcc20 100644
--- a/src/agent_cycles.rs
+++ b/src/agent_cycles.rs
@@ -376,9 +376,20 @@ pub fn format_agent_output(output: &AgentCycleOutput) -> String {
     }
 
     if !output.surfaced_keys.is_empty() {
+        // Create a runtime for the async memory_render calls
+        let rt = tokio::runtime::Builder::new_current_thread()
+            .enable_all()
+            .build();
+        let rt = match rt {
+            Ok(r) => r,
+            Err(_) => return out,
+        };
+
         for key in &output.surfaced_keys {
-            let args = serde_json::json!({"key": key});
-            if let Ok(rendered) = consciousness::mcp_server::forward_to_daemon("memory_render", args) {
+            let rendered = rt.block_on(async {
+                consciousness::agent::tools::memory::memory_render(None, key, None).await
+            });
+            if let Ok(rendered) = rendered {
                 if !rendered.trim().is_empty() {
                     use std::fmt::Write as _;
                     writeln!(out, "--- {} (surfaced) ---", key).ok();
diff --git a/src/memory-search.rs b/src/memory-search.rs
index 6f60597..3cb3362 100644
--- a/src/memory-search.rs
+++ b/src/memory-search.rs
@@ -165,9 +165,21 @@ fn run_agent_and_parse(agent: &str, session_arg: &Option<String>) {
             return;
         }
 
+        let rt = match tokio::runtime::Builder::new_current_thread()
+            .enable_all()
+            .build() {
+            Ok(r) => r,
+            Err(e) => {
+                eprintln!("Failed to create runtime: {}", e);
+                return;
+            }
+        };
+
         for key in &keys {
-            let args = serde_json::json!({"key": key});
-            match consciousness::mcp_server::forward_to_daemon("memory_render", args) {
+            let rendered = rt.block_on(async {
+                consciousness::agent::tools::memory::memory_render(None, &key, None).await
+            });
+            match rendered {
                 Ok(content) if !content.trim().is_empty() => {
                     println!("--- {} (surfaced) ---", key);
                     print!("{}", content);