release: v0.21.2

Author: 李杰

CHANGELOG.md

@@ -6,6 +6,29 @@ All notable changes to Cockpit Tools will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+---
+## [0.21.2] - 2026-04-13
+
+### Added
+- **Settings now support data backup/import bundles for accounts and app config**: export or import accounts only, config only, or both together; config restore covers groups, instances, wakeup tasks, current-account refresh settings, and Codex model-provider data, while legacy account-only backups remain importable and report when some bindings need remapping or a restart is required.
+- **Settings now include a Backup Manager for scheduled local backups**: Cockpit can create one managed backup per day, keep backups in the app data `backups` directory with configurable retention, and let users run a backup immediately or import/delete existing backup files from the same dialog.
+- **Codex Session Manager now supports restoring trashed sessions back to their original instances**: restored sessions recover the rollout file, the `session_index.jsonl` entry, and the `state_5.sqlite` thread row together instead of requiring manual file repair.
+
+### Changed
+- **Provider account pages now share a unified pagination and filter experience**: page size is configurable per platform, selection and grouping stay consistent across table and grid views, and tag/sort dropdowns auto-flip to remain usable in small windows.
+- **Gemini account tables now surface Pro / Flash quota status directly in list view**: quota summaries are visible without switching back to card layout, making remaining capacity easier to scan.
+- **Instance account pickers now open in anchored floating menus that stay visible near window edges**: long account lists keep the active option in view, and Trae instance search now also matches display names in addition to email and plan text.
+- **Codex account switching now auto-repairs historical session visibility only when the effective provider changes**: after a successful switch, Cockpit compares the provider before and after the change and only then repairs rollout/session metadata together with `state_5.sqlite`.
+
+### Removed
+- **Windsurf account onboarding no longer includes email/password login**: the add-account dialog now focuses on OAuth, token, and local JSON import flows.
+
+### Fixed
+- **Quota refresh failures now surface explicit warning and empty states across provider account pages**: Cursor, Gemini, GitHub Copilot, Kiro, Qoder, Trae, Windsurf, Zed, and the aggregated Accounts page now persist the last quota-query error, show a visible failure badge/message, and fall back to a clear `No quota data` state instead of silently rendering blank or ambiguous quota panels.
+- **Codex account state now stays aligned with the live local OAuth session more reliably**: current-account detection, switch preparation, quota refresh, and wakeup runs reuse newer local auth data and write refreshed tokens back to managed homes, reducing stale-token mismatches.
+- **Background auto refresh now runs through a unified scheduler**: quota refresh and current-account refresh jobs across providers are less likely to overlap or double-trigger, improving refresh stability.
+- **Trae token refresh now preserves regional auth context when rewriting local auth state**: refreshed sessions keep the host, region, and refresh-expiry metadata needed for follow-up injection flows.
+
 ---
 ## [0.21.1] - 2026-04-11
 

CHANGELOG.zh-CN.md

@@ -6,6 +6,29 @@
 
 格式参考 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/)。
 
