refactor: Move all data files in data directory, docker support updated

Author: kosz78

.dockerignore

@@ -1 +1,2 @@
-/target/*
+/target/*
+/data/*

.gitignore

@@ -1,11 +1,8 @@
 debug/
 target/
-logs/
+data/
 .vscode/
 **/*.rs.bk
 *.pdb
-history.json
 huly-coder-local.yaml
-/memory.yaml
-/.fastembed_cache/
-openrouter_models.json
+/.fastembed_cache/

README.md

@@ -46,21 +46,19 @@ cargo run
 To build the Huly Coder image, run:
 
 ```bash
-docker build -t huly-coder -f "./Dockerfile" .
+cargo xtask build-docker
 ```
 
 ### Running Huly Coder
 
 To run the Huly Coder image:
 
+Create a `huly-coder-local.yaml` file in your `data` directory with overrided configurations and run the following command:
+
 ```bash
-docker run -it --rm -v "$(pwd)/target/workspace:/target/workspace" -e OPENROUTER_API_KEY=<your-api-key> huly-coder
+cargo xtask run-docker <data_dir> <workspace_dir>
 ```
 
-Replace `<your-api-key>` with your OpenRouter API key.
-
-The agent uses `target/workspace` as its working directory.
-
 ## Available Tools
 
 Huly Coder comes with a comprehensive set of tools:

src/agent/utils.rs

@@ -13,6 +13,7 @@ use tokio::sync::RwLock;
 use crate::templates::{ENV_DETAILS, SYSTEM_PROMPT};
 use crate::tools::execute_command::ProcessRegistry;
 use crate::tools::memory::Entity;
+use crate::HISTORY_PATH;
 
 pub const MAX_FILES: usize = 10000;
 
