Merge pull request #13 from xieisabug/sidebar

增加Sidebar

Author: xieisabug

package.json

@@ -53,6 +53,7 @@
     "@tauri-apps/plugin-fs": "^2.4.1",
     "@tauri-apps/plugin-global-shortcut": "^2.3.0",
     "@tauri-apps/plugin-notification": "~2",
+    "@tauri-apps/plugin-opener": "^2.5.3",
     "@tauri-apps/plugin-shell": "^2.3.0",
     "@tauri-apps/plugin-updater": "~2.9.0",
     "class-variance-authority": "^0.7.1",

pnpm-lock.yaml

@@ -68,7 +68,7 @@ rmcp = { version = "0.8", features = [
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] }
 tauri-plugin-notification = "2"
-syntect = "5.3.0"
+syntect = { version = "5.3.0", features = ["dump-load"] }
 # ACP (Agent Client Protocol) SDK
 agent-client-protocol = { version = "0.9", git = "https://github.com/agentclientprotocol/rust-sdk" }
 

src-tauri/Cargo.toml

@@ -17,7 +17,8 @@
     "preview_vue",
     "artifact_preview",
     "artifact_collections",
-    "artifact"
+    "artifact",
+    "sidebar"
   ],
   "permissions": [
     "core:default",
@@ -46,6 +47,7 @@
     "core:window:allow-destroy",
     "core:window:allow-start-dragging",
     "opener:allow-open-url",
+    "opener:allow-default-urls",
     "dialog:allow-open",
     "dialog:allow-save",
     "dialog:allow-message",
@@ -64,4 +66,4 @@
     "autostart:allow-is-enabled",
     "updater:default"
   ]
-}
+}

src-tauri/assets/syntaxes.bin

@@ -27,6 +27,7 @@
             ]
         },
         "opener:allow-open-url",
+        "opener:allow-default-urls",
         "dialog:allow-open",
         "dialog:allow-save",
         "dialog:allow-message",
@@ -36,4 +37,4 @@
         "clipboard-manager:allow-write-text",
         "notification:default"
     ]
-}
+}

src-tauri/assets/themes.bin

@@ -1126,6 +1126,22 @@ pub async fn cancel_ai(
         warn!(conversation_id, error = %e, "failed to cancel MCP tool calls for conversation");
     }
 
+    // 更新所有正在进行中的消息的 finish_time
+    if let Ok(db) = ConversationDatabase::new(&app_handle) {
+        if let Ok(message_repo) = db.message_repo() {
+            match message_repo.finish_pending_messages(conversation_id) {
+                Ok(count) => {
+                    if count > 0 {
+                        debug!(conversation_id, count, "finished pending messages on cancel");
+                    }
+                }
+                Err(e) => {
+                    warn!(conversation_id, error = %e, "failed to finish pending messages on cancel");
+                }
+            }
+        }
+    }
+
     // Send cancellation event to both ask and chat_ui windows
     let cancel_event = crate::api::ai::events::ConversationEvent {
         r#type: "conversation_cancel".to_string(),

src-tauri/capabilities/migrated.json

@@ -5,6 +5,7 @@ use crate::{
             AssistantModel, AssistantModelConfig, AssistantPrompt, AssistantPromptParam,
         },
         conversation_db::ConversationDatabase,
+        llm_db::LLMDatabase,
     },
     utils::share_utils::{
         compress_assistant_data, decompress_assistant_data, AssistantShareData, ModelConfigShare,
@@ -536,6 +537,38 @@ pub fn get_assistant_field_value(
         .ok_or_else(|| format!("Field '{}' not found", field_name))
 }
 
+#[tauri::command]
+#[instrument(skip(app_handle), fields(assistant_id))]
+pub fn get_acp_working_directory(
+    app_handle: tauri::AppHandle,
+    assistant_id: i64,
+) -> Result<String, String> {
+    let assistant_db = AssistantDatabase::new(&app_handle).map_err(|e| e.to_string())?;
+    let assistant = assistant_db.get_assistant(assistant_id).map_err(|e| e.to_string())?;
+
+    if assistant.assistant_type != Some(4) {
+        return Err("Assistant is not ACP type".to_string());
+    }
+
+    let model_configs =
+        assistant_db.get_assistant_model_configs(assistant_id).map_err(|e| e.to_string())?;
+    let provider_configs = if let Some(model) = assistant_db
+        .get_assistant_model(assistant_id)
+        .map_err(|e| e.to_string())?
+        .first()
+    {
+        let llm_db = LLMDatabase::new(&app_handle).map_err(|e| e.to_string())?;
+        llm_db.get_llm_provider_config(model.provider_id).map_err(|e| e.to_string())?
+    } else {
+        Vec::new()
+    };
+
+    let acp_config =
+        crate::api::ai::acp::extract_acp_config(&model_configs, &provider_configs).map_err(|e| e.to_string())?;
+
+    Ok(acp_config.working_directory.display().to_string())
+}
+
 // MCP Configuration Commands
 
 #[tauri::command]
@@ -693,6 +726,7 @@ pub async fn update_assistant_model_config_value(
             .map_err(|e| e.to_string())?;
     }
 
+    let _ = app_handle.emit("assistant_list_changed", ());
     Ok(())
 }
 

