Organize chats by projects (#92)

Author: stippi

crates/code_assistant/src/app/gpui.rs

@@ -22,7 +22,11 @@ pub fn run(config: AgentRunConfig) -> Result<()> {
 
     let session_config_template = SessionConfig {
         init_path: Some(root_path.clone()),
-        initial_project: String::new(),
+        initial_project: root_path
+            .file_name()
+            .and_then(|name| name.to_str())
+            .unwrap_or("unknown")
+            .to_string(),
         tool_syntax: config.tool_syntax,
         use_diff_blocks: config.use_diff_format,
         sandbox_policy: config.sandbox_policy.clone(),

crates/code_assistant/src/session/manager.rs

@@ -70,6 +70,11 @@ impl SessionManager {
         }
     }
 
+    /// Returns the session config template.
+    pub fn session_config_template(&self) -> &SessionConfig {
+        &self.session_config_template
+    }
+
     /// Create a new session and return its ID
     pub fn create_session(&mut self, name: Option<String>) -> Result<String> {
         // Always create sessions with a default model config

crates/code_assistant/src/ui/backend.rs

@@ -20,8 +20,10 @@ pub enum BackendEvent {
     LoadSession {
         session_id: String,
     },
+
     CreateNewSession {
         name: Option<String>,
+        initial_project: Option<String>,
     },
     DeleteSession {
         session_id: String,
@@ -161,9 +163,10 @@ pub async fn handle_backend_events(
         let response = match event {
             BackendEvent::ListSessions => Some(handle_list_sessions(&multi_session_manager).await),
 
-            BackendEvent::CreateNewSession { name } => {
-                Some(handle_create_session(&multi_session_manager, name).await)
-            }
+            BackendEvent::CreateNewSession {
+                name,
+                initial_project,
+            } => Some(handle_create_session(&multi_session_manager, name, initial_project).await),
 
             BackendEvent::LoadSession { session_id } => {
                 handle_load_session(&multi_session_manager, &session_id, &ui).await
@@ -275,10 +278,18 @@ async fn handle_list_sessions(
 async fn handle_create_session(
     multi_session_manager: &Arc<Mutex<SessionManager>>,
     name: Option<String>,
+    initial_project: Option<String>,
 ) -> BackendResponse {
     let create_result = {
         let mut manager = multi_session_manager.lock().await;
-        manager.create_session(name.clone())
+        if let Some(project) = initial_project {
+            // Create a session config override with the specified project
+            let mut config = manager.session_config_template().clone();
+            config.initial_project = project;
+            manager.create_session_with_config(name.clone(), Some(config), None)
+        } else {
+            manager.create_session(name.clone())
+        }
     };
 
     match create_result {

crates/code_assistant/src/ui/gpui/attachment.rs

@@ -1,9 +1,10 @@
 use super::file_icons;
 use super::image;
 use crate::persistence::DraftAttachment;
+
 use gpui::{
-    div, img, prelude::*, px, Context, FocusHandle, Focusable, ImageSource, InteractiveElement,
-    MouseButton, ObjectFit, SharedString, Window,
+    div, img, prelude::*, px, ClickEvent, Context, FocusHandle, Focusable, ImageSource,
+    InteractiveElement, ObjectFit, SharedString, Window,
 };
 use gpui_component::ActiveTheme;
 
@@ -142,6 +143,7 @@ impl Render for AttachmentView {
                 container.child(
                     // Remove button - only visible on hover
                     div()
+                        .id("remove-attachment-btn")
                         .absolute()
                         .top(px(4.))
                         .right(px(4.))
@@ -158,13 +160,9 @@ impl Render for AttachmentView {
                             cx.theme().danger,
                             "🗑",
                         ))
-                        .on_mouse_up(
-                            MouseButton::Left,
-                            cx.listener(move |_view, _event, _window, cx| {
-                                // Emit a custom event that the parent can listen to
-                                cx.emit(AttachmentEvent::Remove(index));
-                            }),
-                        ),
+                        .on_click(cx.listener(move |_view, _event: &ClickEvent, _window, cx| {
+                            cx.emit(AttachmentEvent::Remove(index));
+                        })),
                 )
             })
     }

crates/code_assistant/src/ui/gpui/branch_switcher.rs

@@ -1,5 +1,5 @@
 use crate::persistence::BranchInfo;
-use gpui::{div, prelude::*, px, App, CursorStyle, MouseButton, SharedString, Window};
+use gpui::{div, prelude::*, px, App, CursorStyle, SharedString, Window};
 use gpui_component::{ActiveTheme, Icon};
 
 /// A stateless branch navigation component styled as a bubble on the message border.
@@ -93,7 +93,7 @@ impl RenderOnce for BranchSwitcherElement {
 
                         if has_prev {
                             base.hover(|s| s.bg(cx.theme().accent.opacity(0.15)))
-                                .on_mouse_up(MouseButton::Left, move |_event, _window, cx| {
+                                .on_click(move |_event, _window, cx| {
                                     if let Some(node_id) = prev_node_id {
                                         if let Some(sender) =
                                             cx.try_global::<super::UiEventSender>()
@@ -141,7 +141,7 @@ impl RenderOnce for BranchSwitcherElement {
 
                         if has_next {
                             base.hover(|s| s.bg(cx.theme().accent.opacity(0.25)))
-                                .on_mouse_up(MouseButton::Left, move |_event, _window, cx| {
+                                .on_click(move |_event, _window, cx| {
                                     if let Some(node_id) = next_node_id {
                                         if let Some(sender) =
                                             cx.try_global::<super::UiEventSender>()