Address fetched memory toolbar review comments

- Remove the extra fetched_memories_chip feature flag
- Restore ModelSelector to the default right toolbar item list

Co-Authored-By: Oz <oz-agent@warp.dev>

Author: coolcom200

app/Cargo.toml

@@ -1021,7 +1021,6 @@ cloud_mode_input_v2 = ["cloud_mode"]
 handoff_cloud_cloud = ["cloud_mode_setup_v2"]
 git_credential_refresh = []
 prompt_cache_expiry_warning = []
-fetched_memories_chip = []
 
 [package.metadata.bundle.bin.warp-oss]
 category = "public.app-category.developer-tools"

app/src/ai/agent/api/convert_conversation.rs

@@ -1648,11 +1648,11 @@ pub(crate) fn convert_tool_call_result_to_input(
         // Deprecated/unused result types or absent result.
         Some(ToolCallResultType::SuggestCreatePlan(..))
         | Some(ToolCallResultType::SuggestPlan(..))
-        | Some(ToolCallResultType::WaitForEvents(..))
         | None => {
             log::warn!("No result present for tool call ID: {tool_call_id}");
             None
         }
+        Some(ToolCallResultType::WaitForEvents(_)) => None,
     }
 }
 
@@ -1764,7 +1764,6 @@ fn create_cancelled_result_for_tool_call(
             return None;
         }
         ToolType::Subagent(_) => return None,
