fix: Fix memory embedding initialization

Author: kosz78

huly-coder.yaml

@@ -1,5 +1,6 @@
 #
-# You can override config in ~\huly-coder.yaml file
+# You can override config in ~\huly-coder.yaml file 
+# or huly-coder-local.yaml file
 #
 
 ### Example Anthropic config

src/agent/mod.rs

@@ -1,6 +1,5 @@
 // Copyright © 2025 Huly Labs. Use of this source code is governed by the MIT license.
 use std::sync::Arc;
-use std::sync::RwLock;
 
 use crate::config::McpClientTransport;
 use crate::config::McpConfig;
@@ -45,6 +44,7 @@ pub mod event;
 pub mod utils;
 pub use event::AgentControlEvent;
 pub use event::AgentOutputEvent;
+use tokio::sync::RwLock;
 
 use self::event::AgentCommandStatus;
 use self::event::AgentState;
@@ -95,8 +95,9 @@ impl Agent {
             state: AgentState::Paused,
         }
     }
-    async fn init_memory_index(&mut self) {
-        let documents = self.memory.read().unwrap().entities().clone();
+
+    pub async fn init_memory_index(&mut self) {
+        let documents = self.memory.read().await.entities().clone();
         let client = rig_fastembed::Client::new();
         let model = client.embedding_model(&rig_fastembed::FastembedModel::AllMiniLML6V2);
         let embeddings = EmbeddingsBuilder::new(model.clone())
@@ -506,7 +507,6 @@ impl Agent {
                 .await
                 .unwrap(),
         );
-        self.init_memory_index().await;
         // restore state from messages
         self.set_state(if self.messages.is_empty() {
             AgentState::WaitingUserPrompt

src/main.rs

@@ -112,6 +112,8 @@ async fn main() -> color_eyre::Result<()> {
         output_sender,
         history.clone(),
     );
+    agent.init_memory_index().await;
+
     tokio::spawn(async move {
         agent.run().await;
     });

src/tools/memory/mod.rs

@@ -4,7 +4,7 @@
 // Copyright © 2025 Huly Labs. Use of this source code is governed by the MIT license.
 use std::collections::HashSet;
 use std::fs;
-use std::sync::{Arc, RwLock};
+use std::sync::Arc;
 
 use indicium::simple::{Indexable, SearchIndex};
 use rig::agent::AgentBuilder;
@@ -33,11 +33,11 @@ macro_rules! create_tool {
     ($func_name:ident, $tool_name:ident) => {
         paste::paste! {
             pub struct [<$func_name Tool>] {
-                manager: Arc<RwLock<MemoryManager>>,
+                manager: Arc<tokio::sync::RwLock<MemoryManager>>,
             }
 
             impl [<$func_name Tool>] {
-                pub(self) fn new(manager: Arc<RwLock<MemoryManager>>) -> Self {
+                pub(self) fn new(manager: Arc<tokio::sync::RwLock<MemoryManager>>) -> Self {
                     Self { manager }
                 }
             }
@@ -63,7 +63,7 @@ macro_rules! create_tool {
                 }
 
                 async fn call(&self, args: Self::Args) -> Result<Self::Output, Self::Error> {
-                    self.manager.write().unwrap().call_tool(&self.name(), args)
+                    self.manager.write().await.call_tool(&self.name(), args)
                 }
 
                 fn name(&self) -> String {
@@ -374,7 +374,7 @@ create_tool!(MemoryOpenNodes, open_nodes);
 
 pub(crate) fn add_memory_tools<M>(
     agent_builder: AgentBuilder<M>,
-    memory: Arc<RwLock<MemoryManager>>,
+    memory: Arc<tokio::sync::RwLock<MemoryManager>>,
 ) -> AgentBuilder<M>
 where
     M: CompletionModel,