+---
+## [0.21.2] - 2026-04-13
+
+### 新增
+- **设置页现已支持账号与应用配置的数据备份/导入包**：可分别导出或导入“仅账号”“仅配置”或“两者一起”；配置恢复覆盖分组、实例、唤醒任务、当前账号刷新设置与 Codex 模型供应商数据，旧版仅账号备份也仍可导入，并会提示未能重映射的绑定或需重启的配置项。
+- **设置页现已新增“备份管理”能力，用于定期本地备份**：Cockpit 现可每天自动生成一份受管备份，统一保存在应用数据目录的 `backups` 文件夹中，支持配置保留天数，并可在同一弹框内立即备份、导入已有备份或删除旧备份文件。
+- **Codex 会话管理现已支持把废纸篓中的会话恢复回原实例**：恢复时会一并放回 rollout 文件、`session_index.jsonl` 条目和 `state_5.sqlite` 线程记录，不再需要手工补文件。
+
+### 变更
+- **各平台账号页现已统一为同一套分页与筛选体验**：每个平台都可单独记住每页数量，表格/卡片视图下的选择与分组行为保持一致，标签和排序下拉在小窗口里也会自动翻转方向避免挡住内容。
+- **Gemini 账号表格现已直接显示 Pro / Flash 配额状态**：无需切回卡片视图即可查看配额概览，剩余额度更容易快速扫读。
+- **实例页账号选择器现已改为锚定浮层，并在靠近窗口边缘时自动调整展开方向**：长列表会自动滚动到当前选中项，Trae 实例搜索也新增支持按显示名匹配。
+- **Codex 切号现已仅在实际 provider 发生变化后才自动修复历史会话可见性**：切号成功后会比较切换前后的 provider，仅在发生变化时才联动修复 rollout/session 元数据与 `state_5.sqlite`。
+
+### 移除
+- **Windsurf 账号接入现已不再提供邮箱密码登录**：添加账号弹框现在仅保留 OAuth、Token 和本地 JSON 导入三条路径。
+
+### 修复
+- **各平台账号页现已明确展示配额查询失败与无数据状态**：Cursor、Gemini、GitHub Copilot、Kiro、Qoder、Trae、Windsurf、Zed 以及聚合账号总览页现在都会持久化最近一次配额查询错误，界面会显示明确的失败提示，并在无有效配额数据时回退到清晰的“暂无配额数据”状态，不再静默渲染空白或含糊的配额区块。
+- **Codex 账号状态现已更稳定地与本地 OAuth 登录态保持一致**：当前账号识别、切号准备、配额刷新和唤醒执行都会优先复用更新的本地登录数据，并把刷新后的 token 回写到受管目录，减少旧 token 残留导致的状态不一致。
+- **后台自动刷新现已改为统一调度**：各平台的配额刷新与当前账号刷新更不容易互相重叠或重复触发，整体刷新稳定性更好。
+- **Trae 刷新 token 时现会保留区域登录上下文并回写到本地认证状态**：后续注入与续期所需的 host、region 和 refresh 过期信息会一并保留。
+
 ---
 ## [0.21.1] - 2026-04-11
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cockpit-tools",
   "private": true,
-  "version": "0.21.1",
+  "version": "0.21.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cockpit-tools"
-version = "0.21.1"
+version = "0.21.2"
 description = "Cockpit Tools"
 authors = ["jlcodes"]
 license = "CC-BY-NC-SA-4.0"

src-tauri/Cargo.toml

@@ -55,6 +55,19 @@ pub async fn switch_codex_account(
     account_id: String,
 ) -> Result<CodexAccount, String> {
     let _ = codex_account::prepare_account_for_injection(&account_id).await?;
+    let codex_home = codex_account::get_codex_home();
+    let provider_before =
+        crate::modules::codex_session_visibility::read_history_visibility_provider_for_dir(
+            &codex_home,
+        )
+        .map(Some)
+        .unwrap_or_else(|error| {
+            logger::log_warn(&format!(
+                "切号前读取 Codex provider 失败，跳过自动修复预判: {}",
+                error
+            ));
+            None
+        });
 
     // 切换账号（写入 auth.json）
     let account = codex_account::switch_account(&account_id)?;
@@ -74,6 +87,41 @@ pub async fn switch_codex_account(
         ));
     }
 