@@ -142,7 +143,7 @@ pub fn is_last_user_message(messages: &[Message]) -> bool {
 
 pub fn persist_history(messages: &[Message]) {
     fs::write(
-        "history.json",
+        HISTORY_PATH,
         serde_json::to_string_pretty(messages).unwrap(),
     )
     .unwrap();

src/config.rs

@@ -7,6 +7,7 @@ use serde::Deserialize;
 
 const CONFIG_FILE: &str = "huly-coder.yaml";
 const LOCAL_CONFIG_FILE: &str = "huly-coder-local.yaml";
+const DOCKER_LOCAL_CONFIG_FILE: &str = "data/huly-coder-local.yaml";
 
 #[derive(Debug, Deserialize, Clone)]
 pub enum ProviderKind {
@@ -90,6 +91,12 @@ impl Config {
             builder = builder.add_source(config::File::with_name(LOCAL_CONFIG_FILE));
         }
 
+        // Docker related local config file that stored in /data directory
+        if Path::new(DOCKER_LOCAL_CONFIG_FILE).exists() {
+            tracing::info!("Found local config at {}", DOCKER_LOCAL_CONFIG_FILE);
+            builder = builder.add_source(config::File::with_name(DOCKER_LOCAL_CONFIG_FILE));
+        }
+
         let user_config = format!(
             "{}/{}",
             dirs::home_dir().unwrap().to_str().unwrap(),

src/main.rs

@@ -29,6 +29,8 @@ pub mod templates;
 pub mod tools;
 mod tui;
 
+const HISTORY_PATH: &str = "data/history.json";
+
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
 struct Args {
@@ -38,7 +40,7 @@ struct Args {
 }
 
 fn init_logger() {
-    let writer = tracing_appender::rolling::daily("logs", "huly-coder.log");
+    let writer = tracing_appender::rolling::daily("data/logs", "huly-coder.log");
     tracing_subscriber::registry()
         .with(
             tracing_subscriber::fmt::layer()
@@ -102,8 +104,8 @@ async fn main() -> color_eyre::Result<()> {
         tokio::sync::mpsc::unbounded_channel::<AgentOutputEvent>();
     let (control_sender, control_receiver) =
         tokio::sync::mpsc::unbounded_channel::<AgentControlEvent>();
-    let history = if !args.skip_load_messages && std::path::Path::new("history.json").exists() {
-        serde_json::from_str(&std::fs::read_to_string("history.json").unwrap()).unwrap()
+    let history = if !args.skip_load_messages && std::path::Path::new(HISTORY_PATH).exists() {
+        serde_json::from_str(&std::fs::read_to_string(HISTORY_PATH).unwrap()).unwrap()
     } else {
         Vec::new()
     };

src/providers/model_info.rs

@@ -6,7 +6,7 @@ use serde::Deserialize;
 
 use crate::config::Config;
 
-const OPENROUTER_MODELS_FILE: &str = "openrouter_models.json";
+const OPENROUTER_MODELS_FILE: &str = "data/openrouter_models.json";
 const ANTHROPIC_MODELS: &str = include_str!("anthropic_models.json");
 const OPENAI_MODELS: &str = include_str!("openai_models.json");
 

src/tools/memory/mod.rs

@@ -19,7 +19,7 @@ use super::AgentToolError;
 mod tests;
 
 const TOOLS_STR: &str = include_str!("tools.json");
-const MEMORY_PATH: &str = "memory.yaml";
+const MEMORY_PATH: &str = "data/memory.yaml";
 
 #[derive(Clone, Deserialize)]
 struct JsonToolDefinition {

xtask/src/main.rs

@@ -18,6 +18,18 @@ fn try_main() -> Result<(), DynError> {
     match task.as_deref() {
         Some("clean") => clean()?,
         Some("dist") => dist()?,
+        Some("build-docker") => build_docker()?,
+        Some("run-docker") => {
+            let Some(data_dir) = env::args().nth(2) else {
+                eprintln!("data_dir is required");
+                std::process::exit(-1);
+            };
+            let Some(workspace_dir) = env::args().nth(3) else {
+                eprintln!("workspace_dir is required");
+                std::process::exit(-1);
+            };
+            run_docker(&data_dir, &workspace_dir)?;
+        }
         _ => print_help(),
     }
     Ok(())
@@ -27,19 +39,18 @@ fn print_help() {
     eprintln!(
         "Tasks:
 
-clean            cleans project directory from logs and artifacts
-dist             builds application
+clean                                   cleans project directory from logs and artifacts
+dist                                    builds application
+build-docker                            builds docker image
+run-docker <data_dir> <workspace_dir>   runs docker image
 "
     )
 }
 
 fn clean() -> Result<(), DynError> {
-    let _ = fs::remove_dir_all(project_root().join("logs"));
+    let _ = fs::remove_dir_all(project_root().join("data"));
     let _ = fs::remove_dir_all(project_root().join(".fastembed_cache"));
     let _ = fs::remove_dir_all(project_root().join("target/workspace"));
-    let _ = fs::remove_file(project_root().join("memory.yaml"));
-    let _ = fs::remove_file(project_root().join("history.json"));
-    let _ = fs::remove_file(project_root().join("openrouter_models.json"));
     Ok(())
 }
 
@@ -85,6 +96,35 @@ fn dist_binary() -> Result<(), DynError> {
     Ok(())
 }
 
+fn build_docker() -> Result<(), DynError> {
+    let _ = Command::new("docker")
+        .arg("build")
+        .arg("-t")
+        .arg("huly-coder")
+        .arg("-f")
+        .arg("./Dockerfile")
+        .arg(".")
+        .status()?;
+    Ok(())
+}
+
+fn run_docker(data_dir: &str, workspace_dir: &str) -> Result<(), DynError> {
+    let _ = Command::new("docker")
+        .arg("run")
+        .arg("-it")
+        .arg("--rm")
+        .arg("-v")
+        .arg(format!("{}:/target/workspace", workspace_dir))
+        .arg("-v")
+        .arg(format!("{}:/data", data_dir))
+        .arg("-v")
+        .arg(format!("{}/.fastembed_cache:/.fastembed_cache", data_dir))
+        .arg("huly-coder")
+        .status()?;
+
+    Ok(())
+}
+
 fn project_root() -> PathBuf {
     Path::new(&env!("CARGO_MANIFEST_DIR"))
         .ancestors()