Add append-only context and "modified files" fields to "complete" command of todo_list

Author: kiran-garre

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

@@ -1,7 +1,5 @@
-#![allow(warnings)]
-
 use clap::Subcommand;
-use std::{io, path::PathBuf};
+use std::path::PathBuf;
 use crate::{cli::chat::tools::todo::TodoState, os::Os};
 use crossterm::{
     execute,
@@ -14,10 +12,7 @@ use crate::cli::chat::{
     ChatState,
 };
 
-use eyre::{
-    Result,
-    bail,
-};
+use eyre::Result;
 
 use crate::cli::chat::tools::todo::{
     build_path,
@@ -71,21 +66,21 @@ impl TodoSubcommand {
                             execute!(
                                 session.stderr,
                                 style::Print("No to-do lists to show"),
-                            );
+                            )?;
                         }
                         for e in entries {
                             execute!(
                                 session.stderr,
                                 style::Print(e),
                                 style::Print("\n"),
-                            );
+                            )?;
                         }
                     }
-                    Err(e) => { 
+                    Err(_) => { 
                         execute!(
                             session.stderr,
                             style::Print("Could not show to-do lists"),
-                        ); 
+                        )?; 
                     }
                 }
             },
@@ -99,34 +94,37 @@ impl TodoSubcommand {
                             execute!(
                                 session.stderr,
                                 style::Print("No to-do lists to show"),
-                            );
+                            )?;
                         } else {
                             let selection = FuzzySelect::new()
                                 .with_prompt("Select task:")
                                 .items(&entries)
                                 .report(false)
                                 .interact_opt()
-                                .unwrap_or(None); // FIX: workaround for ^C during selection
+                                .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].path.clone()).await;
                                 }
                             }
                         }
                     }
+                    // %%% FIX %%%
                     Err(e) => println!("{:?}", e),
+                    // %%% --- %%%
                 };
             },
         };
         Ok(ChatState::PromptUser { skip_printing_tools: true })
     }
 
