refactor: Change to-do lists to use database over filesystem

Updates:
- To-do lists now only use the database rather than the filesystem for managing
past and unfinished tasks

Author: kiran-garre

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

@@ -1,5 +1,4 @@
 use clap::Subcommand;
-use std::path::PathBuf;
 use crate::{cli::chat::tools::todo::TodoState, os::Os};
 use crossterm::{
     execute,
@@ -14,28 +13,23 @@ use crate::cli::chat::{
 
 use eyre::Result;
 
-use crate::cli::chat::tools::todo::{
-    build_path,
-    TODO_STATE_FOLDER_PATH,
-};
-
 use dialoguer::{
     FuzzySelect
 };
 
 #[derive(Debug, PartialEq, Subcommand)]
 pub enum TodoSubcommand {
-    // Task/prompt to generate TODO list for
     Show,
     ClearFinished,
     Select,
 }
 
+/// Used for displaying completed and in-progress todo lists
 pub struct TodoDisplayEntry {
     pub num_completed: usize,
     pub num_tasks: usize,
     pub description: String,
-    pub path: PathBuf,
+    pub id: String,
 }
 
 impl std::fmt::Display for TodoDisplayEntry {
@@ -60,7 +54,7 @@ impl TodoSubcommand {
     pub async fn execute(self, os: &mut Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
         match self {
             Self::Show => {
-                match self.get_descriptions_and_statuses(os).await {
+                match self.get_descriptions_and_statuses(os) {
                     Ok(entries) => {
                         if entries.len() == 0 {
                             execute!(
@@ -88,7 +82,7 @@ impl TodoSubcommand {
                 ();
             },
             Self::Select => {
-                match self.get_descriptions_and_statuses(os).await {
+                match self.get_descriptions_and_statuses(os) {
                     Ok(entries) => {
                         if entries.len() == 0 {
                             execute!(
@@ -110,7 +104,7 @@ impl TodoSubcommand {
                                         style::Print("⟳ Resuming: ".magenta()),
                                         style::Print(format!("{}\n", entries[index].description.clone())),
                                     )?;
-                                    return session.resume_todo(os, entries[index].path.clone()).await;
+                                    return session.resume_todo(os, &entries[index].id).await;
                                 }
                             }
                         }
@@ -125,23 +119,29 @@ impl TodoSubcommand {
     }
 
     /// Convert all to-do list state files to displayable entries
-    async fn get_descriptions_and_statuses(self, os: &Os) -> Result<Vec<TodoDisplayEntry>> {
+    fn get_descriptions_and_statuses(self, os: &Os) -> Result<Vec<TodoDisplayEntry>> {
         let mut out = Vec::new();
-        let mut entries = os.fs.read_dir(
-            build_path(os, TODO_STATE_FOLDER_PATH, "")?
-        ).await?;
-
-        while let Some(entry) = entries.next_entry().await? {
-            let contents = os.fs.read_to_string(entry.path()).await?;
-            let temp_struct = match serde_json::from_str::<TodoState>(&contents) {
-                Ok(state) => state,
-                Err(_) => continue,
+        let entries = os.database.get_all_todos()?;
+        for (id, value) in entries.iter() {
+            let temp_struct = match value.as_str() {
+                Some(s) => { match serde_json::from_str::<TodoState>(s) {
+                    Ok(state) => state,
+                    Err(_) => continue,
+                }},
+                None => continue,
             };
-            out.push( TodoDisplayEntry {
+            // For some reason this doesn't work
+            // Has to do with the Value::String wrapping in os.database.all_entries() rather than Value::from_str()
+            // let temp_struct = match serde_json::from_value::<TodoState>(value.clone()) {
+            //     Ok(state) => state,
+            //     Err(_) => continue,
+            // };
+
+            out.push(TodoDisplayEntry {
                 num_completed: temp_struct.completed.iter().filter(|b| **b).count(),
                 num_tasks: temp_struct.completed.len(),
                 description: prewrap(&temp_struct.task_description),
-                path: entry.path(),
+                id: id.to_string(),
             });
         }
         Ok(out)

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

@@ -4,7 +4,6 @@ use std::collections::{
     VecDeque,
 };
 use std::io::Write;
-use std::path::PathBuf;
 use std::sync::atomic::Ordering;
 
 use crossterm::style::Color;
@@ -24,6 +23,7 @@ use tracing::{
 
 use eyre::{
     Result, 
+    bail,
 };
 
 use super::consts::{
@@ -847,17 +847,20 @@ impl ConversationState {
         }
     }
 
-    pub async fn create_todo_request(&self, os: &Os, path: PathBuf) -> Result<FigConversationState> {
-        let contents = self.can_resume_todo(os, &path).await?;
+    pub async fn create_todo_request(&self, os: &Os, id: &str) -> Result<FigConversationState> {
+        let contents = match os.database.get_todo(id)? {
+            Some(todo_list) => serde_json::to_string(&todo_list)?,
+            None => bail!("No todo list with id {}", id)
+        };
         let request = format!(
-            "[SYSTEM NOTE: This is an automated request, not from the user] 
-            Read the TODO list contents below and understand the task description, completed tasks, and provided context. 
-            Call the `load` command of the todo_list tool with the given file path as an argument to display the TODO list to the user and officially resume execution of the TODO list tasks.
-            You do not need to display the tasks to the user yourself. You can begin completing the tasks after calling the `load` command.
-            TODO LIST CONTENTS: {}
-            FILE PATH: {}",
+            "[SYSTEM NOTE: This is an automated request, not from the user]\n
+            Read the TODO list contents below and understand the task description, completed tasks, and provided context.\n 
+            Call the `load` command of the todo_list tool with the given ID as an argument to display the TODO list to the user and officially resume execution of the TODO list tasks.\n
+            You do not need to display the tasks to the user yourself. You can begin completing the tasks after calling the `load` command.\n
+            TODO LIST CONTENTS: {}\n
+            ID: {}\n",
             contents,
-            path.display()
+            id
         ); 
 
         let request_message = UserInputMessage {
@@ -874,13 +877,6 @@ impl ConversationState {
             history: None,
         }) 
     }
-
-    // For now, just check that file path is valid and deserializable
-    pub async fn can_resume_todo(&self, os: &Os, path: &PathBuf) -> Result<String> {
-        let contents = os.fs.read_to_string(path).await?;
-        let _ = serde_json::from_str::<TodoState>(&contents)?;
-        Ok(contents)
-    }
 }
 
 /// Represents a conversation state that can be converted into a [FigConversationState] (the type

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

@@ -55,7 +55,6 @@ use eyre::{
     bail,
     eyre,
 };
-use std::path::PathBuf;
 
 use input_source::InputSource;
 use message::{
@@ -975,12 +974,12 @@ impl ChatSession {
     async fn resume_todo(
         &mut self,
         os: &mut Os,
-        path: PathBuf,
+        id: &str,
     ) -> Result<ChatState, ChatError> {
 
         let request_state = self
             .conversation
-            .create_todo_request(os, path)
+            .create_todo_request(os, id)
             .await;
 
         match request_state {
@@ -1007,6 +1006,7 @@ impl ChatSession {
 
         let response = os.client.send_message(conv_state).await?;
 
+        // Since this is an internal tool call, manually handle the tool requests from Q
         let mut result =  self.handle_response(os, response).await?;
         loop {
             match result {
@@ -1023,12 +1023,7 @@ impl ChatSession {
                     return Ok(other);
                 },
             }
-        };
-        // Ok(ChatState::PromptUser {
-        //     skip_printing_tools: true,
-        // })
-
-        
+        };        
     }
 
     /// Compacts the conversation history, replacing the history with a summary generated by the