diff --git a/Cargo.lock b/Cargo.lock index 4db94e4..3583ecd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -467,6 +467,7 @@ dependencies = [ "iana-time-zone", "js-sys", "num-traits", + "serde", "wasm-bindgen", "windows-link", ] @@ -2758,6 +2759,33 @@ dependencies = [ "time", ] +[[package]] +name = "poc-agent" +version = "0.4.0" +dependencies = [ + "anyhow", + "base64 0.22.1", + "chrono", + "clap", + "crossterm", + "dirs", + "figment", + "futures", + "glob", + "json5", + "libc", + "ratatui", + "reqwest", + "serde", + "serde_json", + "tiktoken-rs", + "tokio", + "tui-markdown", + "tui-textarea-2", + "unicode-width", + "walkdir", +] + [[package]] name = "poc-daemon" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index 66e68fe..1ab917c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["poc-daemon"] +members = ["thalamus", "agent"] resolver = "2" [workspace.package] diff --git a/src/config.rs b/src/hippocampus/config.rs similarity index 100% rename from src/config.rs rename to src/hippocampus/config.rs diff --git a/src/counters.rs b/src/hippocampus/counters.rs similarity index 100% rename from src/counters.rs rename to src/hippocampus/counters.rs diff --git a/src/cursor.rs b/src/hippocampus/cursor.rs similarity index 100% rename from src/cursor.rs rename to src/hippocampus/cursor.rs diff --git a/src/graph.rs b/src/hippocampus/graph.rs similarity index 100% rename from src/graph.rs rename to src/hippocampus/graph.rs diff --git a/src/lookups.rs b/src/hippocampus/lookups.rs similarity index 100% rename from src/lookups.rs rename to src/hippocampus/lookups.rs diff --git a/src/memory_search.rs b/src/hippocampus/memory_search.rs similarity index 100% rename from src/memory_search.rs rename to src/hippocampus/memory_search.rs diff --git a/src/migrate.rs b/src/hippocampus/migrate.rs similarity index 100% rename from src/migrate.rs rename to src/hippocampus/migrate.rs diff --git a/src/hippocampus/mod.rs b/src/hippocampus/mod.rs new file mode 100644 index 0000000..6f6af08 --- /dev/null +++ b/src/hippocampus/mod.rs @@ -0,0 +1,20 @@ +// hippocampus — memory storage, retrieval, and consolidation +// +// The graph-structured memory system: nodes, relations, queries, +// similarity scoring, spectral analysis, and neuroscience-inspired +// consolidation (spaced repetition, interference detection, schema +// assimilation). + +pub mod store; +pub mod graph; +pub mod lookups; +pub mod cursor; +pub mod query; +pub mod similarity; +pub mod spectral; +pub mod neuro; +pub mod counters; +pub mod migrate; +pub mod config; +pub mod transcript; +pub mod memory_search; diff --git a/src/neuro/mod.rs b/src/hippocampus/neuro/mod.rs similarity index 100% rename from src/neuro/mod.rs rename to src/hippocampus/neuro/mod.rs diff --git a/src/neuro/rewrite.rs b/src/hippocampus/neuro/rewrite.rs similarity index 100% rename from src/neuro/rewrite.rs rename to src/hippocampus/neuro/rewrite.rs diff --git a/src/neuro/scoring.rs b/src/hippocampus/neuro/scoring.rs similarity index 100% rename from src/neuro/scoring.rs rename to src/hippocampus/neuro/scoring.rs diff --git a/src/query/engine.rs b/src/hippocampus/query/engine.rs similarity index 100% rename from src/query/engine.rs rename to src/hippocampus/query/engine.rs diff --git a/src/query/mod.rs b/src/hippocampus/query/mod.rs similarity index 100% rename from src/query/mod.rs rename to src/hippocampus/query/mod.rs diff --git a/src/query/parser.rs b/src/hippocampus/query/parser.rs similarity index 100% rename from src/query/parser.rs rename to src/hippocampus/query/parser.rs diff --git a/src/similarity.rs b/src/hippocampus/similarity.rs similarity index 100% rename from src/similarity.rs rename to src/hippocampus/similarity.rs diff --git a/src/spectral.rs b/src/hippocampus/spectral.rs similarity index 100% rename from src/spectral.rs rename to src/hippocampus/spectral.rs diff --git a/src/store/mod.rs b/src/hippocampus/store/mod.rs similarity index 100% rename from src/store/mod.rs rename to src/hippocampus/store/mod.rs diff --git a/src/store/ops.rs b/src/hippocampus/store/ops.rs similarity index 100% rename from src/store/ops.rs rename to src/hippocampus/store/ops.rs diff --git a/src/store/parse.rs b/src/hippocampus/store/parse.rs similarity index 100% rename from src/store/parse.rs rename to src/hippocampus/store/parse.rs diff --git a/src/store/persist.rs b/src/hippocampus/store/persist.rs similarity index 100% rename from src/store/persist.rs rename to src/hippocampus/store/persist.rs diff --git a/src/store/types.rs b/src/hippocampus/store/types.rs similarity index 100% rename from src/store/types.rs rename to src/hippocampus/store/types.rs diff --git a/src/store/view.rs b/src/hippocampus/store/view.rs similarity index 100% rename from src/store/view.rs rename to src/hippocampus/store/view.rs diff --git a/src/transcript.rs b/src/hippocampus/transcript.rs similarity index 100% rename from src/transcript.rs rename to src/hippocampus/transcript.rs diff --git a/src/lib.rs b/src/lib.rs index 0bdcc9e..1773073 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,43 +1,43 @@ -// poc-memory library — unified crate for memory graph + agent infrastructure +// consciousness — unified crate for memory, agents, and subconscious processes // -// Merged from poc-memory + poc-agent. Single crate, no circular deps. +// hippocampus/ — memory storage, retrieval, consolidation +// subconscious/ — autonomous agents (reflect, surface, consolidate, ...) +// agent/ — interactive agent (TUI, tools, API clients) -// Agent infrastructure (formerly poc-agent) +// Agent infrastructure pub mod agent; -// Core infrastructure -pub mod config; -pub mod store; -pub mod util; -pub mod graph; -pub mod query; -pub mod similarity; -pub mod spectral; -pub mod lookups; -// search was moved into query/engine -pub use query::engine as search; -// old query.rs moved into query/parser -pub use query::parser as query_parser; -pub mod transcript; -pub mod neuro; -pub mod counters; -pub mod cursor; +// Memory graph +pub mod hippocampus; -// CLI handlers (split from main.rs) +// Autonomous agents +pub mod subconscious; + +// Shared utilities +pub mod util; + +// CLI handlers pub mod cli; -// Agent layer (LLM-powered operations) -pub mod agents; +// TUI for memory-search pub mod tui; -// Re-export agent submodules at crate root for backwards compatibility -pub use agents::{ - llm, audit, consolidate, knowledge, - enrich, digest, daemon, -}; - -pub mod memory_search; - +// Generated capnp bindings pub mod memory_capnp { include!(concat!(env!("OUT_DIR"), "/schema/memory_capnp.rs")); } + +// Re-exports — all existing crate::X paths keep working +pub use hippocampus::{ + store, graph, lookups, cursor, query, + similarity, spectral, neuro, counters, + config, transcript, memory_search, migrate, +}; +pub use hippocampus::query::engine as search; +pub use hippocampus::query::parser as query_parser; + +pub use subconscious::agents; +pub use subconscious::agents::{ + llm, audit, consolidate, knowledge, + enrich, digest, daemon, +}; diff --git a/src/agents/api.rs b/src/subconscious/agents/api.rs similarity index 100% rename from src/agents/api.rs rename to src/subconscious/agents/api.rs diff --git a/src/agents/audit.rs b/src/subconscious/agents/audit.rs similarity index 100% rename from src/agents/audit.rs rename to src/subconscious/agents/audit.rs diff --git a/src/agents/consolidate.rs b/src/subconscious/agents/consolidate.rs similarity index 100% rename from src/agents/consolidate.rs rename to src/subconscious/agents/consolidate.rs diff --git a/src/agents/daemon.rs b/src/subconscious/agents/daemon.rs similarity index 100% rename from src/agents/daemon.rs rename to src/subconscious/agents/daemon.rs diff --git a/src/agents/defs.rs b/src/subconscious/agents/defs.rs similarity index 100% rename from src/agents/defs.rs rename to src/subconscious/agents/defs.rs diff --git a/src/agents/digest.rs b/src/subconscious/agents/digest.rs similarity index 100% rename from src/agents/digest.rs rename to src/subconscious/agents/digest.rs diff --git a/src/agents/enrich.rs b/src/subconscious/agents/enrich.rs similarity index 100% rename from src/agents/enrich.rs rename to src/subconscious/agents/enrich.rs diff --git a/src/agents/knowledge.rs b/src/subconscious/agents/knowledge.rs similarity index 100% rename from src/agents/knowledge.rs rename to src/subconscious/agents/knowledge.rs diff --git a/src/agents/llm.rs b/src/subconscious/agents/llm.rs similarity index 100% rename from src/agents/llm.rs rename to src/subconscious/agents/llm.rs diff --git a/src/agents/mod.rs b/src/subconscious/agents/mod.rs similarity index 100% rename from src/agents/mod.rs rename to src/subconscious/agents/mod.rs diff --git a/src/agents/prompts.rs b/src/subconscious/agents/prompts.rs similarity index 100% rename from src/agents/prompts.rs rename to src/subconscious/agents/prompts.rs diff --git a/src/agents/transcript.rs b/src/subconscious/agents/transcript.rs similarity index 100% rename from src/agents/transcript.rs rename to src/subconscious/agents/transcript.rs diff --git a/src/subconscious/mod.rs b/src/subconscious/mod.rs new file mode 100644 index 0000000..a85ff0c --- /dev/null +++ b/src/subconscious/mod.rs @@ -0,0 +1,7 @@ +// subconscious — autonomous agents that process without being asked +// +// Reflect, surface, consolidate, digest, audit — the background +// processes that maintain and evolve the memory graph. Runs on +// local models via the API backend. + +pub mod agents;