feat: deprecate history file (#179)

5 files changed, 6 insertions, 73 deletions

diff --git a/src/config/mod.rs b/src/config/mod.rs
index 4437833..695dad5 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -27,7 +27,6 @@ use std::{
 
 const CONFIG_FILE_NAME: &str = "config.yaml";
 const ROLES_FILE_NAME: &str = "roles.yaml";
-const HISTORY_FILE_NAME: &str = "history.txt";
 const MESSAGES_FILE_NAME: &str = "messages.md";
 const SESSIONS_DIR_NAME: &str = "sessions";
 
@@ -221,10 +220,6 @@ impl Config {
         )
     }
 
-    pub fn history_file() -> Result<PathBuf> {
-        Self::local_path(HISTORY_FILE_NAME)
-    }
-
     pub fn messages_file() -> Result<PathBuf> {
         Self::local_path(MESSAGES_FILE_NAME)
     }
diff --git a/src/main.rs b/src/main.rs
index a71a2b5..a7850b5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,7 +3,6 @@ mod client;
 mod config;
 mod render;
 mod repl;
-mod term;
 #[macro_use]
 mod utils;
 
diff --git a/src/repl/init.rs b/src/repl/init.rs
index 60fce00..420f596 100644
--- a/src/repl/init.rs
+++ b/src/repl/init.rs
@@ -2,13 +2,13 @@ use super::{
     highlighter::ReplHighlighter, prompt::ReplPrompt, validator::ReplValidator, REPL_COMMANDS,
 };
 
-use crate::config::{Config, SharedConfig};
+use crate::config::SharedConfig;
 
-use anyhow::{Context, Result};
+use anyhow::Result;
 use reedline::{
     default_emacs_keybindings, default_vi_insert_keybindings, default_vi_normal_keybindings,
-    ColumnarMenu, DefaultCompleter, EditMode, Emacs, FileBackedHistory, KeyCode, KeyModifiers,
-    Keybindings, Reedline, ReedlineEvent, ReedlineMenu, Vi,
+    ColumnarMenu, DefaultCompleter, EditMode, Emacs, KeyCode, KeyModifiers, Keybindings, Reedline,
+    ReedlineEvent, ReedlineMenu, Vi,
 };
 
 const MENU_NAME: &str = "completion_menu";
@@ -27,7 +27,6 @@ impl Repl {
 
         let completer = Self::create_completer(&config, &commands);
         let highlighter = ReplHighlighter::new(config.clone(), commands);
-        let history = Self::create_history()?;
         let menu = Self::create_menu();
         let edit_mode: Box<dyn EditMode> = if config.read().keybindings.is_vi() {
             let mut normal_keybindings = default_vi_normal_keybindings();
@@ -43,7 +42,6 @@ impl Repl {
         let mut editor = Reedline::create()
             .with_completer(Box::new(completer))
             .with_highlighter(Box::new(highlighter))
-            .with_history(history)
             .with_menu(menu)
             .with_edit_mode(edit_mode)
             .with_quick_completions(true)
@@ -75,11 +73,6 @@ impl Repl {
         );
         keybindings.add_binding(
             KeyModifiers::CONTROL,
-            KeyCode::Char('l'),
-            ReedlineEvent::ExecuteHostCommand(".clear screen".into()),
-        );
-        keybindings.add_binding(
-            KeyModifiers::CONTROL,
             KeyCode::Char('s'),
             ReedlineEvent::Submit,
         );
@@ -89,11 +82,4 @@ impl Repl {
         let completion_menu = ColumnarMenu::default().with_name(MENU_NAME);
         ReedlineMenu::EngineCompleter(Box::new(completion_menu))
     }
-
-    fn create_history() -> Result<Box<FileBackedHistory>> {
-        Ok(Box::new(
-            FileBackedHistory::with_file(1000, Config::history_file()?)
-                .with_context(|| "Failed to setup history file")?,
-        ))
-    }
 }
diff --git a/src/repl/mod.rs b/src/repl/mod.rs
index a6f173a..7a665ea 100644
--- a/src/repl/mod.rs
+++ b/src/repl/mod.rs
@@ -11,15 +11,14 @@ pub use self::init::Repl;
 
 use crate::config::SharedConfig;
 use crate::print_now;
-use crate::term;
 
-use anyhow::{Context, Result};
+use anyhow::Result;
 use fancy_regex::Regex;
 use lazy_static::lazy_static;
 use reedline::Signal;
 use std::rc::Rc;
 
-pub const REPL_COMMANDS: [(&str, &str); 14] = [
+pub const REPL_COMMANDS: [(&str, &str); 12] = [
     (".info", "Print system-wide information"),
     (".set", "Modify the configuration temporarily"),
     (".model", "Choose a model"),
@@ -30,8 +29,6 @@ pub const REPL_COMMANDS: [(&str, &str); 14] = [
     (".copy", "Copy the last output to the clipboard"),
     (".read", "Read the contents of a file and submit"),
     (".edit", "Multi-line editing (CTRL+S to finish)"),
-    (".history", "Print the REPL history"),
-    (".clear history", "Clear the REPL history"),
     (".help", "Print this help message"),
     (".exit", "Exit the REPL"),
 ];
@@ -102,22 +99,10 @@ impl Repl {
                     dump_repl_help();
                 }
                 ".clear" => match args {
-                    Some("screen") => term::clear_screen(0)?,
-                    Some("history") => {
-                        self.editor
-                            .history_mut()
-                            .clear()
-                            .with_context(|| "Failed to clear history")?;
-                        print_now!("\n");
-                    }
                     Some("role") => handler.handle(ReplCmd::ClearRole)?,
                     Some("session") => handler.handle(ReplCmd::EndSession)?,
                     _ => dump_unknown_command(),
                 },
-                ".history" => {
-                    self.editor.print_history()?;
-                    print_now!("\n");
-                }
                 ".model" => match args {
                     Some(name) => handler.handle(ReplCmd::SetModel(name.to_string()))?,
                     None => print_now!("Usage: .model <name>\n\n"),
diff --git a/src/term.rs b/src/term.rs
deleted file mode 100644
index 84449f4..0000000
--- a/src/term.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use anyhow::Result;
-use crossterm::{
-    cursor, queue, style,
-    terminal::{self, disable_raw_mode, enable_raw_mode, ClearType},
-};
-use std::io::{self, Stdout, Write};
-
-pub fn clear_screen(keep_lines: u16) -> Result<()> {
-    enable_raw_mode()?;
-    let mut stdout = io::stdout();
-
-    let ret = clear_screen_inner(&mut stdout, keep_lines);
-
-    // restore terminal
-    disable_raw_mode()?;
-
-    ret
-}
-
-fn clear_screen_inner(writer: &mut Stdout, keep_lines: u16) -> Result<()> {
-    let (_, h) = terminal::size()?;
-    queue!(
-        writer,
-        style::Print("\n".repeat((h - 2).into())),
-        terminal::ScrollUp(2),
-        cursor::MoveTo(0, 0),
-        terminal::Clear(ClearType::FromCursorDown),
-        terminal::ScrollUp(keep_lines),
-    )?;
-    writer.flush()?;
-    Ok(())
-}