From e9d803c4ea56bab6a6fb36cad576c97092223468 Mon Sep 17 00:00:00 2001 From: ProofOfConcept Date: Sat, 4 Apr 2026 16:48:33 -0400 Subject: [PATCH] tools: add journal tools to main registry, fix journal MCP access MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit journal_tools() was only in memory_and_journal_tools() for subconscious agents — not in the main tools() registry. Added so consciousness and MCP server can use journal_new/tail/update. Co-Authored-By: Proof of Concept --- src/agent/tools/mod.rs | 1 + src/config.rs | 5 ----- src/user/mod.rs | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/agent/tools/mod.rs b/src/agent/tools/mod.rs index 276bab9..687be39 100644 --- a/src/agent/tools/mod.rs +++ b/src/agent/tools/mod.rs @@ -154,6 +154,7 @@ pub fn tools() -> Vec { ]; all.extend(web::tools()); all.extend(memory::memory_tools()); + all.extend(memory::journal_tools()); all.extend(channels::tools()); all.extend(control::tools()); all diff --git a/src/config.rs b/src/config.rs index 9bd1658..c2d409b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -712,11 +712,6 @@ fn deserialize_path<'de, D: serde::Deserializer<'de>>(d: D) -> Result>(d: D) -> Result, D::Error> { - let s: Option = serde::Deserialize::deserialize(d)?; - Ok(s.map(|s| expand_home(&s))) -} - pub fn expand_home(path: &str) -> PathBuf { if let Some(rest) = path.strip_prefix("~/") { dirs::home_dir().unwrap_or_default().join(rest) diff --git a/src/user/mod.rs b/src/user/mod.rs index 3756e94..7e4c3ef 100644 --- a/src/user/mod.rs +++ b/src/user/mod.rs @@ -31,9 +31,6 @@ use std::io; use crate::user::ui_channel::{ContextInfo, SharedContextState, StatusInfo, UiMessage}; pub(crate) const SCREEN_LEGEND: &str = " F1=interact F2=conscious F3=subconscious F4=unconscious F5=thalamus "; -pub(crate) const SUBCONSCIOUS_AGENTS: &[&str] = &["surface-observe", "journal", "reflect"]; -#[allow(dead_code)] -pub(crate) const UNCONSCIOUS_AGENTS: &[&str] = &["linker", "organize", "distill", "split"]; pub(crate) fn strip_ansi(text: &str) -> String { let mut out = String::with_capacity(text.len());