create programmatic confirmation on delete_file and delete_directory

Author: alexylon

README.md

@@ -90,8 +90,8 @@ Claude can automatically use these tools:
 - `morph_edit_file` - Ultra-fast code editing (requires MORPH_API_KEY)
 - `list_directory` - List directory contents
 - `create_directory` - Create directories
-- `delete_file` - Delete files (asks for confirmation)
-- `delete_directory` - Delete directories recursively (asks for confirmation)
+- `delete_file` - Delete files (automatic confirmation prompt)
+- `delete_directory` - Delete directories recursively (automatic confirmation prompt)
 - `move_file` - Move or rename files/directories
 - `copy_file` - Copy files
 

src/conversation.rs

@@ -39,17 +39,13 @@ IMPORTANT: All file operations are restricted to the current working directory f
 
 When helping users:
 - Be concise and practical
+- ALWAYS explore first: Use list_directory to find files before trying to read them if you're unsure of their location
 - Use your tools to read files before suggesting changes
 {}
 - Search the web when you need current information or documentation
 - Execute bash commands to test code and verify functionality (read-only, no sudo or file modifications)
 - Explain your reasoning when using tools
 
-File deletion safety:
-- ALWAYS ask the user for explicit confirmation before using delete_file or delete_directory
-- List the files/directories that will be deleted and wait for user approval
-- Never delete files without prior user confirmation
-
 Testing after code changes:
 - After editing code files (not comments, README, or documentation), ALWAYS test the changes using execute_bash
 - Run appropriate build/test commands based on the project type:

src/repl.rs

@@ -179,6 +179,8 @@ impl Repl {
         self.conversation.add_assistant_content(&content_blocks);
 
         if !tool_uses.is_empty() {
+            let mut user_cancelled = false;
+            
             for (_tool_id, tool_name, tool_input) in &tool_uses {
                 if tool_name == "execute_bash" {
                     if let Some(command) = tool_input.get("command").and_then(|v| v.as_str()) {
@@ -203,6 +205,12 @@ impl Repl {
                         println!("{}", output.dimmed());
                         println!();
                         self.conversation.add_tool_result(tool_name, &output);
+                        
+                        // If deletion was cancelled, stop executing remaining tools
+                        if output.contains("cancelled by user") {
+                            user_cancelled = true;
+                            break;
+                        }
                     }
                     Err(e) => {
                         let error_msg = format!("Tool execution failed: {}", e);
@@ -213,6 +221,11 @@ impl Repl {
                 }
             }
 
+            // If user cancelled deletion, don't make another API request - let them respond
+            if user_cancelled {
+                return Ok(());
+            }
+
             // After executing tools, get another response from Claude
             let request = CreateMessageRequest {
                 model: self.model.clone(),

src/tools/mod.rs

@@ -11,9 +11,21 @@ use codesearch::CodeSearchTool;
 use filesystem::FileSystemTool;
 use search::WebSearchTool;
 use serde_json::Value;
+use std::io::{self, Write};
 
 pub use types::{add_code_search_tool, get_tools, get_tools_with_morph};
 
+fn confirm_action(prompt: &str) -> Result<bool> {
+    print!("{} (y/n): ", prompt);
+    io::stdout().flush()?;
+    
+    let mut input = String::new();
+    io::stdin().read_line(&mut input)?;
+    
+    let answer = input.trim().to_lowercase();
+    Ok(answer == "y" || answer == "yes")
+}
+
 /// ToolExecutor handles execution of tool calls from Claude
 pub struct ToolExecutor {
     fs_tool: FileSystemTool,
@@ -57,8 +69,23 @@ impl ToolExecutor {
                     .as_str()
                     .ok_or_else(|| SofosError::ToolExecution("Missing 'path' parameter".to_string()))?;
 
-                let content = self.fs_tool.read_file(path)?;
-                Ok(format!("File content of '{}':\n\n{}", path, content))
+                match self.fs_tool.read_file(path) {
+                    Ok(content) => Ok(format!("File content of '{}':\n\n{}", path, content)),
+                    Err(e) => {
+                        if matches!(e, SofosError::FileNotFound(_)) {
+                            let parent_dir = std::path::Path::new(path)
+                                .parent()
+                                .and_then(|p| p.to_str())
+                                .unwrap_or(".");
+                            Err(SofosError::ToolExecution(format!(
+                                "File not found: '{}'. Suggestion: Use list_directory with path '{}' to see available files.",
+                                path, parent_dir
+                            )))
+                        } else {
+                            Err(e)
+                        }
+                    }
+                }
             }
             "write_file" => {
                 let path = input["path"]
@@ -155,6 +182,15 @@ impl ToolExecutor {
                     .as_str()
                     .ok_or_else(|| SofosError::ToolExecution("Missing 'path' parameter".to_string()))?;
 
+                let confirmed = confirm_action(&format!("Delete file '{}'?", path))?;
+                
+                if !confirmed {
+                    return Ok(format!(
+                        "File deletion cancelled by user. The file '{}' was not deleted.",
+                        path
+                    ));
+                }
+
                 self.fs_tool.delete_file(path)?;
                 Ok(format!("Successfully deleted file '{}'", path))
             }
@@ -163,6 +199,15 @@ impl ToolExecutor {
                     .as_str()
                     .ok_or_else(|| SofosError::ToolExecution("Missing 'path' parameter".to_string()))?;
 
+                let confirmed = confirm_action(&format!("Delete directory '{}' and all its contents?", path))?;
+                
+                if !confirmed {
+                    return Ok(format!(
+                        "Directory deletion cancelled by user. The directory '{}' and its contents were not deleted. What would you like to do instead?",
+                        path
+                    ));
+                }
+
                 self.fs_tool.delete_directory(path)?;
                 Ok(format!("Successfully deleted directory '{}'", path))
             }

src/tools/types.rs

@@ -121,7 +121,7 @@ fn execute_bash_tool() -> Tool {
 fn delete_file_tool() -> Tool {
     Tool {
         name: "delete_file".to_string(),
-        description: "Delete a file in the current workspace. IMPORTANT: Always ask the user for confirmation before deleting files. Use this only after explicit user approval.".to_string(),
+        description: "Delete a file in the current workspace. A confirmation prompt will be shown to the user before deletion.".to_string(),
         input_schema: json!({
             "type": "object",
             "properties": {
@@ -138,7 +138,7 @@ fn delete_file_tool() -> Tool {
 fn delete_directory_tool() -> Tool {
     Tool {
         name: "delete_directory".to_string(),
-        description: "Delete a directory and all its contents in the current workspace. IMPORTANT: Always ask the user for confirmation before deleting directories. Use this only after explicit user approval.".to_string(),
+        description: "Delete a directory and all its contents in the current workspace. A confirmation prompt will be shown to the user before deletion.".to_string(),
         input_schema: json!({
             "type": "object",
             "properties": {