Merge branch 'main' into feat/proxy-full-url

src-tauri/src/app_config.rs

@@ -883,6 +883,7 @@ mod tests {
         dir: TempDir,
         original_home: Option<String>,
         original_userprofile: Option<String>,
+        original_test_home: Option<String>,
     }
 
     impl TempHome {
@@ -890,14 +891,17 @@ mod tests {
             let dir = TempDir::new().expect("failed to create temp home");
             let original_home = env::var("HOME").ok();
             let original_userprofile = env::var("USERPROFILE").ok();
+            let original_test_home = env::var("CC_SWITCH_TEST_HOME").ok();
 
             env::set_var("HOME", dir.path());
             env::set_var("USERPROFILE", dir.path());
+            env::set_var("CC_SWITCH_TEST_HOME", dir.path());
 
             Self {
                 dir,
                 original_home,
                 original_userprofile,
+                original_test_home,
             }
         }
     }
@@ -913,6 +917,11 @@ mod tests {
                 Some(value) => env::set_var("USERPROFILE", value),
                 None => env::remove_var("USERPROFILE"),
             }
+
+            match &self.original_test_home {
+                Some(value) => env::set_var("CC_SWITCH_TEST_HOME", value),
+                None => env::remove_var("CC_SWITCH_TEST_HOME"),
+            }
         }
     }
 

src-tauri/src/commands/settings.rs

@@ -6,8 +6,20 @@ fn merge_settings_for_save(
     mut incoming: crate::settings::AppSettings,
     existing: &crate::settings::AppSettings,
 ) -> crate::settings::AppSettings {
-    if incoming.webdav_sync.is_none() {
-        incoming.webdav_sync = existing.webdav_sync.clone();
+    match (&mut incoming.webdav_sync, &existing.webdav_sync) {
+        // incoming 没有 webdav → 保留现有
+        (None, _) => {
+            incoming.webdav_sync = existing.webdav_sync.clone();
+        }
+        // incoming 有 webdav 但密码为空，且现有有密码 → 填回现有密码
+        // （get_settings_for_frontend 总是清空密码，所以通过 save_settings
+        //   传入的空密码意味着"保持现有"而非"用户主动清空"）
+        (Some(incoming_sync), Some(existing_sync))
+            if incoming_sync.password.is_empty() && !existing_sync.password.is_empty() =>
+        {
+            incoming_sync.password = existing_sync.password.clone();
+        }
+        _ => {}
     }
     incoming
 }
@@ -116,6 +128,66 @@ mod tests {
             Some("https://dav.new.example.com")
         );
     }
+
+    /// Regression test: frontend always receives empty password from
+    /// get_settings_for_frontend(). If a component accidentally spreads
+    /// the full settings object into save_settings, the empty password
+    /// must NOT overwrite the existing one.
+    #[test]
+    fn save_settings_should_preserve_password_when_incoming_has_empty_password() {
+        let mut existing = AppSettings::default();
+        existing.webdav_sync = Some(WebDavSyncSettings {
+            base_url: "https://dav.example.com".to_string(),
+            username: "alice".to_string(),
+            password: "secret".to_string(),
+            ..WebDavSyncSettings::default()
+        });
+
+        // Simulate frontend sending settings with cleared password
+        let mut incoming = AppSettings::default();
+        incoming.webdav_sync = Some(WebDavSyncSettings {
+            base_url: "https://dav.example.com".to_string(),
+            username: "alice".to_string(),
+            password: "".to_string(),
+            ..WebDavSyncSettings::default()
+        });
+
+        let merged = merge_settings_for_save(incoming, &existing);
+
+        assert_eq!(
+            merged.webdav_sync.as_ref().map(|v| v.password.as_str()),
+            Some("secret"),
+            "empty password from frontend must not overwrite existing password"
+        );
+    }
+
+    /// When both incoming and existing have no password, merge should
+    /// work without panicking and keep the empty state.
+    #[test]
+    fn save_settings_should_handle_both_empty_passwords() {
+        let mut existing = AppSettings::default();
+        existing.webdav_sync = Some(WebDavSyncSettings {
+            base_url: "https://dav.example.com".to_string(),
+            username: "alice".to_string(),
+            password: "".to_string(),
+            ..WebDavSyncSettings::default()
+        });
+
+        let mut incoming = AppSettings::default();
+        incoming.webdav_sync = Some(WebDavSyncSettings {
+            base_url: "https://dav.example.com".to_string(),
+            username: "alice".to_string(),
+            password: "".to_string(),
+            ..WebDavSyncSettings::default()
+        });
+
+        let merged = merge_settings_for_save(incoming, &existing);
+
+        assert_eq!(
+            merged.webdav_sync.as_ref().map(|v| v.password.as_str()),
+            Some("")
+        );
+    }
 }
 
 /// 获取开机自启状态