-        ToolType::WaitForEvents(_) => return None,
         ToolType::StartAgent(_) => {
             AIAgentActionResultType::StartAgent(StartAgentResult::Cancelled {
                 version: StartAgentVersion::V1,
@@ -1786,6 +1785,9 @@ fn create_cancelled_result_for_tool_call(
         }
         // These tools are deprecated.
         ToolType::SuggestCreatePlan(_) | ToolType::SuggestPlan(_) => return None,
+        ToolType::WaitForEvents(_) => {
+            return None;
+        }
     };
 
     Some(AIAgentInput::ActionResult {

app/src/ai/agent/conversation.rs

@@ -1186,17 +1186,18 @@ impl AIConversation {
 
     /// Returns the memories the server fetched for this conversation, in the order they first
     /// appeared across messages (server-side rank order within each message). Re-fetched
-    /// memories are deduped by `memory_id`: the first appearance keeps its position while the
-    /// entry's content/store/source are updated to the latest occurrence.
+    /// memories are deduped by `(memory_store_id, memory_id)`: the first appearance keeps its
+    /// position while the entry's content/source are updated to the latest occurrence.
     pub fn fetched_memories(&self) -> Vec<api::message::FetchedMemory> {
         let mut memories: Vec<api::message::FetchedMemory> = Vec::new();
-        let mut index_by_id: HashMap<String, usize> = HashMap::new();
+        let mut index_by_id: HashMap<(String, String), usize> = HashMap::new();
         for message in self.task_store.all_linearized_messages() {
             for memory in &message.fetched_memories {
-                match index_by_id.get(&memory.memory_id) {
+                let key = (memory.memory_store_id.clone(), memory.memory_id.clone());
+                match index_by_id.get(&key) {
                     Some(index) => memories[*index] = memory.clone(),
                     None => {
-                        index_by_id.insert(memory.memory_id.clone(), memories.len());
+                        index_by_id.insert(key, memories.len());
                         memories.push(memory.clone());
                     }
                 }

app/src/ai/agent/conversation_tests.rs

@@ -826,15 +826,18 @@ fn fetched_memories_preserves_order_across_and_within_messages() {
 fn fetched_memories_dedupes_keeping_first_position_and_latest_data() {
     let conversation = restored_conversation_with_memories_per_query(vec![
         vec![
-            fetched_memory("m1", "old content", "store-old", None),
+            fetched_memory("m1", "old content", "store-1", None),
             fetched_memory("m2", "other", "store-1", None),
         ],
-        vec![fetched_memory(
-            "m1",
-            "new content",
-            "store-new",
-            conversation_source("conversation-1"),
-        )],
+        vec![
+            fetched_memory(
+                "m1",
+                "new content",
+                "store-1",
+                conversation_source("conversation-1"),
+            ),
+            fetched_memory("m1", "same memory id different store", "store-2", None),
+        ],
     ]);
 
     let memories = conversation.fetched_memories();
@@ -844,10 +847,11 @@ fn fetched_memories_dedupes_keeping_first_position_and_latest_data() {
             fetched_memory(
                 "m1",
                 "new content",
-                "store-new",
+                "store-1",
                 conversation_source("conversation-1"),
             ),
             fetched_memory("m2", "other", "store-1", None),
+            fetched_memory("m1", "same memory id different store", "store-2", None),
         ]
     );
 }

app/src/ai/blocklist/agent_view/agent_input_footer/toolbar_item.rs

@@ -211,8 +211,8 @@ impl AgentToolbarItemKind {
         let mut items = vec![
             Self::ContextChip(ContextChipKind::AgentPlanAndTodoList),
             Self::ContextWindowUsage,
+            Self::ModelSelector,
         ];
-        items.push(Self::ModelSelector);
         if FeatureFlag::CreatingSharedSessions.is_enabled()
             && FeatureFlag::HOARemoteControl.is_enabled()
         {

app/src/server/telemetry/events.rs

@@ -990,6 +990,8 @@ pub enum AgentModeCitation {
         #[serde(skip_serializing)]
         url: String,
     },
+    /// A fetched memory surfaced as a citation so we can track whether memory-backed
+    /// responses are shown to users and whether users open those memory citations.
     AgentMemory {
         memory_store_id: String,
         memory_id: String,

crates/ai/src/agent/citation.rs

@@ -1,10 +1,9 @@
 use std::fmt::Display;
-use std::hash::{Hash, Hasher};
 
 use warp_multi_agent_api as api;
 
 /// A citation listed in an AI response.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Hash, Eq, PartialEq)]
 pub enum AIAgentCitation {
     WarpDriveObject {
         uid: String,
@@ -16,67 +15,14 @@ pub enum AIAgentCitation {
         url: String,
     },
     /// A memory from an attached memory store. `content` is the raw memory
-    /// text shown as a preview in the chip; `Hash`/`Eq` use only the IDs.
+    /// text shown as a preview in the chip.
     AgentMemory {
         memory_store_id: String,
         memory_id: String,
         content: String,
     },
 }
 
-impl PartialEq for AIAgentCitation {
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (Self::WarpDriveObject { uid: a }, Self::WarpDriveObject { uid: b }) => a == b,
-            (Self::WarpDocumentation { path: a }, Self::WarpDocumentation { path: b }) => a == b,
-            (Self::WebPage { url: a }, Self::WebPage { url: b }) => a == b,
-            (
-                Self::AgentMemory {
-                    memory_store_id: s1,
-                    memory_id: i1,
-                    ..
-                },
-                Self::AgentMemory {
-                    memory_store_id: s2,
-                    memory_id: i2,
-                    ..
-                },
-            ) => s1 == s2 && i1 == i2,
-            _ => false,
-        }
-    }
-}
-
-impl Eq for AIAgentCitation {}
-
-impl Hash for AIAgentCitation {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        match self {
-            Self::WarpDriveObject { uid } => {
-                0u8.hash(state);
-                uid.hash(state);
-            }
-            Self::WarpDocumentation { path } => {
-                1u8.hash(state);
-                path.hash(state);
-            }
-            Self::WebPage { url } => {
-                2u8.hash(state);
-                url.hash(state);
-            }
-            Self::AgentMemory {
-                memory_store_id,
-                memory_id,
-                ..
-            } => {
-                3u8.hash(state);
-                memory_store_id.hash(state);
-                memory_id.hash(state);
-            }
-        }
-    }
-}
-
 impl Display for AIAgentCitation {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {