merge: resolve conflict in SessionManagerPage with main

Accept main's removal of local terminalTarget state, which was
replaced by global settings in refactor(terminal) commit.

src-tauri/src/commands/misc.rs

@@ -652,6 +652,7 @@ exec bash --norc --noprofile
         "alacritty" => launch_macos_open_app("Alacritty", &script_file, true),
         "kitty" => launch_macos_open_app("kitty", &script_file, false),
         "ghostty" => launch_macos_open_app("Ghostty", &script_file, true),
+        "wezterm" => launch_macos_open_app("WezTerm", &script_file, true),
         _ => launch_macos_terminal_app(&script_file), // "terminal" or default
     };
 
@@ -954,3 +955,18 @@ fn run_windows_start_command(args: &[&str], terminal_name: &str) -> Result<(), S
 
     Ok(())
 }
+
+/// 设置窗口主题（Windows/macOS 标题栏颜色）
+/// theme: "dark" | "light" | "system"
+#[tauri::command]
+pub async fn set_window_theme(window: tauri::Window, theme: String) -> Result<(), String> {
+    use tauri::Theme;
+
+    let tauri_theme = match theme.as_str() {
+        "dark" => Some(Theme::Dark),
+        "light" => Some(Theme::Light),
+        _ => None, // system default
+    };
+
+    window.set_theme(tauri_theme).map_err(|e| e.to_string())
+}

src-tauri/src/commands/session_manager.rs

@@ -26,16 +26,24 @@ pub async fn get_session_messages(
 
 #[tauri::command]
 pub async fn launch_session_terminal(
-    target: String,
     command: String,
     cwd: Option<String>,
     custom_config: Option<String>,
 ) -> Result<bool, String> {
     let command = command.clone();
-    let target = target.clone();
     let cwd = cwd.clone();
     let custom_config = custom_config.clone();
 
+    // Read preferred terminal from global settings
+    let preferred = crate::settings::get_preferred_terminal();
+    // Map global setting terminal names to session terminal names
+    // Global uses "iterm2", session terminal uses "iterm"
+    let target = match preferred.as_deref() {
+        Some("iterm2") => "iterm".to_string(),
+        Some(t) => t.to_string(),
+        None => "terminal".to_string(), // Default to Terminal.app on macOS
+    };
+
     tauri::async_runtime::spawn_blocking(move || {
         session_manager::terminal::launch_terminal(
             &target,