assistant2: Do not allow a context entry to be added multiple times (#22712)

https://github.com/user-attachments/assets/81674c88-031b-4d55-b362-43819492b93d


Release Notes:

- N/A

crates/assistant2/src/context_strip.rs

@@ -3,14 +3,12 @@ use std::rc::Rc;
 use editor::Editor;
 use gpui::{AppContext, FocusHandle, Model, View, WeakModel, WeakView};
 use language::Buffer;
-use project::ProjectEntryId;
 use ui::{prelude::*, KeyBinding, PopoverMenu, PopoverMenuHandle, Tooltip};
 use workspace::Workspace;
 
-use crate::context::ContextKind;
 use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;
-use crate::thread::{Thread, ThreadId};
+use crate::thread::Thread;
 use crate::thread_store::ThreadStore;
 use crate::ui::ContextPill;
 use crate::{AssistantPanel, ToggleContextPicker};
@@ -62,20 +60,19 @@ impl ContextStrip {
     fn suggested_file(&self, cx: &ViewContext<Self>) -> Option<SuggestedContext> {
         let workspace = self.workspace.upgrade()?;
         let active_item = workspace.read(cx).active_item(cx)?;
-        let entry_id = *active_item.project_entry_ids(cx).first()?;
-
-        if self.context_store.read(cx).contains_project_entry(entry_id) {
-            return None;
-        }
 
         let editor = active_item.to_any().downcast::<Editor>().ok()?.read(cx);
         let active_buffer = editor.buffer().read(cx).as_singleton()?;
 
-        let file = active_buffer.read(cx).file()?;
-        let title = file.path().to_string_lossy().into_owned().into();
+        let path = active_buffer.read(cx).file()?.path();
+
+        if self.context_store.read(cx).included_file(path).is_some() {
+            return None;
+        }
+
+        let title = path.to_string_lossy().into_owned().into();
 
         Some(SuggestedContext::File {
-            entry_id,
             title,
             buffer: active_buffer.downgrade(),
         })
@@ -95,13 +92,13 @@ impl ContextStrip {
         if self
             .context_store
             .read(cx)
-            .contains_thread(active_thread.id())
+            .included_thread(active_thread.id())
+            .is_some()
         {
             return None;
         }
 
         Some(SuggestedContext::Thread {
-            id: active_thread.id().clone(),
             title: active_thread.summary().unwrap_or("Active Thread".into()),
             thread: weak_active_thread,
         })
@@ -230,12 +227,10 @@ pub enum SuggestContextKind {
 #[derive(Clone)]
 pub enum SuggestedContext {
     File {
-        entry_id: ProjectEntryId,
         title: SharedString,
         buffer: WeakModel<Buffer>,
     },
     Thread {
-        id: ThreadId,
         title: SharedString,
         thread: WeakModel<Thread>,
     },
@@ -251,32 +246,15 @@ impl SuggestedContext {
 
     pub fn accept(&self, context_store: &mut ContextStore, cx: &mut AppContext) {
         match self {
-            Self::File {
-                entry_id,
-                title,
-                buffer,
-            } => {
-                let Some(buffer) = buffer.upgrade() else {
-                    return;
+            Self::File { buffer, title: _ } => {
+                if let Some(buffer) = buffer.upgrade() {
+                    context_store.insert_file(buffer.read(cx));
                 };
-                let text = buffer.read(cx).text();
-
-                context_store.insert_context(
-                    ContextKind::File(*entry_id),
-                    title.clone(),
-                    text.clone(),
-                );
             }
-            Self::Thread { id, title, thread } => {
-                let Some(thread) = thread.upgrade() else {
-                    return;
+            Self::Thread { thread, title: _ } => {
+                if let Some(thread) = thread.upgrade() {
+                    context_store.insert_thread(thread.read(cx));
                 };
-
-                context_store.insert_context(
-                    ContextKind::Thread(id.clone()),
-                    title.clone(),
-                    thread.read(cx).text(),
-                );
             }
         }
     }