refactor: Consolidate task logic, parameterize local directory name

Author: kiran-garre

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

@@ -77,7 +77,7 @@ impl TodoSubcommand {
                 let mut cleared_one = false;
 
                 for todo_status in todos.iter() {
-                    if todo_status.completed.iter().all(|b| *b) {
+                    if todo_status.tasks.iter().all(|b| b.completed) {
                         match delete_todo(os, &todo_status.id).await {
                             Ok(_) => cleared_one = true,
                             Err(e) => {
@@ -185,8 +185,8 @@ impl TodoSubcommand {
         let (todos, _) = get_all_todos(os).await?;
         for todo in todos.iter() {
             out.push(TodoDisplayEntry {
-                num_completed: todo.completed.iter().filter(|b| **b).count(),
-                num_tasks: todo.completed.len(),
+                num_completed: todo.tasks.iter().filter(|t| t.completed).count(),
+                num_tasks: todo.tasks.len(),
                 description: todo.description.clone(),
                 id: todo.id.clone(),
             });

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

@@ -145,7 +145,6 @@ use crate::cli::chat::cli::prompts::{
     PromptsSubcommand,
 };
 use crate::cli::chat::message::UserMessage;
-use crate::cli::chat::tools::ToolOrigin;
 use crate::cli::chat::util::sanitize_unicode_tags;
 use crate::database::settings::Setting;
 use crate::mcp_client::Prompt;
@@ -2878,7 +2877,7 @@ impl ChatSession {
             Ok(s) => s,
             Err(e) => return Err(ChatError::Custom(format!("Error deserializing todo list: {e}").into())),
         };
-        let summary_content = format!(
+        let request_content = format!(
             "[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
@@ -2889,23 +2888,13 @@ impl ChatSession {
             id
         );
 
-        let summary_message = UserMessage::new_prompt(summary_content.clone(), None);
+        let summary_message = UserMessage::new_prompt(request_content.clone(), None);
 
-        // Only send the todo_list tool
-        let mut tools = self.conversation.tools.clone();
-        tools.retain(|k, v| match k {
-            ToolOrigin::Native => {
-                v.retain(|tool| match tool {
-                    api_client::model::Tool::ToolSpecification(tool_spec) => tool_spec.name == "todo_list",
-                });
-                true
-            },
-            ToolOrigin::McpServer(_) => false,
-        });
+        ChatSession::reset_user_turn(self);
 
         Ok(ChatState::HandleInput {
             input: summary_message
-                .into_user_input_message(self.conversation.model.clone(), &tools)
+                .into_user_input_message(self.conversation.model.clone(), &self.conversation.tools)
                 .content,
         })
     }

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

@@ -26,14 +26,16 @@ use serde::{
 use super::InvokeOutput;
 use crate::os::Os;
 
-// Local directory to store todo lists
-const TODO_LIST_DIR: &str = ".amazonq/cli-todo-lists/";
+#[derive(Debug, Default, Serialize, Deserialize, Clone)]
+pub struct Task {
+    pub task_description: String,
+    pub completed: bool,
+}
 
 /// Contains all state to be serialized and deserialized into a todo list
 #[derive(Debug, Default, Serialize, Deserialize, Clone)]
 pub struct TodoListState {
-    pub tasks: Vec<String>,
-    pub completed: Vec<bool>,
+    pub tasks: Vec<Task>,
     pub description: String,
     pub context: Vec<String>,
     pub modified_files: Vec<String>,
@@ -43,7 +45,9 @@ pub struct TodoListState {
 impl TodoListState {
     /// Creates a local directory to store todo lists
     pub async fn init_dir(os: &Os) -> Result<()> {
-        os.fs.create_dir_all(os.env.current_dir()?.join(TODO_LIST_DIR)).await?;
+        os.fs
+            .create_dir_all(os.env.current_dir()?.join(get_todo_list_dir(os)?))
+            .await?;
         Ok(())
     }
 
@@ -72,8 +76,8 @@ impl TodoListState {
     /// Displays the TodoListState as a to-do list
     pub fn display_list(&self, output: &mut impl Write) -> Result<()> {
         queue!(output, style::Print("TODO:\n".yellow()))?;
-        for (index, (task, completed)) in self.tasks.iter().zip(self.completed.iter()).enumerate() {
-            queue_next_without_newline(output, task.clone(), *completed)?;
+        for (index, task) in self.tasks.iter().enumerate() {
+            queue_next_without_newline(output, task.task_description.clone(), task.completed)?;
             if index < self.tasks.len() - 1 {
                 queue!(output, style::Print("\n"))?;
             }
@@ -117,12 +121,16 @@ pub fn generate_new_todo_id() -> String {
 
 /// Converts a todo list id to an absolute path in the cwd
 pub fn id_to_path(os: &Os, id: &str) -> Result<PathBuf> {
-    Ok(os.env.current_dir()?.join(TODO_LIST_DIR).join(format!("{id}.json")))
+    Ok(os
+        .env
+        .current_dir()?
+        .join(get_todo_list_dir(os)?)
+        .join(format!("{id}.json")))
 }
 
 /// Gets all todo lists from the local directory
 pub async fn get_all_todos(os: &Os) -> Result<(Vec<TodoListState>, Vec<Report>)> {
-    let todo_list_dir = os.env.current_dir()?.join(TODO_LIST_DIR);
+    let todo_list_dir = os.env.current_dir()?.join(get_todo_list_dir(os)?);
     let mut read_dir_output = os.fs.read_dir(todo_list_dir).await?;
 
     let mut todos = Vec::new();
@@ -154,6 +162,12 @@ pub async fn delete_todo(os: &Os, id: &str) -> Result<()> {
     Ok(())
 }
 
+/// Returns the local todo list storage directory
+pub fn get_todo_list_dir(os: &Os) -> Result<PathBuf> {
+    let cwd = os.env.current_dir()?;
+    Ok(cwd.join(".amazonq").join("cli-todo-lists"))
+}
+
 /// Contains the command definitions that allow the model to create,
 /// modify, and mark todo list tasks as complete
 #[derive(Debug, Clone, Deserialize)]
@@ -203,11 +217,17 @@ impl TodoList {
                 todo_list_description: task_description,
             } => {
                 let new_id = generate_new_todo_id();
+                let mut todo_tasks = Vec::new();
+                for task_description in tasks {
+                    todo_tasks.push(Task {
+                        task_description: task_description.clone(),
+                        completed: false,
+                    });
+                }
 
                 // Create a new todo list with the given tasks and save state
                 let state = TodoListState {
-                    tasks: tasks.clone(),
-                    completed: vec![false; tasks.len()],
+                    tasks: todo_tasks.clone(),
                     description: task_description.clone(),
                     context: Vec::new(),
                     modified_files: Vec::new(),
@@ -226,7 +246,7 @@ impl TodoList {
                 let mut state = TodoListState::load(os, id).await?;
 
                 for i in completed_indices.iter() {
-                    state.completed[*i] = true;
+                    state.tasks[*i].completed = true;
                 }
 
                 state.context.push(context_update.clone());
@@ -239,21 +259,17 @@ impl TodoList {
                 // As tasks are being completed, display only the newly completed tasks
                 // and the next. Only display the whole list when all tasks are completed
                 let last_completed = completed_indices.iter().max().unwrap();
-                if *last_completed == state.tasks.len() - 1 || state.completed.iter().all(|c| *c) {
+                if *last_completed == state.tasks.len() - 1 || state.tasks.iter().all(|t| t.completed) {
                     state.display_list(output)?;
                 } else {
                     let mut display_list = TodoListState {
                         tasks: completed_indices.iter().map(|i| state.tasks[*i].clone()).collect(),
                         ..Default::default()
                     };
-                    for _ in 0..completed_indices.len() {
-                        display_list.completed.push(true);
-                    }
 
                     // For next state, mark it true/false depending on actual completion state
                     // This only matters when the model skips around tasks
                     display_list.tasks.push(state.tasks[*last_completed + 1].clone());
-                    display_list.completed.push(state.completed[*last_completed + 1]);
 
                     display_list.display_list(output)?;
                 }
@@ -271,9 +287,12 @@ impl TodoList {
                 current_id: id,
             } => {
                 let mut state = TodoListState::load(os, id).await?;
-                for (i, task) in insert_indices.iter().zip(new_tasks.iter()) {
-                    state.tasks.insert(*i, task.clone());
-                    state.completed.insert(*i, false);
+                for (i, task_description) in insert_indices.iter().zip(new_tasks.iter()) {
+                    let new_task = Task {
+                        task_description: task_description.clone(),
+                        completed: false,
+                    };
+                    state.tasks.insert(*i, new_task);
                 }
                 if let Some(description) = new_description {
                     state.description = description.clone();
@@ -294,7 +313,6 @@ impl TodoList {
                 remove_indices.sort();
                 for i in remove_indices.iter().rev() {
                     state.tasks.remove(*i);
-                    state.completed.remove(*i);
                 }
                 if let Some(description) = new_description {
                     state.description = description.clone();