feat: implement persistent CLI history with file storage (#2769)

- Add Drop trait to InputSource for automatic history saving
- Replace DefaultHistory with FileHistory for persistence
- Store history in ~/.aws/amazonq/cli_history
- Refactor ChatHinter to use rustyline's built-in history search
- Remove manual history tracking in favor of rustyline's implementation
- Add history loading on startup with error handling
- Clean up unused hinter history update methods

Author: kkashilk

crates/chat-cli/src/cli/chat/input_source.rs

@@ -31,11 +31,33 @@ mod inner {
     }
 }
 
+impl Drop for InputSource {
+    fn drop(&mut self) {
+        self.save_history().unwrap();
+    }
+}
 impl InputSource {
     pub fn new(os: &Os, sender: PromptQuerySender, receiver: PromptQueryResponseReceiver) -> Result<Self> {
         Ok(Self(inner::Inner::Readline(rl(os, sender, receiver)?)))
     }
 
+    /// Save history to file
+    pub fn save_history(&mut self) -> Result<()> {
+        if let inner::Inner::Readline(rl) = &mut self.0 {
+            if let Some(helper) = rl.helper() {
+                let history_path = helper.get_history_path();
+
+                // Create directory if it doesn't exist
+                if let Some(parent) = history_path.parent() {
+                    std::fs::create_dir_all(parent)?;
+                }
+
+                rl.append_history(&history_path)?;
+            }
+        }
+        Ok(())
+    }
+
     #[cfg(unix)]
     pub fn put_skim_command_selector(
         &mut self,
@@ -78,12 +100,9 @@ impl InputSource {
                 let curr_line = rl.readline(prompt);
                 match curr_line {
                     Ok(line) => {
-                        let _ = rl.add_history_entry(line.as_str());
-
-                        if let Some(helper) = rl.helper_mut() {
-                            helper.update_hinter_history(&line);
+                        if Self::should_append_history(&line) {
+                            let _ = rl.add_history_entry(line.as_str());
                         }
-
                         Ok(Some(line))
                     },
                     Err(ReadlineError::Interrupted | ReadlineError::Eof) => Ok(None),
@@ -97,6 +116,18 @@ impl InputSource {
         }
     }
 
+    fn should_append_history(line: &str) -> bool {
+        let trimmed = line.trim().to_lowercase();
+        if trimmed.is_empty() {
+            return false;
+        }
+
+        if matches!(trimmed.as_str(), "y" | "n" | "t") {
+            return false;
+        }
+        true
+    }
+
     // We're keeping this method for potential future use
     #[allow(dead_code)]
     pub fn set_buffer(&mut self, content: &str) {

crates/chat-cli/src/cli/chat/prompt.rs

@@ -1,5 +1,6 @@
 use std::borrow::Cow;
 use std::cell::RefCell;
+use std::path::PathBuf;
 
 use eyre::Result;
 use rustyline::completion::{
@@ -13,7 +14,10 @@ use rustyline::highlight::{
     Highlighter,
 };
 use rustyline::hint::Hinter as RustylineHinter;
-use rustyline::history::DefaultHistory;
+use rustyline::history::{
+    FileHistory,
+    SearchDirection,
+};
 use rustyline::validate::{
     ValidationContext,
     ValidationResult,
@@ -44,6 +48,7 @@ use super::tool_manager::{
 };
 use crate::database::settings::Setting;
 use crate::os::Os;
+use crate::util::directories::chat_cli_bash_history_path;
 
 pub const COMMANDS: &[&str] = &[
     "/clear",
@@ -262,31 +267,26 @@ impl Completer for ChatCompleter {
 
 /// Custom hinter that provides shadowtext suggestions
 pub struct ChatHinter {
-    /// Command history for providing suggestions based on past commands
-    history: Vec<String>,
     /// Whether history-based hints are enabled
     history_hints_enabled: bool,
+    history_path: PathBuf,
 }
 
 impl ChatHinter {
     /// Creates a new ChatHinter instance
-    pub fn new(history_hints_enabled: bool) -> Self {
+    pub fn new(history_hints_enabled: bool, history_path: PathBuf) -> Self {
         Self {
-            history: Vec::new(),
             history_hints_enabled,
+            history_path,
         }
     }
 
-    /// Updates the history with a new command
-    pub fn update_history(&mut self, command: &str) {
-        let command = command.trim();
-        if !command.is_empty() && !command.contains('\n') && !command.contains('\r') {
-            self.history.push(command.to_string());
-        }
+    pub fn get_history_path(&self) -> PathBuf {
+        self.history_path.clone()
     }
 
-    /// Finds the best hint for the current input
-    fn find_hint(&self, line: &str) -> Option<String> {
+    /// Finds the best hint for the current input using rustyline's history
+    fn find_hint(&self, line: &str, ctx: &Context<'_>) -> Option<String> {
         // If line is empty, no hint
         if line.is_empty() {
             return None;
@@ -300,13 +300,20 @@ impl ChatHinter {
                 .map(|cmd| cmd[line.len()..].to_string());
         }
 
-        // Try to find a hint from history if history hints are enabled
+        // Try to find a hint from rustyline's history if history hints are enabled
         if self.history_hints_enabled {
-            return self.history
-                .iter()
-                .rev() // Start from most recent
-                .find(|cmd| cmd.starts_with(line) && cmd.len() > line.len())
-                .map(|cmd| cmd[line.len()..].to_string());
+            let history = ctx.history();
+            let history_len = history.len();
+            if history_len == 0 {
+                return None;
+            }
+
+            if let Ok(Some(search_result)) = history.starts_with(line, history_len - 1, SearchDirection::Reverse) {
+                let entry = search_result.entry.to_string();
+                if entry.len() > line.len() {
+                    return Some(entry[line.len()..].to_string());
+                }
+            }
         }
 
         None
@@ -316,13 +323,13 @@ impl ChatHinter {
 impl RustylineHinter for ChatHinter {
     type Hint = String;
 
-    fn hint(&self, line: &str, pos: usize, _ctx: &Context<'_>) -> Option<Self::Hint> {
+    fn hint(&self, line: &str, pos: usize, ctx: &Context<'_>) -> Option<Self::Hint> {
         // Only provide hints when cursor is at the end of the line
         if pos < line.len() {
             return None;
         }
 
-        self.find_hint(line)
+        self.find_hint(line, ctx)
     }
 }
 
@@ -363,9 +370,8 @@ pub struct ChatHelper {
 }
 
 impl ChatHelper {
-    /// Updates the history of the ChatHinter with a new command
-    pub fn update_hinter_history(&mut self, command: &str) {
-        self.hinter.update_history(command);
+    pub fn get_history_path(&self) -> PathBuf {
+        self.hinter.get_history_path()
     }
 }
 
@@ -426,7 +432,7 @@ pub fn rl(
     os: &Os,
     sender: PromptQuerySender,
     receiver: PromptQueryResponseReceiver,
-) -> Result<Editor<ChatHelper, DefaultHistory>> {
+) -> Result<Editor<ChatHelper, FileHistory>> {
     let edit_mode = match os.database.settings.get_string(Setting::ChatEditMode).as_deref() {
         Some("vi" | "vim") => EditMode::Vi,
         _ => EditMode::Emacs,
@@ -437,21 +443,30 @@ pub fn rl(
         .edit_mode(edit_mode)
         .build();
 
-    // Default to disabled if setting doesn't exist
     let history_hints_enabled = os
         .database
         .settings
         .get_bool(Setting::ChatEnableHistoryHints)
         .unwrap_or(false);
+
+    let history_path = chat_cli_bash_history_path(os)?;
+
     let h = ChatHelper {
         completer: ChatCompleter::new(sender, receiver),
-        hinter: ChatHinter::new(history_hints_enabled),
+        hinter: ChatHinter::new(history_hints_enabled, history_path),
         validator: MultiLineValidator,
     };
 
     let mut rl = Editor::with_config(config)?;
     rl.set_helper(Some(h));
 
+    // Load history from ~/.aws/amazonq/cli_history
+    if let Err(e) = rl.load_history(&rl.helper().unwrap().get_history_path()) {
+        if !matches!(e, ReadlineError::Io(ref io_err) if io_err.kind() == std::io::ErrorKind::NotFound) {
+            eprintln!("Warning: Failed to load history: {}", e);
+        }
+    }
+
     // Add custom keybinding for Alt+Enter to insert a newline
     rl.bind_sequence(
         KeyEvent(KeyCode::Enter, Modifiers::ALT),
@@ -487,6 +502,7 @@ pub fn rl(
 mod tests {
     use crossterm::style::Stylize;
     use rustyline::highlight::Highlighter;
+    use rustyline::history::DefaultHistory;
 
     use super::*;
 
@@ -537,7 +553,7 @@ mod tests {
         let (_, prompt_response_receiver) = tokio::sync::broadcast::channel::<PromptQueryResult>(5);
         let helper = ChatHelper {
             completer: ChatCompleter::new(prompt_request_sender, prompt_response_receiver),
-            hinter: ChatHinter::new(true),
+            hinter: ChatHinter::new(true, PathBuf::new()),
             validator: MultiLineValidator,
         };
 
@@ -553,7 +569,7 @@ mod tests {
         let (_, prompt_response_receiver) = tokio::sync::broadcast::channel::<PromptQueryResult>(5);
         let helper = ChatHelper {
             completer: ChatCompleter::new(prompt_request_sender, prompt_response_receiver),
-            hinter: ChatHinter::new(true),
+            hinter: ChatHinter::new(true, PathBuf::new()),
             validator: MultiLineValidator,
         };
 
@@ -569,7 +585,7 @@ mod tests {
         let (_, prompt_response_receiver) = tokio::sync::broadcast::channel::<PromptQueryResult>(5);
         let helper = ChatHelper {
             completer: ChatCompleter::new(prompt_request_sender, prompt_response_receiver),
-            hinter: ChatHinter::new(true),
+            hinter: ChatHinter::new(true, PathBuf::new()),
             validator: MultiLineValidator,
         };
 
@@ -585,7 +601,7 @@ mod tests {
         let (_, prompt_response_receiver) = tokio::sync::broadcast::channel::<PromptQueryResult>(5);
         let helper = ChatHelper {
             completer: ChatCompleter::new(prompt_request_sender, prompt_response_receiver),
-            hinter: ChatHinter::new(true),
+            hinter: ChatHinter::new(true, PathBuf::new()),
             validator: MultiLineValidator,
         };
 
@@ -604,7 +620,7 @@ mod tests {
         let (_, prompt_response_receiver) = tokio::sync::broadcast::channel::<PromptQueryResult>(5);
         let helper = ChatHelper {
             completer: ChatCompleter::new(prompt_request_sender, prompt_response_receiver),
-            hinter: ChatHinter::new(true),
+            hinter: ChatHinter::new(true, PathBuf::new()),
             validator: MultiLineValidator,
         };
 
@@ -620,7 +636,7 @@ mod tests {
         let (_, prompt_response_receiver) = tokio::sync::broadcast::channel::<PromptQueryResult>(1);
         let helper = ChatHelper {
             completer: ChatCompleter::new(prompt_request_sender, prompt_response_receiver),
-            hinter: ChatHinter::new(true),
+            hinter: ChatHinter::new(true, PathBuf::new()),
             validator: MultiLineValidator,
         };
 
@@ -635,7 +651,7 @@ mod tests {
         let (_, prompt_response_receiver) = tokio::sync::broadcast::channel::<PromptQueryResult>(1);
         let helper = ChatHelper {
             completer: ChatCompleter::new(prompt_request_sender, prompt_response_receiver),
-            hinter: ChatHinter::new(true),
+            hinter: ChatHinter::new(true, PathBuf::new()),
             validator: MultiLineValidator,
         };
 
@@ -650,7 +666,7 @@ mod tests {
         let (_, prompt_response_receiver) = tokio::sync::broadcast::channel::<PromptQueryResult>(1);
         let helper = ChatHelper {
             completer: ChatCompleter::new(prompt_request_sender, prompt_response_receiver),
-            hinter: ChatHinter::new(true),
+            hinter: ChatHinter::new(true, PathBuf::new()),
             validator: MultiLineValidator,
         };
 
@@ -664,7 +680,7 @@ mod tests {
 
     #[test]
     fn test_chat_hinter_command_hint() {
-        let hinter = ChatHinter::new(true);
+        let hinter = ChatHinter::new(true, PathBuf::new());
 
         // Test hint for a command
         let line = "/he";
@@ -694,11 +710,7 @@ mod tests {
 
     #[test]
     fn test_chat_hinter_history_hint_disabled() {
-        let mut hinter = ChatHinter::new(false);
-
-        // Add some history
-        hinter.update_history("Hello, world!");
-        hinter.update_history("How are you?");
+        let hinter = ChatHinter::new(false, PathBuf::new());
 
         // Test hint from history - should be None since history hints are disabled
         let line = "How";

crates/chat-cli/src/util/directories.rs

@@ -44,6 +44,7 @@ type Result<T, E = DirectoryError> = std::result::Result<T, E>;
 
 const WORKSPACE_AGENT_DIR_RELATIVE: &str = ".amazonq/cli-agents";
 const GLOBAL_AGENT_DIR_RELATIVE_TO_HOME: &str = ".aws/amazonq/cli-agents";
+const CLI_BASH_HISTORY_PATH: &str = ".aws/amazonq/.cli_bash_history";
 
 /// The directory of the users home
 ///
@@ -158,6 +159,10 @@ pub fn chat_legacy_global_mcp_config(os: &Os) -> Result<PathBuf> {
     Ok(home_dir(os)?.join(".aws").join("amazonq").join("mcp.json"))
 }
 
+pub fn chat_cli_bash_history_path(os: &Os) -> Result<PathBuf> {
+    Ok(home_dir(os)?.join(CLI_BASH_HISTORY_PATH))
+}
+
 /// Legacy workspace MCP server config path
 pub fn chat_legacy_workspace_mcp_config(os: &Os) -> Result<PathBuf> {
     let cwd = os.env.current_dir()?;