+    let provider_after =
+        crate::modules::codex_session_visibility::read_history_visibility_provider_for_dir(
+            &codex_home,
+        )
+        .map(Some)
+        .unwrap_or_else(|error| {
+            logger::log_warn(&format!(
+                "切号后读取 Codex provider 失败，跳过自动修复可见性: {}",
+                error
+            ));
+            None
+        });
+    let should_repair_visibility = match (provider_before.as_deref(), provider_after.as_deref()) {
+        (Some(before), Some(after)) => before != after,
+        (None, Some(_)) => true,
+        _ => false,
+    };
+    if should_repair_visibility {
+        match crate::modules::codex_session_visibility::repair_session_visibility_across_instances()
+        {
+            Ok(summary) => {
+                logger::log_info(&format!(
+                    "Codex 切号后已自动执行历史会话可见性修复: {}",
+                    summary.message
+                ));
+            }
+            Err(error) => {
+                logger::log_warn(&format!(
+                    "Codex 切号成功，但自动修复历史会话可见性失败，请稍后在会话管理中手动补跑: {}",
+                    error
+                ));
+            }
+        }
+    }
+
     let user_config = config::get_user_config();
     let mut opencode_updated = false;
     if user_config.opencode_auth_overwrite_on_switch {

src-tauri/src/commands/codex.rs

@@ -272,6 +272,19 @@ pub async fn codex_move_sessions_to_trash_across_instances(
     modules::codex_session_manager::move_sessions_to_trash_across_instances(session_ids)
 }
 
+#[tauri::command]
+pub async fn codex_list_trashed_sessions_across_instances(
+) -> Result<Vec<modules::codex_session_manager::CodexTrashedSessionRecord>, String> {
+    modules::codex_session_manager::list_trashed_sessions_across_instances()
+}
+
+#[tauri::command]
+pub async fn codex_restore_sessions_from_trash_across_instances(
+    session_ids: Vec<String>,
+) -> Result<modules::codex_session_manager::CodexSessionRestoreSummary, String> {
+    modules::codex_session_manager::restore_sessions_from_trash_across_instances(session_ids)
+}
+
 #[tauri::command]
 pub async fn codex_create_instance(
     name: String,

src-tauri/src/commands/codex_instance.rs

@@ -0,0 +1,136 @@
+use tauri_plugin_autostart::ManagerExt as _;
+
+use crate::models::InstanceStore;
+use crate::modules;
+use crate::modules::config::{self, UserConfig};
+use crate::modules::websocket;
+
+fn get_app_auto_launch_enabled(app: &tauri::AppHandle) -> Result<bool, String> {
+    app.autolaunch()
+        .is_enabled()
+        .map_err(|err| format!("读取应用自启动状态失败: {}", err))
+}
+
+fn apply_app_auto_launch_enabled(app: &tauri::AppHandle, enabled: bool) -> Result<(), String> {
+    if enabled {
+        app.autolaunch()
+            .enable()
+            .map_err(|err| format!("启用应用自启动失败: {}", err))
+    } else {
+        app.autolaunch()
+            .disable()
+            .map_err(|err| format!("停用应用自启动失败: {}", err))
+    }
+}
+
+fn load_instance_store_by_platform(platform: &str) -> Result<InstanceStore, String> {
+    match platform {
+        "antigravity" => modules::instance::load_instance_store(),
+        "codex" => modules::codex_instance::load_instance_store(),
+        "github-copilot" => modules::github_copilot_instance::load_instance_store(),
+        "windsurf" => modules::windsurf_instance::load_instance_store(),
+        "kiro" => modules::kiro_instance::load_instance_store(),
+        "cursor" => modules::cursor_instance::load_instance_store(),
+        "gemini" => modules::gemini_instance::load_instance_store(),
+        "codebuddy" => modules::codebuddy_instance::load_instance_store(),
+        "codebuddy_cn" => modules::codebuddy_cn_instance::load_instance_store(),
+        "qoder" => modules::qoder_instance::load_instance_store(),
+        "trae" => modules::trae_instance::load_instance_store(),
+        "workbuddy" => modules::workbuddy_instance::load_instance_store(),
+        _ => Err("不支持的实例平台".to_string()),
+    }
+}
+
+fn save_instance_store_by_platform(platform: &str, store: &InstanceStore) -> Result<(), String> {
+    match platform {
+        "antigravity" => modules::instance::save_instance_store(store),
+        "codex" => modules::codex_instance::save_instance_store(store),
+        "github-copilot" => modules::github_copilot_instance::save_instance_store(store),
+        "windsurf" => modules::windsurf_instance::save_instance_store(store),
+        "kiro" => modules::kiro_instance::save_instance_store(store),
+        "cursor" => modules::cursor_instance::save_instance_store(store),
+        "gemini" => modules::gemini_instance::save_instance_store(store),
+        "codebuddy" => modules::codebuddy_instance::save_instance_store(store),
+        "codebuddy_cn" => modules::codebuddy_cn_instance::save_instance_store(store),
+        "qoder" => modules::qoder_instance::save_instance_store(store),
+        "trae" => modules::trae_instance::save_instance_store(store),
+        "workbuddy" => modules::workbuddy_instance::save_instance_store(store),
+        _ => Err("不支持的实例平台".to_string()),
+    }
+}
+
+fn sanitize_instance_store(store: &InstanceStore) -> InstanceStore {
+    let mut next = store.clone();
+    next.default_settings.last_pid = None;
+    for instance in &mut next.instances {
+        instance.last_pid = None;
+        instance.last_launched_at = None;
+    }
+    next
+}
+
+#[tauri::command]
+pub fn data_transfer_get_user_config() -> Result<UserConfig, String> {
+    Ok(config::get_user_config())
+}
+
+#[tauri::command]
+pub fn data_transfer_apply_user_config(
+    app: tauri::AppHandle,
+    config: UserConfig,
+) -> Result<bool, String> {
+    let current = config::get_user_config();
+    let current_app_auto_launch_enabled =
+        get_app_auto_launch_enabled(&app).unwrap_or(current.app_auto_launch_enabled);
+
+    let needs_restart = current.ws_port != config.ws_port
+        || current.ws_enabled != config.ws_enabled
+        || current.report_enabled != config.report_enabled
+        || current.report_port != config.report_port
+        || current.report_token != config.report_token;
+    let language_changed = current.language != config.language;
+    let app_auto_launch_changed = current_app_auto_launch_enabled != config.app_auto_launch_enabled;
+
+    #[cfg(target_os = "macos")]
+    let hide_dock_icon_changed = current.hide_dock_icon != config.hide_dock_icon;
+
+    config::save_user_config(&config)?;
+
+    if app_auto_launch_changed {
+        apply_app_auto_launch_enabled(&app, config.app_auto_launch_enabled)?;
+    }
+
+    if let Err(err) = modules::floating_card_window::apply_floating_card_always_on_top(&app) {
+        modules::logger::log_warn(&format!("[DataTransfer] 应用悬浮卡片置顶状态失败: {}", err));
+    }
+
+    #[cfg(target_os = "macos")]
+    if hide_dock_icon_changed {
+        crate::apply_macos_activation_policy(&app);
+    }
+
+    if language_changed {
+        let normalized_language = config.language.clone();
+        websocket::broadcast_language_changed(&normalized_language, "desktop");
+        modules::sync_settings::write_sync_setting("language", &normalized_language);
+        if let Err(err) = modules::tray::update_tray_menu(&app) {
+            modules::logger::log_warn(&format!("[DataTransfer] 语言变更后刷新托盘失败: {}", err));
+        }
+    }
+
+    Ok(needs_restart)
+}
+
+#[tauri::command]
+pub fn data_transfer_get_instance_store(platform: String) -> Result<InstanceStore, String> {
+    load_instance_store_by_platform(platform.trim())
+}
+
+#[tauri::command]
+pub fn data_transfer_replace_instance_store(
+    platform: String,
+    store: InstanceStore,
+) -> Result<(), String> {
+    let sanitized = sanitize_instance_store(&store);
+    save_instance_store_by_platform(platform.trim(), &sanitized)
+}

src-tauri/src/commands/data_transfer.rs

@@ -8,6 +8,7 @@ pub mod codex;
 pub mod codex_instance;
 pub mod cursor;
 pub mod cursor_instance;
+pub mod data_transfer;
 pub mod device;
 pub mod gemini;
 pub mod gemini_instance;