release: v0.22.0

Author: 李杰

CHANGELOG.md

@@ -6,6 +6,23 @@ 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.0] - 2026-04-18
+
+### Added
+- **Merged upstream workspace/CLI changes from PR #490 (`dcdeda2`, based on `ca5aade`)**: the repository is migrated to a Cargo Workspace, introduces `cockpit-core` as shared Rust logic, and initializes `cockpit-cli` with the first account list/switch flow for Cursor and Gemini.
+- **Codex now includes full local API Service management on the account pages**: an inline service card plus a dedicated panel can manage collection members, API key visibility/reset, service port, direct activate/test actions, and account collection edits in one workflow.
+- **API Service now records and displays usage metrics for totals and per-account views**: request counts, token usage (input/output/cache/reasoning), average latency, and success rate are all visible in the service panel.
+
+### Changed
+- **Integrated Codex account/export adjustments from `5a2d970`**: Codex import now preserves `auth_file_plan_type` (`prolite`/`promax`) from file metadata and uses it in plan badges (`PRO 5x` / `PRO 20x`); `sub2api` export payload now includes `exported_at`, `type/version`, `proxies`, and per-account `concurrency/priority`.
+- **Codex instance binding now supports a dedicated API Service target (`__api_service__`)**: account pickers, instance search, and Codex instance labels now recognize and display API Service mode consistently.
+- **Starting a Codex instance in API Service mode now applies the switch on the real profile directory**: startup uses the same persisted on-disk path as normal instance switching, and triggers history-visibility repair when the effective provider changes.
+- **Activating API Service from Codex accounts now syncs default runtime pointers**: Cockpit clears the default current-account pointer and updates the default Codex instance binding to API Service mode.
+- **Cockpit startup now auto-restores saved local API gateway runtime state**: previously enabled API Service settings are resumed without manual reactivation.
+- **Codex quota error messaging for network failures is now normalized**: manual-refresh hints no longer expose raw backend error details.
+- **New API Service locale keys are now fully synchronized across all supported locales**: `zh-CN`, `en-US`, `en`, and the remaining non-English locale packs all ship with matching keys.
+
 ---
 ## [0.21.4] - 2026-04-16
 

CHANGELOG.zh-CN.md

@@ -6,6 +6,23 @@
 
 格式参考 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/)。
 
+---
+## [0.22.0] - 2026-04-18
+
+### 新增
+- **已合入上游工作区/CLI 改造（PR #490，`dcdeda2`，基于 `ca5aade`）**：仓库已迁移为 Cargo Workspace，新增 `cockpit-core` 共享 Rust 逻辑层，并初始化 `cockpit-cli`（首版支持 Cursor / Gemini 账号列出与切换）。
+- **Codex 账号页现已补齐本地 API 服务全量管理能力**：提供内联服务卡片与独立服务面板，可在同一流程完成集合成员维护、密钥显示/重置、服务端口设置、直接启动/测试，以及成员集合编辑。
+- **API 服务现已记录并展示总量与按账号统计**：服务面板可直接查看请求数、Token 使用（输入/输出/缓存/思考）、平均延迟与成功率。
+
+### 变更
+- **已并入 `5a2d970` 的 Codex 调整**：导入时会保留 `auth_file_plan_type`（`prolite`/`promax`）并用于套餐徽标展示（`PRO 5x` / `PRO 20x`）；`sub2api` 导出结构新增 `exported_at`、`type/version`、`proxies` 及账号级 `concurrency/priority` 字段。
+- **Codex 实例绑定现已支持独立 API 服务目标（`__api_service__`）**：账号选择器、实例搜索与实例列表标签现已统一识别并展示 API 服务模式。
+- **API 服务模式下启动 Codex 实例现已写入真实实例目录配置**：启动链路与普通实例切换一致走真实落盘路径，并在 provider 实际变化时自动触发历史可见性修复。
+- **从 Codex 账号页激活 API 服务时，默认运行态指针现已同步**：会清空默认 current account 指针，并把默认 Codex 实例绑定更新为 API 服务模式。
+- **Cockpit 启动时现会自动恢复已保存的本地 API 网关运行态**：已启用的 API 服务配置无需每次手动重新激活。
+- **Codex 配额网络失败提示现已统一收敛**：手动刷新提示不再直接回显后端原始错误详情。
+- **API 服务新增文案现已覆盖全部支持语言并保持 key 对齐**：`zh-CN`、`en-US`、`en` 以及其余非英语语言包均已同步补齐。
+
 ---
 ## [0.21.4] - 2026-04-16
 