src-tauri/src/database/tests.rs

@@ -296,6 +296,14 @@ fn schema_migration_v4_adds_pricing_model_columns() {
     let conn = Connection::open_in_memory().expect("open memory db");
     conn.execute_batch(
         r#"
+        CREATE TABLE providers (
+            id TEXT NOT NULL,
+            app_type TEXT NOT NULL,
+            name TEXT NOT NULL,
+            settings_config TEXT NOT NULL DEFAULT '{}',
+            meta TEXT NOT NULL DEFAULT '{}',
+            PRIMARY KEY (id, app_type)
+        );
         CREATE TABLE proxy_config (app_type TEXT PRIMARY KEY);
         CREATE TABLE proxy_request_logs (request_id TEXT PRIMARY KEY, model TEXT NOT NULL);
         CREATE TABLE mcp_servers (

src-tauri/src/proxy/mod.rs

@@ -22,6 +22,7 @@ pub mod response_handler;
 pub mod response_processor;
 pub(crate) mod server;
 pub mod session;
+pub(crate) mod sse;
 pub mod thinking_budget_rectifier;
 pub mod thinking_optimizer;
 pub mod thinking_rectifier;

src-tauri/src/proxy/providers/streaming.rs

@@ -2,6 +2,7 @@
 //!
 //! 实现 OpenAI SSE → Anthropic SSE 格式转换
 
+use crate::proxy::sse::strip_sse_field;
 use bytes::Bytes;
 use futures::stream::{Stream, StreamExt};
 use serde::{Deserialize, Serialize};
@@ -118,7 +119,7 @@ pub fn create_anthropic_sse_stream(
                         }
 
                         for l in line.lines() {
-                            if let Some(data) = l.strip_prefix("data: ") {
+                            if let Some(data) = strip_sse_field(l, "data") {
                                 if data.trim() == "[DONE]" {
                                     log::debug!("[Claude/OpenRouter] <<< OpenAI SSE: [DONE]");
                                     let event = json!({"type": "message_stop"});
@@ -609,7 +610,9 @@ mod tests {
         let events: Vec<Value> = merged
             .split("\n\n")
             .filter_map(|block| {
-                let data = block.lines().find_map(|line| line.strip_prefix("data: "))?;
+                let data = block
+                    .lines()
+                    .find_map(|line| strip_sse_field(line, "data"))?;
                 serde_json::from_str::<Value>(data).ok()
             })
             .collect();
@@ -694,7 +697,9 @@ mod tests {
         let events: Vec<Value> = merged
             .split("\n\n")
             .filter_map(|block| {
-                let data = block.lines().find_map(|line| line.strip_prefix("data: "))?;
+                let data = block
+                    .lines()
+                    .find_map(|line| strip_sse_field(line, "data"))?;
                 serde_json::from_str::<Value>(data).ok()
             })
             .collect();

src-tauri/src/proxy/providers/streaming_responses.rs

@@ -9,6 +9,7 @@
 //! 与 Chat Completions 的 delta chunk 模型完全不同，需要独立的状态机处理。
 
 use super::transform_responses::{build_anthropic_usage_from_responses, map_responses_stop_reason};
+use crate::proxy::sse::strip_sse_field;
 use bytes::Bytes;
 use futures::stream::{Stream, StreamExt};
 use serde_json::{json, Value};
@@ -133,9 +134,9 @@ pub fn create_anthropic_sse_stream_from_responses(
                         let mut data_parts: Vec<String> = Vec::new();
 
                         for line in block.lines() {
-                            if let Some(evt) = line.strip_prefix("event: ") {
+                            if let Some(evt) = strip_sse_field(line, "event") {
                                 event_type = Some(evt.trim().to_string());
-                            } else if let Some(d) = line.strip_prefix("data: ") {
+                            } else if let Some(d) = strip_sse_field(line, "data") {
                                 data_parts.push(d.to_string());
                             }
                         }
@@ -810,7 +811,9 @@ mod tests {
         let events: Vec<Value> = merged
             .split("\n\n")
             .filter_map(|block| {
-                let data = block.lines().find_map(|line| line.strip_prefix("data: "))?;
+                let data = block
+                    .lines()
+                    .find_map(|line| strip_sse_field(line, "data"))?;
                 serde_json::from_str::<Value>(data).ok()
             })
             .collect();

src-tauri/src/proxy/response_handler.rs

@@ -5,6 +5,7 @@
 use super::session::ProxySession;
 use super::usage::parser::TokenUsage;
 use super::ProxyError;
+use crate::proxy::sse::strip_sse_field;
 use bytes::Bytes;
 use futures::stream::{Stream, StreamExt};
 use serde_json::Value;
@@ -90,7 +91,7 @@ impl StreamHandler {
                             buffer = buffer[pos + 2..].to_string();
 
                             for line in event_text.lines() {
-                                if let Some(data) = line.strip_prefix("data: ") {
+                                if let Some(data) = strip_sse_field(line, "data") {
                                     if data.trim() != "[DONE]" {
                                         if let Ok(json) = serde_json::from_str::<Value>(data) {
                                             let mut guard = events.lock().await;
@@ -211,4 +212,24 @@ mod tests {
         let handler = StreamHandler::new(30);
         assert_eq!(handler.idle_timeout, Duration::from_secs(30));
     }
+
+    #[test]
+    fn test_strip_sse_field_accepts_optional_space() {
+        assert_eq!(
+            super::strip_sse_field("data: {\"ok\":true}", "data"),
+            Some("{\"ok\":true}")
+        );
+        assert_eq!(
+            super::strip_sse_field("data:{\"ok\":true}", "data"),
+            Some("{\"ok\":true}")
+        );
+        assert_eq!(
+            super::strip_sse_field("event: message_start", "event"),
+            Some("message_start")
+        );
+        assert_eq!(
+            super::strip_sse_field("event:message_start", "event"),
+            Some("message_start")
+        );
+    }
 }

src-tauri/src/proxy/response_processor.rs

@@ -6,6 +6,7 @@ use super::{
     handler_config::UsageParserConfig,
     handler_context::{RequestContext, StreamingTimeoutConfig},
     server::ProxyState,
+    sse::strip_sse_field,
     usage::parser::TokenUsage,
     ProxyError,
 };
@@ -527,7 +528,7 @@ pub fn create_logged_passthrough_stream(
                         if !event_text.trim().is_empty() {
                             // 提取 data 部分并尝试解析为 JSON
                             for line in event_text.lines() {
-                                if let Some(data) = line.strip_prefix("data: ") {
+                                if let Some(data) = strip_sse_field(line, "data") {
                                     if data.trim() != "[DONE]" {
                                         if let Ok(json_value) = serde_json::from_str::<Value>(data) {
                                             if let Some(c) = &collector {
@@ -591,6 +592,27 @@ mod tests {
     use std::sync::Arc;
     use tokio::sync::RwLock;
 
+    #[test]
+    fn test_strip_sse_field_accepts_optional_space() {
+        assert_eq!(
+            super::strip_sse_field("data: {\"ok\":true}", "data"),
+            Some("{\"ok\":true}")
+        );
+        assert_eq!(
+            super::strip_sse_field("data:{\"ok\":true}", "data"),
+            Some("{\"ok\":true}")
+        );
+        assert_eq!(
+            super::strip_sse_field("event: message_start", "event"),
+            Some("message_start")
+        );
+        assert_eq!(
+            super::strip_sse_field("event:message_start", "event"),
+            Some("message_start")
+        );
+        assert_eq!(super::strip_sse_field("id:1", "data"), None);
+    }
+
     fn build_state(db: Arc<Database>) -> ProxyState {
         ProxyState {
             db: db.clone(),

src-tauri/src/proxy/sse.rs

@@ -0,0 +1,31 @@
+#[inline]
+pub(crate) fn strip_sse_field<'a>(line: &'a str, field: &str) -> Option<&'a str> {
+    line.strip_prefix(&format!("{field}: "))
+        .or_else(|| line.strip_prefix(&format!("{field}:")))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::strip_sse_field;
+
+    #[test]
+    fn strip_sse_field_accepts_optional_space() {
+        assert_eq!(
+            strip_sse_field("data: {\"ok\":true}", "data"),
+            Some("{\"ok\":true}")
+        );
+        assert_eq!(
+            strip_sse_field("data:{\"ok\":true}", "data"),
+            Some("{\"ok\":true}")
+        );
+        assert_eq!(
+            strip_sse_field("event: message_start", "event"),
+            Some("message_start")
+        );
+        assert_eq!(
+            strip_sse_field("event:message_start", "event"),
+            Some("message_start")
+        );
+        assert_eq!(strip_sse_field("id:1", "data"), None);
+    }
+}