release: v0.22.5

Author: 李杰

CHANGELOG.md

@@ -6,6 +6,20 @@ 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.22.5] - 2026-04-20
+
+### Fixed
+- **Trae account upsert now uses `user_id` as the primary identity key and falls back to email only when needed**: imports no longer merge different users just because emails match, and placeholder `unknown` email values are excluded from identity matching.
+- **Cursor plan badge normalization now maps `pro_student` to `pro`**: student Pro subscriptions now render the expected Pro badge instead of exposing raw membership text.
+
+### Added
+- **Codex API Service switch now prompts to enable the service when it is currently disabled**: the account-page action shows a warning modal and supports one-click `Enable and Switch` before proceeding.
+
+### Changed
+- **Gemini default-instance settings now persist `working_dir` end-to-end**: list/update/start/stop flows all read and return the saved working directory instead of forcing it to empty.
+- **API Service activation paths no longer auto-run session visibility repair**: switching to service mode now focuses on applying the real profile change, while history-repair remains an explicit operation.
+
 ---
 ## [0.22.4] - 2026-04-19
 

CHANGELOG.zh-CN.md

@@ -6,6 +6,20 @@
 
 格式参考 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/)。
 
+---
+## [0.22.5] - 2026-04-20
+
+### 修复
+- **Trae 账号 upsert 现已改为 `user_id` 优先识别，仅在必要时才回退到邮箱**：导入时不再因邮箱相同误合并不同用户，且占位邮箱 `unknown` 不再参与身份匹配。
+- **Cursor 套餐徽标归一化现已把 `pro_student` 映射为 `pro`**：学生 Pro 订阅将显示预期的 Pro 徽标，不再暴露原始 membership 文本。
+
+### 新增
+- **Codex API 服务在“未启用”状态下切号前现会先弹出启用确认**：账号页操作会显示警告弹框，并支持一键“启用并切号”后继续执行。
+
+### 变更
+- **Gemini 默认实例设置现已端到端持久化 `working_dir`**：列表、更新、启动、停止链路都会读取并返回已保存的工作目录，不再固定为空。
+- **API 服务激活链路现已不再自动触发历史会话可见性修复**：切换到服务模式时仅执行真实实例配置切换，历史修复改为显式触发流程。
+
 ---
 ## [0.22.4] - 2026-04-19
 

Cargo.lock

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

package.json

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

release-artifacts/SHA256SUMS.txt

@@ -725,18 +725,6 @@ pub async fn codex_local_access_set_enabled(
 #[tauri::command]
 pub async fn codex_local_access_activate(app: AppHandle) -> Result<CodexLocalAccessState, String> {
     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!(
-                "切换 API 服务前读取 Codex provider 失败，跳过自动修复预判: {}",
-                error
-            ));
-            None
-        });
     let state = codex_local_access::activate_local_access_for_dir(&codex_home).await?;
 
     let mut index = codex_account::load_account_index();
@@ -756,41 +744,6 @@ pub async fn codex_local_access_activate(app: AppHandle) -> Result<CodexLocalAcc
         logger::log_info("已同步更新 Codex 默认实例为 API 服务模式");
     }
 
-    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!(
-                "切换 API 服务后读取 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!(
-                    "切换 API 服务后已自动执行历史会话可见性修复: {}",
-                    summary.message
-                ));
-            }
-            Err(error) => {
-                logger::log_warn(&format!(
-                    "API 服务切换成功，但自动修复历史会话可见性失败，请稍后在会话管理中手动补跑: {}",
-                    error
-                ));
-            }
-        }
-    }
-
     let user_config = config::get_user_config();
     logger::log_info("API 服务启动模式下跳过 OpenCode / OpenClaw OAuth 同步");
 

src-tauri/Cargo.toml

