fix: Remove todo_list tool from tool spec when disabled

Author: kiran-garre

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

@@ -47,7 +47,7 @@ static AVAILABLE_EXPERIMENTS: &[Experiment] = &[
     Experiment {
         name: "Todo Lists",
         description: "Enables Q to create todo lists that can be viewed and managed using /todos",
-        setting_key: Setting::EnabledTodoLists,
+        setting_key: Setting::EnabledTodoList,
     },
 ];
 

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

@@ -8,6 +8,7 @@ use dialoguer::Select;
 use eyre::Result;
 
 use crate::cli::chat::tools::todo::{
+    TodoList,
     TodoListState,
     delete_todo,
     get_all_todos,
@@ -17,7 +18,6 @@ use crate::cli::chat::{
     ChatSession,
     ChatState,
 };
-use crate::database::settings::Setting;
 use crate::os::Os;
 
 /// Defines subcommands that allow users to view and manage todo lists
@@ -67,16 +67,11 @@ impl std::fmt::Display for TodoDisplayEntry {
 impl TodoSubcommand {
     pub async fn execute(self, os: &mut Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
         // Check if todo lists are enabled
-        if !os
-            .database
-            .settings
-            .get_bool(Setting::EnabledTodoLists)
-            .unwrap_or(false)
-        {
+        if !TodoList::is_enabled(os) {
             execute!(
                 session.stderr,
                 style::SetForegroundColor(style::Color::Red),
-                style::Print("Todo lists are disabled. Enable them with: q settings chat.enableTodoLists true\n"),
+                style::Print("Todo lists are disabled. Enable them with: q settings chat.enableTodoList true\n"),
                 style::SetForegroundColor(style::Color::Reset)
             )?;
             return Ok(ChatState::PromptUser {

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

@@ -650,6 +650,9 @@ impl ToolManager {
             if !crate::cli::chat::tools::knowledge::Knowledge::is_enabled(os) {
                 tool_specs.remove("knowledge");
             }
+            if !crate::cli::chat::tools::todo::TodoList::is_enabled(os) {
+                tool_specs.remove("todo_list");
+            }
 
             #[cfg(windows)]
             {

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

@@ -58,7 +58,7 @@ use crate::cli::chat::line_tracker::FileLineTracker;
 use crate::os::Os;
 
 pub const DEFAULT_APPROVE: [&str; 1] = ["fs_read"];
-pub const NATIVE_TOOLS: [&str; 7] = [
+pub const NATIVE_TOOLS: [&str; 8] = [
     "fs_read",
     "fs_write",
     #[cfg(windows)]
@@ -69,6 +69,7 @@ pub const NATIVE_TOOLS: [&str; 7] = [
     "gh_issue",
     "knowledge",
     "thinking",
+    "todo_list",
 ];
 
 /// Represents an executable tool use.

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

@@ -214,18 +214,17 @@ pub enum TodoList {
 }
 
 impl TodoList {
+    /// Checks if todo lists are enabled
+    pub fn is_enabled(os: &Os) -> bool {
+        os.database.settings.get_bool(Setting::EnabledTodoList).unwrap_or(false)
+    }
+
     pub async fn invoke(&self, os: &Os, output: &mut impl Write) -> Result<InvokeOutput> {
-        // Check if todo lists are enabled
-        if !os
-            .database
-            .settings
-            .get_bool(Setting::EnabledTodoLists)
-            .unwrap_or(false)
-        {
+        if !Self::is_enabled(os) {
             queue!(
                 output,
                 style::SetForegroundColor(style::Color::Red),
-                style::Print("Todo lists are disabled. Enable them with: q settings chat.enableTodoLists true"),
+                style::Print("Todo lists are disabled. Enable them with: q settings chat.enableTodoList true"),
                 style::SetForegroundColor(style::Color::Reset)
             )?;
             return Ok(InvokeOutput {

crates/chat-cli/src/database/settings.rs

@@ -76,7 +76,7 @@ pub enum Setting {
     #[strum(message = "Show conversation history hints (boolean)")]
     ChatEnableHistoryHints,
     #[strum(message = "Enable the todo list feature (boolean)")]
-    EnabledTodoLists,
+    EnabledTodoList,
 }
 
 impl AsRef<str> for Setting {
@@ -111,7 +111,7 @@ impl AsRef<str> for Setting {
             Self::ChatDefaultAgent => "chat.defaultAgent",
             Self::ChatDisableAutoCompaction => "chat.disableAutoCompaction",
             Self::ChatEnableHistoryHints => "chat.enableHistoryHints",
-            Self::EnabledTodoLists => "chat.enableTodoLists",
+            Self::EnabledTodoList => "chat.enableTodoList",
         }
     }
 }
@@ -156,7 +156,7 @@ impl TryFrom<&str> for Setting {
             "chat.defaultAgent" => Ok(Self::ChatDefaultAgent),
             "chat.disableAutoCompaction" => Ok(Self::ChatDisableAutoCompaction),
             "chat.enableHistoryHints" => Ok(Self::ChatEnableHistoryHints),
-            "chat.enableTodoLists" => Ok(Self::EnabledTodoLists),
+            "chat.enableTodoList" => Ok(Self::EnabledTodoList),
             _ => Err(DatabaseError::InvalidSetting(value.to_string())),
         }
     }