diff --git a/crates/app/cli/src/main.rs b/crates/app/cli/src/main.rs
index aeff06a..868ac8e 100644
--- a/crates/app/cli/src/main.rs
+++ b/crates/app/cli/src/main.rs
@@ -3,6 +3,7 @@ mod messages;
 mod engine;
 mod state;
 mod agent_manager;
+mod tool_registry;
 
 use clap::{Parser, ValueEnum};
 use color_eyre::eyre::{Result, eyre};
diff --git a/crates/app/cli/src/tool_registry.rs b/crates/app/cli/src/tool_registry.rs
new file mode 100644
index 0000000..2eca55c
--- /dev/null
+++ b/crates/app/cli/src/tool_registry.rs
@@ -0,0 +1,56 @@
+use std::collections::HashMap;
+use serde_json::Value;
+use llm_core::Tool;
+
+/// Registry for tools available to the agent
+pub struct ToolRegistry {
+    tools: HashMap<String, Tool>,
+}
+
+impl ToolRegistry {
+    pub fn new() -> Self {
+        Self {
+            tools: HashMap::new(),
+        }
+    }
+
+    /// Register a tool
+    pub fn register(&mut self, tool: Tool) {
+        self.tools.insert(tool.function.name.clone(), tool);
+    }
+
+    /// Get a tool by name
+    pub fn get(&self, name: &str) -> Option<&Tool> {
+        self.tools.get(name)
+    }
+
+    /// Get all registered tools as a list (for LLM context)
+    pub fn list_tools(&self) -> Vec<Tool> {
+        self.tools.values().cloned().collect()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use llm_core::{ToolParameters, ToolFunction};
+
+    fn create_mock_tool(name: &str) -> Tool {
+        Tool::function(
+            name,
+            "Description",
+            ToolParameters::object(serde_json::json!({}), vec![])
+        )
+    }
+
+    #[test]
+    fn test_registry() {
+        let mut registry = ToolRegistry::new();
+        let tool = create_mock_tool("test_tool");
+        
+        registry.register(tool.clone());
+        
+        assert!(registry.get("test_tool").is_some());
+        assert_eq!(registry.list_tools().len(), 1);
+    }
+}