@@ -87,56 +87,7 @@ async fn inject_bound_account_to_profile(
     bind_account_id: &str,
 ) -> Result<(), String> {
     if modules::codex_instance::is_api_service_bind_account_id(bind_account_id) {
-        let provider_before =
-            modules::codex_session_visibility::read_history_visibility_provider_for_dir(
-                profile_dir,
-            )
-            .map(Some)
-            .unwrap_or_else(|error| {
-                modules::logger::log_warn(&format!(
-                    "实例切换 API 服务前读取 provider 失败，跳过自动修复预判: {}",
-                    error
-                ));
-                None
-            });
-
         modules::codex_local_access::activate_local_access_for_dir(profile_dir).await?;
-
-        let provider_after =
-            modules::codex_session_visibility::read_history_visibility_provider_for_dir(
-                profile_dir,
-            )
-            .map(Some)
-            .unwrap_or_else(|error| {
-                modules::logger::log_warn(&format!(
-                    "实例切换 API 服务后读取 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 modules::codex_session_visibility::repair_session_visibility_across_instances() {
-                Ok(summary) => {
-                    modules::logger::log_info(&format!(
-                        "实例切换 API 服务后已自动执行历史会话可见性修复: {}",
-                        summary.message
-                    ));
-                }
-                Err(error) => {
-                    modules::logger::log_warn(&format!(
-                        "实例 API 服务切换成功，但自动修复历史会话可见性失败，请稍后在会话管理中手动补跑: {}",
-                        error
-                    ));
-                }
-            }
-        }
-
         return Ok(());
     }
 

src-tauri/src/commands/codex.rs

@@ -57,7 +57,7 @@ fn resolve_instance_launch_context(instance_id: &str) -> Result<GeminiLaunchCont
         let default_settings = modules::gemini_instance::load_default_settings()?;
         return Ok(GeminiLaunchContext {
             user_data_dir: default_dir.to_string_lossy().to_string(),
-            working_dir: None,
+            working_dir: default_settings.working_dir,
             extra_args: default_settings.extra_args,
             use_home_env: false,
         });
@@ -166,7 +166,7 @@ pub async fn gemini_list_instances() -> Result<Vec<InstanceProfileView>, String>
         id: DEFAULT_INSTANCE_ID.to_string(),
         name: String::new(),
         user_data_dir: default_dir_str,
-        working_dir: None,
+        working_dir: default_settings.working_dir.clone(),
         extra_args: default_settings.extra_args.clone(),
         bind_account_id: default_settings.bind_account_id.clone(),
         created_at: 0,
@@ -225,6 +225,7 @@ pub async fn gemini_update_instance(
         let default_dir_str = default_dir.to_string_lossy().to_string();
         let updated = modules::gemini_instance::update_default_settings(
             bind_account_id,
+            working_dir,
             extra_args,
             follow_local_account,
         )?;
@@ -233,7 +234,7 @@ pub async fn gemini_update_instance(
             id: DEFAULT_INSTANCE_ID.to_string(),
             name: String::new(),
             user_data_dir: default_dir_str,
-            working_dir: None,
+            working_dir: updated.working_dir,
             extra_args: updated.extra_args,
             bind_account_id: updated.bind_account_id,
             created_at: 0,
@@ -301,7 +302,7 @@ pub async fn gemini_start_instance(instance_id: String) -> Result<InstanceProfil
             id: DEFAULT_INSTANCE_ID.to_string(),
             name: String::new(),
             user_data_dir: default_dir_str,
-            working_dir: None,
+            working_dir: default_settings.working_dir.clone(),
             extra_args: default_settings.extra_args,
             bind_account_id: default_settings.bind_account_id,
             created_at: 0,
@@ -348,7 +349,7 @@ pub async fn gemini_stop_instance(instance_id: String) -> Result<InstanceProfile
             id: DEFAULT_INSTANCE_ID.to_string(),
             name: String::new(),
             user_data_dir: default_dir_str,
-            working_dir: None,
+            working_dir: default_settings.working_dir.clone(),
             extra_args: default_settings.extra_args,
             bind_account_id: default_settings.bind_account_id,
             created_at: 0,

src-tauri/src/commands/codex_instance.rs

@@ -56,6 +56,8 @@ pub struct DefaultInstanceSettings {
     #[serde(default)]
     pub extra_args: String,
     #[serde(default)]
+    pub working_dir: Option<String>,
+    #[serde(default)]
     pub launch_mode: InstanceLaunchMode,
     #[serde(default = "default_follow_local_account")]
     pub follow_local_account: bool,
@@ -72,6 +74,7 @@ impl Default for DefaultInstanceSettings {
         Self {
             bind_account_id: None,
             extra_args: String::new(),
+            working_dir: None,
             launch_mode: InstanceLaunchMode::App,
             follow_local_account: true,
             last_pid: None,