Cargo.lock

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

package.json

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

src-tauri/Cargo.lock

@@ -1,9 +1,12 @@
 use crate::models::codex::{
     CodexAccount, CodexApiProviderMode, CodexQuickConfig, CodexQuota, CodexTokens,
 };
+use crate::models::codex_local_access::{
+    CodexLocalAccessRoutingStrategy, CodexLocalAccessState,
+};
 use crate::modules::{
-    codex_account, codex_oauth, codex_quota, codex_wakeup, codex_wakeup_scheduler, config, logger,
-    openclaw_auth, opencode_auth, process,
+    codex_account, codex_local_access, codex_oauth, codex_quota, codex_wakeup,
+    codex_wakeup_scheduler, config, logger, openclaw_auth, opencode_auth, process,
 };
 use std::sync::atomic::{AtomicBool, Ordering};
 use tauri::AppHandle;
@@ -672,3 +675,151 @@ pub async fn save_codex_model_providers(data: String) -> Result<(), String> {
     let path = dir.join(CODEX_MODEL_PROVIDERS_FILE);
     std::fs::write(&path, data).map_err(|e| format!("Failed to write codex model providers: {}", e))
 }
+
+#[tauri::command]
+pub async fn codex_local_access_get_state() -> Result<CodexLocalAccessState, String> {
+    codex_local_access::get_local_access_state().await
+}
+
+#[tauri::command]
+pub async fn codex_local_access_save_accounts(
+    account_ids: Vec<String>,
+) -> Result<CodexLocalAccessState, String> {
+    codex_local_access::save_local_access_accounts(account_ids).await
+}
+
+#[tauri::command]
+pub async fn codex_local_access_remove_account(
+    account_id: String,
+) -> Result<CodexLocalAccessState, String> {
+    codex_local_access::remove_local_access_account(&account_id).await
+}
+
+#[tauri::command]
+pub async fn codex_local_access_rotate_api_key() -> Result<CodexLocalAccessState, String> {
+    codex_local_access::rotate_local_access_api_key().await
+}
+
+#[tauri::command]
+pub async fn codex_local_access_clear_stats() -> Result<CodexLocalAccessState, String> {
+    codex_local_access::clear_local_access_stats().await
+}
+
+#[tauri::command]
+pub async fn codex_local_access_update_port(
+    port: u16,
+) -> Result<CodexLocalAccessState, String> {
+    codex_local_access::update_local_access_port(port).await
+}
+
+#[tauri::command]
+pub async fn codex_local_access_update_routing_strategy(
+    strategy: CodexLocalAccessRoutingStrategy,
+) -> Result<CodexLocalAccessState, String> {
+    codex_local_access::update_local_access_routing_strategy(strategy).await
+}
+
+#[tauri::command]
+pub async fn codex_local_access_set_enabled(
+    enabled: bool,
+) -> Result<CodexLocalAccessState, String> {
+    codex_local_access::set_local_access_enabled(enabled).await
+}
+
+#[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();
+    index.current_account_id = None;
+    codex_account::save_account_index(&index)?;
+
+    if let Err(e) = crate::modules::codex_instance::update_default_settings(
+        Some(Some(
+            crate::modules::codex_instance::CODEX_API_SERVICE_BIND_ACCOUNT_ID.to_string(),
+        )),
+        None,
+        Some(false),
+        None,
+    ) {
+        logger::log_warn(&format!("更新 Codex 默认实例为 API 服务模式失败: {}", e));
+    } else {
+        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 同步");
+
+    if user_config.codex_launch_on_switch {
+        #[cfg(target_os = "macos")]
+        if process::is_codex_running() {
+            logger::log_info("检测到 Codex 正在运行，将按默认实例 PID 逻辑重启");
+        }
+        match crate::commands::codex_instance::codex_start_instance("__default__".to_string()).await
+        {
+            Ok(_) => {}
+            Err(e) => {
+                logger::log_warn(&format!("Codex 启动失败: {}", e));
+                if e.starts_with("APP_PATH_NOT_FOUND:") {
+                    let _ = app.emit(
+                        "app:path_missing",
+                        serde_json::json!({ "app": "codex", "retry": { "kind": "default" } }),
+                    );
+                }
+            }
+        }
+    } else {
+        logger::log_info("已关闭切换 Codex 时自动启动 Codex App");
+    }
+
+    let _ = crate::modules::tray::update_tray_menu(&app);
+    Ok(state)
+}

