fix: deletes history on tool deny (#655)

* fix: deletes history on tool deny

* fix: includes deny msg as well as stub tool use results on tool deny

Author: dingfeli

crates/q_cli/src/cli/chat/conversation_state.rs

@@ -169,6 +169,36 @@ impl ConversationState {
         self.next_message = Some(msg);
     }
 
+    pub fn abandon_tool_use(&mut self, tools_to_be_abandoned: Vec<(String, super::tools::Tool)>, deny_input: String) {
+        let tool_results = tools_to_be_abandoned
+            .into_iter()
+            .map(|(tool_use_id, _)| ToolResult {
+                tool_use_id,
+                content: vec![ToolResultContentBlock::Text(
+                    "Tool use was cancelled by the user".to_string(),
+                )],
+                status: fig_api_client::model::ToolResultStatus::Error,
+            })
+            .collect::<Vec<_>>();
+        let user_input_message_context = UserInputMessageContext {
+            shell_state: None,
+            env_state: Some(build_env_state(None)),
+            tool_results: Some(tool_results),
+            tools: if self.tools.is_empty() {
+                None
+            } else {
+                Some(self.tools.clone())
+            },
+            ..Default::default()
+        };
+        let msg = Message(ChatMessage::UserInputMessage(UserInputMessage {
+            content: deny_input,
+            user_input_message_context: Some(user_input_message_context),
+            user_intent: None,
+        }));
+        self.next_message = Some(msg);
+    }
+
     /// Returns a [FigConversationState] capable of being sent by
     /// [fig_api_client::StreamingClient] while preparing the current conversation state to be sent
     /// in the next message.

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

@@ -627,7 +627,23 @@ Hi, I'm <g>Amazon Q</g>. Ask me anything.
                     self.spinner = Some(Spinner::new(Spinners::Dots, "Thinking...".to_owned()));
                 }
 
-                self.conversation_state.append_new_user_message(user_input).await;
+                let should_abandon_tool_use = self
+                    .conversation_state
+                    .history
+                    .back()
+                    .and_then(|last_msg| match &last_msg.0 {
+                        fig_api_client::model::ChatMessage::AssistantResponseMessage(msg) => Some(msg),
+                        fig_api_client::model::ChatMessage::UserInputMessage(_) => None,
+                    })
+                    .and_then(|msg| msg.tool_uses.as_ref())
+                    .is_some_and(|tool_use| !tool_use.is_empty());
+
+                if should_abandon_tool_use {
+                    self.conversation_state.abandon_tool_use(queued_tools, user_input);
+                } else {
+                    self.conversation_state.append_new_user_message(user_input).await;
+                }
+
                 self.send_tool_use_telemetry().await;
                 Ok(Some(
                     self.client