handles tool call rejection structured event

Author: dingfeli

crates/chat-cli-ui/src/conduit.rs

@@ -15,6 +15,7 @@ use crate::legacy_ui_util::ThemeSource;
 use crate::protocol::{
     Event,
     LegacyPassThroughOutput,
+    ToolCallRejection,
     ToolCallStart,
 };
 
@@ -153,7 +154,22 @@ impl ViewEnd {
                 Event::ReasoningMessageChunk(_reasoning_message_chunk) => {},
                 Event::ReasoningEnd(_reasoning_end) => {},
                 Event::MetaEvent(_meta_event) => {},
-                Event::ToolCallRejection(tool_call_rejection) => todo!(),
+                Event::ToolCallRejection(tool_call_rejection) => {
+                    let ToolCallRejection { reason, name, .. } = tool_call_rejection;
+
+                    execute!(
+                        stderr,
+                        theme_source.error_fg(),
+                        Print("Command "),
+                        theme_source.warning_fg(),
+                        Print(name),
+                        theme_source.error_fg(),
+                        Print(" is rejected because it matches one or more rules on the denied list:"),
+                        Print(reason),
+                        Print("\n"),
+                        theme_source.reset(),
+                    )?;
+                },
             }
         }
 

crates/chat-cli-ui/src/protocol.rs

@@ -171,6 +171,7 @@ pub struct ToolCallResult {
 #[serde(rename_all = "camelCase")]
 pub struct ToolCallRejection {
     pub tool_call_id: String,
+    pub name: String,
     pub reason: String,
 }
 

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

@@ -2203,6 +2203,7 @@ impl ChatSession {
                 } else {
                     let event = ToolCallRejection {
                         tool_call_id: tool.id.clone(),
+                        name: tool.name.clone(),
                         reason: formatted_set,
                     };
                     self.stderr.send(Event::ToolCallRejection(event))?;
@@ -2227,7 +2228,10 @@ impl ChatSession {
 
             // TODO: Control flow is hacky here because of borrow rules
             let _ = tool;
+
             self.print_tool_description(os, i, allowed).await?;
+            self.stdout.flush()?;
+
             let tool = &mut self.tool_uses[i];
 
             if allowed {
@@ -3255,7 +3259,20 @@ impl ChatSession {
     async fn print_tool_description(&mut self, os: &Os, tool_index: usize, trusted: bool) -> Result<(), ChatError> {
         let tool_use = &self.tool_uses[tool_index];
 
-        if !self.stderr.should_send_structured_event {
+        if self.stderr.should_send_structured_event {
+            let tool_call_start = ToolCallStart {
+                tool_call_id: tool_use.id.clone(),
+                tool_call_name: tool_use.name.clone(),
+                mcp_server_name: if let Tool::Custom(ref tool) = tool_use.tool {
+                    Some(tool.server_name.clone())
+                } else {
+                    None
+                },
+                is_trusted: trusted,
+                parent_message_id: None,
+            };
+            self.stdout.send(Event::ToolCallStart(tool_call_start))?;
+        } else {
             queue!(
                 self.stdout,
                 StyledText::emphasis_fg(),
@@ -3284,19 +3301,6 @@ impl ChatSession {
                 style::Print("\n"),
                 style::Print(TOOL_BULLET)
             )?;
-        } else {
-            let tool_call_start = ToolCallStart {
-                tool_call_id: tool_use.id.clone(),
-                tool_call_name: tool_use.name.clone(),
-                mcp_server_name: if let Tool::Custom(ref tool) = tool_use.tool {
-                    Some(tool.server_name.clone())
-                } else {
-                    None
-                },
-                is_trusted: trusted,
-                parent_message_id: None,
-            };
-            self.stdout.send(Event::ToolCallStart(tool_call_start))?;
         }
 
         tool_use

crates/chat-cli/src/mcp_client/oauth_util.rs

@@ -201,6 +201,7 @@ pub struct HttpServiceBuilder<'a> {
 }
 
 impl<'a> HttpServiceBuilder<'a> {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         server_name: &'a str,
         os: &'a Os,
@@ -527,7 +528,7 @@ async fn get_auth_manager_impl(
         .and_then(|cfg| cfg.redirect_uri.as_ref())
         .and_then(|uri| {
             // Parse port from redirect_uri like "127.0.0.1:7778" or ":7778"
-            uri.split(':').last().and_then(|p| p.parse::<u16>().ok())
+            uri.split(':').next_back().and_then(|p| p.parse::<u16>().ok())
         })
         .unwrap_or(0); // Port 0 = OS assigns random available port