src-tauri/Cargo.toml

@@ -80,6 +80,63 @@ fn resolve_local_account_id() -> Option<String> {
     Some(account.id)
 }
 
+async fn inject_bound_account_to_profile(
+    profile_dir: &Path,
+    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(());
+    }
+
+    modules::codex_instance::inject_account_to_profile(profile_dir, bind_account_id).await
+}
+
 fn default_instance_view(
     default_dir: &Path,
     default_settings: &DefaultInstanceSettings,
@@ -406,7 +463,7 @@ pub async fn codex_start_instance(instance_id: String) -> Result<CodexInstancePr
             let _ = modules::codex_instance::update_default_pid(None)?;
         }
         if let Some(ref account_id) = default_bind_account_id {
-            modules::codex_instance::inject_account_to_profile(&default_dir, account_id).await?;
+            inject_bound_account_to_profile(&default_dir, account_id).await?;
         }
 
         if default_settings.launch_mode == InstanceLaunchMode::Cli {
@@ -453,11 +510,7 @@ pub async fn codex_start_instance(instance_id: String) -> Result<CodexInstancePr
     }
 
     if let Some(ref account_id) = instance.bind_account_id {
-        modules::codex_instance::inject_account_to_profile(
-            Path::new(&instance.user_data_dir),
-            account_id,
-        )
-        .await?;
+        inject_bound_account_to_profile(Path::new(&instance.user_data_dir), account_id).await?;
     }
 
     if instance.launch_mode == InstanceLaunchMode::Cli {

src-tauri/src/commands/codex.rs

@@ -130,6 +130,10 @@ pub fn run() {
                 modules::web_report::start_server().await;
             });
 
+            tauri::async_runtime::spawn(async {
+                modules::codex_local_access::restore_local_access_gateway().await;
+            });
+
             {
                 let app_handle = app.handle().clone();
                 tauri::async_runtime::spawn(async move {
@@ -392,6 +396,15 @@ pub fn run() {
             commands::codex::save_codex_account_groups,
             commands::codex::load_codex_model_providers,
             commands::codex::save_codex_model_providers,
+            commands::codex::codex_local_access_get_state,
+            commands::codex::codex_local_access_save_accounts,
+            commands::codex::codex_local_access_remove_account,
+            commands::codex::codex_local_access_rotate_api_key,
+            commands::codex::codex_local_access_clear_stats,
+            commands::codex::codex_local_access_update_port,
+            commands::codex::codex_local_access_update_routing_strategy,
+            commands::codex::codex_local_access_set_enabled,
+            commands::codex::codex_local_access_activate,
             // GitHub Copilot Commands
             commands::github_copilot::list_github_copilot_accounts,
             commands::github_copilot::delete_github_copilot_account,