Refactor history file handling and cleanup main (#39)

* Refactor history file handling and cleanup main

* Improve documentation

* Add todo

Author: MituuZ

Cargo.lock

@@ -6,13 +6,15 @@
 - [x] Use ollama API instead of run commands
 - [x] Parse the chat history to a correctly formatted JSON
 - [x] Implement simple completions with rustyline
-    - [x] Commands
-    - [x] Files
+  - [x] Commands
+  - [x] Files
 - [x] Support multiline input with alt + enter (using rustyline)
 - [x] Update the default sysprompt
 - [x] Keep track of the model's context window and file size
 - [x] Add support for knowledge directory
 - [x] The model might not realize that it has the context file available
+- [ ] Support streaming with an interrupt thread
+- [ ] Add an option to hide thinking
 - [ ] Custom completions for `model` and `profile` commands
 - [ ] Keybinds for commands?
 - [ ] Support memories, which are included in the prompt by default (session/global) (could be implemented as a tool)
@@ -32,16 +34,17 @@
 - [ ] Create an extension system for adding tools
 - [ ] Add tool validation for user-defined tools (e.g., check unique names)
 - [ ] Should tool results be saved (to history or maybe an alternative file) or (even) printed?
-    - `append_tool_input` in git history
+  - `append_tool_input` in git history
 
 ## Commands
 
 - [x] Allow changing the context file during a chat
-    - [x] `config.create_editor` - Handle command/file command logic using the registry
+  - [x] `config.create_editor` - Handle command/file command logic using the registry
 - [x] `prompt`- Enable creating, editing and using prompt files
-    - The user should be able to define where their actual prompt is injected
+  - The user should be able to define where their actual prompt is injected
 - [x] `clear` - Clear the current history file
-- [ ] `copy` - Copy the history file to another location. Edit the copy of the file?
+- [ ] `fork` - Copy the history file to another location. Edit the copy of the file
+- [ ] `rename` - Rename the current history file
 - [ ] Truncate chat (line count, estimated tokens, or LLM assisted)
 
 ## Completion overhaul

docs/todo.md

@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2025 Mitja Leino
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the “Software”), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+use clap::Parser;
+use std::path::PathBuf;
+
+#[derive(Parser)]
+#[command(author, version, about, long_about = None)]
+pub(crate) struct Args {
+    /// Path to file containing chat history. Can be either relative (to `cforge_dir`) or absolute.
+    /// If not provided, the last history file will be used, which is saved in the XDG cache file.
+    pub(crate) history_file: Option<String>,
+
+    /// Optional file path, which's content is used as additional input for each chat message.
+    #[arg(short = 'f', long = "file")]
+    pub(crate) context_file: Option<PathBuf>,
+}

src/config/args.rs

@@ -55,7 +55,7 @@ impl CacheConfig {
         Self::new(None, None, None)
     }
 
-    pub(crate) fn load(cache_path: Option<PathBuf>) -> Self {
+    pub(crate) fn load(cache_path: Option<PathBuf>, arg_history_file: &Option<String>) -> Self {
         let mut cache = Self::empty();
 
         if let Some(cache_path) = cache_path {
@@ -68,6 +68,16 @@ impl CacheConfig {
             }
         };
 
+        if let Some(hf) = arg_history_file {
+            cache.last_history_file = Some(hf.to_string());
+        }
+
+        if cache.last_history_file.is_none() {
+            println!("You must specify a history file `cforge <history_file>` for the first time.");
+            println!("See `cforge --help` for more information.");
+            panic!("No history file specified and no previous history file found from cache.");
+        }
+
         cache
     }
 
@@ -83,6 +93,15 @@ impl CacheConfig {
             }
         }
     }
+
+    pub fn get_history_file_path(&self) -> String {
+        match &self.last_history_file {
+            Some(hf) => hf.to_string(),
+            None => panic!(
+                "No history file given as an argument or found from cache. This shouldn't happen"
+            ),
+        }
+    }
 }
 
 #[cfg(test)]
