Complete Rig tool lifecycle migration

app/src/ai/blocklist/action_model.rs

@@ -267,9 +267,15 @@ fn domain_tool_result(action_result: &AIAgentActionResult, permission_denied: bo
     } else {
         ToolResultStatus::Success
     };
+    let content = action_result.result.model_content();
+    let content = if permission_denied {
+        format!("Permission denied by the user. {content}")
+    } else {
+        content
+    };
     ToolResult {
         call_id: action_result.id.to_string(),
-        content: action_result.result.model_content(),
+        content,
         status,
     }
 }

app/src/ai/blocklist/action_model_tests.rs

@@ -139,6 +139,8 @@ fn domain_tool_results_preserve_success_failure_cancellation_and_denial() {
     assert_eq!(failure.call_id, "failure");
     assert_eq!(cancelled.call_id, "cancelled");
     assert_eq!(denied.call_id, "cancelled");
+    assert!(!cancelled.content.contains("Permission denied"));
+    assert!(denied.content.contains("Permission denied by the user"));
 }
 
 #[test]

app/src/ai/blocklist/controller.rs

@@ -3423,7 +3423,23 @@ impl BlocklistAIController {
                 };
                 let history_model = BlocklistAIHistoryModel::handle(ctx);
                 match event {
-                    Ok(event) => {
+                    Ok(api::StreamEvent::ToolProposed(action)) => {
+                        let apply_result = history_model.update(ctx, |history_model, ctx| {
+                            history_model.apply_domain_tool_proposal(
+                                &stream_id,
+                                conversation_id,
+                                self.terminal_surface_id,
+                                action,
+                                ctx,
+                            )
+                        });
+                        if let Err(error) = apply_result {
+                            log::error!(
+                                "Failed to apply Rig tool proposal to conversation: {error:?}"
+                            );
+                        }
+                    }
+                    Ok(api::StreamEvent::Response(event)) => {
                         // If this controller is part of a shared session, forward the entire response event to viewers first.
                         if FeatureFlag::AgentSharedSessions.is_enabled()
                             && !response_stream.as_ref(ctx).is_acp()

app/src/ai/blocklist/controller/response_stream.rs

@@ -186,7 +186,7 @@ impl ResponseStream {
         ctx: &mut ModelContext<Self>,
     ) {
         ctx.emit(ResponseStreamEvent::ReceivedEvent(Consumable::new(Ok(
-            event,
+            api::StreamEvent::Response(event),
         ))));
     }
     #[cfg(test)]
@@ -718,7 +718,16 @@ impl ResponseStream {
         self.time_to_latest_event = Local::now().signed_duration_since(self.start_time);
 
         match &event {
-            Ok(response_event) => {
+            Ok(api::StreamEvent::ToolProposed(action)) => {
+                self.has_received_client_actions = true;
+                log::debug!(
+                    "Rig proposed domain tool action {} for task {}",
+                    action.id,
+                    action.task_id
+                );
+                ctx.emit(ResponseStreamEvent::ReceivedEvent(Consumable::new(event)));
+            }
+            Ok(api::StreamEvent::Response(response_event)) => {
                 let event_type_name = match &response_event.r#type {
                     Some(warp_multi_agent_api::response_event::Type::Init(_)) => "Init",
                     Some(warp_multi_agent_api::response_event::Type::ClientActions(a)) => {

app/src/ai/blocklist/history_model.rs

@@ -33,9 +33,9 @@ use crate::ai::agent::conversation::{
 use crate::ai::agent::task::helper::{MessageExt, ToolCallExt};
 use crate::ai::agent::task::TaskId;
 use crate::ai::agent::{
-    AIAgentActionId, AIAgentExchange, AIAgentExchangeId, AIAgentInput, AIAgentOutputStatus,
-    CancellationReason, FinishedAIAgentOutput, MessageId, RenderableAIError, RequestCost,
-    Suggestions,
+    AIAgentAction, AIAgentActionId, AIAgentExchange, AIAgentExchangeId, AIAgentInput,
+    AIAgentOutputStatus, CancellationReason, FinishedAIAgentOutput, MessageId, RenderableAIError,
+    RequestCost, Suggestions,
 };
 use crate::ai::artifacts::Artifact;
 use crate::ai::document::ai_document_model::AIDocumentModel;
@@ -1852,6 +1852,21 @@ impl BlocklistAIHistoryModel {
         Ok(())
     }
 
+    pub fn apply_domain_tool_proposal(
+        &mut self,
+        response_stream_id: &ResponseStreamId,
+        conversation_id: AIConversationId,
+        terminal_surface_id: EntityId,
+        action: AIAgentAction,
+        ctx: &mut ModelContext<Self>,
+    ) -> Result<(), UpdateHistoryError> {
+        self.conversations_by_id
+            .get_mut(&conversation_id)
+            .ok_or(UpdateHistoryError::ConversationNotFound(conversation_id))?
+            .apply_domain_tool_proposal(response_stream_id, terminal_surface_id, action, ctx)?;
+        Ok(())
+    }
+
     pub fn update_conversation_cost_and_usage_for_request(
         &mut self,
         conversation_id: AIConversationId,

app/src/ai/blocklist/passive_suggestions/maa.rs

@@ -486,7 +486,7 @@ async fn extract_suggestion_from_stream(
     let mut client_actions: Vec<api::ClientAction> = Vec::new();
     let mut server_request_token: Option<String> = None;
     while let Some(event) = stream.next().await {
-        let Ok(response_event) = event else {
+        let Ok(crate::ai::agent::api::StreamEvent::Response(response_event)) = event else {
             continue;
         };
         match response_event.r#type {