Fix AI blocks not appearing due to conversation existing in more than one pane (warpdotdev#11494)

## Description
Fix queries and output not showing up due to a conversation existing in
more than one pane. A conversation and its blocks should only be in one
pane at a time. This PR enforces this by notifying when a conversation
becomes active in a new terminal view, so that old terminal views can
delete the AI and command blocks for that conversation.


https://github.com/warpdotdev/warp/pull/10241/changes#diff-fe3dd831b48d66196f87f13cd7a57f0e3660444b8f4fd9f6a5718be5fa617e40
introduced `mark_active_conversation_id` to not transfer ownership.
warpdotdev#10327 uses it in the restoration
path. The first PR mentions it's short term, and @advait-m mentioned
these original fixes are probably no longer needed, but would like
review from you and @szgupta to verify. My understanding is that a
conversation must never be in more than one terminal view, even with
orchestration, so it should be correct to enforce this when setting
active conversation id.

I'm also unsure what should be the source of truth for where the
conversation lives. I'm using the ai history model for this, but it
seems like the agent view controller also has this info.

## Testing
<!--
How did you test this change? What automated tests did you add? If you
didn't add any new tests, what's your justification for not adding any?

Manual testing is required for changes that can be manually tested, and
almost all changes can be manually tested. If your change can be
manually tested, please include screenshots or a screen recording that
show it working end to end.

You can run the app locally using `./script/run` - see WARP.md for more
details on how to get set up.
-->

- [x] I have manually tested my changes locally with `./script/run`

### Screenshots / Videos
<!-- Attach screenshots or a short video demonstrating the change, where
appropriate. Remove this section if it is not relevant to your PR. -->

https://www.loom.com/share/e0af242e4f2f42dcbe77b1753dca5177

## Changelog Entries for Stable
CHANGELOG-BUG-FIX: Fixed an issue that could prevent an AI query and
output from showing up

Author: seemeroland

app/src/ai/blocklist/agent_view/agent_view_block.rs

@@ -88,7 +88,6 @@ impl AgentViewEntryBlock {
             _ => (),
         });
         ctx.subscribe_to_model(&agent_view_controller, |_, _, _, ctx| ctx.notify());
-
         let active_agent_views_model = ActiveAgentViewsModel::handle(ctx);
         ctx.subscribe_to_model(&active_agent_views_model, |_, _, _, ctx| ctx.notify());
 

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

@@ -783,11 +783,8 @@ impl AgentViewController {
             });
             (id, 0)
         };