src-tauri/capabilities/mobile.json

@@ -460,14 +460,31 @@ pub async fn fork_conversation(
         .map_err(|e| e.to_string())?
         .ok_or_else(|| "Conversation not found".to_string())?;
 
-    // 获取原对话的所有消息
+    // 获取原对话的所有消息（包含附件）
     let message_repo = db.message_repo().unwrap();
     let all_messages_with_attachments =
         message_repo.list_by_conversation_id(conversation_id).map_err(|e| e.to_string())?;
 
-    // 提取消息部分
-    let all_messages: Vec<Message> =
-        all_messages_with_attachments.iter().map(|(message, _)| message.clone()).collect();
+    // 构建消息ID到附件列表的映射
+    let mut attachment_map: HashMap<i64, Vec<MessageAttachment>> = HashMap::new();
+    for (message, attachment) in &all_messages_with_attachments {
+        if let Some(att) = attachment {
+            attachment_map.entry(message.id).or_default().push(att.clone());
+        }
+    }
+
+    // 提取消息部分（去重，因为一条消息可能有多个附件导致多行）
+    let mut seen_ids = std::collections::HashSet::new();
+    let all_messages: Vec<Message> = all_messages_with_attachments
+        .iter()
+        .filter_map(|(message, _)| {
+            if seen_ids.insert(message.id) {
+                Some(message.clone())
+            } else {
+                None
+            }
+        })
+        .collect();
 
     // 找到目标消息的位置
     let target_message_index = all_messages
@@ -501,14 +518,29 @@ pub async fn fork_conversation(
     let created_conversation =
         conversation_repo.create(&new_conversation).map_err(|e| e.to_string())?;
 
-    // 复制消息到新对话
+    // 获取附件仓库
+    let attachment_repo = db.attachment_repo().map_err(|e| e.to_string())?;
+
+    // 复制消息到新对话，并复制对应的附件
     for message in messages_to_copy {
+        let old_message_id = message.id;
+
         let mut new_message = message.clone();
         new_message.id = 0;
         new_message.conversation_id = created_conversation.id;
         new_message.created_time = chrono::Utc::now();
 
-        message_repo.create(&new_message).map_err(|e| e.to_string())?;
+        let created_message = message_repo.create(&new_message).map_err(|e| e.to_string())?;
+
+        // 复制该消息的所有附件
+        if let Some(attachments) = attachment_map.get(&old_message_id) {
+            for attachment in attachments {
+                let mut new_attachment = attachment.clone();
+                new_attachment.id = 0;
+                new_attachment.message_id = created_message.id;
+                attachment_repo.create(&new_attachment).map_err(|e| e.to_string())?;
+            }
+        }
     }
 
     Ok(created_conversation.id)