@@ -91,60 +110,57 @@ mod tests {
 
     use tempfile::TempDir;
 
-    use crate::config::cache_config::{CacheConfig, CACHE_FILE};
+    use crate::config::cache_config::{CACHE_FILE, CacheConfig};
 
     #[test]
+    #[should_panic]
     fn load_invalid_cache_config() {
         let temp_dir = create_cache_config(
             "
             thisisa malformed \" string !\"#¤
             ",
         );
         let path_opt = Some(temp_dir.path().to_path_buf());
-        let config = CacheConfig::load(path_opt);
-
-        assert_eq!(
-            config.last_history_file,
-            CacheConfig::empty().last_history_file
-        );
+        let _ = CacheConfig::load(path_opt, &None);
     }
 
     #[test]
+    #[should_panic]
     fn load_non_existent_cache_config() {
         let temp_dir = create_cache_config("");
         let path_opt = Some(temp_dir.path().join("doesnt_exist.toml").to_path_buf());
-        let config = CacheConfig::load(path_opt);
-
-        assert_eq!(
-            config.last_history_file,
-            CacheConfig::empty().last_history_file
-        );
+        let _ = CacheConfig::load(path_opt, &None);
     }
 
     #[test]
+    #[should_panic]
     fn load_empty_cache_config() {
         let temp_dir = create_cache_config("");
         let path_opt = Some(temp_dir.path().to_path_buf());
-        let config = CacheConfig::load(path_opt);
-
-        assert_eq!(
-            config.last_history_file,
-            CacheConfig::empty().last_history_file
-        );
+        let _ = CacheConfig::load(path_opt, &None);
     }
 
     #[test]
     fn load_valid_cache_config() {
         let temp_dir = create_cache_config("last_history_file = \"some_history_file\"");
         let path_opt = Some(temp_dir.path().to_path_buf());
-        let config = CacheConfig::load(path_opt);
+        let config = CacheConfig::load(path_opt, &None);
 
         assert_eq!(
             config.last_history_file,
             Some("some_history_file".to_string())
         );
     }
 
+    #[test]
+    fn override_using_arg_history() {
+        let temp_dir = create_cache_config("last_history_file = \"some_history_file\"");
+        let path_opt = Some(temp_dir.path().to_path_buf());
+        let config = CacheConfig::load(path_opt, &Some("override_path".to_string()));
+
+        assert_eq!(config.last_history_file, Some("override_path".to_string()));
+    }
+
     fn create_cache_config(content: &str) -> TempDir {
         let temp_dir: TempDir = TempDir::new().unwrap();
         let config_path: PathBuf = temp_dir.path().join(CACHE_FILE);

src/config/cache_config.rs

@@ -15,13 +15,16 @@
  */
 use std::{collections::HashMap, fs::create_dir_all, path::PathBuf};
 
-use rustyline::{history::DefaultHistory, Cmd, Config, Editor, EventHandler, KeyEvent, Modifiers};
+use rustyline::{Cmd, Config, Editor, EventHandler, KeyEvent, Modifiers, history::DefaultHistory};
 
 use crate::command::command_complete::CommandHelper;
 use crate::command::commands::{CommandStruct, FileCommandDirectory};
 use crate::config::profiles_config::{Model, ModelType, Profile};
-pub(crate) use crate::config::{cache_config::CacheConfig, rustyline_config::build, user_config::UserConfig};
+pub(crate) use crate::config::{
+    cache_config::CacheConfig, rustyline_config::build, user_config::UserConfig,
+};
 
+pub mod args;
 pub mod cache_config;
 pub mod profiles_config;
 pub mod rustyline_config;
@@ -39,8 +42,8 @@ pub struct AppConfig {
 }
 
 impl AppConfig {
-    pub fn load_config() -> AppConfig {
-        let mut cache_config: CacheConfig = CacheConfig::load(get_cache_path());
+    pub fn load_config(arg_history_file: &Option<String>) -> AppConfig {
+        let mut cache_config: CacheConfig = CacheConfig::load(get_cache_path(), &arg_history_file);
         let user_config: UserConfig = UserConfig::load(get_config_path());
         let rustyline_config = build(&user_config);
 
@@ -176,6 +179,13 @@ impl AppConfig {
 
         println!("Switched to model: {}", model.model);
     }
+
+    pub(crate) fn print_model_info(&self) {
+        println!(
+            "\n\nYou're conversing with model '{}' ({}) from profile '{}'",
+            &self.current_model, &self.current_model.model_type, &self.current_profile.name
+        );
+    }
 }
 
 impl Default for AppConfig {
@@ -219,7 +229,10 @@ fn get_commands(command_registry: &HashMap<String, CommandStruct>) -> CommandVec
         }
     }
 
-    CommandVecs { all_commands, file_commands }
+    CommandVecs {
+        all_commands,
+        file_commands,
+    }
 }
 
 /// Return XDG compliant config path

src/config/mod.rs

@@ -27,60 +27,27 @@ mod test_support;
 
 use crate::api::{ChatClient, get_chat_client_implementation};
 use crate::command::commands::{CommandResult, create_command_registry};
-use crate::config::AppConfig;
+use crate::config::{AppConfig, args::Args};
 use crate::models::context_file::ContextFile;
 use crate::models::history_file::HistoryFile;
 use crate::traits::estimate_context_size::ContextEstimation;
 use clap::Parser;
 use colored::Colorize;
 use command::processor::CommandProcessor;
 use std::io::{self};
-use std::path::PathBuf;
-
-#[derive(Parser)]
-#[command(author, version, about, long_about = None)]
-struct Args {
-    /// Path to file containing chat history. Can be either relative (to `cforge_dir`) or absolute.
-    /// If not provided, the last history file will be used, which is saved in `~/.cforge.toml`.
-    history_file: Option<String>,
-
-    /// Optional file with content to be used as input for each chat message
-    #[arg(short = 'f', long = "file")]
-    context_file: Option<PathBuf>,
-}
 
 fn main() -> io::Result<()> {
-    let mut app_config = AppConfig::load_config();
     let args = Args::parse();
+    let mut app_config = AppConfig::load_config(&args.history_file);
     let command_registry = create_command_registry(app_config.user_config.command_prefixes.clone());
     let mut context_file_path = args.context_file.clone();
-
-    let history_path = args.history_file.unwrap_or_else(|| {
-        match app_config.cache_config.last_history_file.clone() {
-            Some(path) => path,
-            None => {
-                println!(
-                    "You must specify a history file `cforge <history_file>` for the first time."
-                );
-                println!("See `cforge --help` for more information.");
-                panic!("No history file specified and no previous history file found.");
-            }
-        }
-    });
-
-    app_config.update_last_history_file(history_path.clone());
-
     let mut history = HistoryFile::new(
-        history_path.clone(),
+        app_config.cache_config.get_history_file_path(),
         app_config.data_dir.display().to_string(),
     )?;
-    println!("{}", history.get_content());
-    println!(
-        "\n\nYou're conversing with model '{}' ({}) from profile '{}'",
-        &app_config.current_model,
-        &app_config.current_model.model_type,
-        &app_config.current_profile.name
-    );
+
+    history.print_content();
+    app_config.print_model_info();
 
     let mut chat_client: Box<dyn ChatClient> = get_chat_client_implementation(
         &app_config.current_profile.provider,
@@ -108,12 +75,10 @@ fn main() -> io::Result<()> {
 
         let context_file = ContextFile::new(&context_file_path);
 
-        if let Some(model_context_size) = chat_client.model_context_size()
-            && app_config.user_config.token_estimation
-        {
+        if app_config.user_config.token_estimation {
             print_token_usage(
                 history.estimate_context_size() + context_file.estimate_context_size(),
-                model_context_size,
+                &chat_client.model_context_size(),
             );
         }
 
@@ -161,7 +126,14 @@ fn main() -> io::Result<()> {
 }
 
 /// Calculate and visualize token usage compared to model context size
-fn print_token_usage(estimated_tokens: usize, context_size: usize) {
+fn print_token_usage(estimated_tokens: usize, maybe_context_size: &Option<usize>) {
+    let context_size = match maybe_context_size {
+        Some(c) => *c,
+        None => {
+            return;
+        }
+    };
+
     let percentage = (estimated_tokens as f64 / context_size as f64 * 100.0).min(100.0);
 
     let bar_width = 50;

src/main.rs

@@ -112,6 +112,10 @@ impl HistoryFile {
         &self.content
     }
 
+    pub(crate) fn print_content(&self) {
+        println!("{}", &self.content);
+    }
+
     /// Get the content of the history file formatted as a JSON array
     ///
     /// Returns a JSON array of `"role": "", "content": ""` messages