-        // Non-transferring: don't rip the conversation out of another terminal
-        // view's live list (e.g. a child agent's hidden pane). Explicit
-        // cross-view ownership transfer is handled by callers elsewhere.
         history_model.update(ctx, |history_model, ctx| {
-            history_model.mark_active_conversation_id(conversation_id, self.terminal_view_id, ctx)
+            history_model.set_active_conversation_id(conversation_id, self.terminal_view_id, ctx)
         });
 
         self.agent_view_state = AgentViewState::Active {

app/src/ai/blocklist/controller.rs

@@ -1449,7 +1449,7 @@ impl BlocklistAIController {
         }
 
         BlocklistAIHistoryModel::handle(ctx).update(ctx, |history, ctx| {
-            history.mark_active_conversation_id(conversation_id, self.terminal_view_id, ctx);
+            history.set_active_conversation_id(conversation_id, self.terminal_view_id, ctx);
         });
 
         if !FeatureFlag::AgentView.is_enabled() && trigger == FollowUpTrigger::Auto {
@@ -2402,7 +2402,7 @@ impl BlocklistAIController {
         });
         if !is_passive_request {
             history_model.update(ctx, |history_model, ctx| {
-                history_model.mark_active_conversation_id(
+                history_model.set_active_conversation_id(
                     conversation_data.id,
                     self.terminal_view_id,
                     ctx,

app/src/ai/blocklist/history_model.rs

@@ -813,10 +813,13 @@ impl BlocklistAIHistoryModel {
         for conversation in conversations.into_iter() {
             let conversation_id = conversation.id();
             conversation_ids.push(conversation_id);
-            self.live_conversation_ids_for_terminal_view
+            let live_conversation_ids = self
+                .live_conversation_ids_for_terminal_view
                 .entry(terminal_view_id)
-                .or_default()
-                .push(conversation_id);
+                .or_default();
+            if !live_conversation_ids.contains(&conversation_id) {
+                live_conversation_ids.push(conversation_id);
+            }
 
             if let Some(key) = agent_id_key(&conversation) {
                 self.agent_id_to_conversation_id
@@ -856,13 +859,8 @@ impl BlocklistAIHistoryModel {
         });
     }
 
-    /// Sets the active conversation ID, transferring ownership from any other
-    /// terminal view that currently holds it.
-    ///
-    /// Use this when the user **explicitly navigates** to a conversation in a
-    /// different view (e.g. from the conversation history or command palette).
-    /// For automatic follow-ups during tool-call cycles, use [`Self::mark_active_conversation_id`]
-    /// instead — it updates the active pointer without touching other views.
+    /// Sets the active conversation ID for a terminal view and transfers ownership
+    /// from any other terminal view that currently holds it.
     pub fn set_active_conversation_id(
         &mut self,
         conversation_id: AIConversationId,
@@ -892,11 +890,9 @@ impl BlocklistAIHistoryModel {
             .iter_mut()
             .filter(|(other_terminal_view_id, _)| **other_terminal_view_id != terminal_view_id)
         {
-            if let Some(pos) = other_terminal_view_live_conversation_ids
-                .iter()
-                .position(|id| *id == conversation_id)
-            {
-                other_terminal_view_live_conversation_ids.remove(pos);
+            let previous_len = other_terminal_view_live_conversation_ids.len();
+            other_terminal_view_live_conversation_ids.retain(|id| *id != conversation_id);
+            if other_terminal_view_live_conversation_ids.len() != previous_len {
                 previous_owners.push(*other_terminal_view);
             }
 
@@ -930,40 +926,6 @@ impl BlocklistAIHistoryModel {
         });
     }
 
-    /// Marks a conversation as the active conversation for a terminal view
-    /// **without** removing it from other views.
-    ///
-    /// This is the non-transferring counterpart to [`Self::set_active_conversation_id`].
-    /// Use this during automatic follow-ups and request sending where the
-    /// conversation already belongs to this view and we only need to update
-    /// the "most recently streamed" pointer.
-    pub fn mark_active_conversation_id(
-        &mut self,
-        conversation_id: AIConversationId,
-        terminal_view_id: EntityId,
-        ctx: &mut ModelContext<Self>,
-    ) {
-        if !self
-            .live_conversation_ids_for_terminal_view
-            .get(&terminal_view_id)
-            .is_some_and(|conversation_ids| conversation_ids.contains(&conversation_id))
-        {
-            log::warn!(
-                "mark_active_conversation_id: conversation {conversation_id:?} is not in \
-                 terminal view {terminal_view_id:?} live list, skipping"
-            );
-            return;
-        }
-
-        self.active_conversation_for_terminal_view
-            .insert(terminal_view_id, conversation_id);
-
-        ctx.emit(BlocklistAIHistoryEvent::SetActiveConversation {
-            conversation_id,
-            terminal_view_id,
-        });
-    }
-
     /// Starts a new conversation in the given terminal view's history, effectively marking the
     /// existing conversation (if any) as completed.
     ///

app/src/pane_group/mod.rs

@@ -138,7 +138,9 @@ use crate::terminal::shared_session::{
 use crate::terminal::view::inline_banner::{
     ZeroStatePromptSuggestionTriggeredFrom, ZeroStatePromptSuggestionType,
 };
-use crate::terminal::view::load_ai_conversation::RestoredAIConversation;
+use crate::terminal::view::load_ai_conversation::{
+    RestoreConversationEntryBehavior, RestoredAIConversation,
+};
 use crate::terminal::view::ssh_file_upload::FileUploadId;
 use crate::terminal::view::{
     BlockNotification, ConversationRestorationInNewPaneType, ExecuteCommandEvent,
@@ -3348,6 +3350,7 @@ impl PaneGroup {
                 terminal_view.restore_conversation_after_view_creation(
                     RestoredAIConversation::new(child_conversation),
                     true,
+                    RestoreConversationEntryBehavior::PreserveAgentViewState,
                     ctx,
                 );
                 terminal_view.enter_agent_view(
@@ -3379,6 +3382,7 @@ impl PaneGroup {
                     terminal_view.restore_conversation_after_view_creation(
                         RestoredAIConversation::new(child_conversation),
                         true,
+                        RestoreConversationEntryBehavior::PreserveAgentViewState,
                         ctx,
                     );
                     terminal_view.enter_agent_view(
@@ -3442,6 +3446,7 @@ impl PaneGroup {
                 terminal_view.restore_conversation_after_view_creation(
                     RestoredAIConversation::new(child_conversation),
                     true,
+                    RestoreConversationEntryBehavior::PreserveAgentViewState,
                     ctx,
                 );
                 terminal_view.enter_agent_view(
@@ -3540,6 +3545,7 @@ impl PaneGroup {
             terminal_view.restore_conversation_after_view_creation(
                 RestoredAIConversation::new(child_conversation),
                 true,
+                RestoreConversationEntryBehavior::PreserveAgentViewState,
                 ctx,
             );
             terminal_view.enter_agent_view(
@@ -4260,6 +4266,7 @@ impl PaneGroup {
                     view.restore_conversation_after_view_creation(
                         RestoredAIConversation::new(*conversation),
                         true,
+                        RestoreConversationEntryBehavior::EnterRestoredConversation,
                         ctx,
                     );
                 });
@@ -4281,6 +4288,7 @@ impl PaneGroup {
                     view.restore_conversation_and_directory_context(
                         CloudConversationData::CLIAgent(cli_conversation),
                         true,
+                        RestoreConversationEntryBehavior::PreserveAgentViewState,
                         |_, _| {},
                         ctx,
                     );
@@ -5861,6 +5869,7 @@ impl PaneGroup {
                     view.restore_conversation_after_view_creation(
                         RestoredAIConversation::new(*conversation),
                         true,
+                        RestoreConversationEntryBehavior::PreserveAgentViewState,
                         ctx,
                     );
                     view.enter_agent_view(None, Some(id), AgentViewEntryOrigin::CloudAgent, ctx);
@@ -5884,6 +5893,7 @@ impl PaneGroup {
                     view.restore_conversation_and_directory_context(
                         CloudConversationData::CLIAgent(cli_conversation),
                         true,
+                        RestoreConversationEntryBehavior::PreserveAgentViewState,
                         |_, _| {},
                         ctx,
                     );

app/src/terminal/model/blocks.rs

@@ -1510,6 +1510,44 @@ impl BlockList {
         self.event_proxy.send_wakeup_event();
     }
 
+    pub fn remove_command_blocks_for_conversation(&mut self, conversation_id: AIConversationId) {
+        let active_block_index = self.active_block_index();
+
+        let mut indices_to_remove = Vec::new();
+        for (i, block) in self.blocks.iter().enumerate() {
+            let index: BlockIndex = i.into();
+            if index == active_block_index {
+                continue;
+            }
+
+            if matches!(
+                block.agent_view_visibility(),
+                AgentViewVisibility::Agent {
+                    origin_conversation_id,
+                    ..
+                } if *origin_conversation_id == conversation_id
+            ) {
+                indices_to_remove.push(index);
+            }
+        }
+
+        if indices_to_remove.is_empty() {
+            return;
+        }
+
+        self.clear_selection();
+        self.clear_smart_select_override();
+        self.clear_scroll_position_before_filter();
+
+        // Remove in reverse order so indices remain valid.
+        for index in indices_to_remove.into_iter().rev() {
+            self.remove_block_at_index(index);
+        }
+
+        // Force a re-draw since the blocklist has changed.
+        self.event_proxy.send_wakeup_event();
+    }
+
     /// Gets the active background block, if one exists.
     pub(super) fn background_block_mut(&mut self) -> Option<&mut Block> {
         // The active background block will be the one immediately before

app/src/terminal/view.rs

@@ -5361,16 +5361,16 @@ impl TerminalView {
             | BlocklistAIHistoryEvent::UpdatedConversationStatus {
                 conversation_id, ..
             }
-            | BlocklistAIHistoryEvent::UpdatedConversationMetadata {
-                conversation_id, ..
-            }
             | BlocklistAIHistoryEvent::UpdatedConversationArtifacts {
                 conversation_id, ..
             } => history_model.terminal_view_id_for_conversation(conversation_id),
             BlocklistAIHistoryEvent::ReassignedExchange {
                 new_conversation_id,
                 ..
             } => history_model.terminal_view_id_for_conversation(new_conversation_id),
+            BlocklistAIHistoryEvent::UpdatedConversationMetadata {
+                conversation_id, ..
+            } => history_model.terminal_view_id_for_conversation(conversation_id),
             BlocklistAIHistoryEvent::StartedNewConversation { .. }
             | BlocklistAIHistoryEvent::CreatedSubtask { .. }
             | BlocklistAIHistoryEvent::UpgradedTask { .. }
@@ -5823,27 +5823,22 @@ impl TerminalView {
                 // The conversation has moved to another terminal view. We are
                 // the previous owner (the per-view filter at the top of this
                 // function uses `previous_terminal_view_id`), so drop any
-                // rendered AI blocks and agent-view entry blocks tagged to
-                // this conversation. Otherwise the user sees a transcript
-                // split across two panes (old exchanges here, new exchanges
-                // in the new owner).
+                // rendered blocks tagged to this conversation. Leave the
+                // agent-view entry in place so the user can click it to
+                // navigate to the current owner pane later.
                 if *previous_terminal_view_id != self.view_id {
                     return;
                 }
                 let view_ids_to_remove = self
                     .rich_content_views
                     .iter()
                     .filter_map(|view| {
-                        let belongs_to_conversation = match view.metadata() {
-                            Some(RichContentMetadata::AIBlock(metadata)) => {
-                                metadata.conversation_id == *conversation_id
-                            }
-                            Some(RichContentMetadata::AgentViewEntry(metadata)) => {
-                                metadata.conversation_id == *conversation_id
-                            }
-                            _ => false,
-                        };
-                        belongs_to_conversation.then_some(view.view_id())
+                        let is_ai_block_for_conversation = matches!(
+                            view.metadata(),
+                            Some(RichContentMetadata::AIBlock(metadata))
+                                if metadata.conversation_id == *conversation_id
+                        );
+                        is_ai_block_for_conversation.then_some(view.view_id())
                     })
                     .collect_vec();
                 for view_id_to_remove in view_ids_to_remove.into_iter() {
@@ -5854,6 +5849,10 @@ impl TerminalView {
                     self.rich_content_views
                         .retain(|view| view.view_id() != view_id_to_remove);
                 }
+                self.model
+                    .lock()
+                    .block_list_mut()
+                    .remove_command_blocks_for_conversation(*conversation_id);
             }
             BlocklistAIHistoryEvent::CreatedSubtask { .. }
             | BlocklistAIHistoryEvent::UpdatedAutoexecuteOverride { .. }

app/src/terminal/view/agent_view.rs

@@ -17,6 +17,9 @@ use crate::persistence::ModelEvent;
 use crate::server::telemetry::TelemetryAgentViewEntryOrigin;
 use crate::terminal::input::message_bar::{Message, MessageItem};
 use crate::terminal::model::rich_content::RichContentType;
+use crate::terminal::view::load_ai_conversation::{
+    RestoreConversationEntryBehavior, RestoredAIConversation,
+};
 use crate::terminal::view::{
     AgentViewEntryMetadata, RichContentInsertionPosition, RichContentMetadata,
 };
@@ -124,14 +127,18 @@ impl TerminalView {
         conversation_id: AIConversationId,
         ctx: &mut ViewContext<Self>,
     ) {
-        let history_model = BlocklistAIHistoryModel::handle(ctx).as_ref(ctx);
-
-        let is_conversation_in_memory = history_model.conversation(&conversation_id).is_some();
-        let is_live = history_model
-            .all_live_conversations_for_terminal_view(self.view_id)
-            .any(|conversation| conversation.id() == conversation_id);
+        let history_model = BlocklistAIHistoryModel::handle(ctx);
+        let (in_memory_conversation, is_live) = {
+            let history_model_ref = history_model.as_ref(ctx);
+            let in_memory_conversation = history_model_ref.conversation(&conversation_id).cloned();
+            let is_live = in_memory_conversation.is_some()
+                && history_model_ref
+                    .all_live_conversations_for_terminal_view(self.view_id)
+                    .any(|conversation| conversation.id() == conversation_id);
+            (in_memory_conversation, is_live)
+        };
 
-        if is_conversation_in_memory && is_live {
+        if is_live {
             if let Err(e) = self.try_enter_agent_view(
                 initial_prompt.clone(),
                 origin,
@@ -146,9 +153,32 @@ impl TerminalView {
                 );
                 self.show_error_toast(e.to_string(), ctx);
             }
+        } else if let Some(conversation) = in_memory_conversation {
+            self.restore_conversation_after_view_creation(
+                RestoredAIConversation::new(conversation),
+                false,
+                RestoreConversationEntryBehavior::PreserveAgentViewState,
+                ctx,
+            );
+            if let Err(e) = self.try_enter_agent_view(
+                initial_prompt.clone(),
+                origin,
+                Some(conversation_id),
+                ctx,
+            ) {
+                log::error!(
+                    "Failed to enter agent view for restored in-memory conversation ({:?}) from origin {:?}: {:?}",
+                    conversation_id,
+                    origin,
+                    e
+                );
+                self.show_error_toast(e.to_string(), ctx);
+            }
         } else {
             let conversation_id_copy = conversation_id;
-            let future = history_model.load_conversation_data(conversation_id_copy, ctx);
+            let future = history_model
+                .as_ref(ctx)
+                .load_conversation_data(conversation_id_copy, ctx);
             ctx.spawn(future, move |me, conversation, ctx| {
                 let Some(conversation) = conversation else {
                     me.show_error_toast(
@@ -185,6 +215,7 @@ impl TerminalView {
                 me.restore_conversation_and_directory_context(
                     conversation,
                     false,
+                    RestoreConversationEntryBehavior::PreserveAgentViewState,
                     on_restored,
                     ctx,
                 );