+    /// Convert all to-do list state files to displayable entries
     async fn get_descriptions_and_statuses(self, os: &Os) -> Result<Vec<TodoDisplayEntry>> {
         let mut out = Vec::new();
         let mut entries = os.fs.read_dir(
@@ -167,7 +165,7 @@ fn prewrap(text: &str) -> String {
     let mut current_line_length = 0;
     let words: Vec<&str> = text.split_whitespace().collect();
 
-    for (i, word) in words.iter().enumerate() {
+    for (_, word) in words.iter().enumerate() {
         let word_length = word.len();
 
         // If adding this word would exceed the line length and we're not at the start of a line

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

@@ -876,7 +876,6 @@ impl ConversationState {
     }
 
     // For now, just check that file path is valid and deserializable
-    // QUESTION: How do you pass errors cleanly in the todo_request functions?
     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)?;

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

@@ -1,7 +1,4 @@
-#![allow(warnings)]
-
-use core::task;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::time::{SystemTime, UNIX_EPOCH};
 
 use std::io::Write;
@@ -11,7 +8,6 @@ use serde::{
 };
 
 use crossterm::{
-    execute,
     queue,
     style,
 };
@@ -20,26 +16,22 @@ use eyre::{
     Result,
     bail,
 };
-use uuid::timestamp::context;
 
-use super::{
-    InvokeOutput,
-    MAX_TOOL_RESPONSE_SIZE,
-    OutputKind,
-};
+use super::InvokeOutput;
 
 use crate::os::Os;
 
 /*
 Demo prompts:
 Create a Python package layout with a blank main file and a blank utilities file. Start by making a todo list.
 Design your own super simple programming task with 4 steps. Make a todo list for the task, and begin executing those steps.
+Implement a basic input to Python type converter where the user can input either a string or integer and it gets converted to the corresponding Python object.
 */
 
 // ########### HARDCODED VALUES ##############
 pub const CURRENT_TODO_STATE_PATH: &str = ".aws/amazonq/todos/CURRENT_STATE.txt";
 pub const TODO_STATE_FOLDER_PATH: &str = ".aws/amazonq/todos";
-// ########### --------------------- ##############
+// ########### ---------------- ##############
 
 #[derive(Debug, Clone, Deserialize)]
 #[serde(tag = "command")]
@@ -55,6 +47,7 @@ pub enum TodoInput {
     Complete { 
         completed_indices: Vec<usize>,
         context_update: String,
+        modified_files: Option<Vec<String>>,
     },
 
     #[serde(rename = "load")]
@@ -68,7 +61,8 @@ pub struct TodoState {
     pub tasks: Vec<String>,
     pub completed: Vec<bool>,
     pub task_description: String,
-    pub context: String,
+    pub context: Vec<String>,
+    pub modified_files: Vec<String>,
 }
 
 impl TodoState {
@@ -141,18 +135,21 @@ impl TodoState {
 
     /// Gets the current to-do list path from the fixed state file
     pub async fn get_current_todo_path(os: &Os) -> Result<Option<String>> {
-        let temp = build_path(os, CURRENT_TODO_STATE_PATH, "")?;
-        let path = os.fs.read_to_string(
-            build_path(os, CURRENT_TODO_STATE_PATH, "")?
-        ).await?;
-        if path.len() > 0 {
-            return Ok(Some(path));
+        let state_file_path = build_path(os, CURRENT_TODO_STATE_PATH, "")?;
+        if !os.fs.exists(&state_file_path) {
+            return Ok(None);
+        }
+        
+        let path = os.fs.read_to_string(&state_file_path).await?;
+        if path.is_empty() {
+            Ok(None)
+        } else {
+            Ok(Some(path.to_string()))
         }
-        Ok(None)
     }
 
     /// Sets the current to-do list path in the fixed state file
-    pub async fn set_current_todo_path(os: &Os, path: &str) -> Result<()> {;
+    pub async fn set_current_todo_path(os: &Os, path: &str) -> Result<()> {
         os.fs.write(
             build_path(os, CURRENT_TODO_STATE_PATH, "")?, 
             path
@@ -180,7 +177,8 @@ impl TodoInput {
                     tasks: tasks.clone(),
                     completed: vec![false; tasks.len()],
                     task_description: task_description.clone(),
-                    context: String::new(),
+                    context: Vec::new(),
+                    modified_files: Vec::new(),
                 };
                 let path = build_path(
                     os, 
@@ -191,21 +189,27 @@ impl TodoInput {
                 TodoState::set_current_todo_path(os, &path.to_string_lossy()).await?;
                 state
             },
-            TodoInput::Complete { completed_indices, context_update} => {
+            TodoInput::Complete { completed_indices, context_update, modified_files } => {
                 let current_path = match TodoState::get_current_todo_path(os).await? {
                     Some(path) => path,
                     None => bail!("No todo list is currently loaded"),
                 };
                 let mut state = TodoState::load(os, &current_path).await?;
+                
                 completed_indices.iter().for_each(|i| {
                     state.completed[*i] = true;
                 });
-                state.context = context_update.clone();
+                
+                state.context.push(context_update.clone());
+                
+                if let Some(files) = modified_files {
+                    state.modified_files.extend_from_slice(&files);
+                }
                 state.save(os, &current_path).await?;
                 state
             },
             TodoInput::Load { path } => { 
-                let mut state = TodoState::load(os, &path).await?;
+                let state = TodoState::load(os, &path).await?;
                 TodoState::set_current_todo_path(os, path).await?;
                 state
             }  
@@ -225,18 +229,22 @@ impl TodoInput {
             TodoInput::Create { tasks, task_description } => {
                 if tasks.len() == 0 {
                     bail!("No tasks were provided");
+                } else if tasks.iter().any(|task| task.trim().is_empty()) {
+                    bail!("Tasks cannot be empty");
                 } else if task_description.is_empty() {
                     bail!("No task description was provided");
                 }
             }
-            TodoInput::Complete { completed_indices, context_update } => {
+            TodoInput::Complete { completed_indices, context_update, .. } => {
                 let current_path = match TodoState::get_current_todo_path(os).await? {
                     Some(path) => path,
                     None => bail!("No todo list is currently loaded"),
                 };
-                let mut state = TodoState::load(os, &current_path).await?;
-                if completed_indices.iter().any(|i| *i > state.completed.len()) {
+                let state = TodoState::load(os, &current_path).await?;
+                if completed_indices.iter().any(|i| *i >= state.completed.len()) {
                     bail!("Completed index is out of bounds");
+                } else if context_update.len() == 0 {
+                    bail!("No context update was provided");
                 }
             }
             TodoInput::Load { path } => {

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

@@ -233,9 +233,9 @@
         "required": ["command"]
       }
   },
-  "todo": {
+  "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 todo list AT ANY POINT; this is done for you.",
+    "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.",
     "input_schema": {
       "type": "object",
       "properties": {
@@ -251,21 +251,28 @@
             "type": "string"
           }
         },
+        "task_description": {
+          "description": "Required paramter of `create` command containing a BRIEF summary of the given task. The summary should be detailed enough to refer to without knowing the problem context beforehand.",
+          "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 display your own version of a TODO list.",
+          "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.",
           "type": "array",
           "items": {
             "type": "integer"
           }
         },
-        "task_description": {
-          "description": "Required paramter of `create` command containing a BRIEF summary of the given task. The summary should be detailed enough to refer to without knowing the problem context beforehand.",
-          "type": "string"
-        },
         "context_update": {
-          "description": "Required parameter of `complete` command containing important task context. Use this command to track important information about the task and its current status.",
+          "description": "Required parameter of `complete` command containing important task context. Use this command to track important information about the task AND information about files you have read.",
           "type": "string"
         },
+        "modified_files": {
+          "description": "Optional parameter of `complete` command containing a list of paths of files that were modified during the task. This is useful for tracking file changes that are important to the task.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
         "path": {
           "description": "Required parameter of `load` command containing path of todo list to load"
         }