fix: slash command bugs (#275)

Author: evanliu048

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

@@ -1277,8 +1277,6 @@ impl ChatSession {
             })
         } else {
             // Check for a pending tool approval
-            let tool_denied_without_reason = ["n", "N"].contains(&input);
-
             if let Some(index) = self.pending_tool_index {
                 let is_trust = ["t", "T"].contains(&input);
                 let tool_use = &mut self.tool_uses[index];
@@ -1289,21 +1287,6 @@ impl ChatSession {
                     tool_use.accepted = true;
 
                     return Ok(ChatState::ExecuteTools);
-                // Prompt reason if no selected
-                } else if tool_denied_without_reason {
-                    tool_use.accepted = false;
-                    execute!(
-                        self.output,
-                        style::SetForegroundColor(Color::DarkGrey),
-                        style::Print(
-                            "\nPlease provide a reason for denying this tool use, or otherwise continue your conversation:\n\n"
-                        ),
-                        style::SetForegroundColor(Color::Reset),
-                    )?;
-
-                    return Ok(ChatState::PromptUser {
-                        skip_printing_tools: true,
-                    });
                 }
             } else if !self.pending_prompts.is_empty() {
                 let prompts = self.pending_prompts.drain(0..).collect();
@@ -1378,6 +1361,8 @@ impl ChatSession {
                 continue;
             }
 
+            self.pending_tool_index = Some(i);
+
             return Ok(ChatState::PromptUser {
                 skip_printing_tools: false,
             });
@@ -1871,6 +1856,7 @@ impl ChatSession {
         }
 
         self.tool_uses = queued_tools;
+        self.pending_tool_index = Some(0);
         Ok(ChatState::ExecuteTools)
     }
 
@@ -2393,13 +2379,11 @@ mod tests {
                 "/tools untrust fs_write".to_string(),
                 "create a file".to_string(), // prompt again due to untrust
                 "n".to_string(),             // cancel
-                "no reason".to_string(),     // dummy reason
                 "/tools trust fs_write".to_string(),
                 "create a file".to_string(), // again without prompting due to '/tools trust'
                 "/tools reset".to_string(),
                 "create a file".to_string(), // prompt again due to reset
                 "n".to_string(),             // cancel
-                "no reason".to_string(),     // dummy reason
                 "exit".to_string(),
             ]),
             false,
@@ -2413,7 +2397,7 @@ mod tests {
         )
         .await
         .unwrap()
-        .next(&mut ctx, &mut database, &telemetry)
+        .spawn(&mut ctx, &mut database, &telemetry)
         .await
         .unwrap();
 
@@ -2512,7 +2496,7 @@ mod tests {
         )
         .await
         .unwrap()
-        .next(&mut ctx, &mut database, &telemetry)
+        .spawn(&mut ctx, &mut database, &telemetry)
         .await
         .unwrap();
 
@@ -2573,7 +2557,7 @@ mod tests {
             SharedWriter::stdout(),
             None,
             InputSource::new_mock(vec![
-                "/tools trustall".to_string(),
+                "/tools trust-all".to_string(),
                 "create a new file".to_string(),
                 "/tools reset".to_string(),
                 "create a new file".to_string(),
@@ -2590,7 +2574,7 @@ mod tests {
         )
         .await
         .unwrap()
-        .next(&mut ctx, &mut database, &telemetry)
+        .spawn(&mut ctx, &mut database, &telemetry)
         .await
         .unwrap();
 
@@ -2646,7 +2630,7 @@ mod tests {
         )
         .await
         .unwrap()
-        .next(&mut ctx, &mut database, &telemetry)
+        .spawn(&mut ctx, &mut database, &telemetry)
         .await
         .unwrap();
 

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

@@ -414,8 +414,8 @@ mod tests {
     use crate::cli::chat::util::shared_writer::NullWriter;
     use crate::util::test::assert_parse;
 
-    #[test]
-    fn test_scope_and_profile_defaults_to_workspace() {
+    #[tokio::test]
+    async fn test_scope_and_profile_defaults_to_workspace() {
         let ctx = Context::new();
         let path = resolve_scope_profile(&ctx, None).unwrap();
         assert_eq!(
@@ -425,8 +425,8 @@ mod tests {
         );
     }
 
-    #[test]
-    fn test_resolve_paths() {
+    #[tokio::test]
+    async fn test_resolve_paths() {
         let ctx = Context::new();
         // workspace
         let p = resolve_scope_profile(&ctx, Some(Scope::Workspace)).unwrap();

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

@@ -433,7 +433,7 @@ mod test {
                 input: None,
                 profile: Some("my-profile".to_string()),
                 model: None,
-                trust_all_tools: false,
+                trust_all_tools: true,
                 trust_tools: None,
                 non_interactive: false
             })
@@ -451,7 +451,7 @@ mod test {
                 model: None,
                 trust_all_tools: false,
                 trust_tools: None,
-                non_interactive: false
+                non_interactive: true
             })
         );
         assert_parse!(
@@ -463,7 +463,7 @@ mod test {
                 model: None,
                 trust_all_tools: false,
                 trust_tools: None,
-                non_interactive: false
+                non_interactive: true
             })
         );
     }