feat: Add add and remove functionality for to-do lists

Author: kiran-garre

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

@@ -28,6 +28,9 @@ pub enum TodoSubcommand {
 
     /// View a to-do list
     View,
+
+    /// Delete a to-do list
+    Delete,
 }
 
 /// Used for displaying completed and in-progress todo lists
@@ -61,7 +64,7 @@ impl TodoSubcommand {
             Self::Show => match Self::get_descriptions_and_statuses(os) {
                 Ok(entries) => {
                     if entries.is_empty() {
-                        execute!(session.stderr, style::Print("No to-do lists to show\n"),)?;
+                        execute!(session.stderr, style::Print("No to-do lists to show!\n"),)?;
                     }
                     for e in entries {
                         execute!(session.stderr, style::Print(e), style::Print("\n"),)?;
@@ -96,58 +99,39 @@ impl TodoSubcommand {
                         style::Print("✔ Cleared finished to-do lists!\n".green())
                     )?;
                 } else {
-                    execute!(
-                        session.stderr,
-                        style::Print("No finished to-do lists to clear!\n".green())
-                    )?;
+                    execute!(session.stderr, style::Print("No finished to-do lists to clear!\n"))?;
                 }
             },
-            Self::Resume => {
-                match Self::get_descriptions_and_statuses(os) {
-                    Ok(entries) => {
-                        if entries.is_empty() {
-                            execute!(session.stderr, style::Print("No to-do lists to show\n"),)?;
-                        } else {
-                            let selection = FuzzySelect::new()
-                                .with_prompt("Select a to-do list to resume:")
-                                .items(&entries)
-                                .report(false)
-                                .interact_opt()
-                                .unwrap_or(None);
-
-                            if let Some(index) = selection {
-                                if index < entries.len() {
-                                    execute!(
-                                        session.stderr,
-                                        style::Print("⟳ Resuming: ".magenta()),
-                                        style::Print(format!("{}\n", entries[index].description.clone())),
-                                    )?;
-                                    return session.resume_todo(os, &entries[index].id).await;
-                                }
+            Self::Resume => match Self::get_descriptions_and_statuses(os) {
+                Ok(entries) => {
+                    if entries.is_empty() {
+                        execute!(session.stderr, style::Print("No to-do lists to resume!\n"),)?;
+                    } else {
+                        if let Some(index) = fuzzy_select_todos(&entries, "Select a to-do list to resume:") {
+                            if index < entries.len() {
+                                execute!(
+                                    session.stderr,
+                                    style::Print("⟳ Resuming: ".magenta()),
+                                    style::Print(format!("{}\n", entries[index].description.clone())),
+                                )?;
+                                return session.resume_todo(os, &entries[index].id).await;
                             }
                         }
-                    },
-                    Err(_) => return Err(ChatError::Custom("Could not show to-do lists".into())),
-                };
+                    }
+                },
+                Err(_) => return Err(ChatError::Custom("Could not show to-do lists".into())),
             },
             Self::View => match Self::get_descriptions_and_statuses(os) {
                 Ok(entries) => {
                     if entries.is_empty() {
-                        execute!(session.stderr, style::Print("No to-do lists to view\n"))?;
+                        execute!(session.stderr, style::Print("No to-do lists to view!\n"))?;
                     } else {
-                        let selection = FuzzySelect::new()
-                            .with_prompt("Select a to-do list to view:")
-                            .items(&entries)
-                            .report(false)
-                            .interact_opt()
-                            .unwrap_or(None);
-
-                        if let Some(index) = selection {
+                        if let Some(index) = fuzzy_select_todos(&entries, "Select a to-do list to view:") {
                             if index < entries.len() {
                                 let list = match TodoState::load(os, &entries[index].id) {
                                     Ok(list) => list,
                                     Err(_) => {
-                                        return Err(ChatError::Custom("Could not load requested to-do list".into()));
+                                        return Err(ChatError::Custom("Could not load the selected to-do list".into()));
                                     },
                                 };
                                 execute!(
@@ -161,7 +145,9 @@ impl TodoSubcommand {
                                 match list.display_list(&mut session.stderr) {
                                     Ok(_) => {},
                                     Err(_) => {
-                                        return Err(ChatError::Custom("Could not display requested to-do list".into()));
+                                        return Err(ChatError::Custom(
+                                            "Could not display the selected to-do list".into(),
+                                        ));
                                     },
                                 };
                                 execute!(session.stderr, style::Print("\n"),)?;
@@ -171,6 +157,32 @@ impl TodoSubcommand {
                 },
                 Err(_) => return Err(ChatError::Custom("Could not show to-do lists".into())),
             },
+            Self::Delete => match Self::get_descriptions_and_statuses(os) {
+                Ok(entries) => {
+                    if entries.is_empty() {
+                        execute!(session.stderr, style::Print("No to-do lists to delete!\n"))?;
+                    } else {
+                        if let Some(index) = fuzzy_select_todos(&entries, "Select a to-do list to delete:") {
+                            if index < entries.len() {
+                                match os.database.delete_todo(&entries[index].id) {
+                                    Ok(_) => {},
+                                    Err(_) => {
+                                        return Err(ChatError::Custom(
+                                            "Could not delete the selected to-do list".into(),
+                                        ));
+                                    },
+                                };
+                                execute!(
+                                    session.stderr,
+                                    style::Print("✔ Deleted to-do list: ".green()),
+                                    style::Print(format!("{}\n", entries[index].description.clone().dark_grey()))
+                                )?;
+                            }
+                        }
+                    }
+                },
+                Err(_) => return Err(ChatError::Custom("Could not show to-do lists".into())),
+            },
         }
         Ok(ChatState::PromptUser {
             skip_printing_tools: true,
@@ -208,6 +220,15 @@ impl TodoSubcommand {
     }
 }
 
+fn fuzzy_select_todos(entries: &Vec<TodoDisplayEntry>, prompt_str: &str) -> Option<usize> {
+    FuzzySelect::new()
+        .with_prompt(prompt_str)
+        .items(&entries)
+        .report(false)
+        .interact_opt()
+        .unwrap_or(None)
+}
+
 // const MAX_LINE_LENGTH: usize = 80;
 
 // // FIX: Hacky workaround for cleanly wrapping lines

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

@@ -988,7 +988,6 @@ impl ChatSession {
             },
         };
 
-        // Use the normal sendable conversation state which includes tool definitions
         let conv_state = self
             .conversation
             .as_sendable_conversation_state(os, &mut self.stderr, false)

crates/chat-cli/src/cli/chat/tools/todo.rs

@@ -1,4 +1,5 @@
 use std::io::Write;
+use std::collections::HashSet;
 use std::time::{
     SystemTime,
     UNIX_EPOCH,
@@ -45,6 +46,19 @@ pub enum TodoInput {
 
     #[serde(rename = "load")]
     Load { id: String },
+
+    #[serde(rename = "add")]
+    Add {
+        new_tasks: Vec<String>,
+        insert_indices: Vec<usize>,
+        new_description: Option<String>,
+    },
+
+    #[serde(rename = "remove")]
+    Remove {
+        remove_indices: Vec<usize>,
+        new_description: Option<String>,
+    }
 }
 
 #[derive(Debug, Default, Serialize, Deserialize, Clone)]
@@ -174,6 +188,38 @@ impl TodoInput {
                 TodoState::set_current_todo_id(os, id)?;
                 TodoState::load(os, id)?
             },
+            TodoInput::Add { new_tasks, insert_indices, new_description } => {
+                let current_id = match TodoState::get_current_todo_id(os)? {
+                    Some(id) => id,
+                    None => bail!("No to-do list currently loaded"),
+                };
+                let mut state = TodoState::load(os, &current_id)?;
+                for (i, task) in insert_indices.iter().zip(new_tasks.iter()) {
+                    state.tasks.insert(*i, task.clone());
+                    state.completed.insert(*i, false);
+                }
+                if let Some(description) = new_description {
+                    state.task_description = description.clone();
+                }
+                state.save(os, &current_id)?;
+                state
+            },
+            TodoInput::Remove { remove_indices, new_description } => {
+                let current_id = match TodoState::get_current_todo_id(os)? {
+                    Some(id) => id,
+                    None => bail!("No to-do list currently loaded"),
+                };
+                let mut state = TodoState::load(os, &current_id)?;
+                for i in remove_indices.iter() {
+                    state.tasks.remove(*i);
+                    state.completed.remove(*i);
+                }
+                if let Some(description) = new_description {
+                    state.task_description = description.clone();
+                }
+                state.save(os, &current_id)?;
+                state
+            }
         };
         state.display_list(output)?;
         output.flush()?;
@@ -221,7 +267,49 @@ impl TodoInput {
                     bail!("Loaded todo list is empty");
                 }
             },
+            TodoInput::Add { new_tasks, insert_indices, new_description } => {
+                let current_id = match TodoState::get_current_todo_id(os)? {
+                    Some(id) => id,
+                    None => bail!("No todo list is currently loaded"),
+                };
+                let state = TodoState::load(os, &current_id)?;
+                if new_tasks.iter().any(|task| task.trim().is_empty()) {
+                    bail!("New tasks cannot be empty");
+                } else if has_duplicates(&insert_indices) {
+                    bail!("Insertion indices must be unique")
+                } else if new_tasks.len() != insert_indices.len() {
+                    bail!("Must provide an index for every new task");
+                } else if insert_indices.iter().any(|i| *i > state.tasks.len()) {
+                    bail!("Index is out of bounds");
+                } else if new_description.is_some() && new_description.as_ref().unwrap().trim().is_empty() {
+                    bail!("New description cannot be empty");
+                }
+            },
+            TodoInput::Remove { remove_indices, new_description } => {
+                let current_id = match TodoState::get_current_todo_id(os)? {
+                    Some(id) => id,
+                    None => bail!("No todo list is currently loaded"),
+                };
+                let state = TodoState::load(os, &current_id)?;
+                if has_duplicates(&remove_indices) {
+                    bail!("Removal indices must be unique")
+                } else if remove_indices.iter().any(|i| *i > state.tasks.len()) {
+                    bail!("Index is out of bounds");
+                } else if new_description.is_some() && new_description.as_ref().unwrap().trim().is_empty() {
+                    bail!("New description cannot be empty");
+                }
+            }
         }
         Ok(())
     }
 }
+
+
+/// Generated by Q
+fn has_duplicates<T>(vec: &[T]) -> bool 
+where
+    T: std::hash::Hash + Eq,
+{
+    let mut seen = HashSet::with_capacity(vec.len());
+    vec.iter().any(|item| !seen.insert(item))
+}

crates/chat-cli/src/cli/chat/tools/tool_index.json

@@ -235,13 +235,13 @@
   },
   "todo_list": {
     "name": "todo_list",
-    "description": "A tool for creating a TODO list and keeping track of tasks. This tool should be requested EVERY time the user gives you a task that will take multiple steps. A TODO list should be made BEFORE executing any steps. Steps should be marked off AS YOU COMPLETE THEM. DO NOT display your own tasks or todo list AT ANY POINT; this is done for you. Complete the tasks in the same order that you provide them.",
+    "description": "A tool for creating a TODO list and keeping track of tasks. This tool should be requested EVERY time the user gives you a task that will take multiple steps. A TODO list should be made BEFORE executing any steps. Steps should be marked off AS YOU COMPLETE THEM. DO NOT display your own tasks or todo list AT ANY POINT; this is done for you. Complete the tasks in the same order that you provide them. If the user tells you to skip a step, DO NOT mark it as completed.",
     "input_schema": {
       "type": "object",
       "properties": {
         "command": {
           "type": "string",
-          "enum": ["create", "complete", "load"],
+          "enum": ["create", "complete", "load", "add", "remove"],
           "description": "The command to run. Allowed options are `add`, `complete`."
         },
         "tasks": {
@@ -256,7 +256,7 @@
           "type": "string"
         },
         "completed_indices": {
-          "description": "Required parameter of `complete` command containing the 0-INDEXED numbers of EVERY completed task. Each task should be marked as completed IMMEDIATELY after it is finished. DO NOT mark tasks as completed if you skip them.",
+          "description": "Required parameter of `complete` command containing the 0-INDEXED numbers of EVERY completed task. Each task should be marked as completed IMMEDIATELY after it is finished.",
           "type": "array",
           "items": {
             "type": "integer"
@@ -276,6 +276,31 @@
         "id": {
           "description": "Required parameter of `load` command containing ID of todo list to load",
           "type": "string"
+        },
+        "new_tasks": {
+          "description": "Required parameter of `add` command containing a list of new tasks to be added to the to-do list.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "insert_indices": {
+          "description": "Required parameter of `add` command containing a list of 0-INDEXED positions to insert the new tasks. There MUST be an index for every new task being added.",
+          "type": "array",
+          "items": {
+            "type": "integer"
+          }
+        },
+        "new_description": {
+          "description": "Optional parameter of `add` and `remove` containing a new task description. Use this when the updated set of tasks significantly change the goal or overall procedure of the task.",
+          "type": "string"
+        },
+        "remove_indices": {
+          "description": "Required parameter of `remove` command containing a list of 0-INDEXED positions of tasks to remove.",
+          "type": "array",
+          "items": {
+            "type": "integer"
+          }
         }
       },
       "required": ["command"]