Merge branch 'main' into fix/common-config-sync-improvements

feat(omo): unify common config enabled via provider meta for OpenCode
2026-07-25 13:45:03 +08:00 · 2026-02-12 23:09:57 +08:00 · 2026-02-12 12:01:50 +08:00 · 2026-02-12 10:30:31 +08:00 · 2026-02-06 16:33:15 +08:00 · 2026-02-05 16:55:09 +08:00
128 changed files with 5311 additions and 11651 deletions
@@ -15,11 +15,11 @@ English | [中文](README_ZH.md) | [日本語](README_JA.md) | [Changelog](CHANG

 ## ❤️Sponsor

-[![MiniMax](assets/partners/banners/minimax-en.jpeg)](https://platform.minimax.io/subscribe/coding-plan?code=ClLhgxr2je&source=link)
+[![MiniMax](assets/partners/banners/minimax-en.jpg)](https://bit.ly/3Nue8mA)

-MiniMax-M2.5 is a SOTA large language model designed for real-world productivity. Trained in a diverse range of complex real-world digital working environments, M2.5 builds upon the coding expertise of M2.1 to extend into general office work, reaching fluency in generating and operating Word, Excel, and Powerpoint files, context switching between diverse software environments, and working across different agent and human teams. Scoring 80.2% on SWE-Bench Verified, 51.3% on Multi-SWE-Bench, and 76.3% on BrowseComp, M2.5 is also more token efficient than previous generations, having been trained to optimize its actions and output through planning.
+MiniMax M2.1 is an open-source, SOTA model built for real-world development and agentic workflows. It delivers top-tier performance on major coding benchmarks such as SWE, VIBE, and Multi-SWE. Powered by a 10B active / 230B total MoE architecture, M2.1 enables faster inference, easier deployment, and even local execution. It excels at coding, navigating digital environments, and handling long, multi-step tasks at scale.

-[Click](https://platform.minimax.io/subscribe/coding-plan?code=ClLhgxr2je&source=link) to get an exclusive 12% off the MiniMax Coding Plan!
+[Click](https://bit.ly/3Nue8mA) to get an exclusive 12% off the MiniMax Coding Plan!

 ---

@@ -60,11 +60,6 @@ Claude Code / Codex / Gemini official channels at 38% / 2% / 9% of original pric
 <td>Thanks to AICoding.sh for sponsoring this project! AICoding.sh — Global AI Model API Relay Service at Unbeatable Prices! Claude Code at 19% of original price, GPT at just 1%! Trusted by hundreds of enterprises for cost-effective AI services. Supports Claude Code, GPT, Gemini and major domestic models, with enterprise-grade high concurrency, fast invoicing, and 24/7 dedicated technical support. CC Switch users who register via <a href="https://aicoding.sh/i/CCSWITCH">this link</a> get 10% off their first top-up!</td>
 </tr>

-<tr>
-<td width="180"><a href="https://crazyrouter.com/register?ref=cc-switch"><img src="assets/partners/logos/crazyrouter.jpg" alt="AICoding" width="150"></a></td>
-<td>Thanks to Crazyrouter for sponsoring this project! Crazyrouter is a high-performance AI API aggregation platform — one API key for 300+ models including Claude Code, Codex, Gemini CLI, GPT, and more. All through a single OpenAI-compatible endpoint with zero code changes. Features include auto-failover, smart routing, unlimited concurrency, and global low-latency access. <a href="https://crazyrouter.com/register?ref=cc-switch">Register here</a> to get started.</td>
-</tr>
-
 </table>

 ## Screenshots
@@ -15,11 +15,11 @@

 ## ❤️スポンサー

-[![MiniMax](assets/partners/banners/minimax-en.jpeg)](https://platform.minimax.io/subscribe/coding-plan?code=ClLhgxr2je&source=link)
+[![MiniMax](assets/partners/banners/minimax-en.jpg)](https://bit.ly/3Nue8mA)

-MiniMax-M2.5 は、実際の生産性向上のために設計された最先端の大規模言語モデルです。多様で複雑な実環境のデジタルワークスペースでトレーニングされた M2.5 は、M2.1 のコーディング能力をベースに一般的なオフィス業務へと拡張し、Word・Excel・PowerPoint ファイルの生成と操作、多様なソフトウェア環境間のコンテキスト切り替え、異なるエージェントや人間チーム間での協働を流暢にこなします。SWE-Bench Verified で 80.2%、Multi-SWE-Bench で 51.3%、BrowseComp で 76.3% を達成し、計画的な行動と出力の最適化トレーニングにより、前世代よりもトークン効率に優れています。
+MiniMax M2.1 は、実務開発とエージェントワークフロー向けに構築されたオープンソースの最先端モデルです。100 億のアクティブパラメータ / 2,300 億の総パラメータを持つ MoE アーキテクチャにより、高速な推論、簡単なデプロイ、ローカル実行にも対応します。SWE、VIBE、Multi-SWE などの主要コーディングベンチマークでトップクラスの性能を発揮し、コーディング、デジタル環境のナビゲーション、大規模な多段階タスクの処理に優れています。

-[こちら](https://platform.minimax.io/subscribe/coding-plan?code=ClLhgxr2je&source=link)から MiniMax Coding Plan の限定 12% オフを入手！
+[こちら](https://bit.ly/3Nue8mA)から MiniMax Coding Plan の限定 12% オフを入手！

 ---

@@ -60,11 +60,6 @@ Claude Code / Codex / Gemini 公式チャンネルが最安で元価格の 38% /
 <td>AICoding.sh のご支援に感謝します！AICoding.sh —— グローバル AI モデル API 超お得な中継サービス！Claude Code 81% オフ、GPT 99% オフ！数百社の企業に高コストパフォーマンスの AI サービスを提供。Claude Code、GPT、Gemini および国内主要モデルに対応、エンタープライズ級の高同時接続、迅速な請求書発行、24 時間年中無休の専属テクニカルサポート。<a href="https://aicoding.sh/i/CCSWITCH">こちらのリンク</a>から登録した CC Switch ユーザーは、初回チャージ 10% オフ！</td>
 </tr>

-<tr>
-<td width="180"><a href="https://crazyrouter.com/register?ref=cc-switch"><img src="assets/partners/logos/crazyrouter.jpg" alt="AICoding" width="150"></a></td>
-<td>Crazyrouter のご支援に感謝します！Crazyrouter は高性能 AI API アグリゲーションプラットフォームです。1 つの API キーで Claude Code、Codex、Gemini CLI、GPT など 300 以上のモデルにアクセス可能。OpenAI 互換エンドポイントでコード変更不要。自動フェイルオーバー、スマートルーティング、無制限同時接続、グローバル低遅延アクセスに対応。<a href="https://crazyrouter.com/register?ref=cc-switch">こちらから登録</a>してすぐにご利用いただけます。</td>
-</tr>
-
 </table>

 ## スクリーンショット
@@ -17,7 +17,7 @@

 [![MiniMax](assets/partners/banners/minimax-zh.jpeg)](https://platform.minimaxi.com/subscribe/coding-plan?code=7kYF2VoaCn&source=link)

-MiniMax M2.5 在编程、工具调用与搜索、办公等核心生产力场景均达到或刷新行业 SOTA，拥有架构师级代码能力与高效任务拆解能力，推理速度较上一代提升 37%、token 消耗更优；100 token/s 连续工作一小时仅需 1 美金，让复杂 Agent 规模化部署经济可行，已在企业多职能场景深度落地，加速全民 Agent 时代到来。
+MiniMax M2.x 系列模型是面向实际开发与智能体工作流打造的编码模型，M2.1 基于 100 亿激活 / 2300 亿总参的混合专家架构打造，推理更快、部署更便捷且支持本地运行，在 SWE、VIBE、Multi-SWE 等主流代码评测基准中均表现顶尖，擅长代码开发、数字环境适配及规模化处理长链路多步骤任务。

 [点击](https://platform.minimaxi.com/subscribe/coding-plan?code=7kYF2VoaCn&source=link)即可领取 MiniMax Coding Plan 专属 88 折优惠！

@@ -61,11 +61,6 @@ Claude Code / Codex / Gemini 官方渠道低至 3.8 / 0.2 / 0.9 折，充值更
 <td>感谢 AICoding.sh 赞助了本项目！AICoding.sh —— 全球大模型 API 超值中转服务！Claude Code 1.9 折，GPT 0.1 折，已为数百家企业提供高性价比 AI 服务。支持 Claude Code、GPT、Gemini 及国内主流模型，企业级高并发、极速开票、7×24 专属技术支持，通过<a href="https://aicoding.sh/i/CCSWITCH">此链接</a> 注册的 CC Switch 用户，首充可享受九折优惠！</td>
 </tr>

-<tr>
-<td width="180"><a href="https://crazyrouter.com/register?ref=cc-switch"><img src="assets/partners/logos/crazyrouter.jpg" alt="AICoding" width="150"></a></td>
-<td>感谢 Crazyrouter 赞助了本项目！Crazyrouter 是一个高性能 AI API 聚合平台——一个 API Key 即可访问 300+ 模型，包括 Claude Code、Codex、Gemini CLI、GPT 等。通过单一 OpenAI 兼容端点实现零代码改动接入。支持自动故障转移、智能路由、无限并发和全球低延迟访问。<a href="https://crazyrouter.com/register?ref=cc-switch">点击这里注册</a>即可开始使用！</td>
-</tr>
-
 </table>

 ## 界面预览
@@ -54,7 +54,6 @@
    "@lobehub/icons-static-svg": "^1.73.0",
    "@radix-ui/react-accordion": "^1.2.12",
    "@radix-ui/react-checkbox": "^1.3.3",
-    "@radix-ui/react-collapsible": "^1.1.12",
    "@radix-ui/react-dialog": "^1.1.15",
    "@radix-ui/react-dropdown-menu": "^2.1.16",
    "@radix-ui/react-label": "^2.1.7",
@@ -50,9 +50,6 @@ importers:
      '@radix-ui/react-checkbox':
        specifier: ^1.3.3
        version: 1.3.3(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@radix-ui/react-collapsible':
-        specifier: ^1.1.12
-        version: 1.1.12(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
      '@radix-ui/react-dialog':
        specifier: ^1.1.15
        version: 1.1.15(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -714,7 +714,6 @@ dependencies = [
 "futures",
 "hyper",
 "indexmap 2.11.4",
- "json5",
 "log",
 "objc2 0.5.2",
 "objc2-app-kit 0.2.2",
@@ -728,7 +727,6 @@ dependencies = [
 "serde_json",
 "serde_yaml",
 "serial_test",
- "sha2",
 "tauri",
 "tauri-build",
 "tauri-plugin-deep-link",
@@ -2522,17 +2520,6 @@ dependencies = [
 "thiserror 1.0.69",
 ]

-[[package]]
-name = "json5"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"
-dependencies = [
- "pest",
- "pest_derive",
- "serde",
-]
-
 [[package]]
 name = "jsonptr"
 version = "0.6.3"
@@ -3417,49 +3404,6 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"

-[[package]]
-name = "pest"
-version = "2.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7"
-dependencies = [
- "memchr",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f9dbced329c441fa79d80472764b1a2c7e57123553b8519b36663a2fb234ed"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bb96d5051a78f44f43c8f712d8e810adb0ebf923fc9ed2655a7f66f63ba8ee5"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602113b5b5e8621770cfd490cfd90b9f84ab29bd2b0e49ad83eb6d186cef2365"
-dependencies = [
- "pest",
- "sha2",
-]
-
 [[package]]
 name = "phf"
 version = "0.8.0"
@@ -5690,6 +5634,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
 dependencies = [
+ "indexmap 2.11.4",
 "serde",
 "serde_spanned 0.6.9",
 "toml_datetime 0.6.11",
@@ -5943,12 +5888,6 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"

-[[package]]
-name = "ucd-trie"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
-
 [[package]]
 name = "uds_windows"
 version = "1.1.0"
@@ -35,7 +35,7 @@ tauri-plugin-dialog = "2"
 tauri-plugin-store = "2"
 tauri-plugin-deep-link = "2"
 dirs = "5.0"
-toml = "0.8"
+toml = { version = "0.8", features = ["preserve_order"] }
 toml_edit = "0.22"
 reqwest = { version = "0.12", features = ["rustls-tls", "json", "stream", "socks"] }
 tokio = { version = "1", features = ["macros", "rt-multi-thread", "time", "sync"] }
@@ -57,12 +57,10 @@ url = "2.5"
 auto-launch = "0.5"
 once_cell = "1.21.3"
 base64 = "0.22"
-rusqlite = { version = "0.31", features = ["bundled", "backup", "hooks"] }
+rusqlite = { version = "0.31", features = ["bundled", "backup"] }
 indexmap = { version = "2", features = ["serde"] }
 rust_decimal = "1.33"
 uuid = { version = "1.11", features = ["v4"] }
-sha2 = "0.10"
-json5 = "0.4"

 [target.'cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))'.dependencies]
 tauri-plugin-single-instance = "2"
@@ -25,7 +25,6 @@ impl McpApps {
            AppType::Codex => self.codex,
            AppType::Gemini => self.gemini,
            AppType::OpenCode => self.opencode,
-            AppType::OpenClaw => false, // OpenClaw doesn't support MCP
        }
    }

@@ -36,7 +35,6 @@ impl McpApps {
            AppType::Codex => self.codex = enabled,
            AppType::Gemini => self.gemini = enabled,
            AppType::OpenCode => self.opencode = enabled,
-            AppType::OpenClaw => {} // OpenClaw doesn't support MCP, ignore
        }
    }

@@ -85,7 +83,6 @@ impl SkillApps {
            AppType::Codex => self.codex,
            AppType::Gemini => self.gemini,
            AppType::OpenCode => self.opencode,
-            AppType::OpenClaw => false, // OpenClaw doesn't support Skills
        }
    }

@@ -96,7 +93,6 @@ impl SkillApps {
            AppType::Codex => self.codex = enabled,
            AppType::Gemini => self.gemini = enabled,
            AppType::OpenCode => self.opencode = enabled,
-            AppType::OpenClaw => {} // OpenClaw doesn't support Skills, ignore
        }
    }

@@ -226,9 +222,6 @@ pub struct McpRoot {
    /// OpenCode MCP 配置（v4.0.0+，实际使用 opencode.json）
    #[serde(default, skip_serializing_if = "McpConfig::is_empty")]
    pub opencode: McpConfig,
-    /// OpenClaw MCP 配置（v4.1.0+，实际使用 openclaw.json）
-    #[serde(default, skip_serializing_if = "McpConfig::is_empty")]
-    pub openclaw: McpConfig,
 }

 impl Default for McpRoot {
@@ -241,7 +234,6 @@ impl Default for McpRoot {
            codex: McpConfig::default(),
            gemini: McpConfig::default(),
            opencode: McpConfig::default(),
-            openclaw: McpConfig::default(),
        }
    }
 }
@@ -264,8 +256,6 @@ pub struct PromptRoot {
    pub gemini: PromptConfig,
    #[serde(default)]
    pub opencode: PromptConfig,
-    #[serde(default)]
-    pub openclaw: PromptConfig,
 }

 use crate::config::{copy_file, get_app_config_dir, get_app_config_path, write_json_file};
@@ -281,7 +271,6 @@ pub enum AppType {
    Codex,
    Gemini,
    OpenCode,
-    OpenClaw,
 }

 impl AppType {
@@ -291,16 +280,15 @@ impl AppType {
            AppType::Codex => "codex",
            AppType::Gemini => "gemini",
            AppType::OpenCode => "opencode",
-            AppType::OpenClaw => "openclaw",
        }
    }

    /// Check if this app uses additive mode
    ///
    /// - Switch mode (false): Only the current provider is written to live config (Claude, Codex, Gemini)
-    /// - Additive mode (true): All providers are written to live config (OpenCode, OpenClaw)
+    /// - Additive mode (true): All providers are written to live config (OpenCode)
    pub fn is_additive_mode(&self) -> bool {
-        matches!(self, AppType::OpenCode | AppType::OpenClaw)
+        matches!(self, AppType::OpenCode)
    }

    /// Return an iterator over all app types
@@ -310,7 +298,6 @@ impl AppType {
            AppType::Codex,
            AppType::Gemini,
            AppType::OpenCode,
-            AppType::OpenClaw,
        ]
        .into_iter()
    }
@@ -326,11 +313,10 @@ impl FromStr for AppType {
            "codex" => Ok(AppType::Codex),
            "gemini" => Ok(AppType::Gemini),
            "opencode" => Ok(AppType::OpenCode),
-            "openclaw" => Ok(AppType::OpenClaw),
            other => Err(AppError::localized(
                "unsupported_app",
-                format!("不支持的应用标识: '{other}'。可选值: claude, codex, gemini, opencode, openclaw。"),
-                format!("Unsupported app id: '{other}'. Allowed: claude, codex, gemini, opencode, openclaw."),
+                format!("不支持的应用标识: '{other}'。可选值: claude, codex, gemini, opencode。"),
+                format!("Unsupported app id: '{other}'. Allowed: claude, codex, gemini, opencode."),
            )),
        }
    }
@@ -350,12 +336,23 @@ pub struct CommonConfigSnippets {

    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub opencode: Option<String>,
-
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub openclaw: Option<String>,
 }

 impl CommonConfigSnippets {
+    /// 检查是否所有字段都为空
+    pub fn is_empty(&self) -> bool {
+        let is_blank = |value: &Option<String>| {
+            value
+                .as_ref()
+                .map(|snippet| snippet.trim().is_empty())
+                .unwrap_or(true)
+        };
+        is_blank(&self.claude)
+            && is_blank(&self.codex)
+            && is_blank(&self.gemini)
+            && is_blank(&self.opencode)
+    }
+
    /// 获取指定应用的通用配置片段
    pub fn get(&self, app: &AppType) -> Option<&String> {
        match app {
@@ -363,7 +360,6 @@ impl CommonConfigSnippets {
            AppType::Codex => self.codex.as_ref(),
            AppType::Gemini => self.gemini.as_ref(),
            AppType::OpenCode => self.opencode.as_ref(),
-            AppType::OpenClaw => self.openclaw.as_ref(),
        }
    }

@@ -374,7 +370,6 @@ impl CommonConfigSnippets {
            AppType::Codex => self.codex = snippet,
            AppType::Gemini => self.gemini = snippet,
            AppType::OpenCode => self.opencode = snippet,
-            AppType::OpenClaw => self.openclaw = snippet,
        }
    }
 }
@@ -397,7 +392,9 @@ pub struct MultiAppConfig {
    #[serde(default)]
    pub skills: SkillStore,
    /// 通用配置片段（按应用分治）
-    #[serde(default)]
+    /// 注意：此字段主要用于从旧版 config.json 迁移数据到数据库
+    /// 迁移成功后会被清空，空时不写入 config.json
+    #[serde(default, skip_serializing_if = "CommonConfigSnippets::is_empty")]
    pub common_config_snippets: CommonConfigSnippets,
    /// Claude 通用配置片段（旧字段，用于向后兼容迁移）
    #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -415,7 +412,6 @@ impl Default for MultiAppConfig {
        apps.insert("codex".to_string(), ProviderManager::default());
        apps.insert("gemini".to_string(), ProviderManager::default());
        apps.insert("opencode".to_string(), ProviderManager::default());
-        apps.insert("openclaw".to_string(), ProviderManager::default());

        Self {
            version: 2,
@@ -575,7 +571,6 @@ impl MultiAppConfig {
            AppType::Codex => &self.mcp.codex,
            AppType::Gemini => &self.mcp.gemini,
            AppType::OpenCode => &self.mcp.opencode,
-            AppType::OpenClaw => &self.mcp.openclaw,
        }
    }

@@ -586,7 +581,6 @@ impl MultiAppConfig {
            AppType::Codex => &mut self.mcp.codex,
            AppType::Gemini => &mut self.mcp.gemini,
            AppType::OpenCode => &mut self.mcp.opencode,
-            AppType::OpenClaw => &mut self.mcp.openclaw,
        }
    }

@@ -601,7 +595,6 @@ impl MultiAppConfig {
        Self::auto_import_prompt_if_exists(&mut config, AppType::Codex)?;
        Self::auto_import_prompt_if_exists(&mut config, AppType::Gemini)?;
        Self::auto_import_prompt_if_exists(&mut config, AppType::OpenCode)?;
-        Self::auto_import_prompt_if_exists(&mut config, AppType::OpenClaw)?;

        Ok(config)
    }
@@ -622,7 +615,6 @@ impl MultiAppConfig {
            || !self.prompts.codex.prompts.is_empty()
            || !self.prompts.gemini.prompts.is_empty()
            || !self.prompts.opencode.prompts.is_empty()
-            || !self.prompts.openclaw.prompts.is_empty()
        {
            return Ok(false);
        }
@@ -635,7 +627,6 @@ impl MultiAppConfig {
            AppType::Codex,
            AppType::Gemini,
            AppType::OpenCode,
-            AppType::OpenClaw,
        ] {
            // 复用已有的单应用导入逻辑
            if Self::auto_import_prompt_if_exists(self, app)? {
@@ -706,7 +697,6 @@ impl MultiAppConfig {
            AppType::Codex => &mut config.prompts.codex.prompts,
            AppType::Gemini => &mut config.prompts.gemini.prompts,
            AppType::OpenCode => &mut config.prompts.opencode.prompts,
-            AppType::OpenClaw => &mut config.prompts.openclaw.prompts,
        };

        prompts.insert(id, prompt);
@@ -735,18 +725,12 @@ impl MultiAppConfig {
        let mut conflicts = Vec::new();

        // 收集所有应用的 MCP
-        for app in [
-            AppType::Claude,
-            AppType::Codex,
-            AppType::Gemini,
-            AppType::OpenCode,
-        ] {
+        for app in [AppType::Claude, AppType::Codex, AppType::Gemini] {
            let old_servers = match app {
                AppType::Claude => &self.mcp.claude.servers,
                AppType::Codex => &self.mcp.codex.servers,
                AppType::Gemini => &self.mcp.gemini.servers,
                AppType::OpenCode => &self.mcp.opencode.servers,
-                AppType::OpenClaw => continue, // OpenClaw MCP is still in development, skip
            };

            for (id, entry) in old_servers {
@@ -59,15 +59,6 @@ pub async fn get_config_status(app: String) -> Result<ConfigStatus, String> {

            Ok(ConfigStatus { exists, path })
        }
-        AppType::OpenClaw => {
-            let config_path = crate::openclaw_config::get_openclaw_config_path();
-            let exists = config_path.exists();
-            let path = crate::openclaw_config::get_openclaw_dir()
-                .to_string_lossy()
-                .to_string();
-
-            Ok(ConfigStatus { exists, path })
-        }
    }
 }

@@ -83,7 +74,6 @@ pub async fn get_config_dir(app: String) -> Result<String, String> {
        AppType::Codex => codex_config::get_codex_config_dir(),
        AppType::Gemini => crate::gemini_config::get_gemini_dir(),
        AppType::OpenCode => crate::opencode_config::get_opencode_dir(),
-        AppType::OpenClaw => crate::openclaw_config::get_openclaw_dir(),
    };

    Ok(dir.to_string_lossy().to_string())
@@ -96,7 +86,6 @@ pub async fn open_config_folder(handle: AppHandle, app: String) -> Result<bool,
        AppType::Codex => codex_config::get_codex_config_dir(),
        AppType::Gemini => crate::gemini_config::get_gemini_dir(),
        AppType::OpenCode => crate::opencode_config::get_opencode_dir(),
-        AppType::OpenClaw => crate::openclaw_config::get_openclaw_dir(),
    };

    if !config_dir.exists() {
@@ -215,11 +204,36 @@ pub async fn set_common_config_snippet(
 ) -> Result<(), String> {
    if !snippet.trim().is_empty() {
        match app_type.as_str() {
-            "claude" | "gemini" | "omo" => {
+            "claude" => {
+                // 验证 JSON 格式
+                serde_json::from_str::<serde_json::Value>(&snippet)
+                    .map_err(invalid_json_format_error)?;
+            }
+            "gemini" => {
+                // 验证 ENV/JSON 格式并拒绝禁用键
+                let validation = crate::config_merge::validate_gemini_common_snippet(&snippet);
+
+                // 如果有禁用键，返回错误
+                if !validation.forbidden_keys_found.is_empty() {
+                    return Err(format!(
+                        "GEMINI_FORBIDDEN_KEYS:{}",
+                        validation.forbidden_keys_found.join(",")
+                    ));
+                }
+
+                // 如果非空但解析后无有效内容，返回错误
+                if !validation.is_valid {
+                    return Err("GEMINI_INVALID_SNIPPET".to_string());
+                }
+            }
+            "codex" => {
+                // TOML 格式，暂不验证（前端验证）
+            }
+            "omo" => {
+                // 验证 JSON 格式
                serde_json::from_str::<serde_json::Value>(&snippet)
                    .map_err(invalid_json_format_error)?;
            }
-            "codex" => {}
            _ => {}
        }
    }
@@ -5,15 +5,10 @@ use std::path::PathBuf;
 use tauri::State;
 use tauri_plugin_dialog::DialogExt;

-use crate::commands::sync_support::{
-    post_sync_warning_from_result, run_post_import_sync, success_payload_with_warning,
-};
 use crate::error::AppError;
 use crate::services::provider::ProviderService;
 use crate::store::AppState;

-// ─── File import/export ──────────────────────────────────────
-
 /// 导出数据库为 SQL 备份
 #[tauri::command]
 pub async fn export_config_to_file(
@@ -42,15 +37,27 @@ pub async fn import_config_from_file(
    state: State<'_, AppState>,
 ) -> Result<Value, String> {
    let db = state.db.clone();
-    let db_for_sync = db.clone();
+    let db_for_state = db.clone();
    tauri::async_runtime::spawn_blocking(move || {
        let path_buf = PathBuf::from(&filePath);
        let backup_id = db.import_sql(&path_buf)?;
-        let warning = post_sync_warning_from_result(Ok(run_post_import_sync(db_for_sync)));
-        if let Some(msg) = warning.as_ref() {
-            log::warn!("[Import] post-import sync warning: {msg}");
+
+        // 导入后同步当前供应商到各自的 live 配置
+        let app_state = AppState::new(db_for_state);
+        if let Err(err) = ProviderService::sync_current_to_live(&app_state) {
+            log::warn!("导入后同步 live 配置失败: {err}");
        }
-        Ok::<_, AppError>(success_payload_with_warning(backup_id, warning))
+
+        // 重新加载设置到内存缓存，确保导入的设置生效
+        if let Err(err) = crate::settings::reload_settings() {
+            log::warn!("导入后重载设置失败: {err}");
+        }
+
+        Ok::<_, AppError>(json!({
+            "success": true,
+            "message": "SQL imported successfully",
+            "backupId": backup_id
+        }))
    })
    .await
    .map_err(|e| format!("导入配置失败: {e}"))?
@@ -73,8 +80,6 @@ pub async fn sync_current_providers_live(state: State<'_, AppState>) -> Result<V
    .map_err(|e: AppError| e.to_string())
 }

-// ─── File dialogs ────────────────────────────────────────────
-
 /// 保存文件对话框
 #[tauri::command]
 pub async fn save_file_dialog<R: tauri::Runtime>(
@@ -313,79 +313,6 @@ fn try_get_version_wsl(_tool: &str, _distro: &str) -> (Option<String>, Option<St
    )
 }

-fn push_unique_path(paths: &mut Vec<std::path::PathBuf>, path: std::path::PathBuf) {
-    if path.as_os_str().is_empty() {
-        return;
-    }
-
-    if !paths.iter().any(|existing| existing == &path) {
-        paths.push(path);
-    }
-}
-
-fn push_env_single_dir(paths: &mut Vec<std::path::PathBuf>, value: Option<std::ffi::OsString>) {
-    if let Some(raw) = value {
-        push_unique_path(paths, std::path::PathBuf::from(raw));
-    }
-}
-
-fn extend_from_path_list(
-    paths: &mut Vec<std::path::PathBuf>,
-    value: Option<std::ffi::OsString>,
-    suffix: Option<&str>,
-) {
-    if let Some(raw) = value {
-        for p in std::env::split_paths(&raw) {
-            let dir = match suffix {
-                Some(s) => p.join(s),
-                None => p,
-            };
-            push_unique_path(paths, dir);
-        }
-    }
-}
-
-/// OpenCode install.sh 路径优先级（见 https://github.com/anomalyco/opencode README）:
-///   $OPENCODE_INSTALL_DIR > $XDG_BIN_DIR > $HOME/bin > $HOME/.opencode/bin
-/// 额外扫描 Go 安装路径（~/go/bin、$GOPATH/*/bin）。
-fn opencode_extra_search_paths(
-    home: &Path,
-    opencode_install_dir: Option<std::ffi::OsString>,
-    xdg_bin_dir: Option<std::ffi::OsString>,
-    gopath: Option<std::ffi::OsString>,
-) -> Vec<std::path::PathBuf> {
-    let mut paths = Vec::new();
-
-    push_env_single_dir(&mut paths, opencode_install_dir);
-    push_env_single_dir(&mut paths, xdg_bin_dir);
-
-    if !home.as_os_str().is_empty() {
-        push_unique_path(&mut paths, home.join("bin"));
-        push_unique_path(&mut paths, home.join(".opencode").join("bin"));
-        push_unique_path(&mut paths, home.join("go").join("bin"));
-    }
-
-    extend_from_path_list(&mut paths, gopath, Some("bin"));
-
-    paths
-}
-
-fn tool_executable_candidates(tool: &str, dir: &Path) -> Vec<std::path::PathBuf> {
-    #[cfg(target_os = "windows")]
-    {
-        vec![
-            dir.join(format!("{tool}.cmd")),
-            dir.join(format!("{tool}.exe")),
-            dir.join(tool),
-        ]
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    {
-        vec![dir.join(tool)]
-    }
-}
-
 /// 扫描常见路径查找 CLI
 fn scan_cli_version(tool: &str) -> (Option<String>, Option<String>) {
    use std::process::Command;
@@ -393,99 +320,88 @@ fn scan_cli_version(tool: &str) -> (Option<String>, Option<String>) {
    let home = dirs::home_dir().unwrap_or_default();

    // 常见的安装路径（原生安装优先）
-    let mut search_paths: Vec<std::path::PathBuf> = Vec::new();
-    if !home.as_os_str().is_empty() {
-        push_unique_path(&mut search_paths, home.join(".local/bin"));
-        push_unique_path(&mut search_paths, home.join(".npm-global/bin"));
-        push_unique_path(&mut search_paths, home.join("n/bin"));
-        push_unique_path(&mut search_paths, home.join(".volta/bin"));
-    }
+    let mut search_paths: Vec<std::path::PathBuf> = vec![
+        home.join(".local/bin"), // Native install (official recommended)
+        home.join(".npm-global/bin"),
+        home.join("n/bin"),      // n version manager
+        home.join(".volta/bin"), // Volta package manager
+    ];

    #[cfg(target_os = "macos")]
    {
-        push_unique_path(
-            &mut search_paths,
-            std::path::PathBuf::from("/opt/homebrew/bin"),
-        );
-        push_unique_path(
-            &mut search_paths,
-            std::path::PathBuf::from("/usr/local/bin"),
-        );
+        search_paths.push(std::path::PathBuf::from("/opt/homebrew/bin"));
+        search_paths.push(std::path::PathBuf::from("/usr/local/bin"));
    }

    #[cfg(target_os = "linux")]
    {
-        push_unique_path(
-            &mut search_paths,
-            std::path::PathBuf::from("/usr/local/bin"),
-        );
-        push_unique_path(&mut search_paths, std::path::PathBuf::from("/usr/bin"));
+        search_paths.push(std::path::PathBuf::from("/usr/local/bin"));
+        search_paths.push(std::path::PathBuf::from("/usr/bin"));
    }

    #[cfg(target_os = "windows")]
    {
        if let Some(appdata) = dirs::data_dir() {
-            push_unique_path(&mut search_paths, appdata.join("npm"));
+            search_paths.push(appdata.join("npm"));
        }
-        push_unique_path(
-            &mut search_paths,
-            std::path::PathBuf::from("C:\\Program Files\\nodejs"),
-        );
+        search_paths.push(std::path::PathBuf::from("C:\\Program Files\\nodejs"));
    }

+    // 添加 fnm 路径支持
    let fnm_base = home.join(".local/state/fnm_multishells");
    if fnm_base.exists() {
        if let Ok(entries) = std::fs::read_dir(&fnm_base) {
            for entry in entries.flatten() {
                let bin_path = entry.path().join("bin");
                if bin_path.exists() {
-                    push_unique_path(&mut search_paths, bin_path);
+                    search_paths.push(bin_path);
                }
            }
        }
    }

+    // 扫描 nvm 目录下的所有 node 版本
    let nvm_base = home.join(".nvm/versions/node");
    if nvm_base.exists() {
        if let Ok(entries) = std::fs::read_dir(&nvm_base) {
            for entry in entries.flatten() {
                let bin_path = entry.path().join("bin");
                if bin_path.exists() {
-                    push_unique_path(&mut search_paths, bin_path);
+                    search_paths.push(bin_path);
                }
            }
        }
    }

+    // 添加 Go 路径支持 (opencode 使用 go install 安装)
    if tool == "opencode" {
-        let extra_paths = opencode_extra_search_paths(
-            &home,
-            std::env::var_os("OPENCODE_INSTALL_DIR"),
-            std::env::var_os("XDG_BIN_DIR"),
-            std::env::var_os("GOPATH"),
-        );
-
-        for path in extra_paths {
-            push_unique_path(&mut search_paths, path);
+        search_paths.push(home.join("go/bin")); // go install 默认路径
+        if let Ok(gopath) = std::env::var("GOPATH") {
+            search_paths.push(std::path::PathBuf::from(gopath).join("bin"));
        }
    }

-    let current_path = std::env::var("PATH").unwrap_or_default();
-
+    // 在每个路径中查找工具
    for path in &search_paths {
-        #[cfg(target_os = "windows")]
-        let new_path = format!("{};{}", path.display(), current_path);
+        let tool_path = if cfg!(target_os = "windows") {
+            path.join(format!("{tool}.cmd"))
+        } else {
+            path.join(tool)
+        };

-        #[cfg(not(target_os = "windows"))]
-        let new_path = format!("{}:{}", path.display(), current_path);
+        if tool_path.exists() {
+            // 构建 PATH 环境变量，确保 node 可被找到
+            let current_path = std::env::var("PATH").unwrap_or_default();

-        for tool_path in tool_executable_candidates(tool, path) {
-            if !tool_path.exists() {
-                continue;
-            }
+            #[cfg(target_os = "windows")]
+            let new_path = format!("{};{}", path.display(), current_path);
+
+            #[cfg(not(target_os = "windows"))]
+            let new_path = format!("{}:{}", path.display(), current_path);

            #[cfg(target_os = "windows")]
            let output = {
+                // 使用 cmd /C 包装执行，确保子进程也在隐藏的控制台中运行
                Command::new("cmd")
                    .args(["/C", &format!("\"{}\" --version", tool_path.display())])
                    .env("PATH", &new_path)
@@ -1055,67 +971,3 @@ pub async fn set_window_theme(window: tauri::Window, theme: String) -> Result<()

    window.set_theme(tauri_theme).map_err(|e| e.to_string())
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::path::PathBuf;
-
-    #[test]
-    fn opencode_extra_search_paths_includes_install_and_fallback_dirs() {
-        let home = PathBuf::from("/home/tester");
-        let install_dir = Some(std::ffi::OsString::from("/custom/opencode/bin"));
-        let xdg_bin_dir = Some(std::ffi::OsString::from("/xdg/bin"));
-        let gopath =
-            std::env::join_paths([PathBuf::from("/go/path1"), PathBuf::from("/go/path2")]).ok();
-
-        let paths = opencode_extra_search_paths(&home, install_dir, xdg_bin_dir, gopath);
-
-        assert_eq!(paths[0], PathBuf::from("/custom/opencode/bin"));
-        assert_eq!(paths[1], PathBuf::from("/xdg/bin"));
-        assert!(paths.contains(&PathBuf::from("/home/tester/bin")));
-        assert!(paths.contains(&PathBuf::from("/home/tester/.opencode/bin")));
-        assert!(paths.contains(&PathBuf::from("/home/tester/go/bin")));
-        assert!(paths.contains(&PathBuf::from("/go/path1/bin")));
-        assert!(paths.contains(&PathBuf::from("/go/path2/bin")));
-    }
-
-    #[test]
-    fn opencode_extra_search_paths_deduplicates_repeated_entries() {
-        let home = PathBuf::from("/home/tester");
-        let same_dir = Some(std::ffi::OsString::from("/same/path"));
-
-        let paths = opencode_extra_search_paths(&home, same_dir.clone(), same_dir.clone(), None);
-
-        let count = paths
-            .iter()
-            .filter(|path| **path == PathBuf::from("/same/path"))
-            .count();
-        assert_eq!(count, 1);
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    #[test]
-    fn tool_executable_candidates_non_windows_uses_plain_binary_name() {
-        let dir = PathBuf::from("/usr/local/bin");
-        let candidates = tool_executable_candidates("opencode", &dir);
-
-        assert_eq!(candidates, vec![PathBuf::from("/usr/local/bin/opencode")]);
-    }
-
-    #[cfg(target_os = "windows")]
-    #[test]
-    fn tool_executable_candidates_windows_includes_cmd_exe_and_plain_name() {
-        let dir = PathBuf::from("C:\\tools");
-        let candidates = tool_executable_candidates("opencode", &dir);
-
-        assert_eq!(
-            candidates,
-            vec![
-                PathBuf::from("C:\\tools\\opencode.cmd"),
-                PathBuf::from("C:\\tools\\opencode.exe"),
-                PathBuf::from("C:\\tools\\opencode"),
-            ]
-        );
-    }
-}
@@ -9,7 +9,6 @@ mod import_export;
 mod mcp;
 mod misc;
 mod omo;
-mod openclaw;
 mod plugin;
 mod prompt;
 mod provider;
@@ -18,10 +17,7 @@ mod session_manager;
 mod settings;
 pub mod skill;
 mod stream_check;
-mod sync_support;
 mod usage;
-mod webdav_sync;
-mod workspace;

 pub use config::*;
 pub use deeplink::*;
@@ -32,7 +28,6 @@ pub use import_export::*;
 pub use mcp::*;
 pub use misc::*;
 pub use omo::*;
-pub use openclaw::*;
 pub use plugin::*;
 pub use prompt::*;
 pub use provider::*;
@@ -42,5 +37,3 @@ pub use settings::*;
 pub use skill::*;
 pub use stream_check::*;
 pub use usage::*;
-pub use webdav_sync::*;
-pub use workspace::*;
@@ -1,108 +0,0 @@
-use std::collections::HashMap;
-use tauri::State;
-
-use crate::openclaw_config;
-use crate::store::AppState;
-
-// ============================================================================
-// OpenClaw Provider Commands (migrated from provider.rs)
-// ============================================================================
-
-/// Import providers from OpenClaw live config to database.
-///
-/// OpenClaw uses additive mode — users may already have providers
-/// configured in openclaw.json.
-#[tauri::command]
-pub fn import_openclaw_providers_from_live(state: State<'_, AppState>) -> Result<usize, String> {
-    crate::services::provider::import_openclaw_providers_from_live(state.inner())
-        .map_err(|e| e.to_string())
-}
-
-/// Get provider IDs in the OpenClaw live config.
-#[tauri::command]
-pub fn get_openclaw_live_provider_ids() -> Result<Vec<String>, String> {
-    openclaw_config::get_providers()
-        .map(|providers| providers.keys().cloned().collect())
-        .map_err(|e| e.to_string())
-}
-
-// ============================================================================
-// Agents Configuration Commands
-// ============================================================================
-
-/// Get OpenClaw default model config (agents.defaults.model)
-#[tauri::command]
-pub fn get_openclaw_default_model() -> Result<Option<openclaw_config::OpenClawDefaultModel>, String>
-{
-    openclaw_config::get_default_model().map_err(|e| e.to_string())
-}
-
-/// Set OpenClaw default model config (agents.defaults.model)
-#[tauri::command]
-pub fn set_openclaw_default_model(
-    model: openclaw_config::OpenClawDefaultModel,
-) -> Result<(), String> {
-    openclaw_config::set_default_model(&model).map_err(|e| e.to_string())
-}
-
-/// Get OpenClaw model catalog/allowlist (agents.defaults.models)
-#[tauri::command]
-pub fn get_openclaw_model_catalog(
-) -> Result<Option<HashMap<String, openclaw_config::OpenClawModelCatalogEntry>>, String> {
-    openclaw_config::get_model_catalog().map_err(|e| e.to_string())
-}
-
-/// Set OpenClaw model catalog/allowlist (agents.defaults.models)
-#[tauri::command]
-pub fn set_openclaw_model_catalog(
-    catalog: HashMap<String, openclaw_config::OpenClawModelCatalogEntry>,
-) -> Result<(), String> {
-    openclaw_config::set_model_catalog(&catalog).map_err(|e| e.to_string())
-}
-
-/// Get full agents.defaults config (all fields)
-#[tauri::command]
-pub fn get_openclaw_agents_defaults(
-) -> Result<Option<openclaw_config::OpenClawAgentsDefaults>, String> {
-    openclaw_config::get_agents_defaults().map_err(|e| e.to_string())
-}
-
-/// Set full agents.defaults config (all fields)
-#[tauri::command]
-pub fn set_openclaw_agents_defaults(
-    defaults: openclaw_config::OpenClawAgentsDefaults,
-) -> Result<(), String> {
-    openclaw_config::set_agents_defaults(&defaults).map_err(|e| e.to_string())
-}
-
-// ============================================================================
-// Env Configuration Commands
-// ============================================================================
-
-/// Get OpenClaw env config (env section of openclaw.json)
-#[tauri::command]
-pub fn get_openclaw_env() -> Result<openclaw_config::OpenClawEnvConfig, String> {
-    openclaw_config::get_env_config().map_err(|e| e.to_string())
-}
-
-/// Set OpenClaw env config (env section of openclaw.json)
-#[tauri::command]
-pub fn set_openclaw_env(env: openclaw_config::OpenClawEnvConfig) -> Result<(), String> {
-    openclaw_config::set_env_config(&env).map_err(|e| e.to_string())
-}
-
-// ============================================================================
-// Tools Configuration Commands
-// ============================================================================
-
-/// Get OpenClaw tools config (tools section of openclaw.json)
-#[tauri::command]
-pub fn get_openclaw_tools() -> Result<openclaw_config::OpenClawToolsConfig, String> {
-    openclaw_config::get_tools_config().map_err(|e| e.to_string())
-}
-
-/// Set OpenClaw tools config (tools section of openclaw.json)
-#[tauri::command]
-pub fn set_openclaw_tools(tools: openclaw_config::OpenClawToolsConfig) -> Result<(), String> {
-    openclaw_config::set_tools_config(&tools).map_err(|e| e.to_string())
-}
@@ -318,7 +318,3 @@ pub fn get_opencode_live_provider_ids() -> Result<Vec<String>, String> {
        .map(|providers| providers.keys().cloned().collect())
        .map_err(|e| e.to_string())
 }
-
-// ============================================================================
-// OpenClaw 专属命令 → 已迁移至 commands/openclaw.rs
-// ============================================================================
@@ -2,28 +2,16 @@

 use tauri::AppHandle;

-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();
-    }
-    incoming
-}
-
 /// 获取设置
 #[tauri::command]
 pub async fn get_settings() -> Result<crate::settings::AppSettings, String> {
-    Ok(crate::settings::get_settings_for_frontend())
+    Ok(crate::settings::get_settings())
 }

 /// 保存设置
 #[tauri::command]
 pub async fn save_settings(settings: crate::settings::AppSettings) -> Result<bool, String> {
-    let existing = crate::settings::get_settings();
-    let merged = merge_settings_for_save(settings, &existing);
-    crate::settings::update_settings(merged).map_err(|e| e.to_string())?;
+    crate::settings::update_settings(settings).map_err(|e| e.to_string())?;
    Ok(true)
 }

@@ -66,58 +54,6 @@ pub async fn set_auto_launch(enabled: bool) -> Result<bool, String> {
    Ok(true)
 }

-#[cfg(test)]
-mod tests {
-    use super::merge_settings_for_save;
-    use crate::settings::{AppSettings, WebDavSyncSettings};
-
-    #[test]
-    fn save_settings_should_preserve_existing_webdav_when_payload_omits_it() {
-        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()
-        });
-
-        let incoming = AppSettings::default();
-        let merged = merge_settings_for_save(incoming, &existing);
-
-        assert!(merged.webdav_sync.is_some());
-        assert_eq!(
-            merged.webdav_sync.as_ref().map(|v| v.base_url.as_str()),
-            Some("https://dav.example.com")
-        );
-    }
-
-    #[test]
-    fn save_settings_should_keep_incoming_webdav_when_present() {
-        let mut existing = AppSettings::default();
-        existing.webdav_sync = Some(WebDavSyncSettings {
-            base_url: "https://dav.old.example.com".to_string(),
-            username: "old".to_string(),
-            password: "old-pass".to_string(),
-            ..WebDavSyncSettings::default()
-        });
-
-        let mut incoming = AppSettings::default();
-        incoming.webdav_sync = Some(WebDavSyncSettings {
-            base_url: "https://dav.new.example.com".to_string(),
-            username: "new".to_string(),
-            password: "new-pass".to_string(),
-            ..WebDavSyncSettings::default()
-        });
-
-        let merged = merge_settings_for_save(incoming, &existing);
-
-        assert_eq!(
-            merged.webdav_sync.as_ref().map(|v| v.base_url.as_str()),
-            Some("https://dav.new.example.com")
-        );
-    }
-}
-
 /// 获取开机自启状态
 #[tauri::command]
 pub async fn get_auto_launch_status() -> Result<bool, String> {
@@ -1,97 +0,0 @@
-use serde_json::{json, Value};
-use std::sync::Arc;
-
-use crate::database::Database;
-use crate::error::AppError;
-use crate::services::provider::ProviderService;
-use crate::settings;
-use crate::store::AppState;
-
-pub(crate) fn run_post_import_sync(db: Arc<Database>) -> Result<(), AppError> {
-    let app_state = AppState::new(db);
-    ProviderService::sync_current_to_live(&app_state)?;
-    settings::reload_settings()?;
-    Ok(())
-}
-
-fn post_sync_warning<E: std::fmt::Display>(err: E) -> String {
-    AppError::localized(
-        "sync.post_operation_sync_failed",
-        format!("后置同步状态失败: {err}"),
-        format!("Post-operation synchronization failed: {err}"),
-    )
-    .to_string()
-}
-
-pub(crate) fn post_sync_warning_from_result(
-    result: Result<Result<(), AppError>, String>,
-) -> Option<String> {
-    match result {
-        Ok(Ok(())) => None,
-        Ok(Err(err)) => Some(post_sync_warning(err)),
-        Err(err) => Some(post_sync_warning(err)),
-    }
-}
-
-pub(crate) fn attach_warning(mut value: Value, warning: Option<String>) -> Value {
-    if let Some(message) = warning {
-        if let Some(obj) = value.as_object_mut() {
-            obj.insert("warning".to_string(), Value::String(message));
-        }
-    }
-    value
-}
-
-pub(crate) fn success_payload_with_warning(backup_id: String, warning: Option<String>) -> Value {
-    attach_warning(
-        json!({
-            "success": true,
-            "message": "SQL imported successfully",
-            "backupId": backup_id
-        }),
-        warning,
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{attach_warning, post_sync_warning_from_result};
-    use serde_json::json;
-
-    #[test]
-    fn post_sync_warning_from_result_returns_none_on_success() {
-        let warning = post_sync_warning_from_result(Ok(Ok(())));
-        assert!(warning.is_none());
-    }
-
-    #[test]
-    fn post_sync_warning_from_result_returns_some_on_sync_error() {
-        let warning =
-            post_sync_warning_from_result(Ok(Err(crate::error::AppError::Config("boom".into()))));
-        assert!(warning.is_some());
-    }
-
-    #[tokio::test]
-    async fn post_sync_warning_from_result_returns_some_on_join_error() {
-        let handle = tokio::spawn(async move {
-            panic!("forced join error");
-        });
-        let join_err = handle.await.expect_err("task should panic");
-        let warning = post_sync_warning_from_result(Err(join_err.to_string()));
-        assert!(warning.is_some());
-    }
-
-    #[test]
-    fn attach_warning_adds_warning_without_dropping_existing_fields() {
-        let payload = json!({ "status": "downloaded" });
-        let updated = attach_warning(payload, Some("post sync warning".to_string()));
-        assert_eq!(
-            updated.get("status").and_then(|v| v.as_str()),
-            Some("downloaded")
-        );
-        assert_eq!(
-            updated.get("warning").and_then(|v| v.as_str()),
-            Some("post sync warning")
-        );
-    }
-}
@@ -1,357 +0,0 @@
-#![allow(non_snake_case)]
-
-use serde_json::{json, Value};
-use tauri::State;
-
-use crate::commands::sync_support::{
-    attach_warning, post_sync_warning_from_result, run_post_import_sync,
-};
-use crate::error::AppError;
-use crate::services::webdav_sync as webdav_sync_service;
-use crate::settings::{self, WebDavSyncSettings};
-use crate::store::AppState;
-
-fn persist_sync_error(settings: &mut WebDavSyncSettings, error: &AppError, source: &str) {
-    settings.status.last_error = Some(error.to_string());
-    settings.status.last_error_source = Some(source.to_string());
-    let _ = settings::update_webdav_sync_status(settings.status.clone());
-}
-
-fn webdav_not_configured_error() -> String {
-    AppError::localized(
-        "webdav.sync.not_configured",
-        "未配置 WebDAV 同步",
-        "WebDAV sync is not configured.",
-    )
-    .to_string()
-}
-
-fn webdav_sync_disabled_error() -> String {
-    AppError::localized(
-        "webdav.sync.disabled",
-        "WebDAV 同步未启用",
-        "WebDAV sync is disabled.",
-    )
-    .to_string()
-}
-
-fn require_enabled_webdav_settings() -> Result<WebDavSyncSettings, String> {
-    let settings = settings::get_webdav_sync_settings().ok_or_else(webdav_not_configured_error)?;
-    if !settings.enabled {
-        return Err(webdav_sync_disabled_error());
-    }
-    Ok(settings)
-}
-
-fn resolve_password_for_request(
-    mut incoming: WebDavSyncSettings,
-    existing: Option<WebDavSyncSettings>,
-    preserve_empty_password: bool,
-) -> WebDavSyncSettings {
-    if let Some(existing_settings) = existing {
-        if preserve_empty_password && incoming.password.is_empty() {
-            incoming.password = existing_settings.password;
-        }
-    }
-    incoming
-}
-
-#[cfg(test)]
-fn webdav_sync_mutex() -> &'static tokio::sync::Mutex<()> {
-    webdav_sync_service::sync_mutex()
-}
-
-async fn run_with_webdav_lock<T, Fut>(operation: Fut) -> Result<T, AppError>
-where
-    Fut: std::future::Future<Output = Result<T, AppError>>,
-{
-    webdav_sync_service::run_with_sync_lock(operation).await
-}
-
-fn map_sync_result<T, F>(result: Result<T, AppError>, on_error: F) -> Result<T, String>
-where
-    F: FnOnce(&AppError),
-{
-    match result {
-        Ok(value) => Ok(value),
-        Err(err) => {
-            on_error(&err);
-            Err(err.to_string())
-        }
-    }
-}
-
-#[tauri::command]
-pub async fn webdav_test_connection(
-    settings: WebDavSyncSettings,
-    #[allow(non_snake_case)] preserveEmptyPassword: Option<bool>,
-) -> Result<Value, String> {
-    let preserve_empty = preserveEmptyPassword.unwrap_or(true);
-    let resolved = resolve_password_for_request(
-        settings,
-        settings::get_webdav_sync_settings(),
-        preserve_empty,
-    );
-    webdav_sync_service::check_connection(&resolved)
-        .await
-        .map_err(|e| e.to_string())?;
-    Ok(json!({
-        "success": true,
-        "message": "WebDAV connection ok"
-    }))
-}
-
-#[tauri::command]
-pub async fn webdav_sync_upload(state: State<'_, AppState>) -> Result<Value, String> {
-    let db = state.db.clone();
-    let mut settings = require_enabled_webdav_settings()?;
-
-    let result = run_with_webdav_lock(webdav_sync_service::upload(&db, &mut settings)).await;
-    map_sync_result(result, |error| {
-        persist_sync_error(&mut settings, error, "manual")
-    })
-}
-
-#[tauri::command]
-pub async fn webdav_sync_download(state: State<'_, AppState>) -> Result<Value, String> {
-    let db = state.db.clone();
-    let db_for_sync = db.clone();
-    let mut settings = require_enabled_webdav_settings()?;
-    let _auto_sync_suppression = crate::services::webdav_auto_sync::AutoSyncSuppressionGuard::new();
-
-    let sync_result = run_with_webdav_lock(webdav_sync_service::download(&db, &mut settings)).await;
-    let mut result = map_sync_result(sync_result, |error| {
-        persist_sync_error(&mut settings, error, "manual")
-    })?;
-
-    // Post-download sync is best-effort: snapshot restore has already succeeded.
-    let warning = post_sync_warning_from_result(
-        tauri::async_runtime::spawn_blocking(move || run_post_import_sync(db_for_sync))
-            .await
-            .map_err(|e| e.to_string()),
-    );
-    if let Some(msg) = warning.as_ref() {
-        log::warn!("[WebDAV] post-download sync warning: {msg}");
-    }
-    result = attach_warning(result, warning);
-
-    Ok(result)
-}
-
-#[tauri::command]
-pub async fn webdav_sync_save_settings(
-    settings: WebDavSyncSettings,
-    #[allow(non_snake_case)] passwordTouched: Option<bool>,
-) -> Result<Value, String> {
-    let password_touched = passwordTouched.unwrap_or(false);
-    let existing = settings::get_webdav_sync_settings();
-    let mut sync_settings =
-        resolve_password_for_request(settings, existing.clone(), !password_touched);
-
-    // Preserve server-owned fields that the frontend does not manage
-    if let Some(existing_settings) = existing {
-        sync_settings.status = existing_settings.status;
-    }
-
-    sync_settings.normalize();
-    sync_settings.validate().map_err(|e| e.to_string())?;
-    settings::set_webdav_sync_settings(Some(sync_settings)).map_err(|e| e.to_string())?;
-    Ok(json!({ "success": true }))
-}
-
-#[tauri::command]
-pub async fn webdav_sync_fetch_remote_info() -> Result<Value, String> {
-    let settings = require_enabled_webdav_settings()?;
-    let info = webdav_sync_service::fetch_remote_info(&settings)
-        .await
-        .map_err(|e| e.to_string())?;
-    Ok(info.unwrap_or(json!({ "empty": true })))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{
-        map_sync_result, persist_sync_error, require_enabled_webdav_settings,
-        resolve_password_for_request, run_with_webdav_lock, webdav_sync_mutex,
-    };
-    use crate::error::AppError;
-    use crate::settings::{AppSettings, WebDavSyncSettings};
-    use serial_test::serial;
-    use std::sync::atomic::{AtomicBool, Ordering};
-    use std::sync::Arc;
-    use std::time::Duration;
-
-    #[tokio::test]
-    async fn webdav_sync_mutex_is_singleton() {
-        let a = webdav_sync_mutex() as *const _;
-        let b = webdav_sync_mutex() as *const _;
-        assert_eq!(a, b);
-    }
-
-    #[tokio::test]
-    #[serial]
-    async fn webdav_sync_mutex_serializes_concurrent_access() {
-        let guard = webdav_sync_mutex().lock().await;
-        let acquired = Arc::new(AtomicBool::new(false));
-        let acquired_bg = Arc::clone(&acquired);
-
-        let waiter = tokio::spawn(async move {
-            let _inner_guard = webdav_sync_mutex().lock().await;
-            acquired_bg.store(true, Ordering::SeqCst);
-        });
-
-        tokio::time::sleep(Duration::from_millis(40)).await;
-        assert!(!acquired.load(Ordering::SeqCst));
-
-        drop(guard);
-        tokio::time::timeout(Duration::from_secs(1), waiter)
-            .await
-            .expect("background task should complete after lock release")
-            .expect("background task should not panic");
-
-        assert!(acquired.load(Ordering::SeqCst));
-    }
-
-    #[tokio::test]
-    #[serial]
-    async fn map_sync_result_runs_error_handler_after_lock_release() {
-        let result = run_with_webdav_lock(async {
-            Err::<(), AppError>(AppError::Config("boom".to_string()))
-        })
-        .await;
-
-        let mut lock_released = false;
-        let mapped = map_sync_result(result, |_| {
-            lock_released = webdav_sync_mutex().try_lock().is_ok();
-        });
-
-        assert!(mapped.is_err());
-        assert!(lock_released);
-    }
-
-    #[test]
-    fn resolve_password_for_request_preserves_existing_when_requested() {
-        let incoming = WebDavSyncSettings {
-            base_url: "https://dav.example.com".to_string(),
-            username: "alice".to_string(),
-            password: String::new(),
-            ..WebDavSyncSettings::default()
-        };
-        let existing = Some(WebDavSyncSettings {
-            password: "secret".to_string(),
-            ..WebDavSyncSettings::default()
-        });
-        let resolved = resolve_password_for_request(incoming, existing, true);
-        assert_eq!(resolved.password, "secret");
-    }
-
-    #[test]
-    fn resolve_password_for_request_allows_explicit_empty_password() {
-        let incoming = WebDavSyncSettings {
-            base_url: "https://dav.example.com".to_string(),
-            username: "alice".to_string(),
-            password: String::new(),
-            ..WebDavSyncSettings::default()
-        };
-        let existing = Some(WebDavSyncSettings {
-            password: "secret".to_string(),
-            ..WebDavSyncSettings::default()
-        });
-        let resolved = resolve_password_for_request(incoming, existing, false);
-        assert!(resolved.password.is_empty());
-    }
-
-    #[test]
-    #[serial]
-    fn persist_sync_error_updates_status_without_overwriting_credentials() {
-        let test_home = std::env::temp_dir().join("cc-switch-sync-error-status-test");
-        let _ = std::fs::remove_dir_all(&test_home);
-        std::fs::create_dir_all(&test_home).expect("create test home");
-        std::env::set_var("CC_SWITCH_TEST_HOME", &test_home);
-
-        crate::settings::update_settings(AppSettings::default()).expect("reset settings");
-        let mut current = WebDavSyncSettings {
-            enabled: true,
-            base_url: "https://dav.example.com/dav/".to_string(),
-            username: "alice".to_string(),
-            password: "secret".to_string(),
-            remote_root: "cc-switch-sync".to_string(),
-            profile: "default".to_string(),
-            ..WebDavSyncSettings::default()
-        };
-        crate::settings::set_webdav_sync_settings(Some(current.clone()))
-            .expect("seed webdav settings");
-
-        persist_sync_error(
-            &mut current,
-            &crate::error::AppError::Config("boom".to_string()),
-            "manual",
-        );
-
-        let after = crate::settings::get_webdav_sync_settings().expect("read webdav settings");
-        assert_eq!(after.base_url, "https://dav.example.com/dav/");
-        assert_eq!(after.username, "alice");
-        assert_eq!(after.password, "secret");
-        assert_eq!(after.remote_root, "cc-switch-sync");
-        assert_eq!(after.profile, "default");
-        assert!(
-            after
-                .status
-                .last_error
-                .as_deref()
-                .unwrap_or_default()
-                .contains("boom"),
-            "status error should be updated"
-        );
-        assert_eq!(after.status.last_error_source.as_deref(), Some("manual"));
-    }
-
-    #[test]
-    #[serial]
-    fn require_enabled_webdav_settings_rejects_disabled_config() {
-        let test_home = std::env::temp_dir().join("cc-switch-sync-enabled-disabled-test");
-        let _ = std::fs::remove_dir_all(&test_home);
-        std::fs::create_dir_all(&test_home).expect("create test home");
-        std::env::set_var("CC_SWITCH_TEST_HOME", &test_home);
-
-        crate::settings::update_settings(AppSettings::default()).expect("reset settings");
-        crate::settings::set_webdav_sync_settings(Some(WebDavSyncSettings {
-            enabled: false,
-            base_url: "https://dav.example.com/dav/".to_string(),
-            username: "alice".to_string(),
-            password: "secret".to_string(),
-            ..WebDavSyncSettings::default()
-        }))
-        .expect("seed disabled webdav settings");
-
-        let err = require_enabled_webdav_settings().expect_err("disabled settings should fail");
-        assert!(
-            err.contains("disabled") || err.contains("未启用"),
-            "unexpected error: {err}"
-        );
-    }
-
-    #[test]
-    #[serial]
-    fn require_enabled_webdav_settings_returns_settings_when_enabled() {
-        let test_home = std::env::temp_dir().join("cc-switch-sync-enabled-ok-test");
-        let _ = std::fs::remove_dir_all(&test_home);
-        std::fs::create_dir_all(&test_home).expect("create test home");
-        std::env::set_var("CC_SWITCH_TEST_HOME", &test_home);
-
-        crate::settings::update_settings(AppSettings::default()).expect("reset settings");
-        crate::settings::set_webdav_sync_settings(Some(WebDavSyncSettings {
-            enabled: true,
-            base_url: "https://dav.example.com/dav/".to_string(),
-            username: "alice".to_string(),
-            password: "secret".to_string(),
-            ..WebDavSyncSettings::default()
-        }))
-        .expect("seed enabled webdav settings");
-
-        let settings =
-            require_enabled_webdav_settings().expect("enabled settings should be accepted");
-        assert!(settings.enabled);
-        assert_eq!(settings.base_url, "https://dav.example.com/dav/");
-    }
-}
@@ -1,60 +0,0 @@
-use crate::config::write_text_file;
-use crate::openclaw_config::get_openclaw_dir;
-
-/// Allowed workspace filenames (whitelist for security)
-const ALLOWED_FILES: &[&str] = &[
-    "AGENTS.md",
-    "SOUL.md",
-    "USER.md",
-    "IDENTITY.md",
-    "TOOLS.md",
-    "MEMORY.md",
-    "HEARTBEAT.md",
-    "BOOTSTRAP.md",
-    "BOOT.md",
-];
-
-fn validate_filename(filename: &str) -> Result<(), String> {
-    if !ALLOWED_FILES.contains(&filename) {
-        return Err(format!(
-            "Invalid workspace filename: {filename}. Allowed: {}",
-            ALLOWED_FILES.join(", ")
-        ));
-    }
-    Ok(())
-}
-
-/// Read an OpenClaw workspace file content.
-/// Returns None if the file does not exist.
-#[tauri::command]
-pub async fn read_workspace_file(filename: String) -> Result<Option<String>, String> {
-    validate_filename(&filename)?;
-
-    let path = get_openclaw_dir().join("workspace").join(&filename);
-
-    if !path.exists() {
-        return Ok(None);
-    }
-
-    std::fs::read_to_string(&path)
-        .map(Some)
-        .map_err(|e| format!("Failed to read workspace file {filename}: {e}"))
-}
-
-/// Write content to an OpenClaw workspace file (atomic write).
-/// Creates the workspace directory if it does not exist.
-#[tauri::command]
-pub async fn write_workspace_file(filename: String, content: String) -> Result<(), String> {
-    validate_filename(&filename)?;
-
-    let workspace_dir = get_openclaw_dir().join("workspace");
-
-    // Ensure workspace directory exists
-    std::fs::create_dir_all(&workspace_dir)
-        .map_err(|e| format!("Failed to create workspace directory: {e}"))?;
-
-    let path = workspace_dir.join(&filename);
-
-    write_text_file(&path, &content)
-        .map_err(|e| format!("Failed to write workspace file {filename}: {e}"))
-}
@@ -0,0 +1,889 @@
+//! Configuration merge utilities for the common config redesign.
+//!
+//! This module provides functions for:
+//! - `compute_final_config`: Merges common config (base) with custom config (override)
+//! - `extract_difference`: Extracts custom parts from live config by comparing with common config
+//!
+//! Supports JSON (Claude, Gemini) and TOML (Codex) formats.
+
+use serde_json::{Map, Value as JsonValue};
+use toml::Value as TomlValue;
+
+// ============================================================================
+// JSON Configuration Merge Functions
+// ============================================================================
+
+/// Deep merge two JSON objects where `source` overrides `target`.
+///
+/// Merge rules:
+/// - Nested objects: Recursive merge
+/// - Arrays: Source completely replaces target (no element-level merge)
+/// - Primitives: Source overrides target
+/// - Null values: Do not override
+fn deep_merge_json(target: &mut JsonValue, source: &JsonValue) {
+    // First check if both are objects without destructuring
+    let both_objects =
+        matches!(target, JsonValue::Object(_)) && matches!(source, JsonValue::Object(_));
+
+    if both_objects {
+        // Safe to destructure now since we know both are objects
+        if let (JsonValue::Object(target_map), JsonValue::Object(source_map)) = (target, source) {
+            for (key, source_value) in source_map {
+                if source_value.is_null() {
+                    // Null doesn't override
+                    continue;
+                }
+                match target_map.get_mut(key) {
+                    Some(target_value) if target_value.is_object() && source_value.is_object() => {
+                        // Nested object: recursive merge
+                        deep_merge_json(target_value, source_value);
+                    }
+                    _ => {
+                        // Other cases: source overrides
+                        target_map.insert(key.clone(), source_value.clone());
+                    }
+                }
+            }
+        }
+    } else {
+        // Non-object: source overrides
+        *target = source.clone();
+    }
+}
+
+/// Compute final JSON config.
+///
+/// Common config as base, custom config overrides (custom takes priority).
+///
+/// # Arguments
+/// * `custom_config` - Provider's custom configuration
+/// * `common_config` - Common configuration snippet
+/// * `enabled` - Whether common config is enabled
+///
+/// # Returns
+/// The merged final configuration as JSON value
+pub fn compute_final_json_config(
+    custom_config: &JsonValue,
+    common_config: &JsonValue,
+    enabled: bool,
+) -> JsonValue {
+    if !enabled {
+        return custom_config.clone();
+    }
+
+    // Validate both are objects
+    let common_obj = match common_config {
+        JsonValue::Object(m) if !m.is_empty() => m,
+        _ => return custom_config.clone(),
+    };
+
+    let custom_obj = match custom_config {
+        JsonValue::Object(_) => custom_config,
+        _ => return custom_config.clone(),
+    };
+
+    // Start with common config as base
+    let mut result = JsonValue::Object(common_obj.clone());
+
+    // Merge custom config on top (custom overrides common)
+    deep_merge_json(&mut result, custom_obj);
+
+    result
+}
+
+/// Check if two JSON values are deeply equal.
+fn json_deep_equal(a: &JsonValue, b: &JsonValue) -> bool {
+    match (a, b) {
+        (JsonValue::Null, JsonValue::Null) => true,
+        (JsonValue::Bool(a), JsonValue::Bool(b)) => a == b,
+        (JsonValue::Number(a), JsonValue::Number(b)) => a == b,
+        (JsonValue::String(a), JsonValue::String(b)) => a == b,
+        (JsonValue::Array(a), JsonValue::Array(b)) => {
+            if a.len() != b.len() {
+                return false;
+            }
+            a.iter().zip(b.iter()).all(|(x, y)| json_deep_equal(x, y))
+        }
+        (JsonValue::Object(a), JsonValue::Object(b)) => {
+            if a.len() != b.len() {
+                return false;
+            }
+            a.iter()
+                .all(|(k, v)| b.get(k).is_some_and(|bv| json_deep_equal(v, bv)))
+        }
+        _ => false,
+    }
+}
+
+/// Extract difference between live config and common config.
+///
+/// Extraction rules:
+/// - Keys not in common config → include in custom config
+/// - Keys in common config but with different values → include in custom config (user override)
+/// - Keys in common config with same values → skip (avoid redundant storage)
+///
+/// # Arguments
+/// * `live_config` - Configuration read from live file
+/// * `common_config` - Common configuration snippet
+///
+/// # Returns
+/// Tuple of (custom_config, has_common_keys)
+pub fn extract_json_difference(
+    live_config: &JsonValue,
+    common_config: &JsonValue,
+) -> (JsonValue, bool) {
+    let live_obj = match live_config {
+        JsonValue::Object(m) => m,
+        _ => return (live_config.clone(), false),
+    };
+
+    let common_obj = match common_config {
+        JsonValue::Object(m) => m,
+        _ => return (live_config.clone(), false),
+    };
+
+    let mut custom_config = Map::new();
+    let mut has_common_keys = false;
+
+    fn extract_recursive(
+        live: &Map<String, JsonValue>,
+        common: &Map<String, JsonValue>,
+        target: &mut Map<String, JsonValue>,
+        has_common: &mut bool,
+    ) {
+        for (key, live_value) in live {
+            match common.get(key) {
+                None => {
+                    // Case 1: Key not in common config, keep it
+                    target.insert(key.clone(), live_value.clone());
+                }
+                Some(common_value) => {
+                    // Check if both are objects for nested handling
+                    match (live_value, common_value) {
+                        (JsonValue::Object(live_map), JsonValue::Object(common_map)) => {
+                            // Case 2: Nested object, recurse
+                            let mut nested = Map::new();
+                            extract_recursive(live_map, common_map, &mut nested, has_common);
+                            if !nested.is_empty() {
+                                target.insert(key.clone(), JsonValue::Object(nested));
+                            } else {
+                                // Nested object matches common config
+                                *has_common = true;
+                            }
+                        }
+                        _ if !json_deep_equal(live_value, common_value) => {
+                            // Case 3: Value different, keep it (user override)
+                            target.insert(key.clone(), live_value.clone());
+                        }
+                        _ => {
+                            // Case 4: Value same, skip (avoid redundancy)
+                            *has_common = true;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    extract_recursive(
+        live_obj,
+        common_obj,
+        &mut custom_config,
+        &mut has_common_keys,
+    );
+
+    (JsonValue::Object(custom_config), has_common_keys)
+}
+
+// ============================================================================
+// TOML Configuration Merge Functions
+// ============================================================================
+
+/// Deep merge TOML tables while preserving target's key order (custom first, then common).
+///
+/// - Keeps target's existing values (target = custom config has priority)
+/// - Only adds keys from source that don't exist in target (common-only keys)
+/// - For nested tables, recursively merges while preserving target's keys first
+fn deep_merge_toml_preserve_order(target: &mut TomlValue, source: &TomlValue) {
+    let both_tables =
+        matches!(target, TomlValue::Table(_)) && matches!(source, TomlValue::Table(_));
+
+    if both_tables {
+        if let (TomlValue::Table(target_map), TomlValue::Table(source_map)) = (target, source) {
+            for (key, source_value) in source_map {
+                match target_map.get_mut(key) {
+                    Some(target_value) if target_value.is_table() && source_value.is_table() => {
+                        // Nested table: recursive merge (preserving target's keys first)
+                        deep_merge_toml_preserve_order(target_value, source_value);
+                    }
+                    Some(_) => {
+                        // Key exists in target: keep target's value (custom overrides common)
+                    }
+                    None => {
+                        // Key only in source: add to target (common-only keys appear after)
+                        target_map.insert(key.clone(), source_value.clone());
+                    }
+                }
+            }
+        }
+    }
+    // Non-table case: keep target as-is (custom has priority)
+}
+
+/// Compute final TOML config.
+///
+/// # Arguments
+/// * `custom_config` - Provider's custom TOML configuration
+/// * `common_config` - Common TOML configuration snippet
+/// * `enabled` - Whether common config is enabled
+///
+/// # Returns
+/// Tuple of (final_config_toml, error_message)
+pub fn compute_final_toml_config_str(
+    custom_toml: &str,
+    common_toml: &str,
+    enabled: bool,
+) -> (String, Option<String>) {
+    if !enabled || common_toml.trim().is_empty() {
+        return (custom_toml.to_string(), None);
+    }
+
+    // Check if common TOML has actual content (not just comments)
+    let common_has_content = common_toml.lines().any(|line| {
+        let trimmed = line.trim();
+        !trimmed.is_empty() && !trimmed.starts_with('#')
+    });
+
+    if !common_has_content {
+        return (custom_toml.to_string(), None);
+    }
+
+    // Parse custom TOML
+    let custom_config: TomlValue = match custom_toml.parse() {
+        Ok(v) => v,
+        Err(_) if custom_toml.trim().is_empty() => TomlValue::Table(toml::map::Map::new()),
+        Err(e) => {
+            return (
+                custom_toml.to_string(),
+                Some(format!("Failed to parse custom TOML: {e}")),
+            )
+        }
+    };
+
+    // Parse common TOML
+    let common_config: TomlValue = match common_toml.parse() {
+        Ok(v) => v,
+        Err(e) => {
+            return (
+                custom_toml.to_string(),
+                Some(format!("Failed to parse common TOML: {e}")),
+            )
+        }
+    };
+
+    // Start with custom config (so custom keys appear first in output)
+    let mut result = custom_config;
+
+    // Add common config keys that don't exist in custom (these appear after custom keys)
+    // Custom values always take priority (they're already in result)
+    deep_merge_toml_preserve_order(&mut result, &common_config);
+
+    // Serialize back to TOML string
+    match toml::to_string_pretty(&result) {
+        Ok(s) => (s, None),
+        Err(e) => (
+            custom_toml.to_string(),
+            Some(format!("Failed to serialize TOML: {e}")),
+        ),
+    }
+}
+
+/// Check if two TOML values are deeply equal.
+fn toml_deep_equal(a: &TomlValue, b: &TomlValue) -> bool {
+    match (a, b) {
+        (TomlValue::String(a), TomlValue::String(b)) => a == b,
+        (TomlValue::Integer(a), TomlValue::Integer(b)) => a == b,
+        (TomlValue::Float(a), TomlValue::Float(b)) => (a - b).abs() < f64::EPSILON,
+        (TomlValue::Boolean(a), TomlValue::Boolean(b)) => a == b,
+        (TomlValue::Datetime(a), TomlValue::Datetime(b)) => a == b,
+        (TomlValue::Array(a), TomlValue::Array(b)) => {
+            if a.len() != b.len() {
+                return false;
+            }
+            a.iter().zip(b.iter()).all(|(x, y)| toml_deep_equal(x, y))
+        }
+        (TomlValue::Table(a), TomlValue::Table(b)) => {
+            if a.len() != b.len() {
+                return false;
+            }
+            a.iter()
+                .all(|(k, v)| b.get(k).is_some_and(|bv| toml_deep_equal(v, bv)))
+        }
+        _ => false,
+    }
+}
+
+/// Extract difference between live TOML config and common config.
+///
+/// # Returns
+/// Tuple of (custom_toml, has_common_keys, error_message)
+pub fn extract_toml_difference_str(
+    live_toml: &str,
+    common_toml: &str,
+) -> (String, bool, Option<String>) {
+    if common_toml.trim().is_empty() {
+        return (live_toml.to_string(), false, None);
+    }
+
+    // Check if common TOML has actual content
+    let common_has_content = common_toml.lines().any(|line| {
+        let trimmed = line.trim();
+        !trimmed.is_empty() && !trimmed.starts_with('#')
+    });
+
+    if !common_has_content {
+        return (live_toml.to_string(), false, None);
+    }
+
+    // Parse live TOML
+    let live_config: TomlValue = match live_toml.parse() {
+        Ok(v) => v,
+        Err(_) if live_toml.trim().is_empty() => TomlValue::Table(toml::map::Map::new()),
+        Err(e) => {
+            return (
+                live_toml.to_string(),
+                false,
+                Some(format!("Failed to parse live TOML: {e}")),
+            )
+        }
+    };
+
+    // Parse common TOML
+    let common_config: TomlValue = match common_toml.parse() {
+        Ok(v) => v,
+        Err(e) => {
+            return (
+                live_toml.to_string(),
+                false,
+                Some(format!("Failed to parse common TOML: {e}")),
+            )
+        }
+    };
+
+    let live_table = match &live_config {
+        TomlValue::Table(m) => m,
+        _ => return (live_toml.to_string(), false, None),
+    };
+
+    let common_table = match &common_config {
+        TomlValue::Table(m) => m,
+        _ => return (live_toml.to_string(), false, None),
+    };
+
+    let mut custom_table = toml::map::Map::new();
+    let mut has_common_keys = false;
+
+    fn extract_recursive_toml(
+        live: &toml::map::Map<String, TomlValue>,
+        common: &toml::map::Map<String, TomlValue>,
+        target: &mut toml::map::Map<String, TomlValue>,
+        has_common: &mut bool,
+    ) {
+        for (key, live_value) in live {
+            match common.get(key) {
+                None => {
+                    target.insert(key.clone(), live_value.clone());
+                }
+                Some(common_value) => match (live_value, common_value) {
+                    (TomlValue::Table(live_map), TomlValue::Table(common_map)) => {
+                        let mut nested = toml::map::Map::new();
+                        extract_recursive_toml(live_map, common_map, &mut nested, has_common);
+                        if !nested.is_empty() {
+                            target.insert(key.clone(), TomlValue::Table(nested));
+                        } else {
+                            *has_common = true;
+                        }
+                    }
+                    _ if !toml_deep_equal(live_value, common_value) => {
+                        target.insert(key.clone(), live_value.clone());
+                    }
+                    _ => {
+                        *has_common = true;
+                    }
+                },
+            }
+        }
+    }
+
+    extract_recursive_toml(
+        live_table,
+        common_table,
+        &mut custom_table,
+        &mut has_common_keys,
+    );
+
+    let custom_config = TomlValue::Table(custom_table);
+
+    match toml::to_string_pretty(&custom_config) {
+        Ok(s) if s.trim().is_empty() => (String::new(), has_common_keys, None),
+        Ok(s) => (s, has_common_keys, None),
+        Err(e) => (
+            live_toml.to_string(),
+            false,
+            Some(format!("Failed to serialize TOML: {e}")),
+        ),
+    }
+}
+
+// ============================================================================
+// Live Config Merge for Provider Sync
+// ============================================================================
+
+use crate::app_config::AppType;
+use crate::provider::{Provider, ProviderMeta};
+
+/// Result of merging common config with provider's custom config.
+#[derive(Debug)]
+pub struct MergeResult {
+    /// The final merged configuration
+    pub config: JsonValue,
+    /// Warning message if any (e.g., parse errors that were recovered from)
+    pub warning: Option<String>,
+}
+
+/// Check if common config is enabled for a provider and app type.
+///
+/// Priority:
+/// 1. `meta.common_config_enabled_by_app.{app_type}` (per-app setting)
+/// 2. `meta.common_config_enabled` (global setting)
+/// 3. `false` (default)
+pub fn is_common_config_enabled(meta: Option<&ProviderMeta>, app_type: &AppType) -> bool {
+    meta.and_then(|m| {
+        m.common_config_enabled_by_app
+            .as_ref()
+            .and_then(|by_app| match app_type {
+                AppType::Claude => by_app.claude,
+                AppType::Codex => by_app.codex,
+                AppType::Gemini => by_app.gemini,
+                AppType::OpenCode => by_app.opencode,
+            })
+            .or(m.common_config_enabled)
+    })
+    .unwrap_or(false)
+}
+
+/// Merge common config with provider's custom config for live file writing.
+///
+/// This is the single source of truth for common config merging logic.
+/// Used by both `live.rs` and `proxy.rs`.
+///
+/// # Arguments
+/// * `app_type` - The application type (Claude, Codex, Gemini, OpenCode)
+/// * `provider` - The provider whose config is being merged
+/// * `common_snippet` - The common config snippet from database (may be empty)
+///
+/// # Returns
+/// `MergeResult` containing the final config and optional warning
+pub fn merge_config_for_live(
+    app_type: &AppType,
+    provider: &Provider,
+    common_snippet: Option<&str>,
+) -> MergeResult {
+    // Check if common config is enabled
+    let enabled = is_common_config_enabled(provider.meta.as_ref(), app_type);
+
+    // If not enabled or snippet is empty, return original config
+    let snippet = match common_snippet {
+        Some(s) if enabled && !s.trim().is_empty() => s,
+        _ => {
+            return MergeResult {
+                config: provider.settings_config.clone(),
+                warning: None,
+            }
+        }
+    };
+
+    // Perform merge based on app type
+    match app_type {
+        AppType::Claude => merge_claude_config(&provider.settings_config, snippet),
+        AppType::Codex => merge_codex_config(&provider.settings_config, snippet),
+        AppType::Gemini => merge_gemini_config(&provider.settings_config, snippet),
+        AppType::OpenCode => {
+            // OpenCode doesn't support common config merge
+            MergeResult {
+                config: provider.settings_config.clone(),
+                warning: None,
+            }
+        }
+    }
+}
+
+/// Merge Claude config (JSON format).
+fn merge_claude_config(custom_config: &JsonValue, common_snippet: &str) -> MergeResult {
+    let common_value: JsonValue = match serde_json::from_str(common_snippet) {
+        Ok(v) => v,
+        Err(e) => {
+            // Return warning without logging - caller will log if needed
+            return MergeResult {
+                config: custom_config.clone(),
+                warning: Some(format!("COMMON_CONFIG_PARSE_ERROR: {e}")),
+            };
+        }
+    };
+
+    MergeResult {
+        config: compute_final_json_config(custom_config, &common_value, true),
+        warning: None,
+    }
+}
+
+/// Merge Codex config (TOML for config field, JSON for auth field).
+fn merge_codex_config(custom_config: &JsonValue, common_snippet: &str) -> MergeResult {
+    let mut merged_config = custom_config.clone();
+    let mut warning = None;
+
+    if let Some(obj) = merged_config.as_object_mut() {
+        if let Some(config_str) = obj.get("config").and_then(|v| v.as_str()) {
+            let (merged_toml, error) =
+                compute_final_toml_config_str(config_str, common_snippet, true);
+            if let Some(e) = error {
+                // Return warning without logging - caller will log if needed
+                warning = Some(format!("CODEX_TOML_MERGE_ERROR: {e}"));
+            }
+            obj.insert("config".to_string(), JsonValue::String(merged_toml));
+        }
+    }
+
+    MergeResult {
+        config: merged_config,
+        warning,
+    }
+}
+
+/// Merge Gemini config (JSON format for env field).
+///
+/// Gemini common config can be stored in three formats:
+/// - ENV format: KEY=VALUE lines (one per line)
+/// - Flat JSON: `{"KEY": "VALUE", ...}`
+/// - Wrapped JSON: `{"env": {"KEY": "VALUE", ...}}`
+///
+/// This function supports all formats for backward compatibility.
+fn merge_gemini_config(custom_config: &JsonValue, common_snippet: &str) -> MergeResult {
+    // Parse and validate common config (filters forbidden keys)
+    let validation = validate_gemini_common_snippet(common_snippet);
+    let common_env = validation.env;
+
+    // Generate warning if forbidden keys were found
+    let warning = if !validation.forbidden_keys_found.is_empty() {
+        Some(format!(
+            "GEMINI_FORBIDDEN_KEYS:{}",
+            validation.forbidden_keys_found.join(",")
+        ))
+    } else {
+        None
+    };
+
+    if common_env.is_empty() {
+        return MergeResult {
+            config: custom_config.clone(),
+            warning,
+        };
+    }
+
+    let mut merged_config = custom_config.clone();
+
+    // Merge only the env field
+    // If custom config has env, merge common into it; otherwise initialize with common env
+    if let Some(merged_obj) = merged_config.as_object_mut() {
+        if let Some(merged_env) = merged_obj.get_mut("env") {
+            if let Some(merged_env_obj) = merged_env.as_object_mut() {
+                // Common env as base, custom env overrides
+                let mut final_env = common_env;
+                for (k, v) in merged_env_obj.iter() {
+                    final_env.insert(k.clone(), v.clone());
+                }
+                *merged_env = JsonValue::Object(final_env);
+            }
+        } else if !common_env.is_empty() {
+            // Custom config has no env field - initialize with common env
+            merged_obj.insert("env".to_string(), JsonValue::Object(common_env));
+        }
+    }
+
+    MergeResult {
+        config: merged_config,
+        warning,
+    }
+}
+
+/// Parse Gemini common config snippet supporting multiple formats.
+///
+/// Formats supported:
+/// - ENV format: KEY=VALUE lines
+/// - Flat JSON: {"KEY": "VALUE", ...}
+/// - Wrapped JSON: {"env": {"KEY": "VALUE", ...}}
+pub(crate) fn parse_gemini_common_snippet(snippet: &str) -> serde_json::Map<String, JsonValue> {
+    let trimmed = snippet.trim();
+    if trimmed.is_empty() {
+        return serde_json::Map::new();
+    }
+
+    // Try JSON first
+    if let Ok(parsed) = serde_json::from_str::<JsonValue>(trimmed) {
+        if let Some(obj) = parsed.as_object() {
+            // Check if it's wrapped format {"env": {...}}
+            if let Some(env_value) = obj.get("env").and_then(|v| v.as_object()) {
+                return env_value.clone();
+            }
+            // Flat format
+            return obj.clone();
+        }
+    }
+
+    // Parse as ENV format (KEY=VALUE lines)
+    let mut result = serde_json::Map::new();
+    for line in trimmed.lines() {
+        let line_trimmed = line.trim();
+        if line_trimmed.is_empty() || line_trimmed.starts_with('#') {
+            continue;
+        }
+        if let Some(equal_index) = line_trimmed.find('=') {
+            let key = line_trimmed[..equal_index].trim();
+            let raw_value = line_trimmed[equal_index + 1..].trim();
+            // Strip surrounding quotes (single or double) from value
+            // e.g., KEY="value" or KEY='value' -> value
+            let value = strip_env_quotes(raw_value);
+            if !key.is_empty() {
+                result.insert(key.to_string(), JsonValue::String(value.to_string()));
+            }
+        }
+    }
+    result
+}
+
+/// Gemini common config forbidden keys - these should never be in common config
+/// as they are provider-specific credentials/endpoints.
+const GEMINI_FORBIDDEN_KEYS: &[&str] = &["GOOGLE_GEMINI_BASE_URL", "GEMINI_API_KEY"];
+
+/// Result of validating Gemini common config snippet
+#[derive(Debug, Clone)]
+pub struct GeminiSnippetValidation {
+    /// Parsed environment variables (with forbidden keys filtered out)
+    pub env: serde_json::Map<String, JsonValue>,
+    /// List of forbidden keys that were found and filtered
+    pub forbidden_keys_found: Vec<String>,
+    /// Whether the snippet is valid (parseable and non-empty after filtering)
+    pub is_valid: bool,
+}
+
+/// Parse and validate Gemini common config snippet.
+///
+/// This function:
+/// 1. Parses the snippet (supports ENV/JSON formats)
+/// 2. Filters out forbidden keys (GOOGLE_GEMINI_BASE_URL, GEMINI_API_KEY)
+/// 3. Returns validation result with filtered env and forbidden keys found
+pub fn validate_gemini_common_snippet(snippet: &str) -> GeminiSnippetValidation {
+    let raw_env = parse_gemini_common_snippet(snippet);
+    let mut filtered_env = serde_json::Map::new();
+    let mut forbidden_keys_found = Vec::new();
+
+    for (key, value) in raw_env {
+        if GEMINI_FORBIDDEN_KEYS.contains(&key.as_str()) {
+            forbidden_keys_found.push(key);
+        } else {
+            filtered_env.insert(key, value);
+        }
+    }
+
+    GeminiSnippetValidation {
+        is_valid: !filtered_env.is_empty() || snippet.trim().is_empty(),
+        env: filtered_env,
+        forbidden_keys_found,
+    }
+}
+
+/// Strip surrounding quotes from ENV value.
+/// Supports both single and double quotes: "value" -> value, 'value' -> value
+fn strip_env_quotes(s: &str) -> &str {
+    let bytes = s.as_bytes();
+    if bytes.len() >= 2 {
+        let first = bytes[0];
+        let last = bytes[bytes.len() - 1];
+        if (first == b'"' && last == b'"') || (first == b'\'' && last == b'\'') {
+            return &s[1..s.len() - 1];
+        }
+    }
+    s
+}
+
+// ============================================================================
+// Unit Tests
+// ============================================================================
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    #[test]
+    fn test_compute_final_json_config_disabled() {
+        let custom = json!({"a": 1, "b": 2});
+        let common = json!({"c": 3});
+
+        let result = compute_final_json_config(&custom, &common, false);
+        assert_eq!(result, custom);
+    }
+
+    #[test]
+    fn test_compute_final_json_config_enabled() {
+        let custom = json!({"a": 1, "b": 2});
+        let common = json!({"b": 99, "c": 3});
+
+        let result = compute_final_json_config(&custom, &common, true);
+
+        // custom overrides common, so b should be 2
+        assert_eq!(result["a"], 1);
+        assert_eq!(result["b"], 2); // custom wins
+        assert_eq!(result["c"], 3); // from common
+    }
+
+    #[test]
+    fn test_compute_final_json_config_nested() {
+        let custom = json!({
+            "env": {
+                "API_KEY": "custom-key",
+                "CUSTOM_VAR": "value"
+            }
+        });
+        let common = json!({
+            "env": {
+                "API_KEY": "common-key",
+                "SHARED_VAR": "shared"
+            },
+            "includeCoAuthoredBy": false
+        });
+
+        let result = compute_final_json_config(&custom, &common, true);
+
+        assert_eq!(result["env"]["API_KEY"], "custom-key"); // custom wins
+        assert_eq!(result["env"]["CUSTOM_VAR"], "value"); // from custom
+        assert_eq!(result["env"]["SHARED_VAR"], "shared"); // from common
+        assert_eq!(result["includeCoAuthoredBy"], false); // from common
+    }
+
+    #[test]
+    fn test_extract_json_difference() {
+        let live = json!({
+            "env": {
+                "API_KEY": "my-key",
+                "SHARED_VAR": "shared"
+            },
+            "includeCoAuthoredBy": false,
+            "custom_field": true
+        });
+        let common = json!({
+            "env": {
+                "SHARED_VAR": "shared"
+            },
+            "includeCoAuthoredBy": false
+        });
+
+        let (custom, has_common) = extract_json_difference(&live, &common);
+
+        // Should keep API_KEY (not in common) and custom_field
+        assert_eq!(custom["env"]["API_KEY"], "my-key");
+        assert_eq!(custom["custom_field"], true);
+        // Should NOT have SHARED_VAR or includeCoAuthoredBy (same as common)
+        assert!(custom["env"].get("SHARED_VAR").is_none());
+        assert!(custom.get("includeCoAuthoredBy").is_none());
+        assert!(has_common);
+    }
+
+    #[test]
+    fn test_extract_json_difference_with_override() {
+        let live = json!({
+            "includeCoAuthoredBy": true, // Different from common!
+            "shared": "value"
+        });
+        let common = json!({
+            "includeCoAuthoredBy": false,
+            "shared": "value"
+        });
+
+        let (custom, has_common) = extract_json_difference(&live, &common);
+
+        // Should keep includeCoAuthoredBy because value is different
+        assert_eq!(custom["includeCoAuthoredBy"], true);
+        // Should NOT have shared (same as common)
+        assert!(custom.get("shared").is_none());
+        assert!(has_common);
+    }
+
+    #[test]
+    fn test_compute_final_toml_config() {
+        let custom = r#"
+model = "custom-model"
+[custom_section]
+key = "value"
+"#;
+        let common = r#"
+model = "common-model"
+shared_key = "shared"
+"#;
+
+        let (result, error) = compute_final_toml_config_str(custom, common, true);
+
+        assert!(error.is_none());
+        assert!(result.contains("custom-model")); // custom wins
+        assert!(result.contains("shared_key")); // from common
+
+        // With preserve_order feature enabled, verify key ordering via parsing
+        // instead of relying on string position (which is fragile)
+        let parsed: TomlValue = result.parse().expect("result should be valid TOML");
+        let table = parsed.as_table().expect("result should be a table");
+        let keys: Vec<&String> = table.keys().collect();
+
+        // Custom keys should appear before common-only keys
+        let model_idx = keys.iter().position(|k| *k == "model");
+        let custom_section_idx = keys.iter().position(|k| *k == "custom_section");
+        let shared_key_idx = keys.iter().position(|k| *k == "shared_key");
+
+        assert!(model_idx.is_some(), "model key should exist in result");
+        assert!(
+            custom_section_idx.is_some(),
+            "custom_section key should exist in result"
+        );
+        assert!(
+            shared_key_idx.is_some(),
+            "shared_key key should exist in result"
+        );
+
+        // With preserve_order, custom keys (model, custom_section) should come before common-only keys (shared_key)
+        assert!(
+            model_idx.unwrap() < shared_key_idx.unwrap(),
+            "custom 'model' should appear before common-only 'shared_key' (got model_idx={:?}, shared_key_idx={:?})",
+            model_idx, shared_key_idx
+        );
+    }
+
+    #[test]
+    fn test_extract_toml_difference() {
+        let live = r#"
+model = "my-model"
+shared_key = "shared"
+[custom_section]
+key = "value"
+"#;
+        let common = r#"
+shared_key = "shared"
+"#;
+
+        let (custom, has_common, error) = extract_toml_difference_str(live, common);
+
+        assert!(error.is_none());
+        assert!(custom.contains("model")); // not in common
+        assert!(custom.contains("custom_section")); // not in common
+        assert!(!custom.contains("shared_key")); // same as common
+        assert!(has_common);
+    }
+}
@@ -16,15 +16,10 @@ use tempfile::NamedTempFile;
 const CC_SWITCH_SQL_EXPORT_HEADER: &str = "-- CC Switch SQLite 导出";

 impl Database {
-    /// 导出为 SQLite 兼容的 SQL 文本（内存字符串）
-    pub fn export_sql_string(&self) -> Result<String, AppError> {
-        let snapshot = self.snapshot_to_memory()?;
-        Self::dump_sql(&snapshot)
-    }
-
    /// 导出为 SQLite 兼容的 SQL 文本
    pub fn export_sql(&self, target_path: &Path) -> Result<(), AppError> {
-        let dump = self.export_sql_string()?;
+        let snapshot = self.snapshot_to_memory()?;
+        let dump = Self::dump_sql(&snapshot)?;

        if let Some(parent) = target_path.parent() {
            fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
@@ -43,12 +38,6 @@ impl Database {
        }

        let sql_raw = fs::read_to_string(source_path).map_err(|e| AppError::io(source_path, e))?;
-        let sql_content = sql_raw.trim_start_matches('\u{feff}');
-        self.import_sql_string(sql_content)
-    }
-
-    /// 从 SQL 字符串导入，返回生成的备份 ID（若无备份则为空字符串）
-    pub fn import_sql_string(&self, sql_raw: &str) -> Result<String, AppError> {
        let sql_content = sql_raw.trim_start_matches('\u{feff}');
        Self::validate_cc_switch_sql_export(sql_content)?;

@@ -37,7 +37,7 @@ pub use dao::OmoGlobalConfig;

 use crate::config::get_app_config_dir;
 use crate::error::AppError;
-use rusqlite::{hooks::Action, Connection};
+use rusqlite::Connection;
 use serde::Serialize;
 use std::sync::Mutex;

@@ -76,17 +76,6 @@ pub struct Database {
    pub(crate) conn: Mutex<Connection>,
 }

-fn register_db_change_hook(conn: &Connection) {
-    conn.update_hook(Some(
-        |action: Action, _database: &str, table: &str, _row_id: i64| match action {
-            Action::SQLITE_INSERT | Action::SQLITE_UPDATE | Action::SQLITE_DELETE => {
-                crate::services::webdav_auto_sync::notify_db_changed(table);
-            }
-            _ => {}
-        },
-    ));
-}
-
 impl Database {
    /// 初始化数据库连接并创建表
    ///
@@ -104,7 +93,6 @@ impl Database {
        // 启用外键约束
        conn.execute("PRAGMA foreign_keys = ON;", [])
            .map_err(|e| AppError::Database(e.to_string()))?;
-        register_db_change_hook(&conn);

        let db = Self {
            conn: Mutex::new(conn),
@@ -123,7 +111,6 @@ impl Database {
        // 启用外键约束
        conn.execute("PRAGMA foreign_keys = ON;", [])
            .map_err(|e| AppError::Database(e.to_string()))?;
-        register_db_change_hook(&conn);

        let db = Self {
            conn: Mutex::new(conn),
@@ -297,15 +297,6 @@ fn schema_migration_v4_adds_pricing_model_columns() {
        r#"
        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 (
-            id TEXT PRIMARY KEY,
-            name TEXT NOT NULL,
-            server_config TEXT NOT NULL,
-            enabled_claude INTEGER NOT NULL DEFAULT 0,
-            enabled_codex INTEGER NOT NULL DEFAULT 0,
-            enabled_gemini INTEGER NOT NULL DEFAULT 0,
-            enabled_opencode INTEGER NOT NULL DEFAULT 0
-        );
        "#,
    )
    .expect("seed v4 schema");
@@ -175,10 +175,6 @@ pub(crate) fn parse_mcp_apps(apps_str: &str) -> Result<McpApps, AppError> {
            "codex" => apps.codex = true,
            "gemini" => apps.gemini = true,
            "opencode" => apps.opencode = true,
-            "openclaw" => {
-                // OpenClaw doesn't support MCP, ignore silently
-                log::debug!("OpenClaw doesn't support MCP, ignoring in apps parameter");
-            }
            other => {
                return Err(AppError::InvalidInput(format!(
                    "Invalid app in 'apps': {other}"
@@ -146,7 +146,6 @@ pub(crate) fn build_provider_from_request(
        AppType::Codex => build_codex_settings(request),
        AppType::Gemini => build_gemini_settings(request),
        AppType::OpenCode => build_opencode_settings(request),
-        AppType::OpenClaw => build_openclaw_settings(request),
    };

    // Build usage script configuration if provided
@@ -181,58 +180,68 @@ fn get_primary_endpoint(request: &DeepLinkImportRequest) -> String {
 }

 /// Build provider meta with usage script configuration
+///
+/// Note: Deeplink imported providers have common config disabled by default
+/// to avoid unexpected configuration merging.
 fn build_provider_meta(request: &DeepLinkImportRequest) -> Result<Option<ProviderMeta>, AppError> {
    // Check if any usage script fields are provided
-    if request.usage_script.is_none()
-        && request.usage_enabled.is_none()
-        && request.usage_api_key.is_none()
-        && request.usage_base_url.is_none()
-        && request.usage_access_token.is_none()
-        && request.usage_user_id.is_none()
-        && request.usage_auto_interval.is_none()
-    {
-        return Ok(None);
-    }
+    let has_usage_fields = request.usage_script.is_some()
+        || request.usage_enabled.is_some()
+        || request.usage_api_key.is_some()
+        || request.usage_base_url.is_some()
+        || request.usage_access_token.is_some()
+        || request.usage_user_id.is_some()
+        || request.usage_auto_interval.is_some();

-    // Decode usage script code if provided
-    let code = if let Some(script_b64) = &request.usage_script {
-        let decoded = decode_base64_param("usage_script", script_b64)?;
-        String::from_utf8(decoded)
-            .map_err(|e| AppError::InvalidInput(format!("Invalid UTF-8 in usage_script: {e}")))?
+    // Build usage script if fields are provided
+    let usage_script = if has_usage_fields {
+        // Decode usage script code if provided
+        let code = if let Some(script_b64) = &request.usage_script {
+            let decoded = decode_base64_param("usage_script", script_b64)?;
+            String::from_utf8(decoded).map_err(|e| {
+                AppError::InvalidInput(format!("Invalid UTF-8 in usage_script: {e}"))
+            })?
+        } else {
+            String::new()
+        };
+
+        // Determine enabled state: explicit param > has code > false
+        let enabled = request.usage_enabled.unwrap_or(!code.is_empty());
+
+        // Build UsageScript - use provider's API key and endpoint as defaults
+        // Note: use primary endpoint only (first one if comma-separated)
+        Some(UsageScript {
+            enabled,
+            language: "javascript".to_string(),
+            code,
+            timeout: Some(10),
+            api_key: request
+                .usage_api_key
+                .clone()
+                .or_else(|| request.api_key.clone()),
+            base_url: request.usage_base_url.clone().or_else(|| {
+                let primary = get_primary_endpoint(request);
+                if primary.is_empty() {
+                    None
+                } else {
+                    Some(primary)
+                }
+            }),
+            access_token: request.usage_access_token.clone(),
+            user_id: request.usage_user_id.clone(),
+            template_type: None, // Deeplink providers don't specify template type (will use backward compatibility logic)
+            auto_query_interval: request.usage_auto_interval,
+        })
    } else {
-        String::new()
-    };
-
-    // Determine enabled state: explicit param > has code > false
-    let enabled = request.usage_enabled.unwrap_or(!code.is_empty());
-
-    // Build UsageScript - use provider's API key and endpoint as defaults
-    // Note: use primary endpoint only (first one if comma-separated)
-    let usage_script = UsageScript {
-        enabled,
-        language: "javascript".to_string(),
-        code,
-        timeout: Some(10),
-        api_key: request
-            .usage_api_key
-            .clone()
-            .or_else(|| request.api_key.clone()),
-        base_url: request.usage_base_url.clone().or_else(|| {
-            let primary = get_primary_endpoint(request);
-            if primary.is_empty() {
-                None
-            } else {
-                Some(primary)
-            }
-        }),
-        access_token: request.usage_access_token.clone(),
-        user_id: request.usage_user_id.clone(),
-        template_type: None, // Deeplink providers don't specify template type (will use backward compatibility logic)
-        auto_query_interval: request.usage_auto_interval,
+        None
    };

+    // Always return a ProviderMeta with common_config_enabled = false for deeplink imports
+    // This ensures the imported provider uses its own settings_config directly
+    // without merging with the global common config snippet
    Ok(Some(ProviderMeta {
-        usage_script: Some(usage_script),
+        usage_script,
+        common_config_enabled: Some(false),
        ..Default::default()
    }))
 }
@@ -392,35 +401,6 @@ fn build_opencode_settings(request: &DeepLinkImportRequest) -> serde_json::Value
    })
 }

-fn build_openclaw_settings(request: &DeepLinkImportRequest) -> serde_json::Value {
-    let endpoint = get_primary_endpoint(request);
-
-    // Build OpenClaw provider config
-    // Format: { baseUrl, apiKey, api, models }
-    let mut config = serde_json::Map::new();
-
-    if !endpoint.is_empty() {
-        config.insert("baseUrl".to_string(), json!(endpoint));
-    }
-
-    if let Some(api_key) = &request.api_key {
-        config.insert("apiKey".to_string(), json!(api_key));
-    }
-
-    // Default to OpenAI-compatible API
-    config.insert("api".to_string(), json!("openai-completions"));
-
-    // Build models array
-    if let Some(model) = &request.model {
-        config.insert(
-            "models".to_string(),
-            json!([{ "id": model, "name": model }]),
-        );
-    }
-
-    json!(config)
-}
-
 // =============================================================================
 // Config Merge Logic
 // =============================================================================
@@ -482,10 +462,6 @@ pub fn parse_and_merge_config(
        "claude" => merge_claude_config(&mut merged, &config_value)?,
        "codex" => merge_codex_config(&mut merged, &config_value)?,
        "gemini" => merge_gemini_config(&mut merged, &config_value)?,
-        // Additive mode apps use JSON config directly; pass through as-is
-        "openclaw" | "opencode" => {
-            merge_additive_config(&mut merged, &config_value)?;
-        }
        "" => {
            // No app specified, skip merging
            return Ok(merged);
@@ -657,47 +633,6 @@ fn merge_gemini_config(
    Ok(())
 }

-/// Merge configuration for additive mode apps (OpenClaw, OpenCode)
-///
-/// These apps use JSON config directly, so we only extract common fields
-/// (api_key, endpoint, model) from the config if not already set in URL params.
-fn merge_additive_config(
-    request: &mut DeepLinkImportRequest,
-    config: &serde_json::Value,
-) -> Result<(), AppError> {
-    // Extract api_key from config if not provided in URL
-    if request.api_key.as_ref().is_none_or(|s| s.is_empty()) {
-        if let Some(api_key) = config
-            .get("apiKey")
-            .or_else(|| config.get("api_key"))
-            .and_then(|v| v.as_str())
-        {
-            request.api_key = Some(api_key.to_string());
-        }
-    }
-
-    // Extract endpoint from config if not provided in URL
-    if request.endpoint.as_ref().is_none_or(|s| s.is_empty()) {
-        if let Some(base_url) = config
-            .get("baseUrl")
-            .or_else(|| config.get("base_url"))
-            .or_else(|| config.get("options").and_then(|o| o.get("baseURL")))
-            .and_then(|v| v.as_str())
-        {
-            request.endpoint = Some(base_url.to_string());
-        }
-    }
-
-    // Auto-fill homepage from endpoint
-    if request.homepage.as_ref().is_none_or(|s| s.is_empty()) {
-        if let Some(endpoint) = request.endpoint.as_ref().filter(|s| !s.is_empty()) {
-            request.homepage = infer_homepage_from_endpoint(endpoint);
-        }
-    }
-
-    Ok(())
-}
-
 /// Extract base_url from Codex TOML config
 fn extract_codex_base_url(toml_value: &toml::Value) -> Option<String> {
    // Try to find base_url in model_providers section
@@ -6,6 +6,7 @@ mod claude_plugin;
 mod codex_config;
 mod commands;
 mod config;
+mod config_merge;
 mod database;
 mod deeplink;
 mod error;
@@ -13,7 +14,6 @@ mod gemini_config;
 mod gemini_mcp;
 mod init_status;
 mod mcp;
-mod openclaw_config;
 mod opencode_config;
 mod panic_hook;
 mod prompt;
@@ -501,7 +501,7 @@ pub fn run() {
                    log::info!("✓ Imported {count} OpenCode provider(s) from live config");
                }
                Ok(_) => log::debug!("○ No OpenCode providers found to import"),
-                Err(e) => log::warn!("○ Failed to import OpenCode providers: {e}"),
+                Err(e) => log::debug!("○ Failed to import OpenCode providers: {e}"),
            }

            // 2.2 OMO 配置导入（当数据库中无 OMO provider 时，从本地文件导入）
@@ -526,17 +526,6 @@ pub fn run() {
                }
            }

-            // 2.3 OpenClaw 供应商导入（累加式模式，需特殊处理）
-            // OpenClaw 与 OpenCode 类似：配置文件中可同时存在多个供应商
-            // 需要遍历 models.providers 字段下的每个供应商并导入
-            match crate::services::provider::import_openclaw_providers_from_live(&app_state) {
-                Ok(count) if count > 0 => {
-                    log::info!("✓ Imported {count} OpenClaw provider(s) from live config");
-                }
-                Ok(_) => log::debug!("○ No OpenClaw providers found to import"),
-                Err(e) => log::warn!("○ Failed to import OpenClaw providers: {e}"),
-            }
-
            // 3. 导入 MCP 服务器配置（表空时触发）
            if app_state.db.is_mcp_table_empty().unwrap_or(false) {
                log::info!("MCP table empty, importing from live configurations...");
@@ -582,8 +571,6 @@ pub fn run() {
                    crate::app_config::AppType::Claude,
                    crate::app_config::AppType::Codex,
                    crate::app_config::AppType::Gemini,
-                    crate::app_config::AppType::OpenCode,
-                    crate::app_config::AppType::OpenClaw,
                ] {
                    match crate::services::prompt::PromptService::import_from_file_on_first_launch(
                        &app_state,
@@ -702,10 +689,6 @@ pub fn run() {
            }

            let _tray = tray_builder.build(app)?;
-            crate::services::webdav_auto_sync::start_worker(
-                app_state.db.clone(),
-                app.handle().clone(),
-            );
            // 将同一个实例注入到全局状态，避免重复创建导致的不一致
            app.manage(app_state);

@@ -904,11 +887,6 @@ pub fn run() {
            // theirs: config import/export and dialogs
            commands::export_config_to_file,
            commands::import_config_from_file,
-            commands::webdav_test_connection,
-            commands::webdav_sync_upload,
-            commands::webdav_sync_download,
-            commands::webdav_sync_save_settings,
-            commands::webdav_sync_fetch_remote_info,
            commands::save_file_dialog,
            commands::open_file_dialog,
            commands::open_zip_file_dialog,
@@ -1010,19 +988,6 @@ pub fn run() {
            // OpenCode specific
            commands::import_opencode_providers_from_live,
            commands::get_opencode_live_provider_ids,
-            // OpenClaw specific
-            commands::import_openclaw_providers_from_live,
-            commands::get_openclaw_live_provider_ids,
-            commands::get_openclaw_default_model,
-            commands::set_openclaw_default_model,
-            commands::get_openclaw_model_catalog,
-            commands::set_openclaw_model_catalog,
-            commands::get_openclaw_agents_defaults,
-            commands::set_openclaw_agents_defaults,
-            commands::get_openclaw_env,
-            commands::set_openclaw_env,
-            commands::get_openclaw_tools,
-            commands::set_openclaw_tools,
            // Global upstream proxy
            commands::get_global_proxy_url,
            commands::set_global_proxy_url,
@@ -1035,9 +1000,6 @@ pub fn run() {
            commands::get_current_omo_provider_id,
            commands::get_omo_provider_count,
            commands::disable_current_omo,
-            // Workspace files (OpenClaw)
-            commands::read_workspace_file,
-            commands::write_workspace_file,
        ]);

    let app = builder
@@ -1,546 +0,0 @@
-//! OpenClaw 配置文件读写模块
-//!
-//! 处理 `~/.openclaw/openclaw.json` 配置文件的读写操作（JSON5 格式）。
-//! OpenClaw 使用累加式供应商管理，所有供应商配置共存于同一配置文件中。
-//!
-//! ## 配置文件格式
-//!
-//! ```json5
-//! {
-//!   // 模型供应商配置（映射为 CC Switch 的"供应商"）
-//!   models: {
-//!     mode: "merge",
-//!     providers: {
-//!       "custom-provider": {
-//!         baseUrl: "https://api.example.com/v1",
-//!         apiKey: "${API_KEY}",
-//!         api: "openai-completions",
-//!         models: [{ id: "model-id", name: "Model Name" }]
-//!       }
-//!     }
-//!   },
-//!   // 环境变量配置
-//!   env: {
-//!     ANTHROPIC_API_KEY: "sk-...",
-//!     vars: { ... }
-//!   },
-//!   // Agent 默认模型配置
-//!   agents: {
-//!     defaults: {
-//!       model: {
-//!         primary: "provider/model",
-//!         fallbacks: ["provider2/model2"]
-//!       }
-//!     }
-//!   }
-//! }
-//! ```
-
-use crate::config::write_json_file;
-use crate::error::AppError;
-use crate::settings::get_openclaw_override_dir;
-use indexmap::IndexMap;
-use serde::{Deserialize, Serialize};
-use serde_json::{json, Map, Value};
-use std::collections::HashMap;
-use std::path::PathBuf;
-
-// ============================================================================
-// Path Functions
-// ============================================================================
-
-/// 获取 OpenClaw 配置目录
-///
-/// 默认路径: `~/.openclaw/`
-/// 可通过 settings.openclaw_config_dir 覆盖
-pub fn get_openclaw_dir() -> PathBuf {
-    if let Some(override_dir) = get_openclaw_override_dir() {
-        return override_dir;
-    }
-
-    // 所有平台统一使用 ~/.openclaw
-    dirs::home_dir()
-        .map(|h| h.join(".openclaw"))
-        .unwrap_or_else(|| PathBuf::from(".openclaw"))
-}
-
-/// 获取 OpenClaw 配置文件路径
-///
-/// 返回 `~/.openclaw/openclaw.json`
-pub fn get_openclaw_config_path() -> PathBuf {
-    get_openclaw_dir().join("openclaw.json")
-}
-
-// ============================================================================
-// Type Definitions
-// ============================================================================
-
-/// OpenClaw 供应商配置（对应 models.providers 中的条目）
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct OpenClawProviderConfig {
-    /// API 基础 URL
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub base_url: Option<String>,
-
-    /// API Key（支持环境变量引用 ${VAR_NAME}）
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub api_key: Option<String>,
-
-    /// API 类型（如 "openai-completions", "anthropic" 等）
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub api: Option<String>,
-
-    /// 支持的模型列表
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub models: Vec<OpenClawModelEntry>,
-
-    /// Other custom fields (preserve unknown fields)
-    #[serde(flatten)]
-    pub extra: HashMap<String, Value>,
-}
-
-/// OpenClaw 模型条目
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct OpenClawModelEntry {
-    /// 模型 ID
-    pub id: String,
-
-    /// 模型显示名称
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-
-    /// 模型别名（用于快捷引用）
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub alias: Option<String>,
-
-    /// 模型成本（输入/输出价格）
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cost: Option<OpenClawModelCost>,
-
-    /// 上下文窗口大小
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context_window: Option<u32>,
-
-    /// Other custom fields (preserve unknown fields)
-    #[serde(flatten)]
-    pub extra: HashMap<String, Value>,
-}
-
-/// OpenClaw 模型成本配置
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct OpenClawModelCost {
-    /// 输入价格（每百万 token）
-    pub input: f64,
-
-    /// 输出价格（每百万 token）
-    pub output: f64,
-
-    /// Other custom fields (preserve unknown fields)
-    #[serde(flatten)]
-    pub extra: HashMap<String, Value>,
-}
-
-/// OpenClaw 默认模型配置（agents.defaults.model）
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct OpenClawDefaultModel {
-    /// 主模型 ID（格式：provider/model）
-    pub primary: String,
-
-    /// 回退模型列表
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub fallbacks: Vec<String>,
-
-    /// Other custom fields (preserve unknown fields)
-    #[serde(flatten)]
-    pub extra: HashMap<String, Value>,
-}
-
-/// OpenClaw 模型目录条目（agents.defaults.models 中的值）
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct OpenClawModelCatalogEntry {
-    /// 模型别名（用于 UI 显示）
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub alias: Option<String>,
-
-    /// Other custom fields (preserve unknown fields)
-    #[serde(flatten)]
-    pub extra: HashMap<String, Value>,
-}
-
-/// OpenClaw agents.defaults 配置
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct OpenClawAgentsDefaults {
-    /// 默认模型配置
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub model: Option<OpenClawDefaultModel>,
-
-    /// 模型目录/允许列表（键为 provider/model 格式）
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub models: Option<HashMap<String, OpenClawModelCatalogEntry>>,
-
-    /// Other custom fields (preserve unknown fields)
-    #[serde(flatten)]
-    pub extra: HashMap<String, Value>,
-}
-
-/// OpenClaw agents 顶层配置
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[allow(dead_code)]
-pub struct OpenClawAgents {
-    /// 默认配置
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub defaults: Option<OpenClawAgentsDefaults>,
-
-    /// Other custom fields (preserve unknown fields)
-    #[serde(flatten)]
-    pub extra: HashMap<String, Value>,
-}
-
-// ============================================================================
-// Core Read/Write Functions
-// ============================================================================
-
-/// 读取 OpenClaw 配置文件
-///
-/// 支持 JSON5 格式，返回完整的配置 JSON 对象
-pub fn read_openclaw_config() -> Result<Value, AppError> {
-    let path = get_openclaw_config_path();
-
-    if !path.exists() {
-        // Return empty config structure
-        return Ok(json!({
-            "models": {
-                "mode": "merge",
-                "providers": {}
-            }
-        }));
-    }
-
-    let content = std::fs::read_to_string(&path).map_err(|e| AppError::io(&path, e))?;
-
-    // 尝试 JSON5 解析（支持注释和尾随逗号）
-    json5::from_str(&content)
-        .map_err(|e| AppError::Config(format!("Failed to parse OpenClaw config as JSON5: {}", e)))
-}
-
-/// 写入 OpenClaw 配置文件（原子写入）
-///
-/// 使用标准 JSON 格式写入（JSON5 是 JSON 的超集）
-pub fn write_openclaw_config(config: &Value) -> Result<(), AppError> {
-    let path = get_openclaw_config_path();
-
-    // 确保目录存在
-    if let Some(parent) = path.parent() {
-        std::fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
-    }
-
-    // 复用统一的原子写入逻辑
-    write_json_file(&path, config)?;
-
-    log::debug!("OpenClaw config written to {path:?}");
-    Ok(())
-}
-
-// ============================================================================
-// Provider Functions (Untyped - for raw JSON operations)
-// ============================================================================
-
-/// 获取所有供应商配置（原始 JSON）
-///
-/// 从 `models.providers` 读取
-pub fn get_providers() -> Result<Map<String, Value>, AppError> {
-    let config = read_openclaw_config()?;
-    Ok(config
-        .get("models")
-        .and_then(|m| m.get("providers"))
-        .and_then(|v| v.as_object())
-        .cloned()
-        .unwrap_or_default())
-}
-
-/// 设置供应商配置（原始 JSON）
-///
-/// 写入到 `models.providers`
-pub fn set_provider(id: &str, provider_config: Value) -> Result<(), AppError> {
-    let mut full_config = read_openclaw_config()?;
-
-    // 确保 models 结构存在
-    if full_config.get("models").is_none() {
-        full_config["models"] = json!({
-            "mode": "merge",
-            "providers": {}
-        });
-    }
-
-    // 确保 providers 对象存在
-    if full_config["models"].get("providers").is_none() {
-        full_config["models"]["providers"] = json!({});
-    }
-
-    // 设置供应商
-    if let Some(providers) = full_config["models"]
-        .get_mut("providers")
-        .and_then(|v| v.as_object_mut())
-    {
-        providers.insert(id.to_string(), provider_config);
-    }
-
-    write_openclaw_config(&full_config)
-}
-
-/// 删除供应商配置
-pub fn remove_provider(id: &str) -> Result<(), AppError> {
-    let mut config = read_openclaw_config()?;
-
-    if let Some(providers) = config
-        .get_mut("models")
-        .and_then(|m| m.get_mut("providers"))
-        .and_then(|v| v.as_object_mut())
-    {
-        providers.remove(id);
-    }
-
-    write_openclaw_config(&config)
-}
-
-// ============================================================================
-// Provider Functions (Typed)
-// ============================================================================
-
-/// 获取所有供应商配置（类型化）
-pub fn get_typed_providers() -> Result<IndexMap<String, OpenClawProviderConfig>, AppError> {
-    let providers = get_providers()?;
-    let mut result = IndexMap::new();
-
-    for (id, value) in providers {
-        match serde_json::from_value::<OpenClawProviderConfig>(value.clone()) {
-            Ok(config) => {
-                result.insert(id, config);
-            }
-            Err(e) => {
-                log::warn!("Failed to parse OpenClaw provider '{id}': {e}");
-                // Skip invalid providers but continue
-            }
-        }
-    }
-
-    Ok(result)
-}
-
-/// 设置供应商配置（类型化）
-pub fn set_typed_provider(id: &str, config: &OpenClawProviderConfig) -> Result<(), AppError> {
-    let value = serde_json::to_value(config).map_err(|e| AppError::JsonSerialize { source: e })?;
-    set_provider(id, value)
-}
-
-// ============================================================================
-// Agents Configuration Functions
-// ============================================================================
-
-/// 读取默认模型配置（agents.defaults.model）
-pub fn get_default_model() -> Result<Option<OpenClawDefaultModel>, AppError> {
-    let config = read_openclaw_config()?;
-
-    let Some(model_value) = config
-        .get("agents")
-        .and_then(|a| a.get("defaults"))
-        .and_then(|d| d.get("model"))
-    else {
-        return Ok(None);
-    };
-
-    let model = serde_json::from_value(model_value.clone())
-        .map_err(|e| AppError::Config(format!("Failed to parse agents.defaults.model: {e}")))?;
-
-    Ok(Some(model))
-}
-
-/// 设置默认模型配置（agents.defaults.model）
-pub fn set_default_model(model: &OpenClawDefaultModel) -> Result<(), AppError> {
-    let mut config = read_openclaw_config()?;
-
-    // Ensure agents.defaults path exists, preserving unknown fields
-    ensure_agents_defaults_path(&mut config);
-
-    let model_value =
-        serde_json::to_value(model).map_err(|e| AppError::JsonSerialize { source: e })?;
-
-    config["agents"]["defaults"]["model"] = model_value;
-
-    write_openclaw_config(&config)
-}
-
-/// 读取模型目录/允许列表（agents.defaults.models）
-pub fn get_model_catalog() -> Result<Option<HashMap<String, OpenClawModelCatalogEntry>>, AppError> {
-    let config = read_openclaw_config()?;
-
-    let Some(models_value) = config
-        .get("agents")
-        .and_then(|a| a.get("defaults"))
-        .and_then(|d| d.get("models"))
-    else {
-        return Ok(None);
-    };
-
-    let catalog = serde_json::from_value(models_value.clone())
-        .map_err(|e| AppError::Config(format!("Failed to parse agents.defaults.models: {e}")))?;
-
-    Ok(Some(catalog))
-}
-
-/// 设置模型目录/允许列表（agents.defaults.models）
-pub fn set_model_catalog(
-    catalog: &HashMap<String, OpenClawModelCatalogEntry>,
-) -> Result<(), AppError> {
-    let mut config = read_openclaw_config()?;
-
-    // Ensure agents.defaults path exists, preserving unknown fields
-    ensure_agents_defaults_path(&mut config);
-
-    let catalog_value =
-        serde_json::to_value(catalog).map_err(|e| AppError::JsonSerialize { source: e })?;
-
-    config["agents"]["defaults"]["models"] = catalog_value;
-
-    write_openclaw_config(&config)
-}
-
-/// Ensure the `agents.defaults` path exists in the config,
-/// preserving any existing unknown fields.
-fn ensure_agents_defaults_path(config: &mut Value) {
-    if config.get("agents").is_none() {
-        config["agents"] = json!({});
-    }
-    if config["agents"].get("defaults").is_none() {
-        config["agents"]["defaults"] = json!({});
-    }
-}
-
-// ============================================================================
-// Full Agents Defaults Functions
-// ============================================================================
-
-/// Read the full agents.defaults config
-pub fn get_agents_defaults() -> Result<Option<OpenClawAgentsDefaults>, AppError> {
-    let config = read_openclaw_config()?;
-
-    let Some(defaults_value) = config.get("agents").and_then(|a| a.get("defaults")) else {
-        return Ok(None);
-    };
-
-    let defaults = serde_json::from_value(defaults_value.clone())
-        .map_err(|e| AppError::Config(format!("Failed to parse agents.defaults: {e}")))?;
-
-    Ok(Some(defaults))
-}
-
-/// Write the full agents.defaults config
-pub fn set_agents_defaults(defaults: &OpenClawAgentsDefaults) -> Result<(), AppError> {
-    let mut config = read_openclaw_config()?;
-
-    if config.get("agents").is_none() {
-        config["agents"] = json!({});
-    }
-
-    let value =
-        serde_json::to_value(defaults).map_err(|e| AppError::JsonSerialize { source: e })?;
-
-    config["agents"]["defaults"] = value;
-
-    write_openclaw_config(&config)
-}
-
-// ============================================================================
-// Env Configuration
-// ============================================================================
-
-/// OpenClaw env configuration (env section of openclaw.json)
-///
-/// Stores environment variables like API keys and custom vars.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct OpenClawEnvConfig {
-    /// All environment variable key-value pairs
-    #[serde(flatten)]
-    pub vars: HashMap<String, Value>,
-}
-
-/// Read the env config section
-pub fn get_env_config() -> Result<OpenClawEnvConfig, AppError> {
-    let config = read_openclaw_config()?;
-
-    let Some(env_value) = config.get("env") else {
-        return Ok(OpenClawEnvConfig {
-            vars: HashMap::new(),
-        });
-    };
-
-    serde_json::from_value(env_value.clone())
-        .map_err(|e| AppError::Config(format!("Failed to parse env config: {e}")))
-}
-
-/// Write the env config section
-pub fn set_env_config(env: &OpenClawEnvConfig) -> Result<(), AppError> {
-    let mut config = read_openclaw_config()?;
-
-    let value = serde_json::to_value(env).map_err(|e| AppError::JsonSerialize { source: e })?;
-
-    config["env"] = value;
-
-    write_openclaw_config(&config)
-}
-
-// ============================================================================
-// Tools Configuration
-// ============================================================================
-
-/// OpenClaw tools configuration (tools section of openclaw.json)
-///
-/// Controls tool permissions with profile-based allow/deny lists.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct OpenClawToolsConfig {
-    /// Active permission profile (e.g. "default", "strict", "permissive")
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub profile: Option<String>,
-
-    /// Allowed tool patterns
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub allow: Vec<String>,
-
-    /// Denied tool patterns
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub deny: Vec<String>,
-
-    /// Other custom fields (preserve unknown fields)
-    #[serde(flatten)]
-    pub extra: HashMap<String, Value>,
-}
-
-/// Read the tools config section
-pub fn get_tools_config() -> Result<OpenClawToolsConfig, AppError> {
-    let config = read_openclaw_config()?;
-
-    let Some(tools_value) = config.get("tools") else {
-        return Ok(OpenClawToolsConfig {
-            profile: None,
-            allow: Vec::new(),
-            deny: Vec::new(),
-            extra: HashMap::new(),
-        });
-    };
-
-    serde_json::from_value(tools_value.clone())
-        .map_err(|e| AppError::Config(format!("Failed to parse tools config: {e}")))
-}
-
-/// Write the tools config section
-pub fn set_tools_config(tools: &OpenClawToolsConfig) -> Result<(), AppError> {
-    let mut config = read_openclaw_config()?;
-
-    let value = serde_json::to_value(tools).map_err(|e| AppError::JsonSerialize { source: e })?;
-
-    config["tools"] = value;
-
-    write_openclaw_config(&config)
-}
@@ -5,7 +5,6 @@ use crate::codex_config::get_codex_auth_path;
 use crate::config::get_claude_settings_path;
 use crate::error::AppError;
 use crate::gemini_config::get_gemini_dir;
-use crate::openclaw_config::get_openclaw_dir;
 use crate::opencode_config::get_opencode_dir;

 /// 返回指定应用所使用的提示词文件路径。
@@ -15,7 +14,6 @@ pub fn prompt_file_path(app: &AppType) -> Result<PathBuf, AppError> {
        AppType::Codex => get_base_dir_with_fallback(get_codex_auth_path(), ".codex")?,
        AppType::Gemini => get_gemini_dir(),
        AppType::OpenCode => get_opencode_dir(),
-        AppType::OpenClaw => get_openclaw_dir(),
    };

    let filename = match app {
@@ -23,7 +21,6 @@ pub fn prompt_file_path(app: &AppType) -> Result<PathBuf, AppError> {
        AppType::Codex => "AGENTS.md",
        AppType::Gemini => "GEMINI.md",
        AppType::OpenCode => "AGENTS.md",
-        AppType::OpenClaw => "AGENTS.md", // OpenClaw uses AGENTS.md for agent instructions
    };

    Ok(base_dir.join(filename))
@@ -191,6 +191,19 @@ pub struct ProviderProxyConfig {
    pub proxy_password: Option<String>,
 }

+/// 通用配置启用状态（按应用）
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct CommonConfigEnabledByApp {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub claude: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub codex: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub gemini: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub opencode: Option<bool>,
+}
+
 /// 供应商元数据
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct ProviderMeta {
@@ -230,6 +243,18 @@ pub struct ProviderMeta {
    /// 供应商单独的代理配置
    #[serde(rename = "proxyConfig", skip_serializing_if = "Option::is_none")]
    pub proxy_config: Option<ProviderProxyConfig>,
+    /// 是否启用通用配置片段（用于跨供应商保持勾选状态）
+    #[serde(
+        rename = "commonConfigEnabled",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub common_config_enabled: Option<bool>,
+    /// 按应用记录通用配置启用状态（优先于 commonConfigEnabled）
+    #[serde(
+        rename = "commonConfigEnabledByApp",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub common_config_enabled_by_app: Option<CommonConfigEnabledByApp>,
    /// Claude API 格式（仅 Claude 供应商使用）
    /// - "anthropic": 原生 Anthropic Messages API，直接透传
    /// - "openai_chat": OpenAI Chat Completions 格式，需要转换
@@ -631,7 +656,7 @@ pub struct OpenCodeModelLimit {
 }

 #[cfg(test)]
-mod tests {
+mod provider_tests {
    use super::{
        ClaudeModelConfig, CodexModelConfig, GeminiModelConfig, OpenCodeProviderConfig, Provider,
        ProviderManager, ProviderMeta, UniversalProvider,
@@ -136,10 +136,6 @@ impl ProviderType {
                // OpenCode doesn't support proxy, but return a default type for completeness
                ProviderType::Codex // Fallback to Codex-like type
            }
-            AppType::OpenClaw => {
-                // OpenClaw doesn't support proxy, but return a default type for completeness
-                ProviderType::Codex // Fallback to Codex-like type
-            }
        }
    }

@@ -188,10 +184,6 @@ pub fn get_adapter(app_type: &AppType) -> Box<dyn ProviderAdapter> {
            // OpenCode doesn't support proxy, fallback to Codex adapter
            Box::new(CodexAdapter::new())
        }
-        AppType::OpenClaw => {
-            // OpenClaw doesn't support proxy, fallback to Codex adapter
-            Box::new(CodexAdapter::new())
-        }
    }
 }

@@ -113,8 +113,6 @@ pub struct ProxyTakeoverStatus {
    pub claude: bool,
    pub codex: bool,
    pub gemini: bool,
-    pub opencode: bool,
-    pub openclaw: bool,
 }

 /// API 格式类型（预留，当前不需要格式转换）
@@ -126,10 +126,6 @@ impl ConfigService {
                // OpenCode uses additive mode, no live sync needed
                // OpenCode providers are managed directly in the config file
            }
-            AppType::OpenClaw => {
-                // OpenClaw uses additive mode, no live sync needed
-                // OpenClaw providers are managed directly in the config file
-            }
        }

        Ok(())
@@ -123,11 +123,6 @@ impl McpService {
                    &server.server,
                )?;
            }
-            AppType::OpenClaw => {
-                // OpenClaw MCP support is still in development (Issue #4834)
-                // Skip for now
-                log::debug!("OpenClaw MCP support is still in development, skipping sync");
-            }
        }
        Ok(())
    }
@@ -153,10 +148,6 @@ impl McpService {
            AppType::OpenCode => {
                mcp::remove_server_from_opencode(id)?;
            }
-            AppType::OpenClaw => {
-                // OpenClaw MCP support is still in development
-                log::debug!("OpenClaw MCP support is still in development, skipping remove");
-            }
        }
        Ok(())
    }
@@ -10,9 +10,6 @@ pub mod skill;
 pub mod speedtest;
 pub mod stream_check;
 pub mod usage_stats;
-pub mod webdav;
-pub mod webdav_auto_sync;
-pub mod webdav_sync;

 pub use config::ConfigService;
 pub use mcp::McpService;
@@ -2,6 +2,7 @@ use crate::config::write_json_file;
 use crate::database::OmoGlobalConfig;
 use crate::error::AppError;
 use crate::opencode_config::get_opencode_dir;
+use crate::provider::{CommonConfigEnabledByApp, ProviderMeta};
 use crate::store::AppState;
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
@@ -142,6 +143,29 @@ impl OmoService {
        }
    }

+    fn resolve_common_config_enabled(provider: &crate::provider::Provider) -> bool {
+        // Unified path: use provider meta (same mechanism as other apps).
+        if let Some(meta) = provider.meta.as_ref() {
+            if let Some(enabled) = meta
+                .common_config_enabled_by_app
+                .as_ref()
+                .and_then(|by_app| by_app.opencode)
+            {
+                return enabled;
+            }
+            if let Some(enabled) = meta.common_config_enabled {
+                return enabled;
+            }
+        }
+
+        // Backward compatibility: legacy OMO providers stored this flag in settings_config.
+        provider
+            .settings_config
+            .get("useCommonConfig")
+            .and_then(|v| v.as_bool())
+            .unwrap_or(true)
+    }
+
    pub fn delete_config_file() -> Result<(), AppError> {
        let config_path = Self::config_path();
        if config_path.exists() {
@@ -160,11 +184,7 @@ impl OmoService {
            let agents = p.settings_config.get("agents").cloned();
            let categories = p.settings_config.get("categories").cloned();
            let other_fields = p.settings_config.get("otherFields").cloned();
-            let use_common_config = p
-                .settings_config
-                .get("useCommonConfig")
-                .and_then(|v| v.as_bool())
-                .unwrap_or(true);
+            let use_common_config = Self::resolve_common_config_enabled(p);
            (agents, categories, other_fields, use_common_config)
        });

@@ -237,7 +257,6 @@ impl OmoService {
        if let Some(categories) = obj.get("categories") {
            settings.insert("categories".to_string(), categories.clone());
        }
-        settings.insert("useCommonConfig".to_string(), Value::Bool(true));

        let other = Self::extract_other_fields(&obj);
        if !other.is_empty() {
@@ -263,7 +282,13 @@ impl OmoService {
            created_at: Some(chrono::Utc::now().timestamp_millis()),
            sort_index: None,
            notes: None,
-            meta: None,
+            meta: Some(ProviderMeta {
+                common_config_enabled_by_app: Some(CommonConfigEnabledByApp {
+                    opencode: Some(true),
+                    ..Default::default()
+                }),
+                ..Default::default()
+            }),
            icon: None,
            icon_color: None,
            in_failover_queue: false,
@@ -1,6 +1,14 @@
 //! Live configuration operations
 //!
 //! Handles reading and writing live configuration files for Claude, Codex, and Gemini.
+//!
+//! ## Common Config Runtime Merge
+//!
+//! When writing to live files, this module performs runtime merge of:
+//! - `customConfig` (provider's settings_config) - provider-specific settings
+//! - `commonConfig` (from database settings table) - shared template settings
+//!
+//! The merge follows the rule: customConfig overrides commonConfig.

 use std::collections::HashMap;

@@ -9,6 +17,7 @@ use serde_json::{json, Value};
 use crate::app_config::AppType;
 use crate::codex_config::{get_codex_auth_path, get_codex_config_path};
 use crate::config::{delete_file, get_claude_settings_path, read_json_file, write_json_file};
+use crate::config_merge::merge_config_for_live;
 use crate::error::AppError;
 use crate::provider::Provider;
 use crate::services::mcp::McpService;
@@ -104,24 +113,86 @@ impl LiveSnapshot {
    }
 }

-/// Write live configuration snapshot for a provider
+/// Write live configuration snapshot for a provider (raw, without common config merge)
+///
+/// This function writes the provider's settings_config directly to the live file.
+/// Use `write_live_snapshot_with_merge` for runtime merge with common config.
 pub(crate) fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Result<(), AppError> {
+    write_live_snapshot_internal(app_type, provider, &provider.settings_config)
+}
+
+/// Write live configuration snapshot with common config runtime merge
+///
+/// This function performs runtime merge of:
+/// - Provider's settings_config (custom config)
+/// - Common config snippet from database (shared template)
+///
+/// The merge rule is: customConfig overrides commonConfig.
+pub(crate) fn write_live_snapshot_with_merge(
+    state: &AppState,
+    app_type: &AppType,
+    provider: &Provider,
+) -> Result<(), AppError> {
+    // Get common config snippet from database
+    let common_config_snippet = state.db.get_config_snippet(app_type.as_str())?;
+
+    // Use shared merge function (single source of truth)
+    let merge_result = merge_config_for_live(app_type, provider, common_config_snippet.as_deref());
+
+    // Log warning if any
+    if let Some(warning) = &merge_result.warning {
+        log::warn!(
+            "Common config merge warning for {:?} provider '{}': {}",
+            app_type,
+            provider.id,
+            warning
+        );
+    }
+
+    // Check if merge actually happened (config changed)
+    if merge_result.config != provider.settings_config {
+        log::debug!(
+            "Writing live config with common config merge for {:?} provider '{}'",
+            app_type,
+            provider.id
+        );
+    }
+
+    // Write the merged config to live file
+    let merged_provider = Provider {
+        settings_config: merge_result.config,
+        ..provider.clone()
+    };
+    write_live_snapshot_internal(app_type, &merged_provider, &merged_provider.settings_config)
+}
+
+/// Internal function to write live configuration
+fn write_live_snapshot_internal(
+    app_type: &AppType,
+    provider: &Provider,
+    config_to_write: &Value,
+) -> Result<(), AppError> {
    match app_type {
        AppType::Claude => {
            let path = get_claude_settings_path();
-            let settings = sanitize_claude_settings_for_live(&provider.settings_config);
+            let settings = sanitize_claude_settings_for_live(config_to_write);
            write_json_file(&path, &settings)?;
        }
        AppType::Codex => {
-            let obj = provider
-                .settings_config
-                .as_object()
-                .ok_or_else(|| AppError::Config("Codex 供应商配置必须是 JSON 对象".to_string()))?;
-            let auth = obj
-                .get("auth")
-                .ok_or_else(|| AppError::Config("Codex 供应商配置缺少 'auth' 字段".to_string()))?;
+            let obj = config_to_write.as_object().ok_or_else(|| {
+                AppError::Config(
+                    "CODEX_CONFIG_NOT_OBJECT: settings_config must be a JSON object".to_string(),
+                )
+            })?;
+            let auth = obj.get("auth").ok_or_else(|| {
+                AppError::Config(
+                    "CODEX_CONFIG_MISSING_AUTH: settings_config missing 'auth' field".to_string(),
+                )
+            })?;
            let config_str = obj.get("config").and_then(|v| v.as_str()).ok_or_else(|| {
-                AppError::Config("Codex 供应商配置缺少 'config' 字段或不是字符串".to_string())
+                AppError::Config(
+                    "CODEX_CONFIG_MISSING_CONFIG: settings_config missing 'config' field or not a string".to_string(),
+                )
            })?;

            let auth_path = get_codex_auth_path();
@@ -131,7 +202,12 @@ pub(crate) fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Re
        }
        AppType::Gemini => {
            // Delegate to write_gemini_live which handles env file writing correctly
-            write_gemini_live(provider)?;
+            // Create a temporary provider with the merged config
+            let temp_provider = Provider {
+                settings_config: config_to_write.clone(),
+                ..provider.clone()
+            };
+            write_gemini_live(&temp_provider)?;
        }
        AppType::OpenCode => {
            // OpenCode uses additive mode - write provider to config
@@ -139,7 +215,7 @@ pub(crate) fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Re
            use crate::provider::OpenCodeProviderConfig;

            // Defensive check: if settings_config is a full config structure, extract provider fragment
-            let config_to_write = if let Some(obj) = provider.settings_config.as_object() {
+            let config_to_write = if let Some(obj) = config_to_write.as_object() {
                // Detect full config structure (has $schema or top-level provider field)
                if obj.contains_key("$schema") || obj.contains_key("provider") {
                    log::warn!(
@@ -191,48 +267,6 @@ pub(crate) fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Re
                }
            }
        }
-        AppType::OpenClaw => {
-            // OpenClaw uses additive mode - write provider to config
-            use crate::openclaw_config;
-            use crate::openclaw_config::OpenClawProviderConfig;
-
-            // Convert settings_config to OpenClawProviderConfig
-            let openclaw_config_result =
-                serde_json::from_value::<OpenClawProviderConfig>(provider.settings_config.clone());
-
-            match openclaw_config_result {
-                Ok(config) => {
-                    openclaw_config::set_typed_provider(&provider.id, &config)?;
-                    log::info!("OpenClaw provider '{}' written to live config", provider.id);
-                }
-                Err(e) => {
-                    log::warn!(
-                        "Failed to parse OpenClaw provider config for '{}': {}",
-                        provider.id,
-                        e
-                    );
-                    // Try to write as raw JSON if it looks valid
-                    if provider.settings_config.get("baseUrl").is_some()
-                        || provider.settings_config.get("api").is_some()
-                        || provider.settings_config.get("models").is_some()
-                    {
-                        openclaw_config::set_provider(
-                            &provider.id,
-                            provider.settings_config.clone(),
-                        )?;
-                        log::info!(
-                            "OpenClaw provider '{}' written as raw JSON to live config",
-                            provider.id
-                        );
-                    } else {
-                        log::error!(
-                            "OpenClaw provider '{}' has invalid config structure, skipping write",
-                            provider.id
-                        );
-                    }
-                }
-            }
-        }
    }
    Ok(())
 }
@@ -269,6 +303,8 @@ fn sync_all_providers_to_live(state: &AppState, app_type: &AppType) -> Result<()
 /// 优先从本地 settings 读取，验证后 fallback 到数据库的 is_current 字段。
 /// 这确保了配置导入后无效 ID 会自动 fallback 到数据库。
 ///
+/// This function uses `write_live_snapshot_with_merge` to perform runtime merge
+/// with common config when enabled.
 /// For additive mode apps (OpenCode), all providers are synced instead of just the current one.
 pub fn sync_current_to_live(state: &AppState) -> Result<(), AppError> {
    // Sync providers based on mode
@@ -286,7 +322,8 @@ pub fn sync_current_to_live(state: &AppState) -> Result<(), AppError> {

            let providers = state.db.get_all_providers(app_type.as_str())?;
            if let Some(provider) = providers.get(&current_id) {
-                write_live_snapshot(&app_type, provider)?;
+                // Use write_live_snapshot_with_merge to support common config runtime merge
+                write_live_snapshot_with_merge(state, &app_type, provider)?;
            }
            // Note: get_effective_current_provider already validates existence,
            // so providers.get() should always succeed here
@@ -382,21 +419,6 @@ pub fn read_live_settings(app_type: AppType) -> Result<Value, AppError> {
            let config = read_opencode_config()?;
            Ok(config)
        }
-        AppType::OpenClaw => {
-            use crate::openclaw_config::{get_openclaw_config_path, read_openclaw_config};
-
-            let config_path = get_openclaw_config_path();
-            if !config_path.exists() {
-                return Err(AppError::localized(
-                    "openclaw.config.missing",
-                    "OpenClaw 配置文件不存在",
-                    "OpenClaw configuration file not found",
-                ));
-            }
-
-            let config = read_openclaw_config()?;
-            Ok(config)
-        }
    }
 }

@@ -405,12 +427,6 @@ pub fn read_live_settings(app_type: AppType) -> Result<Value, AppError> {
 /// Returns `Ok(true)` if a provider was actually imported,
 /// `Ok(false)` if skipped (providers already exist for this app).
 pub fn import_default_config(state: &AppState, app_type: AppType) -> Result<bool, AppError> {
-    // Additive mode apps (OpenCode, OpenClaw) should use their dedicated
-    // import_xxx_providers_from_live functions, not this generic default config import
-    if app_type.is_additive_mode() {
-        return Ok(false);
-    }
-
    {
        let providers = state.db.get_all_providers(app_type.as_str())?;
        if !providers.is_empty() {
@@ -478,9 +494,23 @@ pub fn import_default_config(state: &AppState, app_type: AppType) -> Result<bool
                "config": config_obj
            })
        }
-        // OpenCode and OpenClaw use additive mode and are handled by early return above
-        AppType::OpenCode | AppType::OpenClaw => {
-            unreachable!("additive mode apps are handled by early return")
+        AppType::OpenCode => {
+            // OpenCode uses additive mode - import from live is not the same pattern
+            // For now, return an empty config structure
+            use crate::opencode_config::{get_opencode_config_path, read_opencode_config};
+
+            let config_path = get_opencode_config_path();
+            if !config_path.exists() {
+                return Err(AppError::localized(
+                    "opencode.live.missing",
+                    "OpenCode 配置文件不存在",
+                    "OpenCode configuration file is missing",
+                ));
+            }
+
+            // For OpenCode, we return the full config - but note that OpenCode
+            // uses additive mode, so importing defaults works differently
+            read_opencode_config()?
        }
    };

@@ -658,87 +688,3 @@ pub fn import_opencode_providers_from_live(state: &AppState) -> Result<usize, Ap

    Ok(imported)
 }
-
-/// Import all providers from OpenClaw live config to database
-///
-/// This imports existing providers from ~/.openclaw/openclaw.json
-/// into the CC Switch database. Each provider found will be added to the
-/// database with is_current set to false.
-pub fn import_openclaw_providers_from_live(state: &AppState) -> Result<usize, AppError> {
-    use crate::openclaw_config;
-
-    let providers = openclaw_config::get_typed_providers()?;
-    if providers.is_empty() {
-        return Ok(0);
-    }
-
-    let mut imported = 0;
-    let existing = state.db.get_all_providers("openclaw")?;
-
-    for (id, config) in providers {
-        // Validate: skip entries with empty id or no models
-        if id.trim().is_empty() {
-            log::warn!("Skipping OpenClaw provider with empty id");
-            continue;
-        }
-        if config.models.is_empty() {
-            log::warn!("Skipping OpenClaw provider '{id}': no models defined");
-            continue;
-        }
-
-        // Skip if already exists in database
-        if existing.contains_key(&id) {
-            log::debug!("OpenClaw provider '{id}' already exists in database, skipping");
-            continue;
-        }
-
-        // Convert to Value for settings_config
-        let settings_config = match serde_json::to_value(&config) {
-            Ok(v) => v,
-            Err(e) => {
-                log::warn!("Failed to serialize OpenClaw provider '{id}': {e}");
-                continue;
-            }
-        };
-
-        // Determine display name: use first model name if available, otherwise use id
-        let display_name = config
-            .models
-            .first()
-            .and_then(|m| m.name.clone())
-            .unwrap_or_else(|| id.clone());
-
-        // Create provider
-        let provider = Provider::with_id(id.clone(), display_name, settings_config, None);
-
-        // Save to database
-        if let Err(e) = state.db.save_provider("openclaw", &provider) {
-            log::warn!("Failed to import OpenClaw provider '{id}': {e}");
-            continue;
-        }
-
-        imported += 1;
-        log::info!("Imported OpenClaw provider '{id}' from live config");
-    }
-
-    Ok(imported)
-}
-
-/// Remove an OpenClaw provider from live config
-///
-/// This removes a specific provider from ~/.openclaw/openclaw.json
-/// without affecting other providers in the file.
-pub fn remove_openclaw_provider_from_live(provider_id: &str) -> Result<(), AppError> {
-    use crate::openclaw_config;
-
-    // Check if OpenClaw config directory exists
-    if !openclaw_config::get_openclaw_dir().exists() {
-        log::debug!("OpenClaw config directory doesn't exist, skipping removal of '{provider_id}'");
-        return Ok(());
-    }
-
-    openclaw_config::remove_provider(provider_id)?;
-    log::info!("OpenClaw provider '{provider_id}' removed from live config");
-
-    Ok(())
-}
@@ -13,6 +13,9 @@ use serde::Deserialize;
 use serde_json::Value;

 use crate::app_config::AppType;
+use crate::config_merge::{
+    extract_json_difference, extract_toml_difference_str, is_common_config_enabled,
+};
 use crate::error::AppError;
 use crate::provider::{Provider, UsageResult};
 use crate::services::mcp::McpService;
@@ -21,18 +24,16 @@ use crate::store::AppState;

 // Re-export sub-module functions for external access
 pub use live::{
-    import_default_config, import_openclaw_providers_from_live,
-    import_opencode_providers_from_live, read_live_settings, sync_current_to_live,
+    import_default_config, import_opencode_providers_from_live, read_live_settings,
+    sync_current_to_live,
 };

 // Internal re-exports (pub(crate))
 pub(crate) use live::sanitize_claude_settings_for_live;
-pub(crate) use live::write_live_snapshot;
+pub(crate) use live::{write_live_snapshot, write_live_snapshot_with_merge};

 // Internal re-exports
-use live::{
-    remove_openclaw_provider_from_live, remove_opencode_provider_from_live, write_gemini_live,
-};
+use live::{remove_opencode_provider_from_live, write_gemini_live};
 use usage::validate_usage_script;

 /// Provider business logic service
@@ -144,10 +145,10 @@ impl ProviderService {
    /// 优先从本地 settings 读取，验证后 fallback 到数据库的 is_current 字段。
    /// 这确保了云同步场景下多设备可以独立选择供应商，且返回的 ID 一定有效。
    ///
-    /// 对于累加模式应用（OpenCode, OpenClaw），不存在"当前供应商"概念，直接返回空字符串。
+    /// 对于 OpenCode（累加模式），不存在"当前供应商"概念，直接返回空字符串。
    pub fn current(state: &AppState, app_type: AppType) -> Result<String, AppError> {
-        // Additive mode apps have no "current" provider concept
-        if app_type.is_additive_mode() {
+        // OpenCode uses additive mode - no "current" provider concept
+        if matches!(app_type, AppType::OpenCode) {
            return Ok(String::new());
        }
        crate::settings::get_effective_current_provider(&state.db, &app_type)
@@ -164,12 +165,10 @@ impl ProviderService {
        // Save to database
        state.db.save_provider(app_type.as_str(), &provider)?;

-        // Additive mode apps (OpenCode, OpenClaw) - always write to live config
-        if app_type.is_additive_mode() {
+        // OpenCode uses additive mode - always write to live config
+        if matches!(app_type, AppType::OpenCode) {
            // OMO providers use exclusive mode and write to dedicated config file.
-            if matches!(app_type, AppType::OpenCode)
-                && provider.category.as_deref() == Some("omo")
-            {
+            if provider.category.as_deref() == Some("omo") {
                // Do not auto-enable newly added OMO providers.
                // Users must explicitly switch/apply an OMO provider to activate it.
                return Ok(true);
@@ -185,7 +184,8 @@ impl ProviderService {
            state
                .db
                .set_current_provider(app_type.as_str(), &provider.id)?;
-            write_live_snapshot(&app_type, &provider)?;
+            // Use write_live_snapshot_with_merge to support common config runtime merge
+            write_live_snapshot_with_merge(state, &app_type, &provider)?;
        }

        Ok(true)
@@ -205,11 +205,9 @@ impl ProviderService {
        // Save to database
        state.db.save_provider(app_type.as_str(), &provider)?;

-        // Additive mode apps (OpenCode, OpenClaw) - always update in live config
-        if app_type.is_additive_mode() {
-            if matches!(app_type, AppType::OpenCode)
-                && provider.category.as_deref() == Some("omo")
-            {
+        // OpenCode uses additive mode - always update in live config
+        if matches!(app_type, AppType::OpenCode) {
+            if provider.category.as_deref() == Some("omo") {
                let is_omo_current = state
                    .db
                    .is_omo_provider_current(app_type.as_str(), &provider.id)?;
@@ -247,7 +245,8 @@ impl ProviderService {
                )
                .map_err(|e| AppError::Message(format!("更新 Live 备份失败: {e}")))?;
            } else {
-                write_live_snapshot(&app_type, &provider)?;
+                // Use write_live_snapshot_with_merge to support common config runtime merge
+                write_live_snapshot_with_merge(state, &app_type, &provider)?;
                // Sync MCP
                McpService::sync_all_enabled(state)?;
            }
@@ -259,48 +258,43 @@ impl ProviderService {
    /// Delete a provider
    ///
    /// 同时检查本地 settings 和数据库的当前供应商，防止删除任一端正在使用的供应商。
-    /// 对于累加模式应用（OpenCode, OpenClaw），可以随时删除任意供应商，同时从 live 配置中移除。
+    /// 对于 OpenCode（累加模式），可以随时删除任意供应商，同时从 live 配置中移除。
    pub fn delete(state: &AppState, app_type: AppType, id: &str) -> Result<(), AppError> {
-        // Additive mode apps - no current provider concept
-        if app_type.is_additive_mode() {
-            if matches!(app_type, AppType::OpenCode) {
-                let is_omo = state
+        // OpenCode uses additive mode - no current provider concept
+        if matches!(app_type, AppType::OpenCode) {
+            let is_omo = state
+                .db
+                .get_provider_by_id(id, app_type.as_str())?
+                .and_then(|p| p.category)
+                .as_deref()
+                == Some("omo");
+
+            if is_omo {
+                let was_current = state.db.is_omo_provider_current(app_type.as_str(), id)?;
+                let omo_count = state
                    .db
-                    .get_provider_by_id(id, app_type.as_str())?
-                    .and_then(|p| p.category)
-                    .as_deref()
-                    == Some("omo");
+                    .get_all_providers(app_type.as_str())?
+                    .values()
+                    .filter(|p| p.category.as_deref() == Some("omo"))
+                    .count();

-                if is_omo {
-                    let was_current = state.db.is_omo_provider_current(app_type.as_str(), id)?;
-                    let omo_count = state
-                        .db
-                        .get_all_providers(app_type.as_str())?
-                        .values()
-                        .filter(|p| p.category.as_deref() == Some("omo"))
-                        .count();
-
-                    if omo_count <= 1 && was_current {
-                        return Err(AppError::Message(
-                            "无法删除当前启用的最后一个 OMO 配置，请先停用".to_string(),
-                        ));
-                    }
-
-                    state.db.delete_provider(app_type.as_str(), id)?;
-                    if was_current {
-                        crate::services::OmoService::delete_config_file()?;
-                    }
-                    return Ok(());
+                if omo_count <= 1 && was_current {
+                    return Err(AppError::Message(
+                        "无法删除当前启用的最后一个 OMO 配置，请先停用".to_string(),
+                    ));
                }
+
+                state.db.delete_provider(app_type.as_str(), id)?;
+                if was_current {
+                    crate::services::OmoService::delete_config_file()?;
+                }
+                return Ok(());
            }
+
            // Remove from database
            state.db.delete_provider(app_type.as_str(), id)?;
            // Also remove from live config
-            match app_type {
-                AppType::OpenCode => remove_opencode_provider_from_live(id)?,
-                AppType::OpenClaw => remove_openclaw_provider_from_live(id)?,
-                _ => {} // Should not reach here
-            }
+            remove_opencode_provider_from_live(id)?;
            return Ok(());
        }

@@ -317,7 +311,7 @@ impl ProviderService {
        state.db.delete_provider(app_type.as_str(), id)
    }

-    /// Remove provider from live config only (for additive mode apps like OpenCode, OpenClaw)
+    /// Remove provider from live config only (for additive mode apps like OpenCode)
    ///
    /// Does NOT delete from database - provider remains in the list.
    /// This is used when user wants to "remove" a provider from active config
@@ -349,9 +343,7 @@ impl ProviderService {
                    remove_opencode_provider_from_live(id)?;
                }
            }
-            AppType::OpenClaw => {
-                remove_openclaw_provider_from_live(id)?;
-            }
+            // Future: add other additive mode apps here
            _ => {
                return Err(AppError::Message(format!(
                    "App {} does not support remove from live config",
@@ -469,13 +461,25 @@ impl ProviderService {

        if let Some(current_id) = current_id {
            if current_id != id {
-                // Additive mode apps - all providers coexist in the same file,
+                // OpenCode uses additive mode - all providers coexist in the same file,
                // no backfill needed (backfill is for exclusive mode apps like Claude/Codex/Gemini)
-                if !app_type.is_additive_mode() {
+                if !matches!(app_type, AppType::OpenCode) {
                    // Only backfill when switching to a different provider
                    if let Ok(live_config) = read_live_settings(app_type.clone()) {
                        if let Some(mut current_provider) = providers.get(&current_id).cloned() {
-                            current_provider.settings_config = live_config;
+                            // Check if common config is enabled for this provider
+                            let common_enabled =
+                                is_common_config_enabled(current_provider.meta.as_ref(), &app_type);
+
+                            let config_to_save = if common_enabled {
+                                // Extract custom config from live (remove common config parts)
+                                Self::extract_custom_from_live(state, &app_type, &live_config)?
+                            } else {
+                                // Common config not enabled, use live config directly
+                                live_config
+                            };
+
+                            current_provider.settings_config = config_to_save;
                            // Ignore backfill failure, don't affect switch flow
                            let _ = state.db.save_provider(app_type.as_str(), &current_provider);
                        }
@@ -484,8 +488,8 @@ impl ProviderService {
            }
        }

-        // Additive mode apps skip setting is_current (no such concept)
-        if !app_type.is_additive_mode() {
+        // OpenCode uses additive mode - skip setting is_current (no such concept)
+        if !matches!(app_type, AppType::OpenCode) {
            // Update local settings (device-level, takes priority)
            crate::settings::set_current_provider(&app_type, Some(id))?;

@@ -493,8 +497,9 @@ impl ProviderService {
            state.db.set_current_provider(app_type.as_str(), id)?;
        }

-        // Sync to live (write_gemini_live handles security flag internally for Gemini)
-        write_live_snapshot(&app_type, provider)?;
+        // Sync to live (use write_live_snapshot_with_merge for common config runtime merge)
+        // Note: write_gemini_live handles security flag internally for Gemini
+        write_live_snapshot_with_merge(state, &app_type, provider)?;

        // Sync MCP
        McpService::sync_all_enabled(state)?;
@@ -531,7 +536,6 @@ impl ProviderService {
            AppType::Codex => Self::extract_codex_common_config(&provider.settings_config),
            AppType::Gemini => Self::extract_gemini_common_config(&provider.settings_config),
            AppType::OpenCode => Self::extract_opencode_common_config(&provider.settings_config),
-            AppType::OpenClaw => Self::extract_openclaw_common_config(&provider.settings_config),
        }
    }

@@ -545,7 +549,88 @@ impl ProviderService {
            AppType::Codex => Self::extract_codex_common_config(settings_config),
            AppType::Gemini => Self::extract_gemini_common_config(settings_config),
            AppType::OpenCode => Self::extract_opencode_common_config(settings_config),
-            AppType::OpenClaw => Self::extract_openclaw_common_config(settings_config),
+        }
+    }
+
+    /// Extract custom config from live config (remove common config parts).
+    ///
+    /// This is used during backfill to avoid polluting the provider's settings_config
+    /// with common config values that should remain in the common config snippet.
+    fn extract_custom_from_live(
+        state: &AppState,
+        app_type: &AppType,
+        live_config: &Value,
+    ) -> Result<Value, AppError> {
+        // Get common config snippet from database
+        let common_snippet = state
+            .db
+            .get_config_snippet(app_type.as_str())?
+            .unwrap_or_default();
+
+        if common_snippet.trim().is_empty() {
+            // No common config, return live config as-is
+            return Ok(live_config.clone());
+        }
+
+        match app_type {
+            AppType::Claude => {
+                // Parse common config as JSON
+                let common_config: Value = serde_json::from_str(&common_snippet).map_err(|e| {
+                    AppError::Config(format!("Failed to parse common config snippet: {e}"))
+                })?;
+
+                // Extract difference (custom = live - common)
+                let (custom_config, _) = extract_json_difference(live_config, &common_config);
+                Ok(custom_config)
+            }
+            AppType::Codex => {
+                // Codex: Extract TOML config field difference
+                let mut result = live_config.clone();
+
+                if let Some(config_str) = live_config.get("config").and_then(|v| v.as_str()) {
+                    // Extract TOML difference for config field
+                    // Returns (custom_toml, has_common_keys, error)
+                    let (custom_toml, _, _) =
+                        extract_toml_difference_str(config_str, &common_snippet);
+                    if let Some(obj) = result.as_object_mut() {
+                        obj.insert("config".to_string(), Value::String(custom_toml));
+                    }
+                }
+
+                Ok(result)
+            }
+            AppType::Gemini => {
+                // Gemini: Extract env field difference
+                // Parse common config (supports ENV format and JSON format)
+                let common_env = crate::config_merge::parse_gemini_common_snippet(&common_snippet);
+
+                if common_env.is_empty() {
+                    return Ok(live_config.clone());
+                }
+
+                let mut result = live_config.clone();
+
+                if let Some(live_env) = live_config.get("env").and_then(|v| v.as_object()) {
+                    // Extract difference: custom = live_env - common_env
+                    let mut custom_env = serde_json::Map::new();
+                    for (key, value) in live_env {
+                        if common_env.get(key) != Some(value) {
+                            // Key doesn't exist in common or value is different
+                            custom_env.insert(key.clone(), value.clone());
+                        }
+                    }
+
+                    if let Some(obj) = result.as_object_mut() {
+                        obj.insert("env".to_string(), Value::Object(custom_env));
+                    }
+                }
+
+                Ok(result)
+            }
+            AppType::OpenCode => {
+                // OpenCode doesn't support common config
+                Ok(live_config.clone())
+            }
        }
    }

@@ -647,15 +732,19 @@ impl ProviderService {
        Ok(cleaned.trim().to_string())
    }

-    /// Extract common config for Gemini (JSON format)
+    /// Extract common config for Gemini (ENV format)
    ///
    /// Extracts `.env` values while excluding provider-specific credentials:
    /// - GOOGLE_GEMINI_BASE_URL
    /// - GEMINI_API_KEY
+    ///
+    /// Returns ENV format (KEY=VALUE per line) instead of JSON.
+    /// Values containing newlines/carriage returns are skipped to prevent
+    /// ENV format injection/truncation.
    fn extract_gemini_common_config(settings: &Value) -> Result<String, AppError> {
        let env = settings.get("env").and_then(|v| v.as_object());

-        let mut snippet = serde_json::Map::new();
+        let mut lines: Vec<String> = Vec::new();
        if let Some(env) = env {
            for (key, value) in env {
                if key == "GOOGLE_GEMINI_BASE_URL" || key == "GEMINI_API_KEY" {
@@ -666,17 +755,22 @@ impl ProviderService {
                };
                let trimmed = v.trim();
                if !trimmed.is_empty() {
-                    snippet.insert(key.to_string(), Value::String(trimmed.to_string()));
+                    // Skip values containing newlines to prevent ENV format injection
+                    if trimmed.contains('\n') || trimmed.contains('\r') {
+                        continue;
+                    }
+                    lines.push(format!("{key}={trimmed}"));
                }
            }
        }

-        if snippet.is_empty() {
-            return Ok("{}".to_string());
+        if lines.is_empty() {
+            return Ok(String::new());
        }

-        serde_json::to_string_pretty(&Value::Object(snippet))
-            .map_err(|e| AppError::Message(format!("Serialization failed: {e}")))
+        // Sort for consistent output
+        lines.sort();
+        Ok(lines.join("\n"))
    }

    /// Extract common config for OpenCode (JSON format)
@@ -702,27 +796,6 @@ impl ProviderService {
            .map_err(|e| AppError::Message(format!("Serialization failed: {e}")))
    }

-    /// Extract common config for OpenClaw (JSON format)
-    fn extract_openclaw_common_config(settings: &Value) -> Result<String, AppError> {
-        // OpenClaw uses a different config structure with baseUrl, apiKey, api, models
-        // For common config, we exclude provider-specific fields like apiKey
-        let mut config = settings.clone();
-
-        // Remove provider-specific fields
-        if let Some(obj) = config.as_object_mut() {
-            obj.remove("apiKey");
-            obj.remove("baseUrl");
-            // Keep api and models as they might be common
-        }
-
-        if config.is_null() || (config.is_object() && config.as_object().unwrap().is_empty()) {
-            return Ok("{}".to_string());
-        }
-
-        serde_json::to_string_pretty(&config)
-            .map_err(|e| AppError::Message(format!("Serialization failed: {e}")))
-    }
-
    /// Import default configuration from live files (re-export)
    ///
    /// Returns `Ok(true)` if imported, `Ok(false)` if skipped.
@@ -900,17 +973,6 @@ impl ProviderService {
                    ));
                }
            }
-            AppType::OpenClaw => {
-                // OpenClaw uses config structure: { baseUrl, apiKey, api, models }
-                // Basic validation - must be an object
-                if !provider.settings_config.is_object() {
-                    return Err(AppError::localized(
-                        "provider.openclaw.settings.not_object",
-                        "OpenClaw 配置必须是 JSON 对象",
-                        "OpenClaw configuration must be a JSON object",
-                    ));
-                }
-            }
        }

        // Validate and clean UsageScript configuration (common for all app types)
@@ -1082,30 +1144,6 @@ impl ProviderService {

                Ok((api_key, base_url))
            }
-            AppType::OpenClaw => {
-                // OpenClaw uses apiKey and baseUrl directly on the object
-                let api_key = provider
-                    .settings_config
-                    .get("apiKey")
-                    .and_then(|v| v.as_str())
-                    .ok_or_else(|| {
-                        AppError::localized(
-                            "provider.openclaw.api_key.missing",
-                            "缺少 API Key",
-                            "API key is missing",
-                        )
-                    })?
-                    .to_string();
-
-                let base_url = provider
-                    .settings_config
-                    .get("baseUrl")
-                    .and_then(|v| v.as_str())
-                    .unwrap_or("")
-                    .to_string();
-
-                Ok((api_key, base_url))
-            }
        }
    }
 }
@@ -4,6 +4,7 @@

 use crate::app_config::AppType;
 use crate::config::{get_claude_settings_path, read_json_file, write_json_file};
+use crate::config_merge::merge_config_for_live;
 use crate::database::Database;
 use crate::provider::Provider;
 use crate::proxy::server::ProxyServer;
@@ -210,16 +211,11 @@ impl ProxyService {
            .await
            .map(|c| c.enabled)
            .unwrap_or(false);
-        // OpenCode and OpenClaw don't support proxy features, always return false
-        let opencode_enabled = false;
-        let openclaw_enabled = false;

        Ok(ProxyTakeoverStatus {
            claude: claude_enabled,
            codex: codex_enabled,
            gemini: gemini_enabled,
-            opencode: opencode_enabled,
-            openclaw: openclaw_enabled,
        })
    }

@@ -377,10 +373,6 @@ impl ProxyService {
                // OpenCode doesn't support proxy features
                return Err("OpenCode 不支持代理功能".to_string());
            }
-            AppType::OpenClaw => {
-                // OpenClaw doesn't support proxy features
-                return Err("OpenClaw 不支持代理功能".to_string());
-            }
        };

        self.sync_live_config_to_provider(app_type, &live_config)
@@ -597,9 +589,6 @@ impl ProxyService {
            AppType::OpenCode => {
                // OpenCode doesn't support proxy features, skip silently
            }
-            AppType::OpenClaw => {
-                // OpenClaw doesn't support proxy features, skip silently
-            }
        }

        Ok(())
@@ -782,10 +771,6 @@ impl ProxyService {
                // OpenCode doesn't support proxy features
                return Err("OpenCode 不支持代理功能".to_string());
            }
-            AppType::OpenClaw => {
-                // OpenClaw doesn't support proxy features
-                return Err("OpenClaw 不支持代理功能".to_string());
-            }
        };

        let json_str = serde_json::to_string(&config)
@@ -998,10 +983,6 @@ impl ProxyService {
                // OpenCode doesn't support proxy features
                return Err("OpenCode 不支持代理功能".to_string());
            }
-            AppType::OpenClaw => {
-                // OpenClaw doesn't support proxy features
-                return Err("OpenClaw 不支持代理功能".to_string());
-            }
        }

        Ok(())
@@ -1088,9 +1069,6 @@ impl ProxyService {
            AppType::OpenCode => {
                // OpenCode doesn't support proxy features, skip silently
            }
-            AppType::OpenClaw => {
-                // OpenClaw doesn't support proxy features, skip silently
-            }
        }

        Ok(())
@@ -1126,9 +1104,6 @@ impl ProxyService {
            AppType::OpenCode => {
                // OpenCode doesn't support proxy features, skip silently
            }
-            AppType::OpenClaw => {
-                // OpenClaw doesn't support proxy features, skip silently
-            }
        }

        Ok(())
@@ -1212,10 +1187,6 @@ impl ProxyService {
                // OpenCode doesn't support proxy features
                Err("OpenCode 不支持代理功能".to_string())
            }
-            AppType::OpenClaw => {
-                // OpenClaw doesn't support proxy features
-                Err("OpenClaw 不支持代理功能".to_string())
-            }
        }
    }

@@ -1237,10 +1208,6 @@ impl ProxyService {
                // OpenCode doesn't support proxy takeover
                false
            }
-            AppType::OpenClaw => {
-                // OpenClaw doesn't support proxy takeover
-                false
-            }
        }
    }

@@ -1266,7 +1233,27 @@ impl ProxyService {
            return Ok(false);
        };

-        write_live_snapshot(app_type, provider)
+        // Use shared merge function (single source of truth)
+        let common_config_snippet = self.db.get_config_snippet(app_type.as_str()).ok().flatten();
+        let merge_result =
+            merge_config_for_live(app_type, provider, common_config_snippet.as_deref());
+
+        // Log warning if any
+        if let Some(warning) = &merge_result.warning {
+            log::warn!(
+                "Common config merge warning for {:?} provider '{}': {}",
+                app_type,
+                provider.id,
+                warning
+            );
+        }
+
+        // Write merged config to live file
+        let merged_provider = Provider {
+            settings_config: merge_result.config,
+            ..provider.clone()
+        };
+        write_live_snapshot(app_type, &merged_provider)
            .map_err(|e| format!("写入 {app_type:?} Live 配置失败: {e}"))?;

        Ok(true)
@@ -1284,10 +1271,6 @@ impl ProxyService {
                // OpenCode doesn't support proxy features
                Ok(())
            }
-            AppType::OpenClaw => {
-                // OpenClaw doesn't support proxy features
-                Ok(())
-            }
        }
    }

@@ -1523,26 +1506,50 @@ impl ProxyService {
    ///
    /// 与 backup_live_configs() 不同，此方法从供应商的 settings_config 生成备份，
    /// 而不是从 Live 文件读取（因为 Live 文件已被代理接管）。
+    ///
+    /// **重要**: 新架构下 settings_config 存储的是自定义配置（custom diff），
+    /// 备份时需要先与 common config 合并，生成完整的 finalConfig。
    pub async fn update_live_backup_from_provider(
        &self,
        app_type: &str,
        provider: &Provider,
    ) -> Result<(), String> {
+        let app_type_enum =
+            AppType::from_str(app_type).map_err(|_| format!("无效的应用类型: {app_type}"))?;
+
+        // Get common config snippet for merge
+        let common_snippet = self.db.get_config_snippet(app_type).ok().flatten();
+
+        // Merge custom config with common config to get final config
+        let merge_result =
+            merge_config_for_live(&app_type_enum, provider, common_snippet.as_deref());
+
+        // Log warning if any
+        if let Some(warning) = &merge_result.warning {
+            log::warn!(
+                "Common config merge warning for {} provider '{}': {}",
+                app_type,
+                provider.id,
+                warning
+            );
+        }
+
+        let final_config = merge_result.config;
+
        let backup_json = match app_type {
            "claude" => {
-                // Claude: settings_config 直接作为备份
-                serde_json::to_string(&provider.settings_config)
+                // Claude: 使用合并后的 final config 作为备份
+                serde_json::to_string(&final_config)
                    .map_err(|e| format!("序列化 Claude 配置失败: {e}"))?
            }
            "codex" => {
-                // Codex: settings_config 包含 {"auth": ..., "config": ...}，直接使用
-                serde_json::to_string(&provider.settings_config)
+                // Codex: 使用合并后的 final config
+                serde_json::to_string(&final_config)
                    .map_err(|e| format!("序列化 Codex 配置失败: {e}"))?
            }
            "gemini" => {
                // Gemini: 只提取 env 字段（与原始备份格式一致）
-                // proxy.rs 的 read_gemini_live() 返回 {"env": {...}}
-                let env_backup = if let Some(env) = provider.settings_config.get("env") {
+                let env_backup = if let Some(env) = final_config.get("env") {
                    json!({ "env": env })
                } else {
                    json!({ "env": {} })
@@ -1558,7 +1565,7 @@ impl ProxyService {
            .await
            .map_err(|e| format!("更新 {app_type} 备份失败: {e}"))?;

-        log::info!("已更新 {app_type} Live 备份（热切换）");
+        log::info!("已更新 {app_type} Live 备份（热切换，含 common config 合并）");
        Ok(())
    }

@@ -230,11 +230,6 @@ impl SkillService {
                    return Ok(custom.join("skills"));
                }
            }
-            AppType::OpenClaw => {
-                if let Some(custom) = crate::settings::get_openclaw_override_dir() {
-                    return Ok(custom.join("skills"));
-                }
-            }
        }

        // 默认路径：回退到用户主目录下的标准位置
@@ -249,7 +244,6 @@ impl SkillService {
            AppType::Codex => home.join(".codex").join("skills"),
            AppType::Gemini => home.join(".gemini").join("skills"),
            AppType::OpenCode => home.join(".config").join("opencode").join("skills"),
-            AppType::OpenClaw => home.join(".openclaw").join("skills"),
        })
    }

@@ -568,7 +562,6 @@ impl SkillService {
                    AppType::Codex => "codex",
                    AppType::Gemini => "gemini",
                    AppType::OpenCode => "opencode",
-                    AppType::OpenClaw => "openclaw",
                };

                unmanaged
@@ -618,7 +611,6 @@ impl SkillService {
                            AppType::Codex => "codex",
                            AppType::Gemini => "gemini",
                            AppType::OpenCode => "opencode",
-                            AppType::OpenClaw => "openclaw",
                        };
                        found_in.push(app_str.to_string());
                    }
@@ -240,14 +240,6 @@ impl StreamCheckService {
                    "OpenCode does not support health check yet",
                ));
            }
-            AppType::OpenClaw => {
-                // OpenClaw doesn't support stream check yet
-                return Err(AppError::localized(
-                    "openclaw_no_stream_check",
-                    "OpenClaw 暂不支持健康检查",
-                    "OpenClaw does not support health check yet",
-                ));
-            }
        };

        let response_time = start.elapsed().as_millis() as u64;
@@ -575,11 +567,6 @@ impl StreamCheckService {
                // Try to extract first model from the models object
                Self::extract_opencode_model(provider).unwrap_or_else(|| "gpt-4o".to_string())
            }
-            AppType::OpenClaw => {
-                // OpenClaw uses models array in settings_config
-                // Try to extract first model from the models array
-                Self::extract_openclaw_model(provider).unwrap_or_else(|| "gpt-4o".to_string())
-            }
        }
    }

@@ -593,21 +580,6 @@ impl StreamCheckService {
        models.keys().next().map(|s| s.to_string())
    }

-    fn extract_openclaw_model(provider: &Provider) -> Option<String> {
-        // OpenClaw uses models array: [{ "id": "model-id", "name": "Model Name" }]
-        let models = provider
-            .settings_config
-            .get("models")
-            .and_then(|m| m.as_array())?;
-
-        // Return the first model ID from the models array
-        models
-            .first()
-            .and_then(|m| m.get("id"))
-            .and_then(|id| id.as_str())
-            .map(|s| s.to_string())
-    }
-
    fn extract_env_model(provider: &Provider, key: &str) -> Option<String> {
        provider
            .settings_config
@@ -1,552 +0,0 @@
-//! WebDAV HTTP transport layer.
-//!
-//! Low-level HTTP primitives for WebDAV operations (PUT, GET, HEAD, MKCOL, PROPFIND).
-//! The sync protocol logic lives in [`super::webdav_sync`].
-
-use reqwest::{Method, RequestBuilder, StatusCode, Url};
-use std::time::Duration;
-
-use crate::error::AppError;
-use crate::proxy::http_client;
-use futures::StreamExt;
-
-const DEFAULT_TIMEOUT_SECS: u64 = 30;
-/// Timeout for large file transfers (PUT/GET of db.sql, skills.zip).
-const TRANSFER_TIMEOUT_SECS: u64 = 300;
-
-/// Auth pair: `(username, Some(password))`.
-pub type WebDavAuth = Option<(String, Option<String>)>;
-
-// ─── WebDAV extension methods ────────────────────────────────
-
-fn method_propfind() -> Method {
-    Method::from_bytes(b"PROPFIND").expect("PROPFIND is a valid HTTP method")
-}
-
-fn method_mkcol() -> Method {
-    Method::from_bytes(b"MKCOL").expect("MKCOL is a valid HTTP method")
-}
-
-// ─── URL utilities ───────────────────────────────────────────
-
-/// Parse and validate a WebDAV base URL (must be http or https).
-pub fn parse_base_url(raw: &str) -> Result<Url, AppError> {
-    let trimmed = raw.trim();
-    if trimmed.is_empty() {
-        return Err(AppError::localized(
-            "webdav.base_url.required",
-            "WebDAV 地址不能为空",
-            "WebDAV URL is required.",
-        ));
-    }
-    let url = Url::parse(trimmed).map_err(|e| {
-        AppError::localized(
-            "webdav.base_url.invalid",
-            format!("WebDAV 地址无效: {e}"),
-            format!("Invalid WebDAV URL: {e}"),
-        )
-    })?;
-    match url.scheme() {
-        "http" | "https" => Ok(url),
-        _ => Err(AppError::localized(
-            "webdav.base_url.scheme_invalid",
-            "WebDAV 仅支持 http/https 地址",
-            "WebDAV URL must use http or https.",
-        )),
-    }
-}
-
-/// Build a full URL from a base URL string and path segments.
-///
-/// Each segment is individually percent-encoded by the `url` crate.
-pub fn build_remote_url(base_url: &str, segments: &[String]) -> Result<String, AppError> {
-    let mut url = parse_base_url(base_url)?;
-    {
-        let mut path = url.path_segments_mut().map_err(|_| {
-            AppError::localized(
-                "webdav.base_url.unusable",
-                "WebDAV 地址格式不支持追加路径",
-                "WebDAV URL format does not support appending path segments.",
-            )
-        })?;
-        path.pop_if_empty();
-        for seg in segments {
-            path.push(seg);
-        }
-    }
-    Ok(url.to_string())
-}
-
-/// Split a slash-delimited path into non-empty segments.
-pub fn path_segments(raw: &str) -> impl Iterator<Item = &str> {
-    raw.trim_matches('/').split('/').filter(|s| !s.is_empty())
-}
-
-// ─── Auth ────────────────────────────────────────────────────
-
-/// Build auth from username/password. Returns `None` if username is blank.
-pub fn auth_from_credentials(username: &str, password: &str) -> WebDavAuth {
-    let user = username.trim();
-    if user.is_empty() {
-        return None;
-    }
-    Some((user.to_string(), Some(password.to_string())))
-}
-
-/// Apply Basic-Auth to a request builder if auth is present.
-fn apply_auth(builder: RequestBuilder, auth: &WebDavAuth) -> RequestBuilder {
-    match auth {
-        Some((user, pass)) => builder.basic_auth(user, pass.as_deref()),
-        None => builder,
-    }
-}
-
-fn webdav_transport_error(
-    key: &'static str,
-    op_zh: &str,
-    op_en: &str,
-    target_url: &str,
-    err: &reqwest::Error,
-) -> AppError {
-    let (zh_reason, en_reason) = if err.is_timeout() {
-        ("请求超时", "request timed out")
-    } else if err.is_connect() {
-        ("连接失败", "connection failed")
-    } else if err.is_request() {
-        ("请求构造失败", "request build failed")
-    } else {
-        ("网络请求失败", "network request failed")
-    };
-
-    let safe_url = redact_url(target_url);
-    AppError::localized(
-        key,
-        format!("WebDAV {op_zh}失败（{zh_reason}）: {safe_url}"),
-        format!("WebDAV {op_en} failed ({en_reason}): {safe_url}"),
-    )
-}
-
-// ─── HTTP operations ─────────────────────────────────────────
-
-/// Test WebDAV connectivity via PROPFIND Depth=0 on the base URL.
-pub async fn test_connection(base_url: &str, auth: &WebDavAuth) -> Result<(), AppError> {
-    let url = parse_base_url(base_url)?;
-    let client = http_client::get();
-
-    let resp = apply_auth(
-        client
-            .request(method_propfind(), url)
-            .header("Depth", "0")
-            .timeout(Duration::from_secs(DEFAULT_TIMEOUT_SECS)),
-        auth,
-    )
-    .send()
-    .await
-    .map_err(|e| {
-        webdav_transport_error(
-            "webdav.connection_failed",
-            "连接",
-            "connection",
-            base_url,
-            &e,
-        )
-    })?;
-
-    if resp.status().is_success() || resp.status() == StatusCode::MULTI_STATUS {
-        return Ok(());
-    }
-    Err(webdav_status_error("PROPFIND", resp.status(), base_url))
-}
-
-/// Ensure a chain of remote directories exists.
-///
-/// Uses optimistic MKCOL: try creating first, fall back to PROPFIND verification
-/// on ambiguous responses. This halves the round-trips vs PROPFIND-first approach.
-pub async fn ensure_remote_directories(
-    base_url: &str,
-    segments: &[String],
-    auth: &WebDavAuth,
-) -> Result<(), AppError> {
-    if segments.is_empty() {
-        return Ok(());
-    }
-    let client = http_client::get();
-
-    for depth in 1..=segments.len() {
-        let prefix = &segments[..depth];
-        let url = build_remote_url(base_url, prefix)?;
-        let dir_url = if url.ends_with('/') {
-            url
-        } else {
-            format!("{url}/")
-        };
-
-        let resp = apply_auth(
-            client
-                .request(method_mkcol(), &dir_url)
-                .timeout(Duration::from_secs(DEFAULT_TIMEOUT_SECS)),
-            auth,
-        )
-        .send()
-        .await
-        .map_err(|e| {
-            webdav_transport_error(
-                "webdav.mkcol_failed",
-                "MKCOL 请求",
-                "MKCOL request",
-                &dir_url,
-                &e,
-            )
-        })?;
-
-        let status = resp.status();
-        match status {
-            s if s == StatusCode::CREATED || s.is_success() => {
-                log::info!("[WebDAV] MKCOL ok: {}", redact_url(&dir_url));
-            }
-            // 405 commonly means "already exists" on many WebDAV servers
-            StatusCode::METHOD_NOT_ALLOWED => {}
-            // Ambiguous — verify directory actually exists via PROPFIND
-            s if s == StatusCode::CONFLICT || s.is_redirection() => {
-                if !propfind_exists(&client, &dir_url, auth).await? {
-                    return Err(webdav_status_error("MKCOL", status, &dir_url));
-                }
-            }
-            _ => {
-                return Err(webdav_status_error("MKCOL", status, &dir_url));
-            }
-        }
-    }
-    Ok(())
-}
-
-/// PUT bytes to a remote WebDAV URL.
-pub async fn put_bytes(
-    url: &str,
-    auth: &WebDavAuth,
-    bytes: Vec<u8>,
-    content_type: &str,
-) -> Result<(), AppError> {
-    let client = http_client::get();
-    let resp = apply_auth(
-        client
-            .put(url)
-            .header("Content-Type", content_type)
-            .body(bytes)
-            .timeout(Duration::from_secs(TRANSFER_TIMEOUT_SECS)),
-        auth,
-    )
-    .send()
-    .await
-    .map_err(|e| webdav_transport_error("webdav.put_failed", "PUT 请求", "PUT request", url, &e))?;
-
-    if resp.status().is_success() {
-        return Ok(());
-    }
-    Err(webdav_status_error("PUT", resp.status(), url))
-}
-
-/// GET bytes from a remote WebDAV URL. Returns `None` on 404.
-///
-/// On success returns `(body_bytes, optional_etag)`.
-pub async fn get_bytes(
-    url: &str,
-    auth: &WebDavAuth,
-    max_bytes: usize,
-) -> Result<Option<(Vec<u8>, Option<String>)>, AppError> {
-    let client = http_client::get();
-    let resp = apply_auth(
-        client
-            .get(url)
-            .timeout(Duration::from_secs(TRANSFER_TIMEOUT_SECS)),
-        auth,
-    )
-    .send()
-    .await
-    .map_err(|e| webdav_transport_error("webdav.get_failed", "GET 请求", "GET request", url, &e))?;
-
-    if resp.status() == StatusCode::NOT_FOUND {
-        return Ok(None);
-    }
-    if !resp.status().is_success() {
-        return Err(webdav_status_error("GET", resp.status(), url));
-    }
-    ensure_content_length_within_limit(resp.headers(), max_bytes, url)?;
-
-    let etag = resp
-        .headers()
-        .get("etag")
-        .and_then(|v| v.to_str().ok())
-        .map(|s| s.to_string());
-    let mut bytes = Vec::new();
-    let mut stream = resp.bytes_stream();
-    while let Some(chunk) = stream.next().await {
-        let chunk = chunk.map_err(|e| {
-            AppError::localized(
-                "webdav.response_read_failed",
-                format!("读取 WebDAV 响应失败: {e}"),
-                format!("Failed to read WebDAV response: {e}"),
-            )
-        })?;
-        if bytes.len().saturating_add(chunk.len()) > max_bytes {
-            return Err(response_too_large_error(url, max_bytes));
-        }
-        bytes.extend_from_slice(&chunk);
-    }
-    Ok(Some((bytes, etag)))
-}
-
-/// HEAD request to retrieve the ETag. Returns `None` on 404.
-pub async fn head_etag(url: &str, auth: &WebDavAuth) -> Result<Option<String>, AppError> {
-    let client = http_client::get();
-    let resp = apply_auth(
-        client
-            .head(url)
-            .timeout(Duration::from_secs(DEFAULT_TIMEOUT_SECS)),
-        auth,
-    )
-    .send()
-    .await
-    .map_err(|e| {
-        webdav_transport_error("webdav.head_failed", "HEAD 请求", "HEAD request", url, &e)
-    })?;
-
-    if resp.status() == StatusCode::NOT_FOUND {
-        return Ok(None);
-    }
-    if !resp.status().is_success() {
-        return Err(webdav_status_error("HEAD", resp.status(), url));
-    }
-    Ok(resp
-        .headers()
-        .get("etag")
-        .and_then(|v| v.to_str().ok())
-        .map(|s| s.to_string()))
-}
-
-// ─── Internal helpers ────────────────────────────────────────
-
-/// PROPFIND Depth=0 to check if a remote resource exists.
-async fn propfind_exists(
-    client: &reqwest::Client,
-    url: &str,
-    auth: &WebDavAuth,
-) -> Result<bool, AppError> {
-    let resp = apply_auth(
-        client
-            .request(method_propfind(), url)
-            .header("Depth", "0")
-            .timeout(Duration::from_secs(DEFAULT_TIMEOUT_SECS)),
-        auth,
-    )
-    .send()
-    .await;
-    match resp {
-        Ok(r) => Ok(r.status().is_success() || r.status() == StatusCode::MULTI_STATUS),
-        Err(e) => {
-            log::warn!(
-                "[WebDAV] PROPFIND check failed for {}: {e}",
-                redact_url(url)
-            );
-            Ok(false)
-        }
-    }
-}
-
-// ─── Service detection & error helpers ───────────────────────
-
-/// Check if a URL points to Jianguoyun (坚果云).
-pub fn is_jianguoyun(url: &str) -> bool {
-    Url::parse(url)
-        .ok()
-        .and_then(|u| u.host_str().map(|h| h.to_lowercase()))
-        .map(|host| host.contains("jianguoyun.com") || host.contains("nutstore"))
-        .unwrap_or(false)
-}
-
-/// Build an `AppError` with service-specific hints for WebDAV failures.
-pub fn webdav_status_error(op: &str, status: StatusCode, url: &str) -> AppError {
-    let safe_url = redact_url(url);
-    let mut zh = format!("WebDAV {op} 失败: {status} ({safe_url})");
-    let mut en = format!("WebDAV {op} failed: {status} ({safe_url})");
-    let jgy = is_jianguoyun(url);
-
-    if matches!(status, StatusCode::UNAUTHORIZED | StatusCode::FORBIDDEN) {
-        if jgy {
-            zh.push_str("。坚果云请使用「第三方应用密码」，并确认地址指向 /dav/ 下的目录。");
-            en.push_str(
-                ". For Jianguoyun, use an app-specific password and ensure the URL points under /dav/.",
-            );
-        } else {
-            zh.push_str("。请检查 WebDAV 用户名、密码及目录读写权限。");
-            en.push_str(". Please check WebDAV username/password and directory permissions.");
-        }
-    } else if jgy && (status == StatusCode::NOT_FOUND || status.is_redirection()) {
-        zh.push_str("。坚果云常见原因：地址不在 /dav/ 可写目录下。");
-        en.push_str(". Common Jianguoyun cause: URL is outside a writable /dav/ directory.");
-    } else if op == "MKCOL" && status == StatusCode::CONFLICT {
-        if jgy {
-            zh.push_str("。坚果云不允许自动创建顶层文件夹，请先在网页端手动创建后重试。");
-            en.push_str(
-                ". Jianguoyun does not allow creating top-level folders automatically; create it manually first.",
-            );
-        } else {
-            zh.push_str("。请确认上级目录存在。");
-            en.push_str(". Please ensure the parent directory exists.");
-        }
-    }
-
-    AppError::localized("webdav.http.status", zh, en)
-}
-
-fn redact_url(raw: &str) -> String {
-    match Url::parse(raw) {
-        Ok(mut parsed) => {
-            let _ = parsed.set_username("");
-            let _ = parsed.set_password(None);
-
-            let mut out = format!("{}://", parsed.scheme());
-            if let Some(host) = parsed.host_str() {
-                out.push_str(host);
-            }
-            if let Some(port) = parsed.port() {
-                out.push(':');
-                out.push_str(&port.to_string());
-            }
-            out.push_str(parsed.path());
-
-            let mut keys: Vec<String> = parsed.query_pairs().map(|(k, _)| k.into_owned()).collect();
-            keys.sort();
-            keys.dedup();
-            if !keys.is_empty() {
-                out.push_str("?[keys:");
-                out.push_str(&keys.join(","));
-                out.push(']');
-            }
-            out
-        }
-        Err(_) => raw.split('?').next().unwrap_or(raw).to_string(),
-    }
-}
-
-fn response_too_large_error(url: &str, max_bytes: usize) -> AppError {
-    let max_mb = max_bytes / 1024 / 1024;
-    AppError::localized(
-        "webdav.response_too_large",
-        format!(
-            "WebDAV 响应体超过上限（{} MB）: {}",
-            max_mb,
-            redact_url(url)
-        ),
-        format!(
-            "WebDAV response body exceeds limit ({} MB): {}",
-            max_mb,
-            redact_url(url)
-        ),
-    )
-}
-
-fn ensure_content_length_within_limit(
-    headers: &reqwest::header::HeaderMap,
-    max_bytes: usize,
-    url: &str,
-) -> Result<(), AppError> {
-    let Some(content_length) = headers.get(reqwest::header::CONTENT_LENGTH) else {
-        return Ok(());
-    };
-    let Ok(raw) = content_length.to_str() else {
-        return Ok(());
-    };
-    let Ok(value) = raw.parse::<u64>() else {
-        return Ok(());
-    };
-    if value > max_bytes as u64 {
-        return Err(response_too_large_error(url, max_bytes));
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use reqwest::header::{HeaderMap, HeaderValue, CONTENT_LENGTH};
-
-    #[test]
-    fn build_remote_url_encodes_path_segments() {
-        let url = build_remote_url(
-            "https://dav.example.com/remote.php/dav/files/demo/",
-            &[
-                "cc switch-sync".to_string(),
-                "v2".to_string(),
-                "default profile".to_string(),
-                "manifest.json".to_string(),
-            ],
-        )
-        .unwrap();
-        assert_eq!(
-            url,
-            "https://dav.example.com/remote.php/dav/files/demo/cc%20switch-sync/v2/default%20profile/manifest.json"
-        );
-        assert!(!url.contains("//cc"), "should not have double-slash");
-    }
-
-    #[test]
-    fn is_jianguoyun_detects_correctly() {
-        assert!(is_jianguoyun("https://dav.jianguoyun.com/dav"));
-        assert!(is_jianguoyun("https://dav.jianguoyun.com/dav/folder"));
-        assert!(!is_jianguoyun("https://nextcloud.example.com/dav"));
-    }
-
-    #[test]
-    fn path_segments_splits_correctly() {
-        let segs: Vec<_> = path_segments("/a/b/c/").collect();
-        assert_eq!(segs, vec!["a", "b", "c"]);
-
-        let segs: Vec<_> = path_segments("single").collect();
-        assert_eq!(segs, vec!["single"]);
-
-        let segs: Vec<_> = path_segments("").collect();
-        assert!(segs.is_empty());
-    }
-
-    #[test]
-    fn auth_from_credentials_trims_and_rejects_blank() {
-        assert!(auth_from_credentials("  ", "pass").is_none());
-        let auth = auth_from_credentials(" user ", "pass");
-        assert_eq!(auth, Some(("user".to_string(), Some("pass".to_string()))));
-    }
-
-    #[test]
-    fn redact_url_hides_credentials_and_query_values() {
-        let redacted = redact_url("https://alice:secret@example.com:8443/dav?token=abc&foo=1");
-        assert_eq!(redacted, "https://example.com:8443/dav?[keys:foo,token]");
-        assert!(!redacted.contains("secret"));
-    }
-
-    #[test]
-    fn ensure_content_length_within_limit_accepts_missing_or_small_values() {
-        let empty = HeaderMap::new();
-        assert!(
-            ensure_content_length_within_limit(&empty, 1024, "https://dav.example.com").is_ok()
-        );
-
-        let mut small = HeaderMap::new();
-        small.insert(CONTENT_LENGTH, HeaderValue::from_static("1024"));
-        assert!(
-            ensure_content_length_within_limit(&small, 1024, "https://dav.example.com").is_ok()
-        );
-    }
-
-    #[test]
-    fn ensure_content_length_within_limit_rejects_oversized_values() {
-        let mut large = HeaderMap::new();
-        large.insert(CONTENT_LENGTH, HeaderValue::from_static("2048"));
-
-        let err = ensure_content_length_within_limit(&large, 1024, "https://dav.example.com")
-            .expect_err("oversized response should be rejected");
-        assert!(
-            err.to_string().contains("too large") || err.to_string().contains("超过"),
-            "unexpected error: {err}"
-        );
-    }
-}
@@ -1,277 +0,0 @@
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::Arc;
-use std::sync::OnceLock;
-use std::time::{Duration, Instant};
-
-use serde_json::json;
-use tauri::{AppHandle, Emitter};
-use tokio::sync::mpsc::error::TrySendError;
-use tokio::sync::mpsc::{channel, Receiver, Sender};
-
-use crate::error::AppError;
-use crate::services::webdav_sync as webdav_sync_service;
-use crate::settings::{self, WebDavSyncSettings};
-
-const AUTO_SYNC_DEBOUNCE_MS: u64 = 1000;
-pub(crate) const MAX_AUTO_SYNC_WAIT_MS: u64 = 10_000;
-
-static DB_CHANGE_TX: OnceLock<Sender<String>> = OnceLock::new();
-static AUTO_SYNC_SUPPRESS_DEPTH: AtomicUsize = AtomicUsize::new(0);
-
-pub(crate) struct AutoSyncSuppressionGuard;
-
-impl AutoSyncSuppressionGuard {
-    pub fn new() -> Self {
-        AUTO_SYNC_SUPPRESS_DEPTH.fetch_add(1, Ordering::SeqCst);
-        Self
-    }
-}
-
-impl Drop for AutoSyncSuppressionGuard {
-    fn drop(&mut self) {
-        let _ =
-            AUTO_SYNC_SUPPRESS_DEPTH.fetch_update(Ordering::SeqCst, Ordering::SeqCst, |value| {
-                Some(value.saturating_sub(1))
-            });
-    }
-}
-
-pub(crate) fn is_auto_sync_suppressed() -> bool {
-    AUTO_SYNC_SUPPRESS_DEPTH.load(Ordering::SeqCst) > 0
-}
-
-pub fn should_trigger_for_table(table: &str) -> bool {
-    let normalized = table.trim().to_ascii_lowercase();
-    matches!(
-        normalized.as_str(),
-        "providers"
-            | "provider_endpoints"
-            | "mcp_servers"
-            | "prompts"
-            | "skills"
-            | "skill_repos"
-            | "settings"
-            | "proxy_config"
-    )
-}
-
-pub(crate) fn enqueue_change_signal(tx: &Sender<String>, table: &str) -> bool {
-    match tx.try_send(table.to_string()) {
-        Ok(()) => true,
-        Err(TrySendError::Full(_)) | Err(TrySendError::Closed(_)) => false,
-    }
-}
-
-pub(crate) fn auto_sync_wait_duration(started_at: Instant, now: Instant) -> Option<Duration> {
-    let max_wait = Duration::from_millis(MAX_AUTO_SYNC_WAIT_MS);
-    let debounce = Duration::from_millis(AUTO_SYNC_DEBOUNCE_MS);
-    let elapsed = now.saturating_duration_since(started_at);
-    if elapsed >= max_wait {
-        return None;
-    }
-    Some(debounce.min(max_wait - elapsed))
-}
-
-fn should_run_auto_sync(settings: Option<&WebDavSyncSettings>) -> bool {
-    let Some(sync) = settings else {
-        return false;
-    };
-    sync.enabled && sync.auto_sync
-}
-
-fn persist_auto_sync_error(settings: &mut WebDavSyncSettings, error: &AppError) {
-    settings.status.last_error = Some(error.to_string());
-    settings.status.last_error_source = Some("auto".to_string());
-    let _ = settings::update_webdav_sync_status(settings.status.clone());
-}
-
-fn emit_auto_sync_status_updated(app: &AppHandle, status: &str, error: Option<&str>) {
-    let payload = match error {
-        Some(message) => json!({
-            "source": "auto",
-            "status": status,
-            "error": message,
-        }),
-        None => json!({
-            "source": "auto",
-            "status": status,
-        }),
-    };
-
-    if let Err(err) = app.emit("webdav-sync-status-updated", payload) {
-        log::debug!("[WebDAV] failed to emit sync status update event: {err}");
-    }
-}
-
-async fn run_auto_sync_upload(
-    db: &crate::database::Database,
-    app: &AppHandle,
-) -> Result<(), AppError> {
-    let mut settings = settings::get_webdav_sync_settings();
-    if !should_run_auto_sync(settings.as_ref()) {
-        return Ok(());
-    }
-
-    let mut sync_settings = match settings.take() {
-        Some(value) => value,
-        None => return Ok(()),
-    };
-
-    let result = webdav_sync_service::run_with_sync_lock(webdav_sync_service::upload(
-        db,
-        &mut sync_settings,
-    ))
-    .await;
-    match result {
-        Ok(_) => {
-            emit_auto_sync_status_updated(app, "success", None);
-            Ok(())
-        }
-        Err(err) => {
-            persist_auto_sync_error(&mut sync_settings, &err);
-            emit_auto_sync_status_updated(app, "error", Some(&err.to_string()));
-            Err(err)
-        }
-    }
-}
-
-pub fn notify_db_changed(table: &str) {
-    if is_auto_sync_suppressed() {
-        return;
-    }
-    if !should_trigger_for_table(table) {
-        return;
-    }
-    let Some(tx) = DB_CHANGE_TX.get() else {
-        return;
-    };
-    let _ = enqueue_change_signal(tx, table);
-}
-
-pub fn start_worker(db: Arc<crate::database::Database>, app: tauri::AppHandle) {
-    if DB_CHANGE_TX.get().is_some() {
-        return;
-    }
-
-    // Buffer size 1 is enough: we only need "dirty" signals, not every event.
-    let (tx, rx) = channel::<String>(1);
-    if DB_CHANGE_TX.set(tx).is_err() {
-        return;
-    }
-
-    tauri::async_runtime::spawn(async move {
-        run_worker_loop(db, rx, app).await;
-    });
-}
-
-async fn run_worker_loop(
-    db: Arc<crate::database::Database>,
-    mut rx: Receiver<String>,
-    app: tauri::AppHandle,
-) {
-    while let Some(first_table) = rx.recv().await {
-        let started_at = Instant::now();
-        let mut merged_count = 1usize;
-
-        loop {
-            let Some(wait_for) = auto_sync_wait_duration(started_at, Instant::now()) else {
-                break;
-            };
-            let timeout = tokio::time::timeout(wait_for, rx.recv()).await;
-
-            match timeout {
-                Ok(Some(_)) => merged_count += 1,
-                Ok(None) => return,
-                Err(_) => break,
-            }
-        }
-
-        log::debug!(
-            "[WebDAV][AutoSync] Triggered by table={first_table}, merged_changes={merged_count}"
-        );
-
-        if let Err(err) = run_auto_sync_upload(&db, &app).await {
-            log::warn!("[WebDAV][AutoSync] Upload failed: {err}");
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{
-        auto_sync_wait_duration, enqueue_change_signal, is_auto_sync_suppressed,
-        should_run_auto_sync, should_trigger_for_table, AutoSyncSuppressionGuard,
-        MAX_AUTO_SYNC_WAIT_MS,
-    };
-    use crate::settings::WebDavSyncSettings;
-    use std::time::{Duration, Instant};
-    use tokio::sync::mpsc::channel;
-
-    #[test]
-    fn should_trigger_sync_for_config_tables_only() {
-        assert!(should_trigger_for_table("providers"));
-        assert!(should_trigger_for_table("settings"));
-        assert!(!should_trigger_for_table("proxy_request_logs"));
-        assert!(!should_trigger_for_table("provider_health"));
-    }
-
-    #[test]
-    fn suppression_guard_enables_and_restores_state() {
-        assert!(!is_auto_sync_suppressed());
-        {
-            let _guard = AutoSyncSuppressionGuard::new();
-            assert!(is_auto_sync_suppressed());
-        }
-        assert!(!is_auto_sync_suppressed());
-    }
-
-    #[test]
-    fn max_wait_caps_flush_latency_for_continuous_events() {
-        let started = Instant::now();
-        let later = started + Duration::from_millis(MAX_AUTO_SYNC_WAIT_MS + 1);
-        assert!(auto_sync_wait_duration(started, later).is_none());
-    }
-
-    #[tokio::test]
-    async fn enqueue_change_signal_drops_when_channel_is_full() {
-        let (tx, _rx) = channel::<String>(1);
-        assert!(enqueue_change_signal(&tx, "providers"));
-        assert!(!enqueue_change_signal(&tx, "providers"));
-    }
-
-    #[test]
-    fn should_run_auto_sync_requires_enabled_and_auto_sync_flag() {
-        assert!(!should_run_auto_sync(None));
-
-        let disabled = WebDavSyncSettings {
-            enabled: false,
-            auto_sync: true,
-            ..WebDavSyncSettings::default()
-        };
-        assert!(!should_run_auto_sync(Some(&disabled)));
-
-        let auto_sync_off = WebDavSyncSettings {
-            enabled: true,
-            auto_sync: false,
-            ..WebDavSyncSettings::default()
-        };
-        assert!(!should_run_auto_sync(Some(&auto_sync_off)));
-
-        let enabled = WebDavSyncSettings {
-            enabled: true,
-            auto_sync: true,
-            ..WebDavSyncSettings::default()
-        };
-        assert!(should_run_auto_sync(Some(&enabled)));
-    }
-
-    #[test]
-    fn service_layer_does_not_depend_on_commands_layer() {
-        let source = include_str!("webdav_auto_sync.rs");
-        let needle = ["crate", "commands", ""].join("::");
-        assert!(
-            !source.contains(&needle),
-            "services layer should not depend on commands layer"
-        );
-    }
-}
@@ -1,704 +0,0 @@
-//! WebDAV v2 sync protocol layer.
-//!
-//! Implements manifest-based synchronization on top of the HTTP transport
-//! primitives in [`super::webdav`]. Artifact set: `db.sql` + `skills.zip`.
-
-use std::collections::BTreeMap;
-use std::fs;
-use std::future::Future;
-use std::process::Command;
-use std::sync::OnceLock;
-
-use chrono::Utc;
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use sha2::{Digest, Sha256};
-use tempfile::tempdir;
-
-use crate::error::AppError;
-use crate::services::webdav::{
-    auth_from_credentials, build_remote_url, ensure_remote_directories, get_bytes, head_etag,
-    path_segments, put_bytes, test_connection, WebDavAuth,
-};
-use crate::settings::{update_webdav_sync_status, WebDavSyncSettings, WebDavSyncStatus};
-
-mod archive;
-use archive::{
-    backup_current_skills, restore_skills_from_backup, restore_skills_zip, zip_skills_ssot,
-};
-
-// ─── Protocol constants ──────────────────────────────────────
-
-const PROTOCOL_FORMAT: &str = "cc-switch-webdav-sync";
-const PROTOCOL_VERSION: u32 = 2;
-const REMOTE_DB_SQL: &str = "db.sql";
-const REMOTE_SKILLS_ZIP: &str = "skills.zip";
-const REMOTE_MANIFEST: &str = "manifest.json";
-const MAX_DEVICE_NAME_LEN: usize = 64;
-const MAX_MANIFEST_BYTES: usize = 1024 * 1024;
-pub(super) const MAX_SYNC_ARTIFACT_BYTES: u64 = 512 * 1024 * 1024;
-
-pub fn sync_mutex() -> &'static tokio::sync::Mutex<()> {
-    static LOCK: OnceLock<tokio::sync::Mutex<()>> = OnceLock::new();
-    LOCK.get_or_init(|| tokio::sync::Mutex::new(()))
-}
-
-pub async fn run_with_sync_lock<T, Fut>(operation: Fut) -> Result<T, AppError>
-where
-    Fut: Future<Output = Result<T, AppError>>,
-{
-    let _guard = sync_mutex().lock().await;
-    operation.await
-}
-
-fn localized(key: &'static str, zh: impl Into<String>, en: impl Into<String>) -> AppError {
-    AppError::localized(key, zh, en)
-}
-
-fn io_context_localized(
-    _key: &'static str,
-    zh: impl Into<String>,
-    en: impl Into<String>,
-    source: std::io::Error,
-) -> AppError {
-    let zh_msg = zh.into();
-    let en_msg = en.into();
-    AppError::IoContext {
-        context: format!("{zh_msg} ({en_msg})"),
-        source,
-    }
-}
-
-// ─── Types ───────────────────────────────────────────────────
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct SyncManifest {
-    format: String,
-    version: u32,
-    device_name: String,
-    created_at: String,
-    artifacts: BTreeMap<String, ArtifactMeta>,
-    snapshot_id: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct ArtifactMeta {
-    sha256: String,
-    size: u64,
-}
-
-struct LocalSnapshot {
-    db_sql: Vec<u8>,
-    skills_zip: Vec<u8>,
-    manifest_bytes: Vec<u8>,
-    manifest_hash: String,
-}
-
-// ─── Public API ──────────────────────────────────────────────
-
-/// Check WebDAV connectivity and ensure remote directory structure.
-pub async fn check_connection(settings: &WebDavSyncSettings) -> Result<(), AppError> {
-    settings.validate()?;
-    let auth = auth_for(settings);
-    test_connection(&settings.base_url, &auth).await?;
-    let dir_segs = remote_dir_segments(settings);
-    ensure_remote_directories(&settings.base_url, &dir_segs, &auth).await?;
-    Ok(())
-}
-
-/// Upload local snapshot (db + skills) to remote.
-pub async fn upload(
-    db: &crate::database::Database,
-    settings: &mut WebDavSyncSettings,
-) -> Result<Value, AppError> {
-    settings.validate()?;
-    let auth = auth_for(settings);
-    let dir_segs = remote_dir_segments(settings);
-    ensure_remote_directories(&settings.base_url, &dir_segs, &auth).await?;
-
-    let snapshot = build_local_snapshot(db, settings)?;
-
-    // Upload order: artifacts first, manifest last (best-effort consistency)
-    let db_url = remote_file_url(settings, REMOTE_DB_SQL)?;
-    put_bytes(&db_url, &auth, snapshot.db_sql, "application/sql").await?;
-
-    let skills_url = remote_file_url(settings, REMOTE_SKILLS_ZIP)?;
-    put_bytes(&skills_url, &auth, snapshot.skills_zip, "application/zip").await?;
-
-    let manifest_url = remote_file_url(settings, REMOTE_MANIFEST)?;
-    put_bytes(
-        &manifest_url,
-        &auth,
-        snapshot.manifest_bytes,
-        "application/json",
-    )
-    .await?;
-
-    // Fetch etag (best-effort, don't fail the upload)
-    let etag = match head_etag(&manifest_url, &auth).await {
-        Ok(e) => e,
-        Err(e) => {
-            log::debug!("[WebDAV] Failed to fetch ETag after upload: {e}");
-            None
-        }
-    };
-
-    let _persisted = persist_sync_success_best_effort(
-        settings,
-        snapshot.manifest_hash,
-        etag,
-        persist_sync_success,
-    );
-    Ok(serde_json::json!({ "status": "uploaded" }))
-}
-
-/// Download remote snapshot and apply to local database + skills.
-pub async fn download(
-    db: &crate::database::Database,
-    settings: &mut WebDavSyncSettings,
-) -> Result<Value, AppError> {
-    settings.validate()?;
-    let auth = auth_for(settings);
-
-    let manifest_url = remote_file_url(settings, REMOTE_MANIFEST)?;
-    let (manifest_bytes, etag) = get_bytes(&manifest_url, &auth, MAX_MANIFEST_BYTES)
-        .await?
-        .ok_or_else(|| {
-            localized(
-                "webdav.sync.remote_empty",
-                "远端没有可下载的同步数据",
-                "No downloadable sync data found on the remote.",
-            )
-        })?;
-
-    let manifest: SyncManifest =
-        serde_json::from_slice(&manifest_bytes).map_err(|e| AppError::Json {
-            path: REMOTE_MANIFEST.to_string(),
-            source: e,
-        })?;
-
-    validate_manifest_compat(&manifest)?;
-
-    // Download and verify artifacts
-    let db_sql = download_and_verify(settings, &auth, REMOTE_DB_SQL, &manifest.artifacts).await?;
-    let skills_zip =
-        download_and_verify(settings, &auth, REMOTE_SKILLS_ZIP, &manifest.artifacts).await?;
-
-    // Apply snapshot
-    apply_snapshot(db, &db_sql, &skills_zip)?;
-
-    let manifest_hash = sha256_hex(&manifest_bytes);
-    let _persisted =
-        persist_sync_success_best_effort(settings, manifest_hash, etag, persist_sync_success);
-    Ok(serde_json::json!({ "status": "downloaded" }))
-}
-
-/// Fetch remote manifest info without downloading artifacts.
-pub async fn fetch_remote_info(settings: &WebDavSyncSettings) -> Result<Option<Value>, AppError> {
-    settings.validate()?;
-    let auth = auth_for(settings);
-    let manifest_url = remote_file_url(settings, REMOTE_MANIFEST)?;
-
-    let Some((bytes, _)) = get_bytes(&manifest_url, &auth, MAX_MANIFEST_BYTES).await? else {
-        return Ok(None);
-    };
-
-    let manifest: SyncManifest = serde_json::from_slice(&bytes).map_err(|e| AppError::Json {
-        path: REMOTE_MANIFEST.to_string(),
-        source: e,
-    })?;
-
-    let compatible = validate_manifest_compat(&manifest).is_ok();
-
-    let payload = serde_json::json!({
-        "deviceName": manifest.device_name,
-        "createdAt": manifest.created_at,
-        "snapshotId": manifest.snapshot_id,
-        "version": manifest.version,
-        "compatible": compatible,
-        "artifacts": manifest.artifacts.keys().collect::<Vec<_>>(),
-    });
-
-    Ok(Some(payload))
-}
-
-// ─── Sync status persistence (I3: deduplicated) ─────────────
-
-fn persist_sync_success(
-    settings: &mut WebDavSyncSettings,
-    manifest_hash: String,
-    etag: Option<String>,
-) -> Result<(), AppError> {
-    let status = WebDavSyncStatus {
-        last_sync_at: Some(Utc::now().timestamp()),
-        last_error: None,
-        last_error_source: None,
-        last_local_manifest_hash: Some(manifest_hash.clone()),
-        last_remote_manifest_hash: Some(manifest_hash),
-        last_remote_etag: etag,
-    };
-    settings.status = status.clone();
-    update_webdav_sync_status(status)
-}
-
-fn persist_sync_success_best_effort<F>(
-    settings: &mut WebDavSyncSettings,
-    manifest_hash: String,
-    etag: Option<String>,
-    persist_fn: F,
-) -> bool
-where
-    F: FnOnce(&mut WebDavSyncSettings, String, Option<String>) -> Result<(), AppError>,
-{
-    match persist_fn(settings, manifest_hash, etag) {
-        Ok(()) => true,
-        Err(err) => {
-            log::warn!("[WebDAV] Persist sync status failed, keep operation success: {err}");
-            false
-        }
-    }
-}
-
-// ─── Snapshot building ───────────────────────────────────────
-
-fn build_local_snapshot(
-    db: &crate::database::Database,
-    _settings: &WebDavSyncSettings,
-) -> Result<LocalSnapshot, AppError> {
-    // Export database to SQL string
-    let sql_string = db.export_sql_string()?;
-    let db_sql = sql_string.into_bytes();
-
-    // Pack skills into deterministic ZIP
-    let tmp = tempdir().map_err(|e| {
-        io_context_localized(
-            "webdav.sync.snapshot_tmpdir_failed",
-            "创建 WebDAV 快照临时目录失败",
-            "Failed to create temporary directory for WebDAV snapshot",
-            e,
-        )
-    })?;
-    let skills_zip_path = tmp.path().join(REMOTE_SKILLS_ZIP);
-    zip_skills_ssot(&skills_zip_path)?;
-    let skills_zip = fs::read(&skills_zip_path).map_err(|e| AppError::io(&skills_zip_path, e))?;
-
-    // Build artifact map and compute hashes
-    let mut artifacts = BTreeMap::new();
-    artifacts.insert(
-        REMOTE_DB_SQL.to_string(),
-        ArtifactMeta {
-            sha256: sha256_hex(&db_sql),
-            size: db_sql.len() as u64,
-        },
-    );
-    artifacts.insert(
-        REMOTE_SKILLS_ZIP.to_string(),
-        ArtifactMeta {
-            sha256: sha256_hex(&skills_zip),
-            size: skills_zip.len() as u64,
-        },
-    );
-
-    let snapshot_id = compute_snapshot_id(&artifacts);
-    let manifest = SyncManifest {
-        format: PROTOCOL_FORMAT.to_string(),
-        version: PROTOCOL_VERSION,
-        device_name: detect_system_device_name().unwrap_or_else(|| "Unknown Device".to_string()),
-        created_at: Utc::now().to_rfc3339(),
-        artifacts,
-        snapshot_id,
-    };
-    let manifest_bytes =
-        serde_json::to_vec_pretty(&manifest).map_err(|e| AppError::JsonSerialize { source: e })?;
-    let manifest_hash = sha256_hex(&manifest_bytes);
-
-    Ok(LocalSnapshot {
-        db_sql,
-        skills_zip,
-        manifest_bytes,
-        manifest_hash,
-    })
-}
-
-/// Compute a deterministic snapshot identity from artifact hashes.
-///
-/// BTreeMap iteration order is sorted by key, ensuring stability.
-fn compute_snapshot_id(artifacts: &BTreeMap<String, ArtifactMeta>) -> String {
-    let parts: Vec<String> = artifacts
-        .iter()
-        .map(|(name, meta)| format!("{}:{}", name, meta.sha256))
-        .collect();
-    sha256_hex(parts.join("|").as_bytes())
-}
-
-fn sha256_hex(bytes: &[u8]) -> String {
-    let mut hasher = Sha256::new();
-    hasher.update(bytes);
-    format!("{:x}", hasher.finalize())
-}
-
-fn detect_system_device_name() -> Option<String> {
-    let env_name = ["CC_SWITCH_DEVICE_NAME", "COMPUTERNAME", "HOSTNAME"]
-        .iter()
-        .filter_map(|key| std::env::var(key).ok())
-        .find_map(|value| normalize_device_name(&value));
-
-    if env_name.is_some() {
-        return env_name;
-    }
-
-    let output = Command::new("hostname").output().ok()?;
-    if !output.status.success() {
-        return None;
-    }
-    let hostname = String::from_utf8(output.stdout).ok()?;
-    normalize_device_name(&hostname)
-}
-
-fn normalize_device_name(raw: &str) -> Option<String> {
-    let compact = raw
-        .chars()
-        .fold(String::with_capacity(raw.len()), |mut acc, ch| {
-            if ch.is_whitespace() {
-                acc.push(' ');
-            } else if !ch.is_control() {
-                acc.push(ch);
-            }
-            acc
-        });
-    let normalized = compact.split_whitespace().collect::<Vec<_>>().join(" ");
-    let trimmed = normalized.trim();
-    if trimmed.is_empty() {
-        return None;
-    }
-
-    let limited = trimmed
-        .chars()
-        .take(MAX_DEVICE_NAME_LEN)
-        .collect::<String>();
-    if limited.is_empty() {
-        None
-    } else {
-        Some(limited)
-    }
-}
-
-fn validate_manifest_compat(manifest: &SyncManifest) -> Result<(), AppError> {
-    if manifest.format != PROTOCOL_FORMAT {
-        return Err(localized(
-            "webdav.sync.manifest_format_incompatible",
-            format!("远端 manifest 格式不兼容: {}", manifest.format),
-            format!(
-                "Remote manifest format is incompatible: {}",
-                manifest.format
-            ),
-        ));
-    }
-    if manifest.version != PROTOCOL_VERSION {
-        return Err(localized(
-            "webdav.sync.manifest_version_incompatible",
-            format!(
-                "远端 manifest 协议版本不兼容: v{} (本地 v{PROTOCOL_VERSION})",
-                manifest.version
-            ),
-            format!(
-                "Remote manifest protocol version is incompatible: v{} (local v{PROTOCOL_VERSION})",
-                manifest.version
-            ),
-        ));
-    }
-    Ok(())
-}
-
-// ─── Download & verify ───────────────────────────────────────
-
-async fn download_and_verify(
-    settings: &WebDavSyncSettings,
-    auth: &WebDavAuth,
-    artifact_name: &str,
-    artifacts: &BTreeMap<String, ArtifactMeta>,
-) -> Result<Vec<u8>, AppError> {
-    let meta = artifacts.get(artifact_name).ok_or_else(|| {
-        localized(
-            "webdav.sync.manifest_missing_artifact",
-            format!("manifest 中缺少 artifact: {artifact_name}"),
-            format!("Manifest missing artifact: {artifact_name}"),
-        )
-    })?;
-    validate_artifact_size_limit(artifact_name, meta.size)?;
-
-    let url = remote_file_url(settings, artifact_name)?;
-    let (bytes, _) = get_bytes(&url, auth, MAX_SYNC_ARTIFACT_BYTES as usize)
-        .await?
-        .ok_or_else(|| {
-            localized(
-                "webdav.sync.remote_missing_artifact",
-                format!("远端缺少 artifact 文件: {artifact_name}"),
-                format!("Remote artifact file missing: {artifact_name}"),
-            )
-        })?;
-
-    // Quick size check before expensive hash
-    if bytes.len() as u64 != meta.size {
-        return Err(localized(
-            "webdav.sync.artifact_size_mismatch",
-            format!(
-                "artifact {artifact_name} 大小不匹配 (expected: {}, got: {})",
-                meta.size,
-                bytes.len(),
-            ),
-            format!(
-                "Artifact {artifact_name} size mismatch (expected: {}, got: {})",
-                meta.size,
-                bytes.len(),
-            ),
-        ));
-    }
-
-    let actual_hash = sha256_hex(&bytes);
-    if actual_hash != meta.sha256 {
-        return Err(localized(
-            "webdav.sync.artifact_hash_mismatch",
-            format!(
-                "artifact {artifact_name} SHA256 校验失败 (expected: {}..., got: {}...)",
-                meta.sha256.get(..8).unwrap_or(&meta.sha256),
-                actual_hash.get(..8).unwrap_or(&actual_hash),
-            ),
-            format!(
-                "Artifact {artifact_name} SHA256 verification failed (expected: {}..., got: {}...)",
-                meta.sha256.get(..8).unwrap_or(&meta.sha256),
-                actual_hash.get(..8).unwrap_or(&actual_hash),
-            ),
-        ));
-    }
-    Ok(bytes)
-}
-
-fn apply_snapshot(
-    db: &crate::database::Database,
-    db_sql: &[u8],
-    skills_zip: &[u8],
-) -> Result<(), AppError> {
-    let sql_str = std::str::from_utf8(db_sql).map_err(|e| {
-        localized(
-            "webdav.sync.sql_not_utf8",
-            format!("SQL 非 UTF-8: {e}"),
-            format!("SQL is not valid UTF-8: {e}"),
-        )
-    })?;
-    let skills_backup = backup_current_skills()?;
-
-    // 先替换 skills，再导入数据库；若导入失败则回滚 skills，避免“半恢复”。
-    restore_skills_zip(skills_zip)?;
-
-    if let Err(db_err) = db.import_sql_string(sql_str) {
-        if let Err(rollback_err) = restore_skills_from_backup(&skills_backup) {
-            return Err(localized(
-                "webdav.sync.db_import_and_rollback_failed",
-                format!("导入数据库失败: {db_err}; 同时回滚 Skills 失败: {rollback_err}"),
-                format!(
-                    "Database import failed: {db_err}; skills rollback also failed: {rollback_err}"
-                ),
-            ));
-        }
-        return Err(db_err);
-    }
-
-    Ok(())
-}
-
-// ─── Remote path helpers ─────────────────────────────────────
-
-fn remote_dir_segments(settings: &WebDavSyncSettings) -> Vec<String> {
-    let mut segs = Vec::new();
-    segs.extend(path_segments(&settings.remote_root).map(str::to_string));
-    segs.push(format!("v{PROTOCOL_VERSION}"));
-    segs.extend(path_segments(&settings.profile).map(str::to_string));
-    segs
-}
-
-fn remote_file_url(settings: &WebDavSyncSettings, file_name: &str) -> Result<String, AppError> {
-    let mut segs = remote_dir_segments(settings);
-    segs.extend(path_segments(file_name).map(str::to_string));
-    build_remote_url(&settings.base_url, &segs)
-}
-
-fn auth_for(settings: &WebDavSyncSettings) -> WebDavAuth {
-    auth_from_credentials(&settings.username, &settings.password)
-}
-
-fn validate_artifact_size_limit(artifact_name: &str, size: u64) -> Result<(), AppError> {
-    if size > MAX_SYNC_ARTIFACT_BYTES {
-        let max_mb = MAX_SYNC_ARTIFACT_BYTES / 1024 / 1024;
-        return Err(localized(
-            "webdav.sync.artifact_too_large",
-            format!("artifact {artifact_name} 超过下载上限（{} MB）", max_mb),
-            format!(
-                "Artifact {artifact_name} exceeds download limit ({} MB)",
-                max_mb
-            ),
-        ));
-    }
-    Ok(())
-}
-
-// ─── Tests ───────────────────────────────────────────────────
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn artifact(sha256: &str, size: u64) -> ArtifactMeta {
-        ArtifactMeta {
-            sha256: sha256.to_string(),
-            size,
-        }
-    }
-
-    #[test]
-    fn snapshot_id_is_stable() {
-        let mut artifacts = BTreeMap::new();
-        artifacts.insert("db.sql".to_string(), artifact("abc123", 100));
-        artifacts.insert("skills.zip".to_string(), artifact("def456", 200));
-
-        let id1 = compute_snapshot_id(&artifacts);
-        let id2 = compute_snapshot_id(&artifacts);
-        assert_eq!(id1, id2);
-    }
-
-    #[test]
-    fn snapshot_id_changes_with_artifacts() {
-        let mut a1 = BTreeMap::new();
-        a1.insert("db.sql".to_string(), artifact("hash-a", 1));
-
-        let mut a2 = BTreeMap::new();
-        a2.insert("db.sql".to_string(), artifact("hash-b", 1));
-
-        assert_ne!(compute_snapshot_id(&a1), compute_snapshot_id(&a2));
-    }
-
-    #[test]
-    fn remote_dir_segments_uses_v2() {
-        let settings = WebDavSyncSettings {
-            remote_root: "cc-switch-sync".to_string(),
-            profile: "default".to_string(),
-            ..WebDavSyncSettings::default()
-        };
-        let segs = remote_dir_segments(&settings);
-        assert_eq!(segs, vec!["cc-switch-sync", "v2", "default"]);
-    }
-
-    #[test]
-    fn sha256_hex_is_correct() {
-        let hash = sha256_hex(b"hello");
-        assert_eq!(
-            hash,
-            "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824"
-        );
-    }
-
-    #[test]
-    fn persist_best_effort_returns_true_on_success() {
-        let mut settings = WebDavSyncSettings::default();
-        let ok = persist_sync_success_best_effort(
-            &mut settings,
-            "hash".to_string(),
-            Some("etag".to_string()),
-            |_settings, _hash, _etag| Ok(()),
-        );
-        assert!(ok);
-    }
-
-    #[test]
-    fn persist_best_effort_returns_false_on_error() {
-        let mut settings = WebDavSyncSettings::default();
-        let ok = persist_sync_success_best_effort(
-            &mut settings,
-            "hash".to_string(),
-            None,
-            |_settings, _hash, _etag| Err(AppError::Config("boom".to_string())),
-        );
-        assert!(!ok);
-    }
-
-    fn manifest_with(format: &str, version: u32) -> SyncManifest {
-        let mut artifacts = BTreeMap::new();
-        artifacts.insert("db.sql".to_string(), artifact("abc", 1));
-        artifacts.insert("skills.zip".to_string(), artifact("def", 2));
-        SyncManifest {
-            format: format.to_string(),
-            version,
-            device_name: "My MacBook".to_string(),
-            created_at: "2026-02-12T00:00:00Z".to_string(),
-            artifacts,
-            snapshot_id: "snap-1".to_string(),
-        }
-    }
-
-    #[test]
-    fn validate_manifest_compat_accepts_supported_manifest() {
-        let manifest = manifest_with(PROTOCOL_FORMAT, PROTOCOL_VERSION);
-        assert!(validate_manifest_compat(&manifest).is_ok());
-    }
-
-    #[test]
-    fn validate_manifest_compat_rejects_wrong_format() {
-        let manifest = manifest_with("other-format", PROTOCOL_VERSION);
-        assert!(validate_manifest_compat(&manifest).is_err());
-    }
-
-    #[test]
-    fn validate_manifest_compat_rejects_wrong_version() {
-        let manifest = manifest_with(PROTOCOL_FORMAT, PROTOCOL_VERSION + 1);
-        assert!(validate_manifest_compat(&manifest).is_err());
-    }
-
-    #[test]
-    fn normalize_device_name_returns_none_for_blank_input() {
-        assert_eq!(normalize_device_name("   \n\t  "), None);
-    }
-
-    #[test]
-    fn normalize_device_name_collapses_whitespace_and_drops_control_chars() {
-        assert_eq!(
-            normalize_device_name("  Mac\tBook \n Pro\u{0007} "),
-            Some("Mac Book Pro".to_string())
-        );
-    }
-
-    #[test]
-    fn normalize_device_name_truncates_to_max_len() {
-        let long = "a".repeat(80);
-        assert_eq!(normalize_device_name(&long).map(|s| s.len()), Some(64));
-    }
-
-    #[test]
-    fn manifest_serialization_uses_device_name_only() {
-        let manifest = manifest_with(PROTOCOL_FORMAT, PROTOCOL_VERSION);
-        let value = serde_json::to_value(&manifest).expect("serialize manifest");
-        assert!(
-            value.get("deviceName").is_some(),
-            "manifest should contain deviceName"
-        );
-        assert!(
-            value.get("deviceId").is_none(),
-            "manifest should not contain deviceId"
-        );
-    }
-
-    #[test]
-    fn validate_artifact_size_limit_rejects_oversized_artifacts() {
-        let err = validate_artifact_size_limit("skills.zip", MAX_SYNC_ARTIFACT_BYTES + 1)
-            .expect_err("artifact larger than limit should be rejected");
-        assert!(
-            err.to_string().contains("too large") || err.to_string().contains("超过"),
-            "unexpected error: {err}"
-        );
-    }
-
-    #[test]
-    fn validate_artifact_size_limit_accepts_limit_boundary() {
-        assert!(validate_artifact_size_limit("skills.zip", MAX_SYNC_ARTIFACT_BYTES).is_ok());
-    }
-}
@@ -1,410 +0,0 @@
-use std::collections::HashSet;
-use std::fs;
-use std::io::{Read, Write};
-use std::path::{Path, PathBuf};
-
-use tempfile::{tempdir, TempDir};
-use zip::write::SimpleFileOptions;
-use zip::DateTime;
-
-use crate::error::AppError;
-use crate::services::skill::SkillService;
-
-use super::{io_context_localized, localized, MAX_SYNC_ARTIFACT_BYTES, REMOTE_SKILLS_ZIP};
-
-/// Maximum number of entries allowed in a zip archive.
-const MAX_EXTRACT_ENTRIES: usize = 10_000;
-
-pub(super) struct SkillsBackup {
-    _tmp: TempDir,
-    backup_dir: PathBuf,
-    ssot_path: PathBuf,
-    existed: bool,
-}
-
-pub(super) fn zip_skills_ssot(dest_path: &Path) -> Result<(), AppError> {
-    let source = SkillService::get_ssot_dir().map_err(|e| {
-        localized(
-            "webdav.sync.skills_ssot_dir_failed",
-            format!("获取 Skills SSOT 目录失败: {e}"),
-            format!("Failed to resolve Skills SSOT directory: {e}"),
-        )
-    })?;
-    if let Some(parent) = dest_path.parent() {
-        fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
-    }
-
-    let file = fs::File::create(dest_path).map_err(|e| AppError::io(dest_path, e))?;
-    let mut writer = zip::ZipWriter::new(file);
-    let options = SimpleFileOptions::default()
-        .compression_method(zip::CompressionMethod::Deflated)
-        .last_modified_time(DateTime::default());
-
-    if source.exists() {
-        let canonical_root = fs::canonicalize(&source).unwrap_or_else(|_| source.clone());
-        let mut visited = HashSet::new();
-        mark_visited_dir(&canonical_root, &mut visited)?;
-        zip_dir_recursive(
-            &canonical_root,
-            &canonical_root,
-            &mut writer,
-            options,
-            &mut visited,
-        )?;
-    }
-
-    writer.finish().map_err(|e| {
-        localized(
-            "webdav.sync.skills_zip_write_failed",
-            format!("写入 skills.zip 失败: {e}"),
-            format!("Failed to write skills.zip: {e}"),
-        )
-    })?;
-    Ok(())
-}
-
-pub(super) fn restore_skills_zip(raw: &[u8]) -> Result<(), AppError> {
-    let tmp = tempdir().map_err(|e| {
-        io_context_localized(
-            "webdav.sync.skills_extract_tmpdir_failed",
-            "创建 skills 解压临时目录失败",
-            "Failed to create temporary directory for skills extraction",
-            e,
-        )
-    })?;
-    let zip_path = tmp.path().join(REMOTE_SKILLS_ZIP);
-    fs::write(&zip_path, raw).map_err(|e| AppError::io(&zip_path, e))?;
-
-    let file = fs::File::open(&zip_path).map_err(|e| AppError::io(&zip_path, e))?;
-    let mut archive = zip::ZipArchive::new(file).map_err(|e| {
-        localized(
-            "webdav.sync.skills_zip_parse_failed",
-            format!("解析 skills.zip 失败: {e}"),
-            format!("Failed to parse skills.zip: {e}"),
-        )
-    })?;
-
-    let extracted = tmp.path().join("skills-extracted");
-    fs::create_dir_all(&extracted).map_err(|e| AppError::io(&extracted, e))?;
-
-    if archive.len() > MAX_EXTRACT_ENTRIES {
-        return Err(localized(
-            "webdav.sync.skills_zip_too_many_entries",
-            format!(
-                "skills.zip 条目数过多（{}），上限 {MAX_EXTRACT_ENTRIES}",
-                archive.len()
-            ),
-            format!(
-                "skills.zip has too many entries ({}), limit is {MAX_EXTRACT_ENTRIES}",
-                archive.len()
-            ),
-        ));
-    }
-
-    let mut total_bytes: u64 = 0;
-    for idx in 0..archive.len() {
-        let mut entry = archive.by_index(idx).map_err(|e| {
-            localized(
-                "webdav.sync.skills_zip_entry_read_failed",
-                format!("读取 ZIP 项失败: {e}"),
-                format!("Failed to read ZIP entry: {e}"),
-            )
-        })?;
-        let Some(safe_name) = entry.enclosed_name() else {
-            continue;
-        };
-        let out_path = extracted.join(safe_name);
-        if entry.is_dir() {
-            fs::create_dir_all(&out_path).map_err(|e| AppError::io(&out_path, e))?;
-            continue;
-        }
-        if let Some(parent) = out_path.parent() {
-            fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
-        }
-        let mut out = fs::File::create(&out_path).map_err(|e| AppError::io(&out_path, e))?;
-        let _written = copy_entry_with_total_limit(
-            &mut entry,
-            &mut out,
-            &mut total_bytes,
-            MAX_SYNC_ARTIFACT_BYTES,
-            &out_path,
-        )?;
-    }
-
-    let ssot = SkillService::get_ssot_dir().map_err(|e| {
-        localized(
-            "webdav.sync.skills_ssot_dir_failed",
-            format!("获取 Skills SSOT 目录失败: {e}"),
-            format!("Failed to resolve Skills SSOT directory: {e}"),
-        )
-    })?;
-    let bak = ssot.with_extension("bak");
-
-    if ssot.exists() {
-        if bak.exists() {
-            let _ = fs::remove_dir_all(&bak);
-        }
-        fs::rename(&ssot, &bak).map_err(|e| AppError::io(&ssot, e))?;
-    }
-
-    if let Err(e) = copy_dir_recursive(&extracted, &ssot) {
-        if bak.exists() {
-            let _ = fs::remove_dir_all(&ssot);
-            let _ = fs::rename(&bak, &ssot);
-        }
-        return Err(e);
-    }
-
-    let _ = fs::remove_dir_all(&bak);
-    Ok(())
-}
-
-pub(super) fn backup_current_skills() -> Result<SkillsBackup, AppError> {
-    let ssot = SkillService::get_ssot_dir().map_err(|e| {
-        localized(
-            "webdav.sync.skills_ssot_dir_failed",
-            format!("获取 Skills SSOT 目录失败: {e}"),
-            format!("Failed to resolve Skills SSOT directory: {e}"),
-        )
-    })?;
-    let tmp = tempdir().map_err(|e| {
-        io_context_localized(
-            "webdav.sync.skills_backup_tmpdir_failed",
-            "创建 skills 备份临时目录失败",
-            "Failed to create temporary directory for skills backup",
-            e,
-        )
-    })?;
-    let backup_dir = tmp.path().join("skills-backup");
-
-    let existed = ssot.exists();
-    if existed {
-        copy_dir_recursive(&ssot, &backup_dir)?;
-    }
-
-    Ok(SkillsBackup {
-        _tmp: tmp,
-        backup_dir,
-        ssot_path: ssot,
-        existed,
-    })
-}
-
-pub(super) fn restore_skills_from_backup(backup: &SkillsBackup) -> Result<(), AppError> {
-    if backup.ssot_path.exists() {
-        fs::remove_dir_all(&backup.ssot_path).map_err(|e| AppError::io(&backup.ssot_path, e))?;
-    }
-
-    if backup.existed {
-        copy_dir_recursive(&backup.backup_dir, &backup.ssot_path)?;
-    }
-
-    Ok(())
-}
-
-fn zip_dir_recursive(
-    root: &Path,
-    current: &Path,
-    writer: &mut zip::ZipWriter<fs::File>,
-    options: SimpleFileOptions,
-    visited: &mut HashSet<PathBuf>,
-) -> Result<(), AppError> {
-    let mut entries: Vec<_> = fs::read_dir(current)
-        .map_err(|e| AppError::io(current, e))?
-        .collect::<Result<Vec<_>, _>>()
-        .map_err(|e| AppError::io(current, e))?;
-    entries.sort_by_key(|e| e.file_name());
-
-    for entry in entries {
-        let path = entry.path();
-        let name = entry.file_name();
-        let name_str = name.to_string_lossy();
-
-        if name_str.starts_with('.') {
-            continue;
-        }
-
-        let real_path = match fs::canonicalize(&path) {
-            Ok(p) if p.starts_with(root) => p,
-            Ok(_) => {
-                log::warn!(
-                    "[WebDAV] Skipping symlink outside skills root: {}",
-                    path.display()
-                );
-                continue;
-            }
-            Err(_) => path.clone(),
-        };
-
-        let rel = real_path
-            .strip_prefix(root)
-            .or_else(|_| path.strip_prefix(root))
-            .map_err(|e| {
-                localized(
-                    "webdav.sync.zip_relative_path_failed",
-                    format!("生成 ZIP 相对路径失败: {e}"),
-                    format!("Failed to build relative ZIP path: {e}"),
-                )
-            })?;
-        let rel_str = rel.to_string_lossy().replace('\\', "/");
-
-        if real_path.is_dir() {
-            if !mark_visited_dir(&real_path, visited)? {
-                log::warn!(
-                    "[WebDAV] Skipping already visited directory: {}",
-                    real_path.display()
-                );
-                continue;
-            }
-            writer
-                .add_directory(format!("{rel_str}/"), options)
-                .map_err(|e| {
-                    localized(
-                        "webdav.sync.zip_add_directory_failed",
-                        format!("写入 ZIP 目录失败: {e}"),
-                        format!("Failed to write ZIP directory entry: {e}"),
-                    )
-                })?;
-            zip_dir_recursive(root, &real_path, writer, options, visited)?;
-        } else {
-            writer.start_file(&rel_str, options).map_err(|e| {
-                localized(
-                    "webdav.sync.zip_start_file_failed",
-                    format!("写入 ZIP 文件头失败: {e}"),
-                    format!("Failed to start ZIP file entry: {e}"),
-                )
-            })?;
-            let mut file = fs::File::open(&real_path).map_err(|e| AppError::io(&real_path, e))?;
-            let mut buf = Vec::new();
-            file.read_to_end(&mut buf)
-                .map_err(|e| AppError::io(&real_path, e))?;
-            writer.write_all(&buf).map_err(|e| {
-                localized(
-                    "webdav.sync.zip_write_file_failed",
-                    format!("写入 ZIP 文件内容失败: {e}"),
-                    format!("Failed to write ZIP file content: {e}"),
-                )
-            })?;
-        }
-    }
-    Ok(())
-}
-
-fn copy_dir_recursive(src: &Path, dest: &Path) -> Result<(), AppError> {
-    let mut visited = HashSet::new();
-    copy_dir_recursive_inner(src, dest, &mut visited)
-}
-
-fn copy_dir_recursive_inner(
-    src: &Path,
-    dest: &Path,
-    visited: &mut HashSet<PathBuf>,
-) -> Result<(), AppError> {
-    if !src.exists() {
-        return Ok(());
-    }
-    if !mark_visited_dir(src, visited)? {
-        log::warn!(
-            "[WebDAV] Skipping already visited copy path: {}",
-            src.display()
-        );
-        return Ok(());
-    }
-    fs::create_dir_all(dest).map_err(|e| AppError::io(dest, e))?;
-    for entry in fs::read_dir(src).map_err(|e| AppError::io(src, e))? {
-        let entry = entry.map_err(|e| AppError::io(src, e))?;
-        let path = entry.path();
-        let dest_path = dest.join(entry.file_name());
-        if path.is_dir() {
-            copy_dir_recursive_inner(&path, &dest_path, visited)?;
-        } else {
-            fs::copy(&path, &dest_path).map_err(|e| AppError::io(&dest_path, e))?;
-        }
-    }
-    Ok(())
-}
-
-fn mark_visited_dir(path: &Path, visited: &mut HashSet<PathBuf>) -> Result<bool, AppError> {
-    let canonical = fs::canonicalize(path).map_err(|e| AppError::io(path, e))?;
-    Ok(visited.insert(canonical))
-}
-
-fn copy_entry_with_total_limit<R: Read, W: Write>(
-    reader: &mut R,
-    writer: &mut W,
-    total_bytes: &mut u64,
-    max_total_bytes: u64,
-    out_path: &Path,
-) -> Result<u64, AppError> {
-    let mut buffer = [0u8; 16 * 1024];
-    let mut written = 0u64;
-    loop {
-        let n = reader
-            .read(&mut buffer)
-            .map_err(|e| AppError::io(out_path, e))?;
-        if n == 0 {
-            break;
-        }
-
-        if total_bytes.saturating_add(n as u64) > max_total_bytes {
-            let max_mb = max_total_bytes / 1024 / 1024;
-            return Err(localized(
-                "webdav.sync.skills_zip_too_large",
-                format!("skills.zip 解压后体积超过上限（{} MB）", max_mb),
-                format!("skills.zip extracted size exceeds limit ({} MB)", max_mb),
-            ));
-        }
-
-        writer
-            .write_all(&buffer[..n])
-            .map_err(|e| AppError::io(out_path, e))?;
-        *total_bytes += n as u64;
-        written += n as u64;
-    }
-    Ok(written)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{copy_entry_with_total_limit, mark_visited_dir};
-    use std::collections::HashSet;
-    use std::io::Cursor;
-    use std::path::Path;
-    use tempfile::tempdir;
-
-    #[test]
-    fn mark_visited_dir_tracks_canonical_duplicates() {
-        let temp = tempdir().expect("tempdir");
-        let dir = temp.path().join("skills");
-        std::fs::create_dir_all(&dir).expect("create dir");
-
-        let mut visited = HashSet::new();
-        assert!(mark_visited_dir(&dir, &mut visited).expect("first visit"));
-        assert!(!mark_visited_dir(&dir, &mut visited).expect("second visit"));
-    }
-
-    #[test]
-    fn copy_entry_with_total_limit_rejects_oversized_stream_before_write() {
-        let mut reader = Cursor::new(vec![1u8; 16]);
-        let mut writer = Vec::new();
-        let mut total_bytes = 0u64;
-
-        let err = copy_entry_with_total_limit(
-            &mut reader,
-            &mut writer,
-            &mut total_bytes,
-            8,
-            Path::new("skills-extracted/file.bin"),
-        )
-        .expect_err("stream larger than limit should be rejected");
-        assert!(
-            err.to_string().contains("too large") || err.to_string().contains("超过"),
-            "unexpected error: {err}"
-        );
-        assert_eq!(
-            writer.len(),
-            0,
-            "should not write when the first chunk exceeds limit"
-        );
-    }
-}
@@ -1,6 +1,5 @@
 use serde::{Deserialize, Serialize};
 use std::fs;
-use std::io::Write;
 use std::path::PathBuf;
 use std::sync::{OnceLock, RwLock};

@@ -34,8 +33,6 @@ pub struct VisibleApps {
    pub gemini: bool,
    #[serde(default = "default_true")]
    pub opencode: bool,
-    #[serde(default = "default_true")]
-    pub openclaw: bool,
 }

 impl Default for VisibleApps {
@@ -45,7 +42,6 @@ impl Default for VisibleApps {
            codex: true,
            gemini: true,
            opencode: true,
-            openclaw: true,
        }
    }
 }
@@ -58,111 +54,10 @@ impl VisibleApps {
            AppType::Codex => self.codex,
            AppType::Gemini => self.gemini,
            AppType::OpenCode => self.opencode,
-            AppType::OpenClaw => self.openclaw,
        }
    }
 }

-/// WebDAV 同步状态（持久化同步进度信息）
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
-#[serde(rename_all = "camelCase")]
-pub struct WebDavSyncStatus {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub last_sync_at: Option<i64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub last_error: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub last_error_source: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub last_remote_etag: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub last_local_manifest_hash: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub last_remote_manifest_hash: Option<String>,
-}
-
-fn default_remote_root() -> String {
-    "cc-switch-sync".to_string()
-}
-fn default_profile() -> String {
-    "default".to_string()
-}
-
-/// WebDAV v2 同步设置
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct WebDavSyncSettings {
-    #[serde(default)]
-    pub enabled: bool,
-    #[serde(default)]
-    pub auto_sync: bool,
-    #[serde(default)]
-    pub base_url: String,
-    #[serde(default)]
-    pub username: String,
-    #[serde(default)]
-    pub password: String,
-    #[serde(default = "default_remote_root")]
-    pub remote_root: String,
-    #[serde(default = "default_profile")]
-    pub profile: String,
-    #[serde(default)]
-    pub status: WebDavSyncStatus,
-}
-
-impl Default for WebDavSyncSettings {
-    fn default() -> Self {
-        Self {
-            enabled: false,
-            auto_sync: false,
-            base_url: String::new(),
-            username: String::new(),
-            password: String::new(),
-            remote_root: default_remote_root(),
-            profile: default_profile(),
-            status: WebDavSyncStatus::default(),
-        }
-    }
-}
-
-impl WebDavSyncSettings {
-    pub fn validate(&self) -> Result<(), crate::error::AppError> {
-        if self.base_url.trim().is_empty() {
-            return Err(crate::error::AppError::localized(
-                "webdav.base_url.required",
-                "WebDAV 地址不能为空",
-                "WebDAV URL is required.",
-            ));
-        }
-        if self.username.trim().is_empty() {
-            return Err(crate::error::AppError::localized(
-                "webdav.username.required",
-                "WebDAV 用户名不能为空",
-                "WebDAV username is required.",
-            ));
-        }
-        Ok(())
-    }
-
-    pub fn normalize(&mut self) {
-        self.base_url = self.base_url.trim().to_string();
-        self.username = self.username.trim().to_string();
-        self.remote_root = self.remote_root.trim().to_string();
-        self.profile = self.profile.trim().to_string();
-        if self.remote_root.is_empty() {
-            self.remote_root = default_remote_root();
-        }
-        if self.profile.is_empty() {
-            self.profile = default_profile();
-        }
-    }
-
-    /// Returns true if all credential fields are blank (no config to persist).
-    fn is_empty(&self) -> bool {
-        self.base_url.is_empty() && self.username.is_empty() && self.password.is_empty()
-    }
-}
-
 /// 应用设置结构
 ///
 /// 存储设备级别设置，保存在本地 `~/.cc-switch/settings.json`，不随数据库同步。
@@ -203,8 +98,6 @@ pub struct AppSettings {
    pub gemini_config_dir: Option<String>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub opencode_config_dir: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub openclaw_config_dir: Option<String>,

    // ===== 当前供应商 ID（设备级）=====
    /// 当前 Claude 供应商 ID（本地存储，优先于数据库 is_current）
@@ -219,23 +112,12 @@ pub struct AppSettings {
    /// 当前 OpenCode 供应商 ID（本地存储，对 OpenCode 可能无意义，但保持结构一致）
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub current_provider_opencode: Option<String>,
-    /// 当前 OpenClaw 供应商 ID（本地存储，对 OpenClaw 可能无意义，但保持结构一致）
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub current_provider_openclaw: Option<String>,

    // ===== Skill 同步设置 =====
    /// Skill 同步方式：auto（默认，优先 symlink）、symlink、copy
    #[serde(default)]
    pub skill_sync_method: SyncMethod,

-    // ===== WebDAV 同步设置 =====
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub webdav_sync: Option<WebDavSyncSettings>,
-
-    // ===== WebDAV 备份设置（旧版，保留向后兼容）=====
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub webdav_backup: Option<serde_json::Value>,
-
    // ===== 终端设置 =====
    /// 首选终端应用（可选，默认使用系统默认终端）
    /// - macOS: "terminal" | "iterm2" | "warp" | "alacritty" | "kitty" | "ghostty"
@@ -268,15 +150,11 @@ impl Default for AppSettings {
            codex_config_dir: None,
            gemini_config_dir: None,
            opencode_config_dir: None,
-            openclaw_config_dir: None,
            current_provider_claude: None,
            current_provider_codex: None,
            current_provider_gemini: None,
            current_provider_opencode: None,
-            current_provider_openclaw: None,
            skill_sync_method: SyncMethod::default(),
-            webdav_sync: None,
-            webdav_backup: None,
            preferred_terminal: None,
        }
    }
@@ -321,26 +199,12 @@ impl AppSettings {
            .filter(|s| !s.is_empty())
            .map(|s| s.to_string());

-        self.openclaw_config_dir = self
-            .openclaw_config_dir
-            .as_ref()
-            .map(|s| s.trim())
-            .filter(|s| !s.is_empty())
-            .map(|s| s.to_string());
-
        self.language = self
            .language
            .as_ref()
            .map(|s| s.trim())
            .filter(|s| matches!(*s, "en" | "zh" | "ja"))
            .map(|s| s.to_string());
-
-        if let Some(sync) = &mut self.webdav_sync {
-            sync.normalize();
-            if sync.is_empty() {
-                self.webdav_sync = None;
-            }
-        }
    }

    fn load_from_file() -> Self {
@@ -381,27 +245,7 @@ fn save_settings_file(settings: &AppSettings) -> Result<(), AppError> {

    let json = serde_json::to_string_pretty(&normalized)
        .map_err(|e| AppError::JsonSerialize { source: e })?;
-    #[cfg(unix)]
-    {
-        use std::fs::OpenOptions;
-        use std::os::unix::fs::OpenOptionsExt;
-
-        let mut file = OpenOptions::new()
-            .create(true)
-            .write(true)
-            .truncate(true)
-            .mode(0o600)
-            .open(&path)
-            .map_err(|e| AppError::io(&path, e))?;
-        file.write_all(json.as_bytes())
-            .map_err(|e| AppError::io(&path, e))?;
-    }
-
-    #[cfg(not(unix))]
-    {
-        fs::write(&path, json).map_err(|e| AppError::io(&path, e))?;
-    }
-
+    fs::write(&path, json).map_err(|e| AppError::io(&path, e))?;
    Ok(())
 }

@@ -439,15 +283,6 @@ pub fn get_settings() -> AppSettings {
        .clone()
 }

-pub fn get_settings_for_frontend() -> AppSettings {
-    let mut settings = get_settings();
-    if let Some(sync) = &mut settings.webdav_sync {
-        sync.password.clear();
-    }
-    settings.webdav_backup = None;
-    settings
-}
-
 pub fn update_settings(mut new_settings: AppSettings) -> Result<(), AppError> {
    new_settings.normalize_paths();
    save_settings_file(&new_settings)?;
@@ -460,22 +295,6 @@ pub fn update_settings(mut new_settings: AppSettings) -> Result<(), AppError> {
    Ok(())
 }

-fn mutate_settings<F>(mutator: F) -> Result<(), AppError>
-where
-    F: FnOnce(&mut AppSettings),
-{
-    let mut guard = settings_store().write().unwrap_or_else(|e| {
-        log::warn!("设置锁已毒化，使用恢复值: {e}");
-        e.into_inner()
-    });
-    let mut next = guard.clone();
-    mutator(&mut next);
-    next.normalize_paths();
-    save_settings_file(&next)?;
-    *guard = next;
-    Ok(())
-}
-
 /// 从文件重新加载设置到内存缓存
 /// 用于导入配置等场景，确保内存缓存与文件同步
 pub fn reload_settings() -> Result<(), AppError> {
@@ -520,14 +339,6 @@ pub fn get_opencode_override_dir() -> Option<PathBuf> {
        .map(|p| resolve_override_path(p))
 }

-pub fn get_openclaw_override_dir() -> Option<PathBuf> {
-    let settings = settings_store().read().ok()?;
-    settings
-        .openclaw_config_dir
-        .as_ref()
-        .map(|p| resolve_override_path(p))
-}
-
 // ===== 当前供应商管理函数 =====

 /// 获取指定应用类型的当前供应商 ID（从本地 settings 读取）
@@ -541,7 +352,6 @@ pub fn get_current_provider(app_type: &AppType) -> Option<String> {
        AppType::Codex => settings.current_provider_codex.clone(),
        AppType::Gemini => settings.current_provider_gemini.clone(),
        AppType::OpenCode => settings.current_provider_opencode.clone(),
-        AppType::OpenClaw => settings.current_provider_openclaw.clone(),
    }
 }

@@ -557,7 +367,6 @@ pub fn set_current_provider(app_type: &AppType, id: Option<&str>) -> Result<(),
        AppType::Codex => settings.current_provider_codex = id.map(|s| s.to_string()),
        AppType::Gemini => settings.current_provider_gemini = id.map(|s| s.to_string()),
        AppType::OpenCode => settings.current_provider_opencode = id.map(|s| s.to_string()),
-        AppType::OpenClaw => settings.current_provider_openclaw = id.map(|s| s.to_string()),
    }

    update_settings(settings)
@@ -624,26 +433,3 @@ pub fn get_preferred_terminal() -> Option<String> {
        .preferred_terminal
        .clone()
 }
-
-// ===== WebDAV 同步设置管理函数 =====
-
-/// 获取 WebDAV 同步设置
-pub fn get_webdav_sync_settings() -> Option<WebDavSyncSettings> {
-    settings_store().read().ok()?.webdav_sync.clone()
-}
-
-/// 保存 WebDAV 同步设置
-pub fn set_webdav_sync_settings(settings: Option<WebDavSyncSettings>) -> Result<(), AppError> {
-    mutate_settings(|current| {
-        current.webdav_sync = settings;
-    })
-}
-
-/// 仅更新 WebDAV 同步状态，避免覆写 credentials/root/profile 等字段
-pub fn update_webdav_sync_status(status: WebDavSyncStatus) -> Result<(), AppError> {
-    mutate_settings(|current| {
-        if let Some(sync) = current.webdav_sync.as_mut() {
-            sync.status = status;
-        }
-    })
-}
@@ -3,7 +3,6 @@ import { useTranslation } from "react-i18next";
 import { motion, AnimatePresence } from "framer-motion";
 import { toast } from "sonner";
 import { invoke } from "@tauri-apps/api/core";
-import { listen } from "@tauri-apps/api/event";
 import { useQueryClient } from "@tanstack/react-query";
 import {
  Plus,
@@ -17,10 +16,6 @@ import {
  Download,
  FolderArchive,
  Search,
-  FolderOpen,
-  KeyRound,
-  Shield,
-  Cpu,
 } from "lucide-react";
 import type { Provider, VisibleApps } from "@/types";
 import type { EnvConflict } from "@/types/env";
@@ -33,7 +28,6 @@ import {
 } from "@/lib/api";
 import { checkAllEnvConflicts, checkEnvConflicts } from "@/lib/api/env";
 import { useProviderActions } from "@/hooks/useProviderActions";
-import { openclawKeys } from "@/hooks/useOpenClaw";
 import { useProxyStatus } from "@/hooks/useProxyStatus";
 import { useLastValidValue } from "@/hooks/useLastValidValue";
 import { extractErrorMessage } from "@/utils/errorUtils";
@@ -62,10 +56,6 @@ import { McpIcon } from "@/components/BrandIcons";
 import { Button } from "@/components/ui/button";
 import { SessionManagerPage } from "@/components/sessions/SessionManagerPage";
 import { useDisableCurrentOmo } from "@/lib/query/omo";
-import WorkspaceFilesPanel from "@/components/workspace/WorkspaceFilesPanel";
-import EnvPanel from "@/components/openclaw/EnvPanel";
-import ToolsPanel from "@/components/openclaw/ToolsPanel";
-import AgentsDefaultsPanel from "@/components/openclaw/AgentsDefaultsPanel";

 type View =
  | "providers"
@@ -76,30 +66,14 @@ type View =
  | "mcp"
  | "agents"
  | "universal"
-  | "sessions"
-  | "workspace"
-  | "openclawEnv"
-  | "openclawTools"
-  | "openclawAgents";
-
-interface WebDavSyncStatusUpdatedPayload {
-  source?: string;
-  status?: string;
-  error?: string;
-}
+  | "sessions";

 const DRAG_BAR_HEIGHT = isWindows() || isLinux() ? 0 : 28; // px
 const HEADER_HEIGHT = 64; // px
 const CONTENT_TOP_OFFSET = DRAG_BAR_HEIGHT + HEADER_HEIGHT;

 const STORAGE_KEY = "cc-switch-last-app";
-const VALID_APPS: AppId[] = [
-  "claude",
-  "codex",
-  "gemini",
-  "opencode",
-  "openclaw",
-];
+const VALID_APPS: AppId[] = ["claude", "codex", "gemini", "opencode"];

 const getInitialApp = (): AppId => {
  const saved = localStorage.getItem(STORAGE_KEY) as AppId | null;
@@ -120,10 +94,6 @@ const VALID_VIEWS: View[] = [
  "agents",
  "universal",
  "sessions",
-  "workspace",
-  "openclawEnv",
-  "openclawTools",
-  "openclawAgents",
 ];

 const getInitialView = (): View => {
@@ -153,7 +123,6 @@ function App() {
    codex: true,
    gemini: true,
    opencode: true,
-    openclaw: true,
  };

  const getFirstVisibleApp = (): AppId => {
@@ -161,7 +130,6 @@ function App() {
    if (visibleApps.codex) return "codex";
    if (visibleApps.gemini) return "gemini";
    if (visibleApps.opencode) return "opencode";
-    if (visibleApps.openclaw) return "openclaw";
    return "claude"; // fallback
  };

@@ -228,7 +196,6 @@ function App() {
    switchProvider,
    deleteProvider,
    saveUsageScript,
-    setAsDefaultModel,
  } = useProviderActions(activeApp);

  const disableOmoMutation = useDisableCurrentOmo();
@@ -299,49 +266,6 @@ function App() {
    };
  }, [queryClient]);

-  useEffect(() => {
-    let unsubscribe: (() => void) | undefined;
-    let active = true;
-
-    const setupListener = async () => {
-      try {
-        const off = await listen(
-          "webdav-sync-status-updated",
-          async (event) => {
-            const payload = (event.payload ?? {}) as WebDavSyncStatusUpdatedPayload;
-            await queryClient.invalidateQueries({ queryKey: ["settings"] });
-
-            if (payload.source !== "auto" || payload.status !== "error") {
-              return;
-            }
-
-            toast.error(
-              t("settings.webdavSync.autoSyncFailedToast", {
-                error: payload.error || t("common.unknown"),
-              }),
-            );
-          },
-        );
-        if (!active) {
-          off();
-          return;
-        }
-        unsubscribe = off;
-      } catch (error) {
-        console.error(
-          "[App] Failed to subscribe webdav-sync-status-updated event",
-          error,
-        );
-      }
-    };
-
-    void setupListener();
-    return () => {
-      active = false;
-      unsubscribe?.();
-    };
-  }, [queryClient, t]);
-
  useEffect(() => {
    const checkEnvOnStartup = async () => {
      try {
@@ -499,19 +423,10 @@ function App() {
    const { provider, action } = confirmAction;

    if (action === "remove") {
-      // Remove from live config only (for additive mode apps like OpenCode/OpenClaw)
-      // Does NOT delete from database - provider remains in the list
      await providersApi.removeFromLiveConfig(provider.id, activeApp);
-      // Invalidate queries to refresh the isInConfig state
-      if (activeApp === "opencode") {
-        await queryClient.invalidateQueries({
-          queryKey: ["opencodeLiveProviderIds"],
-        });
-      } else if (activeApp === "openclaw") {
-        await queryClient.invalidateQueries({
-          queryKey: openclawKeys.liveProviderIds,
-        });
-      }
+      await queryClient.invalidateQueries({
+        queryKey: ["opencodeLiveProviderIds"],
+      });
      toast.success(
        t("notifications.removeFromConfigSuccess", {
          defaultValue: "已从配置移除",
@@ -671,11 +586,7 @@ function App() {
          return (
            <SkillsPage
              ref={skillsPageRef}
-              initialApp={
-                activeApp === "opencode" || activeApp === "openclaw"
-                  ? "claude"
-                  : activeApp
-              }
+              initialApp={activeApp === "opencode" ? "claude" : activeApp}
            />
          );
        case "mcp":
@@ -698,14 +609,6 @@ function App() {

        case "sessions":
          return <SessionManagerPage />;
-        case "workspace":
-          return <WorkspaceFilesPanel />;
-        case "openclawEnv":
-          return <EnvPanel />;
-        case "openclawTools":
-          return <ToolsPanel />;
-        case "openclawAgents":
-          return <AgentsDefaultsPanel />;
        default:
          return (
            <div className="px-6 flex flex-col h-[calc(100vh-8rem)] overflow-hidden">
@@ -737,7 +640,7 @@ function App() {
                        setConfirmAction({ provider, action: "delete" })
                      }
                      onRemoveFromConfig={
-                        activeApp === "opencode" || activeApp === "openclaw"
+                        activeApp === "opencode"
                          ? (provider) =>
                              setConfirmAction({ provider, action: "remove" })
                          : undefined
@@ -752,9 +655,6 @@ function App() {
                        activeApp === "claude" ? handleOpenTerminal : undefined
                      }
                      onCreate={() => setIsAddOpen(true)}
-                      onSetAsDefault={
-                        activeApp === "openclaw" ? setAsDefaultModel : undefined
-                      }
                    />
                  </motion.div>
                </AnimatePresence>
@@ -864,11 +764,6 @@ function App() {
                      defaultValue: "统一供应商",
                    })}
                  {currentView === "sessions" && t("sessionManager.title")}
-                  {currentView === "workspace" && t("workspace.title")}
-                  {currentView === "openclawEnv" && t("openclaw.env.title")}
-                  {currentView === "openclawTools" && t("openclaw.tools.title")}
-                  {currentView === "openclawAgents" &&
-                    t("openclaw.agents.title")}
                </h1>
              </div>
            ) : (
@@ -1020,7 +915,7 @@ function App() {
            )}
            {currentView === "providers" && (
              <>
-                {activeApp !== "opencode" && activeApp !== "openclaw" && (
+                {activeApp !== "opencode" && (
                  <>
                    <ProxyToggle activeApp={activeApp} />
                    <div
@@ -1047,97 +942,54 @@ function App() {
                />

                <div className="flex items-center gap-1 p-1 bg-muted rounded-xl">
-                  {activeApp === "openclaw" ? (
-                    <>
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={() => setCurrentView("workspace")}
-                        className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
-                        title={t("workspace.manage")}
-                      >
-                        <FolderOpen className="w-4 h-4" />
-                      </Button>
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={() => setCurrentView("openclawEnv")}
-                        className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
-                        title={t("openclaw.env.title")}
-                      >
-                        <KeyRound className="w-4 h-4" />
-                      </Button>
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={() => setCurrentView("openclawTools")}
-                        className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
-                        title={t("openclaw.tools.title")}
-                      >
-                        <Shield className="w-4 h-4" />
-                      </Button>
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={() => setCurrentView("openclawAgents")}
-                        className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
-                        title={t("openclaw.agents.title")}
-                      >
-                        <Cpu className="w-4 h-4" />
-                      </Button>
-                    </>
-                  ) : (
-                    <>
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={() => setCurrentView("skills")}
-                        className={cn(
-                          "text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5",
-                          "transition-all duration-200 ease-in-out overflow-hidden",
-                          hasSkillsSupport
-                            ? "opacity-100 w-8 scale-100 px-2"
-                            : "opacity-0 w-0 scale-75 pointer-events-none px-0 -ml-1",
-                        )}
-                        title={t("skills.manage")}
-                      >
-                        <Wrench className="flex-shrink-0 w-4 h-4" />
-                      </Button>
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={() => setCurrentView("prompts")}
-                        className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
-                        title={t("prompts.manage")}
-                      >
-                        <Book className="w-4 h-4" />
-                      </Button>
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={() => setCurrentView("sessions")}
-                        className={cn(
-                          "text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5",
-                          "transition-all duration-200 ease-in-out overflow-hidden",
-                          hasSessionSupport
-                            ? "opacity-100 w-8 scale-100 px-2"
-                            : "opacity-0 w-0 scale-75 pointer-events-none px-0 -ml-1",
-                        )}
-                        title={t("sessionManager.title")}
-                      >
-                        <History className="flex-shrink-0 w-4 h-4" />
-                      </Button>
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={() => setCurrentView("mcp")}
-                        className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
-                        title={t("mcp.title")}
-                      >
-                        <McpIcon size={16} />
-                      </Button>
-                    </>
-                  )}
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => setCurrentView("skills")}
+                    className={cn(
+                      "text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5",
+                      "transition-all duration-200 ease-in-out overflow-hidden",
+                      hasSkillsSupport
+                        ? "opacity-100 w-8 scale-100 px-2"
+                        : "opacity-0 w-0 scale-75 pointer-events-none px-0 -ml-1",
+                    )}
+                    title={t("skills.manage")}
+                  >
+                    <Wrench className="flex-shrink-0 w-4 h-4" />
+                  </Button>
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => setCurrentView("prompts")}
+                    className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
+                    title={t("prompts.manage")}
+                  >
+                    <Book className="w-4 h-4" />
+                  </Button>
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => setCurrentView("sessions")}
+                    className={cn(
+                      "text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5",
+                      "transition-all duration-200 ease-in-out overflow-hidden",
+                      hasSessionSupport
+                        ? "opacity-100 w-8 scale-100 px-2"
+                        : "opacity-0 w-0 scale-75 pointer-events-none px-0 -ml-1",
+                    )}
+                    title={t("sessionManager.title")}
+                  >
+                    <History className="flex-shrink-0 w-4 h-4" />
+                  </Button>
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => setCurrentView("mcp")}
+                    className="text-muted-foreground hover:text-foreground hover:bg-black/5 dark:hover:bg-white/5"
+                    title={t("mcp.title")}
+                  >
+                    <McpIcon size={16} />
+                  </Button>
                </div>

                <Button
@@ -1153,7 +1005,7 @@ function App() {
        </div>
      </header>

-      <main className="flex-1 min-h-0 flex flex-col overflow-y-auto animate-fade-in">
+      <main className="flex-1 min-h-0 flex flex-col animate-fade-in">
        {renderContent()}
      </main>

@@ -9,7 +9,7 @@ interface AppSwitcherProps {
  compact?: boolean;
 }

-const ALL_APPS: AppId[] = ["claude", "codex", "gemini", "opencode", "openclaw"];
+const ALL_APPS: AppId[] = ["claude", "codex", "gemini", "opencode"];
 const STORAGE_KEY = "cc-switch-last-app";

 export function AppSwitcher({
@@ -29,14 +29,12 @@ export function AppSwitcher({
    codex: "openai",
    gemini: "gemini",
    opencode: "opencode",
-    openclaw: "openclaw",
  };
  const appDisplayName: Record<AppId, string> = {
    claude: "Claude",
    codex: "Codex",
    gemini: "Gemini",
    opencode: "OpenCode",
-    openclaw: "OpenClaw",
  };

  // Filter apps based on visibility settings (default all visible)
@@ -7,7 +7,6 @@ interface IconProps {
 import ClaudeSvg from "@/icons/extracted/claude.svg?url";
 import OpenAISvg from "@/icons/extracted/openai.svg?url";
 import GeminiSvg from "@/icons/extracted/gemini.svg?url";
-import OpenClawSvg from "@/icons/extracted/claw.svg?url";

 export function ClaudeIcon({ size = 16, className = "" }: IconProps) {
  return (
@@ -48,19 +47,6 @@ export function GeminiIcon({ size = 16, className = "" }: IconProps) {
  );
 }

-export function OpenClawIcon({ size = 16, className = "" }: IconProps) {
-  return (
-    <img
-      src={OpenClawSvg}
-      width={size}
-      height={size}
-      className={className}
-      alt="OpenClaw"
-      loading="lazy"
-    />
-  );
-}
-
 // MCP icon uses inline SVG to support currentColor for hover effects
 export function McpIcon({ size = 16, className = "" }: IconProps) {
  return (
@@ -53,15 +53,12 @@ export function DeepLinkImportDialog() {
    const unlistenImport = listen<DeepLinkImportRequest>(
      "deeplink-import",
      async (event) => {
-        console.log("Deep link import event received:", event.payload);
-
        // If config is present, merge it to get the complete configuration
        if (event.payload.config || event.payload.configUrl) {
          try {
            const mergedRequest = await deeplinkApi.mergeDeeplinkConfig(
              event.payload,
            );
-            console.log("Config merged successfully:", mergedRequest);
            setRequest(mergedRequest);
          } catch (error) {
            console.error("Failed to merge config:", error);
@@ -22,6 +22,10 @@ interface JsonEditorProps {
  language?: "json" | "javascript";
  height?: string | number;
  showMinimap?: boolean; // 添加此属性以防未来使用
+  /** 只读模式 */
+  readOnly?: boolean;
+  /** 自动高度模式：根据内容自动调整高度，rows 作为最小行数 */
+  autoHeight?: boolean;
 }

 const JsonEditor: React.FC<JsonEditorProps> = ({
@@ -33,6 +37,8 @@ const JsonEditor: React.FC<JsonEditorProps> = ({
  showValidation = true,
  language = "json",
  height,
+  readOnly = false,
+  autoHeight = false,
 }) => {
  const { t } = useTranslation();
  const editorRef = useRef<HTMLDivElement>(null);
@@ -82,7 +88,14 @@ const JsonEditor: React.FC<JsonEditorProps> = ({
    if (!editorRef.current) return;

    // 创建编辑器扩展
-    const minHeightPx = height ? undefined : Math.max(1, rows) * 18;
+    const lineHeight = 18;
+    const minHeightPx = height ? undefined : Math.max(1, rows) * lineHeight;
+
+    // 自动高度模式：计算内容行数
+    const contentLines = value ? value.split("\n").length : 1;
+    const autoHeightPx = autoHeight
+      ? Math.max(rows, contentLines) * lineHeight + 10 // +10 for padding
+      : undefined;

    // 使用 baseTheme 定义基础样式，优先级低于 oneDark，但可以正确响应主题
    const baseTheme = EditorView.baseTheme({
@@ -123,9 +136,17 @@ const JsonEditor: React.FC<JsonEditorProps> = ({
        ? `${height}px`
        : height
      : undefined;
+
+    // 确定最终高度：优先级 height > autoHeight > minHeight
+    const finalHeight = heightValue
+      ? heightValue
+      : autoHeightPx
+        ? `${autoHeightPx}px`
+        : undefined;
+
    const sizingTheme = EditorView.theme({
-      "&": heightValue
-        ? { height: heightValue }
+      "&": finalHeight
+        ? { height: finalHeight }
        : { minHeight: `${minHeightPx}px` },
      ".cm-scroller": { overflow: "auto" },
      ".cm-content": {
@@ -150,6 +171,22 @@ const JsonEditor: React.FC<JsonEditorProps> = ({
      }),
    ];

+    // 如果是只读模式，添加只读扩展
+    if (readOnly) {
+      extensions.push(EditorState.readOnly.of(true));
+      extensions.push(
+        EditorView.theme({
+          ".cm-editor": {
+            opacity: "0.8",
+            cursor: "default",
+          },
+          ".cm-content": {
+            cursor: "default",
+          },
+        }),
+      );
+    }
+
    // 如果启用深色模式，添加深色主题
    if (darkMode) {
      extensions.push(oneDark);
@@ -208,7 +245,16 @@ const JsonEditor: React.FC<JsonEditorProps> = ({
      view.destroy();
      viewRef.current = null;
    };
-  }, [darkMode, rows, height, language, jsonLinter]); // 依赖项中不包含 onChange 和 placeholder，避免不必要的重建
+  }, [
+    darkMode,
+    rows,
+    height,
+    language,
+    jsonLinter,
+    readOnly,
+    autoHeight,
+    autoHeight ? value.split("\n").length : 0,
+  ]); // 依赖项中不包含 onChange 和 placeholder，避免不必要的重建；autoHeight 模式下根据行数变化重建

  // 当 value 从外部改变时更新编辑器内容
  useEffect(() => {
@@ -261,7 +307,7 @@ const JsonEditor: React.FC<JsonEditorProps> = ({
        style={{ width: "100%", height: isFullHeight ? undefined : "auto" }}
        className={isFullHeight ? "flex-1 min-h-0" : ""}
      />
-      {language === "json" && (
+      {language === "json" && !readOnly && (
        <button
          type="button"
          onClick={handleFormat}
@@ -66,7 +66,6 @@ const McpFormModal: React.FC<McpFormModalProps> = ({
    codex: boolean;
    gemini: boolean;
    opencode: boolean;
-    openclaw: boolean;
  }>(() => {
    if (initialData?.apps) {
      return { ...initialData.apps };
@@ -76,7 +75,6 @@ const McpFormModal: React.FC<McpFormModalProps> = ({
      codex: defaultEnabledApps.includes("codex"),
      gemini: defaultEnabledApps.includes("gemini"),
      opencode: defaultEnabledApps.includes("opencode"),
-      openclaw: defaultEnabledApps.includes("openclaw"),
    };
  });

@@ -563,22 +561,6 @@ const McpFormModal: React.FC<McpFormModalProps> = ({
                    {t("mcp.unifiedPanel.apps.gemini")}
                  </label>
                </div>
-
-                <div className="flex items-center gap-2">
-                  <Checkbox
-                    id="enable-opencode"
-                    checked={enabledApps.opencode}
-                    onCheckedChange={(checked: boolean) =>
-                      setEnabledApps({ ...enabledApps, opencode: checked })
-                    }
-                  />
-                  <label
-                    htmlFor="enable-opencode"
-                    className="text-sm text-foreground cursor-pointer select-none"
-                  >
-                    {t("mcp.unifiedPanel.apps.opencode")}
-                  </label>
-                </div>
              </div>
            </div>

@@ -56,7 +56,7 @@ const UnifiedMcpPanel = React.forwardRef<
  }, [serversMap]);

  const enabledCounts = useMemo(() => {
-    const counts = { claude: 0, codex: 0, gemini: 0, opencode: 0, openclaw: 0 };
+    const counts = { claude: 0, codex: 0, gemini: 0, opencode: 0 };
    serverEntries.forEach(([_, server]) => {
      for (const app of APP_IDS) {
        if (server.apps[app]) counts[app]++;
@@ -1,228 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { Save } from "lucide-react";
-import { toast } from "sonner";
-import {
-  useOpenClawAgentsDefaults,
-  useSaveOpenClawAgentsDefaults,
-} from "@/hooks/useOpenClaw";
-import { extractErrorMessage } from "@/utils/errorUtils";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import type { OpenClawAgentsDefaults } from "@/types";
-
-const AgentsDefaultsPanel: React.FC = () => {
-  const { t } = useTranslation();
-  const { data: agentsData, isLoading } = useOpenClawAgentsDefaults();
-  const saveAgentsMutation = useSaveOpenClawAgentsDefaults();
-  const [defaults, setDefaults] = useState<OpenClawAgentsDefaults | null>(null);
-  const [primaryModel, setPrimaryModel] = useState("");
-  const [fallbacks, setFallbacks] = useState("");
-
-  // Extra known fields from agents.defaults
-  const [workspace, setWorkspace] = useState("");
-  const [timeout, setTimeout_] = useState("");
-  const [contextTokens, setContextTokens] = useState("");
-  const [maxConcurrent, setMaxConcurrent] = useState("");
-
-  useEffect(() => {
-    // agentsData is undefined while loading, null when config section is absent
-    if (agentsData === undefined) return;
-    setDefaults(agentsData);
-
-    if (agentsData) {
-      setPrimaryModel(agentsData.model?.primary ?? "");
-      setFallbacks((agentsData.model?.fallbacks ?? []).join(", "));
-
-      // Extract known extra fields
-      setWorkspace(String(agentsData.workspace ?? ""));
-      setTimeout_(String(agentsData.timeout ?? ""));
-      setContextTokens(String(agentsData.contextTokens ?? ""));
-      setMaxConcurrent(String(agentsData.maxConcurrent ?? ""));
-    }
-  }, [agentsData]);
-
-  const handleSave = async () => {
-    try {
-      // Preserve all unknown fields from original data
-      const updated: OpenClawAgentsDefaults = { ...defaults };
-
-      // Model configuration
-      const fallbackList = fallbacks
-        .split(",")
-        .map((s) => s.trim())
-        .filter(Boolean);
-
-      if (primaryModel.trim()) {
-        updated.model = {
-          primary: primaryModel.trim(),
-          ...(fallbackList.length > 0 ? { fallbacks: fallbackList } : {}),
-        };
-      }
-
-      // Optional fields
-      if (workspace.trim()) updated.workspace = workspace.trim();
-      else delete updated.workspace;
-
-      // Numeric fields: validate before saving to avoid NaN
-      const parseNum = (v: string) => {
-        const n = Number(v);
-        return !isNaN(n) && isFinite(n) ? n : undefined;
-      };
-
-      const timeoutNum = timeout.trim() ? parseNum(timeout) : undefined;
-      if (timeoutNum !== undefined) updated.timeout = timeoutNum;
-      else delete updated.timeout;
-
-      const ctxNum = contextTokens.trim() ? parseNum(contextTokens) : undefined;
-      if (ctxNum !== undefined) updated.contextTokens = ctxNum;
-      else delete updated.contextTokens;
-
-      const concNum = maxConcurrent.trim()
-        ? parseNum(maxConcurrent)
-        : undefined;
-      if (concNum !== undefined) updated.maxConcurrent = concNum;
-      else delete updated.maxConcurrent;
-
-      await saveAgentsMutation.mutateAsync(updated);
-      toast.success(t("openclaw.agents.saveSuccess"));
-    } catch (error) {
-      const detail = extractErrorMessage(error);
-      toast.error(t("openclaw.agents.saveFailed"), {
-        description: detail || undefined,
-      });
-    }
-  };
-
-  if (isLoading) {
-    return (
-      <div className="px-6 pt-4 pb-8 flex items-center justify-center min-h-[200px]">
-        <div className="text-sm text-muted-foreground">
-          {t("common.loading")}
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className="px-6 pt-4 pb-8">
-      <p className="text-sm text-muted-foreground mb-6">
-        {t("openclaw.agents.description")}
-      </p>
-
-      {/* Model Configuration Card */}
-      <div className="rounded-xl border border-border bg-card p-5 mb-4">
-        <h3 className="text-sm font-medium mb-4">
-          {t("openclaw.agents.modelSection")}
-        </h3>
-
-        <div className="space-y-4">
-          <div>
-            <Label className="mb-1.5 block">
-              {t("openclaw.agents.primaryModel")}
-            </Label>
-            <Input
-              value={primaryModel}
-              onChange={(e) => setPrimaryModel(e.target.value)}
-              placeholder="provider/model-id"
-              className="font-mono text-xs"
-            />
-            <p className="text-xs text-muted-foreground mt-1">
-              {t("openclaw.agents.primaryModelHint")}
-            </p>
-          </div>
-
-          <div>
-            <Label className="mb-1.5 block">
-              {t("openclaw.agents.fallbackModels")}
-            </Label>
-            <Input
-              value={fallbacks}
-              onChange={(e) => setFallbacks(e.target.value)}
-              placeholder="provider/model-a, provider/model-b"
-              className="font-mono text-xs"
-            />
-            <p className="text-xs text-muted-foreground mt-1">
-              {t("openclaw.agents.fallbackModelsHint")}
-            </p>
-          </div>
-        </div>
-      </div>
-
-      {/* Runtime Parameters Card */}
-      <div className="rounded-xl border border-border bg-card p-5 mb-4">
-        <h3 className="text-sm font-medium mb-4">
-          {t("openclaw.agents.runtimeSection")}
-        </h3>
-
-        <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
-          <div>
-            <Label className="mb-1.5 block">
-              {t("openclaw.agents.workspace")}
-            </Label>
-            <Input
-              value={workspace}
-              onChange={(e) => setWorkspace(e.target.value)}
-              placeholder="~/projects"
-              className="font-mono text-xs"
-            />
-          </div>
-
-          <div>
-            <Label className="mb-1.5 block">
-              {t("openclaw.agents.timeout")}
-            </Label>
-            <Input
-              type="number"
-              value={timeout}
-              onChange={(e) => setTimeout_(e.target.value)}
-              placeholder="300"
-              className="font-mono text-xs"
-            />
-          </div>
-
-          <div>
-            <Label className="mb-1.5 block">
-              {t("openclaw.agents.contextTokens")}
-            </Label>
-            <Input
-              type="number"
-              value={contextTokens}
-              onChange={(e) => setContextTokens(e.target.value)}
-              placeholder="200000"
-              className="font-mono text-xs"
-            />
-          </div>
-
-          <div>
-            <Label className="mb-1.5 block">
-              {t("openclaw.agents.maxConcurrent")}
-            </Label>
-            <Input
-              type="number"
-              value={maxConcurrent}
-              onChange={(e) => setMaxConcurrent(e.target.value)}
-              placeholder="4"
-              className="font-mono text-xs"
-            />
-          </div>
-        </div>
-      </div>
-
-      {/* Save button */}
-      <div className="flex justify-end">
-        <Button
-          size="sm"
-          onClick={handleSave}
-          disabled={saveAgentsMutation.isPending}
-        >
-          <Save className="w-4 h-4 mr-1" />
-          {saveAgentsMutation.isPending ? t("common.saving") : t("common.save")}
-        </Button>
-      </div>
-    </div>
-  );
-};
-
-export default AgentsDefaultsPanel;
@@ -1,182 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { Plus, Trash2, Save, Eye, EyeOff } from "lucide-react";
-import { toast } from "sonner";
-import { useOpenClawEnv, useSaveOpenClawEnv } from "@/hooks/useOpenClaw";
-import { extractErrorMessage } from "@/utils/errorUtils";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import type { OpenClawEnvConfig } from "@/types";
-
-interface EnvEntry {
-  id: string;
-  key: string;
-  value: string;
-  isNew?: boolean;
-}
-
-const EnvPanel: React.FC = () => {
-  const { t } = useTranslation();
-  const { data: envData, isLoading } = useOpenClawEnv();
-  const saveEnvMutation = useSaveOpenClawEnv();
-  const [entries, setEntries] = useState<EnvEntry[]>([]);
-  const [visibleKeys, setVisibleKeys] = useState<Set<string>>(new Set());
-
-  useEffect(() => {
-    if (envData) {
-      const items: EnvEntry[] = Object.entries(envData).map(([key, value]) => ({
-        id: crypto.randomUUID(),
-        key,
-        value: String(value ?? ""),
-      }));
-      setEntries(items.length > 0 ? items : []);
-    }
-  }, [envData]);
-
-  const handleSave = async () => {
-    try {
-      const env: OpenClawEnvConfig = {};
-      const seen = new Set<string>();
-      for (const entry of entries) {
-        const trimmedKey = entry.key.trim();
-        if (trimmedKey) {
-          if (seen.has(trimmedKey)) {
-            toast.error(t("openclaw.env.duplicateKey", { key: trimmedKey }));
-            return;
-          }
-          seen.add(trimmedKey);
-          env[trimmedKey] = entry.value;
-        }
-      }
-      await saveEnvMutation.mutateAsync(env);
-      toast.success(t("openclaw.env.saveSuccess"));
-    } catch (error) {
-      const detail = extractErrorMessage(error);
-      toast.error(t("openclaw.env.saveFailed"), {
-        description: detail || undefined,
-      });
-    }
-  };
-
-  const addEntry = () => {
-    setEntries((prev) => [
-      ...prev,
-      { id: crypto.randomUUID(), key: "", value: "", isNew: true },
-    ]);
-  };
-
-  const removeEntry = (index: number) => {
-    setEntries((prev) => prev.filter((_, i) => i !== index));
-  };
-
-  const updateEntry = (index: number, field: "key" | "value", val: string) => {
-    setEntries((prev) =>
-      prev.map((entry, i) =>
-        i === index ? { ...entry, [field]: val } : entry,
-      ),
-    );
-  };
-
-  const toggleVisibility = (key: string) => {
-    setVisibleKeys((prev) => {
-      const next = new Set(prev);
-      if (next.has(key)) {
-        next.delete(key);
-      } else {
-        next.add(key);
-      }
-      return next;
-    });
-  };
-
-  const isApiKey = (key: string) => /key|token|secret|password/i.test(key);
-
-  if (isLoading) {
-    return (
-      <div className="px-6 pt-4 pb-8 flex items-center justify-center min-h-[200px]">
-        <div className="text-sm text-muted-foreground">
-          {t("common.loading")}
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className="px-6 pt-4 pb-8">
-      <p className="text-sm text-muted-foreground mb-4">
-        {t("openclaw.env.description")}
-      </p>
-
-      <div className="space-y-3">
-        {entries.map((entry, index) => {
-          const sensitive = isApiKey(entry.key);
-          const visibilityId = entry.key || `__new_${index}`;
-          const visible = visibleKeys.has(visibilityId);
-
-          return (
-            <div key={entry.id} className="flex items-center gap-2">
-              <div className="w-[200px] flex-shrink-0">
-                <Input
-                  value={entry.key}
-                  onChange={(e) => updateEntry(index, "key", e.target.value)}
-                  placeholder={t("openclaw.env.keyPlaceholder")}
-                  className="font-mono text-xs"
-                  autoFocus={entry.isNew}
-                />
-              </div>
-              <div className="flex-1 flex items-center gap-1">
-                <Input
-                  type={sensitive && !visible ? "password" : "text"}
-                  value={entry.value}
-                  onChange={(e) => updateEntry(index, "value", e.target.value)}
-                  placeholder={t("openclaw.env.valuePlaceholder")}
-                  className="font-mono text-xs"
-                />
-                {sensitive && (
-                  <Button
-                    variant="ghost"
-                    size="icon"
-                    className="flex-shrink-0 h-9 w-9 text-muted-foreground"
-                    onClick={() => toggleVisibility(visibilityId)}
-                  >
-                    {visible ? (
-                      <EyeOff className="w-4 h-4" />
-                    ) : (
-                      <Eye className="w-4 h-4" />
-                    )}
-                  </Button>
-                )}
-              </div>
-              <Button
-                variant="ghost"
-                size="icon"
-                className="flex-shrink-0 h-9 w-9 text-muted-foreground hover:text-destructive"
-                onClick={() => removeEntry(index)}
-              >
-                <Trash2 className="w-4 h-4" />
-              </Button>
-            </div>
-          );
-        })}
-      </div>
-
-      <div className="flex items-center gap-2 mt-4">
-        <Button variant="outline" size="sm" onClick={addEntry}>
-          <Plus className="w-4 h-4 mr-1" />
-          {t("openclaw.env.add")}
-        </Button>
-        <div className="flex-1" />
-        <Button
-          size="sm"
-          onClick={handleSave}
-          disabled={saveEnvMutation.isPending}
-        >
-          <Save className="w-4 h-4 mr-1" />
-          {saveEnvMutation.isPending ? t("common.saving") : t("common.save")}
-        </Button>
-      </div>
-    </div>
-  );
-};
-
-export default EnvPanel;
@@ -1,221 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { Plus, Trash2, Save } from "lucide-react";
-import { toast } from "sonner";
-import { useOpenClawTools, useSaveOpenClawTools } from "@/hooks/useOpenClaw";
-import { extractErrorMessage } from "@/utils/errorUtils";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import type { OpenClawToolsConfig } from "@/types";
-
-interface ListItem {
-  id: string;
-  value: string;
-}
-
-const PROFILE_OPTIONS = ["default", "strict", "permissive", "custom"];
-
-const ToolsPanel: React.FC = () => {
-  const { t } = useTranslation();
-  const { data: toolsData, isLoading } = useOpenClawTools();
-  const saveToolsMutation = useSaveOpenClawTools();
-  const [config, setConfig] = useState<OpenClawToolsConfig>({});
-  const [allowList, setAllowList] = useState<ListItem[]>([]);
-  const [denyList, setDenyList] = useState<ListItem[]>([]);
-
-  useEffect(() => {
-    if (toolsData) {
-      setConfig(toolsData);
-      setAllowList(
-        (toolsData.allow ?? []).map((v) => ({
-          id: crypto.randomUUID(),
-          value: v,
-        })),
-      );
-      setDenyList(
-        (toolsData.deny ?? []).map((v) => ({
-          id: crypto.randomUUID(),
-          value: v,
-        })),
-      );
-    }
-  }, [toolsData]);
-
-  const handleSave = async () => {
-    try {
-      const { profile, allow, deny, ...other } = config;
-      const newConfig: OpenClawToolsConfig = {
-        ...other,
-        profile: config.profile,
-        allow: allowList.map((item) => item.value).filter((s) => s.trim()),
-        deny: denyList.map((item) => item.value).filter((s) => s.trim()),
-      };
-      await saveToolsMutation.mutateAsync(newConfig);
-      toast.success(t("openclaw.tools.saveSuccess"));
-    } catch (error) {
-      const detail = extractErrorMessage(error);
-      toast.error(t("openclaw.tools.saveFailed"), {
-        description: detail || undefined,
-      });
-    }
-  };
-
-  const updateListItem = (
-    setList: React.Dispatch<React.SetStateAction<ListItem[]>>,
-    index: number,
-    value: string,
-  ) => {
-    setList((prev) =>
-      prev.map((item, i) => (i === index ? { ...item, value } : item)),
-    );
-  };
-
-  const removeListItem = (
-    setList: React.Dispatch<React.SetStateAction<ListItem[]>>,
-    index: number,
-  ) => {
-    setList((prev) => prev.filter((_, i) => i !== index));
-  };
-
-  if (isLoading) {
-    return (
-      <div className="px-6 pt-4 pb-8 flex items-center justify-center min-h-[200px]">
-        <div className="text-sm text-muted-foreground">
-          {t("common.loading")}
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div className="px-6 pt-4 pb-8">
-      <p className="text-sm text-muted-foreground mb-6">
-        {t("openclaw.tools.description")}
-      </p>
-
-      {/* Profile selector */}
-      <div className="mb-6">
-        <Label className="mb-2 block">{t("openclaw.tools.profile")}</Label>
-        <Select
-          value={config.profile ?? "default"}
-          onValueChange={(val) =>
-            setConfig((prev) => ({ ...prev, profile: val }))
-          }
-        >
-          <SelectTrigger className="w-[200px]">
-            <SelectValue />
-          </SelectTrigger>
-          <SelectContent>
-            {PROFILE_OPTIONS.map((opt) => (
-              <SelectItem key={opt} value={opt}>
-                {t(`openclaw.tools.profiles.${opt}`)}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-      </div>
-
-      {/* Allow list */}
-      <div className="mb-6">
-        <Label className="mb-2 block">{t("openclaw.tools.allowList")}</Label>
-        <div className="space-y-2">
-          {allowList.map((item, index) => (
-            <div key={item.id} className="flex items-center gap-2">
-              <Input
-                value={item.value}
-                onChange={(e) =>
-                  updateListItem(setAllowList, index, e.target.value)
-                }
-                placeholder={t("openclaw.tools.patternPlaceholder")}
-                className="font-mono text-xs"
-              />
-              <Button
-                variant="ghost"
-                size="icon"
-                className="flex-shrink-0 h-9 w-9 text-muted-foreground hover:text-destructive"
-                onClick={() => removeListItem(setAllowList, index)}
-              >
-                <Trash2 className="w-4 h-4" />
-              </Button>
-            </div>
-          ))}
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() =>
-              setAllowList((prev) => [
-                ...prev,
-                { id: crypto.randomUUID(), value: "" },
-              ])
-            }
-          >
-            <Plus className="w-4 h-4 mr-1" />
-            {t("openclaw.tools.addAllow")}
-          </Button>
-        </div>
-      </div>
-
-      {/* Deny list */}
-      <div className="mb-6">
-        <Label className="mb-2 block">{t("openclaw.tools.denyList")}</Label>
-        <div className="space-y-2">
-          {denyList.map((item, index) => (
-            <div key={item.id} className="flex items-center gap-2">
-              <Input
-                value={item.value}
-                onChange={(e) =>
-                  updateListItem(setDenyList, index, e.target.value)
-                }
-                placeholder={t("openclaw.tools.patternPlaceholder")}
-                className="font-mono text-xs"
-              />
-              <Button
-                variant="ghost"
-                size="icon"
-                className="flex-shrink-0 h-9 w-9 text-muted-foreground hover:text-destructive"
-                onClick={() => removeListItem(setDenyList, index)}
-              >
-                <Trash2 className="w-4 h-4" />
-              </Button>
-            </div>
-          ))}
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() =>
-              setDenyList((prev) => [
-                ...prev,
-                { id: crypto.randomUUID(), value: "" },
-              ])
-            }
-          >
-            <Plus className="w-4 h-4 mr-1" />
-            {t("openclaw.tools.addDeny")}
-          </Button>
-        </div>
-      </div>
-
-      {/* Save button */}
-      <div className="flex justify-end">
-        <Button
-          size="sm"
-          onClick={handleSave}
-          disabled={saveToolsMutation.isPending}
-        >
-          <Save className="w-4 h-4 mr-1" />
-          {saveToolsMutation.isPending ? t("common.saving") : t("common.save")}
-        </Button>
-      </div>
-    </div>
-  );
-};
-
-export default ToolsPanel;
@@ -30,13 +30,13 @@ const PromptFormModal: React.FC<PromptFormModalProps> = ({
 }) => {
  const { t } = useTranslation();
  const appName = t(`apps.${appId}`);
-  const filenameMap: Record<Exclude<AppId, "openclaw">, string> = {
+  const filenameMap: Record<AppId, string> = {
    claude: "CLAUDE.md",
    codex: "AGENTS.md",
    gemini: "GEMINI.md",
    opencode: "AGENTS.md",
  };
-  const filename = filenameMap[appId as Exclude<AppId, "openclaw">];
+  const filename = filenameMap[appId];
  const [name, setName] = useState("");
  const [description, setDescription] = useState("");
  const [content, setContent] = useState("");
@@ -29,7 +29,6 @@ const PromptFormPanel: React.FC<PromptFormPanelProps> = ({
    codex: "AGENTS.md",
    gemini: "GEMINI.md",
    opencode: "AGENTS.md",
-    openclaw: "AGENTS.md",
  };
  const filename = filenameMap[appId];
  const [name, setName] = useState("");
@@ -17,7 +17,6 @@ import { UniversalProviderPanel } from "@/components/universal";
 import { providerPresets } from "@/config/claudeProviderPresets";
 import { codexProviderPresets } from "@/config/codexProviderPresets";
 import { geminiProviderPresets } from "@/config/geminiProviderPresets";
-import type { OpenClawSuggestedDefaults } from "@/config/openclawProviderPresets";
 import type { UniversalProviderPreset } from "@/config/universalProviderPresets";

 interface AddProviderDialogProps {
@@ -25,10 +24,7 @@ interface AddProviderDialogProps {
  onOpenChange: (open: boolean) => void;
  appId: AppId;
  onSubmit: (
-    provider: Omit<Provider, "id"> & {
-      providerKey?: string;
-      suggestedDefaults?: OpenClawSuggestedDefaults;
-    },
+    provider: Omit<Provider, "id"> & { providerKey?: string },
  ) => Promise<void> | void;
 }

@@ -39,8 +35,7 @@ export function AddProviderDialog({
  onSubmit,
 }: AddProviderDialogProps) {
  const { t } = useTranslation();
-  // OpenCode and OpenClaw don't support universal providers
-  const showUniversalTab = appId !== "opencode" && appId !== "openclaw";
+  const showUniversalTab = appId !== "opencode";
  const [activeTab, setActiveTab] = useState<"app-specific" | "universal">(
    "app-specific",
  );
@@ -87,11 +82,7 @@ export function AddProviderDialog({
        unknown
      >;

-      // 构造基础提交数据
-      const providerData: Omit<Provider, "id"> & {
-        providerKey?: string;
-        suggestedDefaults?: OpenClawSuggestedDefaults;
-      } = {
+      const providerData: Omit<Provider, "id"> & { providerKey?: string } = {
        name: values.name.trim(),
        notes: values.notes?.trim() || undefined,
        websiteUrl: values.websiteUrl?.trim() || undefined,
@@ -102,11 +93,7 @@ export function AddProviderDialog({
        ...(values.meta ? { meta: values.meta } : {}),
      };

-      // OpenCode/OpenClaw: pass providerKey for ID generation
-      if (
-        (appId === "opencode" || appId === "openclaw") &&
-        values.providerKey
-      ) {
+      if (appId === "opencode" && values.providerKey) {
        providerData.providerKey = values.providerKey;
      }

@@ -198,11 +185,6 @@ export function AddProviderDialog({
          if (options?.baseURL) {
            addUrl(options.baseURL);
          }
-        } else if (appId === "openclaw") {
-          // OpenClaw uses baseUrl directly
-          if (parsedConfig.baseUrl) {
-            addUrl(parsedConfig.baseUrl as string);
-          }
        }

        const urls = Array.from(urlSet);
@@ -224,11 +206,6 @@ export function AddProviderDialog({
        }
      }

-      // OpenClaw: pass suggestedDefaults for model registration
-      if (appId === "openclaw" && values.suggestedDefaults) {
-        providerData.suggestedDefaults = values.suggestedDefaults;
-      }
-
      await onSubmit(providerData);
      onOpenChange(false);
    },
@@ -309,7 +286,6 @@ export function AddProviderDialog({
          </TabsContent>
        </Tabs>
      ) : (
-        // OpenCode/OpenClaw: directly show form without tabs
        <ProviderForm
          appId={appId}
          submitLabel={t("common.add")}
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { toast } from "sonner";
 import { Save } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { FullScreenPanel } from "@/components/common/FullScreenPanel";
@@ -8,7 +9,13 @@ import {
  ProviderForm,
  type ProviderFormValues,
 } from "@/components/providers/forms/ProviderForm";
-import { providersApi, vscodeApi, type AppId } from "@/lib/api";
+import { providersApi, vscodeApi, configApi, type AppId } from "@/lib/api";
+import { extractDifference, isPlainObject } from "@/utils/configMerge";
+import { extractTomlDifference } from "@/utils/tomlConfigMerge";
+import {
+  parseGeminiCommonConfigSnippet,
+  mapGeminiWarningToI18n,
+} from "@/utils/providerConfigUtils";

 interface EditProviderDialogProps {
  open: boolean;
@@ -81,7 +88,103 @@ export function EditProviderDialog({
              appId,
            )) as Record<string, unknown>;
            if (!cancelled && live && typeof live === "object") {
-              setLiveSettings(live);
+              // 检查是否启用了通用配置
+              const metaByApp = provider.meta?.commonConfigEnabledByApp;
+              const commonConfigEnabled =
+                metaByApp?.[appId] ??
+                provider.meta?.commonConfigEnabled ??
+                false;
+
+              if (commonConfigEnabled) {
+                // 从 live 配置中提取自定义部分（去除通用配置）
+                try {
+                  const commonSnippet =
+                    await configApi.getCommonConfigSnippet(appId);
+                  if (commonSnippet && commonSnippet.trim()) {
+                    if (appId === "codex") {
+                      // Codex: 处理 TOML 格式的 config 字段
+                      const liveConfig =
+                        (live as { auth?: unknown; config?: string }).config ??
+                        "";
+                      const { customToml, error } = extractTomlDifference(
+                        liveConfig,
+                        commonSnippet.trim(),
+                      );
+                      if (!error) {
+                        setLiveSettings({
+                          ...live,
+                          config: customToml,
+                        });
+                      } else {
+                        setLiveSettings(live);
+                      }
+                    } else if (appId === "gemini") {
+                      // Gemini: common config supports three formats:
+                      // - ENV format: KEY=VALUE lines
+                      // - Flat JSON: {"KEY": "VALUE", ...}
+                      // - Wrapped JSON: {"env": {"KEY": "VALUE", ...}}
+                      const liveEnv =
+                        (live as { env?: Record<string, string> }).env ?? {};
+
+                      // Use shared parser with validation
+                      const parseResult = parseGeminiCommonConfigSnippet(
+                        commonSnippet,
+                        { strictForbiddenKeys: false },
+                      );
+
+                      if (parseResult.error) {
+                        console.warn(
+                          "[EditProviderDialog] Gemini common config parse error:",
+                          parseResult.error,
+                        );
+                        setLiveSettings(live);
+                      } else {
+                        // Show warning toast if keys were filtered
+                        if (parseResult.warning) {
+                          toast.warning(
+                            mapGeminiWarningToI18n(parseResult.warning, t),
+                          );
+                        }
+
+                        if (
+                          isPlainObject(liveEnv) &&
+                          Object.keys(parseResult.env).length > 0
+                        ) {
+                          const { customConfig } = extractDifference(
+                            liveEnv,
+                            parseResult.env,
+                          );
+                          setLiveSettings({
+                            ...live,
+                            env: customConfig,
+                          });
+                        } else {
+                          setLiveSettings(live);
+                        }
+                      }
+                    } else {
+                      // Claude: 处理 JSON 格式
+                      const commonConfig = JSON.parse(commonSnippet.trim());
+                      if (isPlainObject(live) && isPlainObject(commonConfig)) {
+                        const { customConfig } = extractDifference(
+                          live,
+                          commonConfig,
+                        );
+                        setLiveSettings(customConfig);
+                      } else {
+                        setLiveSettings(live);
+                      }
+                    }
+                  } else {
+                    setLiveSettings(live);
+                  }
+                } catch {
+                  // 提取失败时使用原始 live 配置
+                  setLiveSettings(live);
+                }
+              } else {
+                setLiveSettings(live);
+              }
              setHasLoadedLive(true);
            }
          } catch {
@@ -105,7 +208,14 @@ export function EditProviderDialog({
    return () => {
      cancelled = true;
    };
-  }, [open, provider?.id, appId, hasLoadedLive, isProxyTakeover]); // 只依赖 provider.id，不依赖整个 provider 对象
+  }, [
+    open,
+    provider?.id,
+    provider?.meta,
+    appId,
+    hasLoadedLive,
+    isProxyTakeover,
+  ]); // 添加 provider?.meta 依赖

  const initialSettingsConfig = useMemo(() => {
    return (liveSettings ?? provider?.settingsConfig ?? {}) as Record<
@@ -10,7 +10,6 @@ import {
  Terminal,
  TestTube2,
  Trash2,
-  Zap,
 } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
@@ -37,9 +36,6 @@ interface ProviderActionsProps {
  isAutoFailoverEnabled?: boolean;
  isInFailoverQueue?: boolean;
  onToggleFailover?: (enabled: boolean) => void;
-  // OpenClaw: default model
-  isDefaultModel?: boolean;
-  onSetAsDefault?: () => void;
 }

 export function ProviderActions({
@@ -62,20 +58,14 @@ export function ProviderActions({
  isAutoFailoverEnabled = false,
  isInFailoverQueue = false,
  onToggleFailover,
-  // OpenClaw: default model
-  isDefaultModel = false,
-  onSetAsDefault,
 }: ProviderActionsProps) {
  const { t } = useTranslation();
  const iconButtonClass = "h-8 w-8 p-1";

-  // 累加模式应用（OpenCode 非 OMO 和 OpenClaw）
-  const isAdditiveMode =
-    (appId === "opencode" && !isOmo) || appId === "openclaw";
+  const isOpenCodeMode = appId === "opencode" && !isOmo;

-  // 故障转移模式下的按钮逻辑（累加模式和 OMO 应用不支持故障转移）
  const isFailoverMode =
-    !isAdditiveMode && !isOmo && isAutoFailoverEnabled && onToggleFailover;
+    !isOpenCodeMode && !isOmo && isAutoFailoverEnabled && onToggleFailover;

  const handleMainButtonClick = () => {
    if (isOmo) {
@@ -84,8 +74,7 @@ export function ProviderActions({
      } else {
        onSwitch();
      }
-    } else if (isAdditiveMode) {
-      // 累加模式：切换配置状态（添加/移除）
+    } else if (isOpenCodeMode) {
      if (isInConfig) {
        if (onRemoveFromConfig) {
          onRemoveFromConfig();
@@ -123,16 +112,13 @@ export function ProviderActions({
      };
    }

-    // 累加模式（OpenCode 非 OMO / OpenClaw）
-    if (isAdditiveMode) {
+    if (isOpenCodeMode) {
      if (isInConfig) {
        return {
-          disabled: isDefaultModel === true,
+          disabled: false,
          variant: "secondary" as const,
-          className: cn(
+          className:
            "bg-orange-100 text-orange-600 hover:bg-orange-200 dark:bg-orange-900/50 dark:text-orange-400 dark:hover:bg-orange-900/70",
-            isDefaultModel && "opacity-40 cursor-not-allowed",
-          ),
          icon: <Minus className="h-4 w-4" />,
          text: t("provider.removeFromConfig", { defaultValue: "移除" }),
        };
@@ -194,32 +180,12 @@ export function ProviderActions({

  const canDelete = isOmo
    ? !(isLastOmo && isCurrent)
-    : isAdditiveMode
+    : isOpenCodeMode
      ? true
      : !isCurrent;

  return (
    <div className="flex items-center gap-1.5">
-      {appId === "openclaw" && isInConfig && onSetAsDefault && (
-        <Button
-          size="sm"
-          variant={isDefaultModel ? "secondary" : "default"}
-          onClick={isDefaultModel ? undefined : onSetAsDefault}
-          disabled={isDefaultModel}
-          className={cn(
-            "w-[4.5rem] px-2.5",
-            isDefaultModel
-              ? "bg-gray-200 text-muted-foreground dark:bg-gray-700 opacity-60 cursor-not-allowed"
-              : "bg-blue-500 hover:bg-blue-600 dark:bg-blue-600 dark:hover:bg-blue-700",
-          )}
-        >
-          <Zap className="h-4 w-4" />
-          {isDefaultModel
-            ? t("provider.isDefault", { defaultValue: "默认" })
-            : t("provider.setAsDefault", { defaultValue: "启用" })}
-        </Button>
-      )}
-
      <Button
        size="sm"
        variant={buttonState.variant}
@@ -48,9 +48,6 @@ interface ProviderCardProps {
  isInFailoverQueue?: boolean; // 是否在故障转移队列中
  onToggleFailover?: (enabled: boolean) => void; // 切换故障转移队列
  activeProviderId?: string; // 代理当前实际使用的供应商 ID（用于故障转移模式下标注绿色边框）
-  // OpenClaw: default model
-  isDefaultModel?: boolean;
-  onSetAsDefault?: () => void;
 }

 const extractApiUrl = (provider: Provider, fallbackText: string) => {
@@ -111,9 +108,6 @@ export function ProviderCard({
  isInFailoverQueue = false,
  onToggleFailover,
  activeProviderId,
-  // OpenClaw: default model
-  isDefaultModel,
-  onSetAsDefault,
 }: ProviderCardProps) {
  const { t } = useTranslation();

@@ -139,10 +133,7 @@ export function ProviderCard({

  const usageEnabled = provider.meta?.usage_script?.enabled ?? false;

-  // 获取用量数据以判断是否有多套餐
-  // 累加模式应用（OpenCode/OpenClaw）：使用 isInConfig 代替 isCurrent
-  const shouldAutoQuery =
-    appId === "opencode" || appId === "openclaw" ? isInConfig : isCurrent;
+  const shouldAutoQuery = appId === "opencode" ? isInConfig : isCurrent;
  const autoQueryInterval = shouldAutoQuery
    ? provider.meta?.usage_script?.autoQueryInterval || 0
    : 0;
@@ -185,14 +176,9 @@ export function ProviderCard({
    onOpenWebsite(displayUrl);
  };

-  // 判断是否是"当前使用中"的供应商
-  // - OMO 供应商：使用 isCurrent
-  // - 累加模式应用（OpenCode 非 OMO / OpenClaw）：不存在"当前"概念，始终返回 false
-  // - 故障转移模式：代理实际使用的供应商（activeProviderId）
-  // - 普通模式：isCurrent
  const isActiveProvider = isOmo
    ? isCurrent
-    : appId === "opencode" || appId === "openclaw"
+    : appId === "opencode"
      ? false
      : isAutoFailoverEnabled
        ? activeProviderId === provider.id
@@ -392,9 +378,6 @@ export function ProviderCard({
              isAutoFailoverEnabled={isAutoFailoverEnabled}
              isInFailoverQueue={isInFailoverQueue}
              onToggleFailover={onToggleFailover}
-              // OpenClaw: default model
-              isDefaultModel={isDefaultModel}
-              onSetAsDefault={onSetAsDefault}
            />
          </div>
        </div>
@@ -20,11 +20,6 @@ import type { Provider } from "@/types";
 import type { AppId } from "@/lib/api";
 import { providersApi } from "@/lib/api/providers";
 import { useDragSort } from "@/hooks/useDragSort";
-import {
-  useOpenClawLiveProviderIds,
-  useOpenClawDefaultModel,
-} from "@/hooks/useOpenClaw";
-// import { useStreamCheck } from "@/hooks/useStreamCheck"; // 测试功能已隐藏
 import { ProviderCard } from "@/components/providers/ProviderCard";
 import { ProviderEmptyState } from "@/components/providers/ProviderEmptyState";
 import {
@@ -56,7 +51,6 @@ interface ProviderListProps {
  isProxyRunning?: boolean; // 代理服务运行状态
  isProxyTakeover?: boolean; // 代理接管模式（Live配置已被接管）
  activeProviderId?: string; // 代理当前实际使用的供应商 ID（用于故障转移模式下标注绿色边框）
-  onSetAsDefault?: (provider: Provider) => void; // OpenClaw: set as default model
 }

 export function ProviderList({
@@ -77,7 +71,6 @@ export function ProviderList({
  isProxyRunning = false,
  isProxyTakeover = false,
  activeProviderId,
-  onSetAsDefault,
 }: ProviderListProps) {
  const { t } = useTranslation();
  const { sortedProviders, sensors, handleDragEnd } = useDragSort(
@@ -91,39 +84,14 @@ export function ProviderList({
    enabled: appId === "opencode",
  });

-  // OpenClaw: 查询 live 配置中的供应商 ID 列表，用于判断 isInConfig
-  const { data: openclawLiveIds } = useOpenClawLiveProviderIds(
-    appId === "openclaw",
-  );
-
-  // 判断供应商是否已添加到配置（累加模式应用：OpenCode/OpenClaw）
  const isProviderInConfig = useCallback(
    (providerId: string): boolean => {
-      if (appId === "opencode") {
-        return opencodeLiveIds?.includes(providerId) ?? false;
-      }
-      if (appId === "openclaw") {
-        return openclawLiveIds?.includes(providerId) ?? false;
-      }
-      return true; // 其他应用始终返回 true
+      if (appId !== "opencode") return true; // 非 OpenCode 应用始终返回 true
+      return opencodeLiveIds?.includes(providerId) ?? false;
    },
-    [appId, opencodeLiveIds, openclawLiveIds],
+    [appId, opencodeLiveIds],
  );

-  // OpenClaw: query default model to determine which provider is default
-  const { data: openclawDefaultModel } = useOpenClawDefaultModel(
-    appId === "openclaw",
-  );
-
-  const isProviderDefaultModel = useCallback(
-    (providerId: string): boolean => {
-      if (appId !== "openclaw" || !openclawDefaultModel?.primary) return false;
-      return openclawDefaultModel.primary.startsWith(providerId + "/");
-    },
-    [appId, openclawDefaultModel],
-  );
-
-  // 故障转移相关
  const { data: isAutoFailoverEnabled } = useAutoFailoverEnabled(appId);
  const { data: failoverQueue } = useFailoverQueue(appId);
  const addToQueue = useAddToFailoverQueue();
@@ -272,11 +240,6 @@ export function ProviderList({
                  handleToggleFailover(provider.id, enabled)
                }
                activeProviderId={activeProviderId}
-                // OpenClaw: default model
-                isDefaultModel={isProviderDefaultModel(provider.id)}
-                onSetAsDefault={
-                  onSetAsDefault ? () => onSetAsDefault(provider) : undefined
-                }
              />
            );
          })}
@@ -389,9 +352,6 @@ interface SortableProviderCardProps {
  isInFailoverQueue: boolean;
  onToggleFailover: (enabled: boolean) => void;
  activeProviderId?: string;
-  // OpenClaw: default model
-  isDefaultModel?: boolean;
-  onSetAsDefault?: () => void;
 }

 function SortableProviderCard({
@@ -419,8 +379,6 @@ function SortableProviderCard({
  isInFailoverQueue,
  onToggleFailover,
  activeProviderId,
-  isDefaultModel,
-  onSetAsDefault,
 }: SortableProviderCardProps) {
  const {
    setNodeRef,
@@ -470,9 +428,6 @@ function SortableProviderCard({
        isInFailoverQueue={isInFailoverQueue}
        onToggleFailover={onToggleFailover}
        activeProviderId={activeProviderId}
-        // OpenClaw: default model
-        isDefaultModel={isDefaultModel}
-        onSetAsDefault={onSetAsDefault}
      />
    </div>
  );
@@ -30,6 +30,9 @@ interface CodexConfigEditorProps {
  onExtract?: () => void;

  isExtracting?: boolean;
+
+  /** 最终合并后的配置（只读预览） */
+  finalConfig?: string;
 }

 const CodexConfigEditor: React.FC<CodexConfigEditorProps> = ({
@@ -47,6 +50,7 @@ const CodexConfigEditor: React.FC<CodexConfigEditorProps> = ({
  configError,
  onExtract,
  isExtracting,
+  finalConfig,
 }) => {
  const [isCommonConfigModalOpen, setIsCommonConfigModalOpen] = useState(false);

@@ -76,6 +80,7 @@ const CodexConfigEditor: React.FC<CodexConfigEditorProps> = ({
        onEditCommonConfig={() => setIsCommonConfigModalOpen(true)}
        commonConfigError={commonConfigError}
        configError={configError}
+        finalConfig={finalConfig}
      />

      {/* Common Config Modal */}
@@ -1,6 +1,9 @@
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { Eye, EyeOff } from "lucide-react";
 import JsonEditor from "@/components/JsonEditor";
+import { Label } from "@/components/ui/label";
+import { useDarkMode } from "@/hooks/useDarkMode";

 interface CodexAuthSectionProps {
  value: string;
@@ -19,22 +22,7 @@ export const CodexAuthSection: React.FC<CodexAuthSectionProps> = ({
  error,
 }) => {
  const { t } = useTranslation();
-  const [isDarkMode, setIsDarkMode] = useState(false);
-
-  useEffect(() => {
-    setIsDarkMode(document.documentElement.classList.contains("dark"));
-
-    const observer = new MutationObserver(() => {
-      setIsDarkMode(document.documentElement.classList.contains("dark"));
-    });
-
-    observer.observe(document.documentElement, {
-      attributes: true,
-      attributeFilter: ["class"],
-    });
-
-    return () => observer.disconnect();
-  }, []);
+  const isDarkMode = useDarkMode();

  const handleChange = (newValue: string) => {
    onChange(newValue);
@@ -57,7 +45,8 @@ export const CodexAuthSection: React.FC<CodexAuthSectionProps> = ({
        onChange={handleChange}
        placeholder={t("codexConfig.authJsonPlaceholder")}
        darkMode={isDarkMode}
-        rows={6}
+        rows={3}
+        autoHeight={true}
        showValidation={true}
        language="json"
      />
@@ -83,6 +72,8 @@ interface CodexConfigSectionProps {
  onEditCommonConfig: () => void;
  commonConfigError?: string;
  configError?: string;
+  /** 最终合并后的配置（只读预览） */
+  finalConfig?: string;
 }

 /**
@@ -96,24 +87,18 @@ export const CodexConfigSection: React.FC<CodexConfigSectionProps> = ({
  onEditCommonConfig,
  commonConfigError,
  configError,
+  finalConfig,
 }) => {
  const { t } = useTranslation();
-  const [isDarkMode, setIsDarkMode] = useState(false);
+  const isDarkMode = useDarkMode();
+  const [showPreview, setShowPreview] = useState(false);

+  // 当启用通用配置时，自动显示预览
  useEffect(() => {
-    setIsDarkMode(document.documentElement.classList.contains("dark"));
-
-    const observer = new MutationObserver(() => {
-      setIsDarkMode(document.documentElement.classList.contains("dark"));
-    });
-
-    observer.observe(document.documentElement, {
-      attributes: true,
-      attributeFilter: ["class"],
-    });
-
-    return () => observer.disconnect();
-  }, []);
+    if (useCommonConfig && finalConfig) {
+      setShowPreview(true);
+    }
+  }, [useCommonConfig, finalConfig]);

  return (
    <div className="space-y-2">
@@ -136,7 +121,32 @@ export const CodexConfigSection: React.FC<CodexConfigSectionProps> = ({
        </label>
      </div>

-      <div className="flex items-center justify-end">
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          {useCommonConfig && finalConfig && (
+            <button
+              type="button"
+              onClick={() => setShowPreview(!showPreview)}
+              className="inline-flex items-center gap-1 text-xs text-blue-400 dark:text-blue-500 hover:text-blue-500 dark:hover:text-blue-400 transition-colors"
+            >
+              {showPreview ? (
+                <>
+                  <EyeOff className="w-3 h-3" />
+                  {t("codexConfig.hidePreview", {
+                    defaultValue: "隐藏合并预览",
+                  })}
+                </>
+              ) : (
+                <>
+                  <Eye className="w-3 h-3" />
+                  {t("codexConfig.showPreview", {
+                    defaultValue: "显示合并预览",
+                  })}
+                </>
+              )}
+            </button>
+          )}
+        </div>
        <button
          type="button"
          onClick={onEditCommonConfig}
@@ -152,15 +162,58 @@ export const CodexConfigSection: React.FC<CodexConfigSectionProps> = ({
        </p>
      )}

-      <JsonEditor
-        value={value}
-        onChange={onChange}
-        placeholder=""
-        darkMode={isDarkMode}
-        rows={8}
-        showValidation={false}
-        language="javascript"
-      />
+      {/* 自定义配置编辑器 */}
+      <div className="space-y-1">
+        {useCommonConfig && showPreview && (
+          <Label className="text-xs text-muted-foreground">
+            {t("codexConfig.customConfig", {
+              defaultValue: "自定义配置（覆盖通用配置）",
+            })}
+          </Label>
+        )}
+        <JsonEditor
+          value={value}
+          onChange={onChange}
+          placeholder=""
+          darkMode={isDarkMode}
+          rows={useCommonConfig && showPreview ? 3 : 8}
+          autoHeight={useCommonConfig && showPreview}
+          showValidation={false}
+          language="javascript"
+        />
+      </div>
+
+      {/* 合并预览（只读）- 放在自定义配置下面 */}
+      {useCommonConfig && showPreview && finalConfig && (
+        <div className="space-y-1">
+          <div className="flex items-center justify-between">
+            <Label className="text-xs text-muted-foreground">
+              {t("codexConfig.mergedPreview", {
+                defaultValue: "合并预览（只读）",
+              })}
+            </Label>
+            <span className="text-xs text-green-500 dark:text-green-400">
+              {t("codexConfig.mergedPreviewHint", {
+                defaultValue: "通用配置 + 自定义配置 = 最终配置",
+              })}
+            </span>
+          </div>
+          <div className="relative">
+            <JsonEditor
+              value={finalConfig}
+              onChange={() => {}} // 只读
+              darkMode={isDarkMode}
+              rows={6}
+              showValidation={false}
+              language="javascript"
+              readOnly={true}
+            />
+            <div className="absolute top-2 right-2 px-2 py-0.5 bg-green-500/10 text-green-600 dark:text-green-400 text-xs rounded">
+              {t("common.readonly", { defaultValue: "只读" })}
+            </div>
+          </div>
+        </div>
+      )}

      {configError && (
        <p className="text-xs text-red-500 dark:text-red-400">{configError}</p>
@@ -3,8 +3,9 @@ import { useEffect, useState } from "react";
 import { FullScreenPanel } from "@/components/common/FullScreenPanel";
 import { Label } from "@/components/ui/label";
 import { Button } from "@/components/ui/button";
-import { Save, Download, Loader2 } from "lucide-react";
+import { Save, Download, Loader2, Eye, EyeOff } from "lucide-react";
 import JsonEditor from "@/components/JsonEditor";
+import { useDarkMode } from "@/hooks/useDarkMode";

 interface CommonConfigEditorProps {
  value: string;
@@ -19,6 +20,8 @@ interface CommonConfigEditorProps {
  onModalClose: () => void;
  onExtract?: () => void;
  isExtracting?: boolean;
+  /** 最终合并后的配置（只读预览） */
+  finalConfig?: string;
 }

 export function CommonConfigEditor({
@@ -34,24 +37,18 @@ export function CommonConfigEditor({
  onModalClose,
  onExtract,
  isExtracting,
+  finalConfig,
 }: CommonConfigEditorProps) {
  const { t } = useTranslation();
-  const [isDarkMode, setIsDarkMode] = useState(false);
+  const isDarkMode = useDarkMode();
+  const [showPreview, setShowPreview] = useState(false);

+  // 当启用通用配置时，自动显示预览
  useEffect(() => {
-    setIsDarkMode(document.documentElement.classList.contains("dark"));
-
-    const observer = new MutationObserver(() => {
-      setIsDarkMode(document.documentElement.classList.contains("dark"));
-    });
-
-    observer.observe(document.documentElement, {
-      attributes: true,
-      attributeFilter: ["class"],
-    });
-
-    return () => observer.disconnect();
-  }, []);
+    if (useCommonConfig && finalConfig) {
+      setShowPreview(true);
+    }
+  }, [useCommonConfig, finalConfig]);

  return (
    <>
@@ -75,7 +72,32 @@ export function CommonConfigEditor({
            </label>
          </div>
        </div>
-        <div className="flex items-center justify-end">
+        <div className="flex items-center justify-between">
+          <div className="flex items-center gap-2">
+            {useCommonConfig && finalConfig && (
+              <button
+                type="button"
+                onClick={() => setShowPreview(!showPreview)}
+                className="inline-flex items-center gap-1 text-xs text-blue-400 dark:text-blue-500 hover:text-blue-500 dark:hover:text-blue-400 transition-colors"
+              >
+                {showPreview ? (
+                  <>
+                    <EyeOff className="w-3 h-3" />
+                    {t("claudeConfig.hidePreview", {
+                      defaultValue: "隐藏合并预览",
+                    })}
+                  </>
+                ) : (
+                  <>
+                    <Eye className="w-3 h-3" />
+                    {t("claudeConfig.showPreview", {
+                      defaultValue: "显示合并预览",
+                    })}
+                  </>
+                )}
+              </button>
+            )}
+          </div>
          <button
            type="button"
            onClick={onEditClick}
@@ -91,20 +113,64 @@ export function CommonConfigEditor({
            {commonConfigError}
          </p>
        )}
-        <JsonEditor
-          value={value}
-          onChange={onChange}
-          placeholder={`{
+
+        {/* 自定义配置编辑器 */}
+        <div className="space-y-1">
+          {useCommonConfig && showPreview && (
+            <Label className="text-xs text-muted-foreground">
+              {t("claudeConfig.customConfig", {
+                defaultValue: "自定义配置（覆盖通用配置）",
+              })}
+            </Label>
+          )}
+          <JsonEditor
+            value={value}
+            onChange={onChange}
+            placeholder={`{
  "env": {
    "ANTHROPIC_BASE_URL": "https://your-api-endpoint.com",
    "ANTHROPIC_AUTH_TOKEN": "your-api-key-here"
  }
 }`}
-          darkMode={isDarkMode}
-          rows={14}
-          showValidation={true}
-          language="json"
-        />
+            darkMode={isDarkMode}
+            rows={useCommonConfig && showPreview ? 3 : 14}
+            autoHeight={useCommonConfig && showPreview}
+            showValidation={true}
+            language="json"
+          />
+        </div>
+
+        {/* 合并预览（只读）- 放在自定义配置下面 */}
+        {useCommonConfig && showPreview && finalConfig && (
+          <div className="space-y-1">
+            <div className="flex items-center justify-between">
+              <Label className="text-xs text-muted-foreground">
+                {t("claudeConfig.mergedPreview", {
+                  defaultValue: "合并预览（只读）",
+                })}
+              </Label>
+              <span className="text-xs text-green-500 dark:text-green-400">
+                {t("claudeConfig.mergedPreviewHint", {
+                  defaultValue: "通用配置 + 自定义配置 = 最终配置",
+                })}
+              </span>
+            </div>
+            <div className="relative">
+              <JsonEditor
+                value={finalConfig}
+                onChange={() => {}} // 只读
+                darkMode={isDarkMode}
+                rows={8}
+                showValidation={false}
+                language="json"
+                readOnly={true}
+              />
+              <div className="absolute top-2 right-2 px-2 py-0.5 bg-green-500/10 text-green-600 dark:text-green-400 text-xs rounded">
+                {t("common.readonly", { defaultValue: "只读" })}
+              </div>
+            </div>
+          </div>
+        )}
      </div>

      <FullScreenPanel
@@ -14,7 +14,6 @@ const ENDPOINT_TIMEOUT_SECS: Record<AppId, number> = {
  claude: 8,
  gemini: 8,
  opencode: 8,
-  openclaw: 8,
 };

 interface TestResult {
@@ -18,6 +18,7 @@ interface GeminiCommonConfigModalProps {
 /**
 * GeminiCommonConfigModal - Common Gemini configuration editor modal
 * Allows editing of common env snippet shared across Gemini providers
+ * Uses ENV format (KEY=VALUE) instead of JSON
 */
 export const GeminiCommonConfigModal: React.FC<
  GeminiCommonConfigModalProps
@@ -88,13 +89,14 @@ export const GeminiCommonConfigModal: React.FC<
        <JsonEditor
          value={value}
          onChange={onChange}
-          placeholder={`{
-  "GEMINI_MODEL": "gemini-3-pro-preview"
-}`}
+          placeholder={`# Gemini 通用配置
+# 格式: KEY=VALUE
+
+GEMINI_MODEL=gemini-2.5-pro`}
          darkMode={isDarkMode}
          rows={16}
-          showValidation={true}
-          language="json"
+          showValidation={false}
+          language="javascript"
        />

        {error && (
@@ -17,6 +17,8 @@ interface GeminiConfigEditorProps {
  configError: string;
  onExtract?: () => void;
  isExtracting?: boolean;
+  /** 最终合并后的 env 配置（只读预览） */
+  finalEnv?: string;
 }

 const GeminiConfigEditor: React.FC<GeminiConfigEditorProps> = ({
@@ -34,6 +36,7 @@ const GeminiConfigEditor: React.FC<GeminiConfigEditorProps> = ({
  configError,
  onExtract,
  isExtracting,
+  finalEnv,
 }) => {
  const [isCommonConfigModalOpen, setIsCommonConfigModalOpen] = useState(false);

@@ -56,6 +59,7 @@ const GeminiConfigEditor: React.FC<GeminiConfigEditorProps> = ({
        onCommonConfigToggle={onCommonConfigToggle}
        onEditCommonConfig={() => setIsCommonConfigModalOpen(true)}
        commonConfigError={commonConfigError}
+        finalEnv={finalEnv}
      />

      {/* Config JSON Section */}
@@ -1,6 +1,9 @@
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { Eye, EyeOff } from "lucide-react";
 import JsonEditor from "@/components/JsonEditor";
+import { Label } from "@/components/ui/label";
+import { useDarkMode } from "@/hooks/useDarkMode";

 interface GeminiEnvSectionProps {
  value: string;
@@ -11,6 +14,8 @@ interface GeminiEnvSectionProps {
  onCommonConfigToggle: (checked: boolean) => void;
  onEditCommonConfig: () => void;
  commonConfigError?: string;
+  /** 最终合并后的 env 配置（只读预览） */
+  finalEnv?: string;
 }

 /**
@@ -25,24 +30,18 @@ export const GeminiEnvSection: React.FC<GeminiEnvSectionProps> = ({
  onCommonConfigToggle,
  onEditCommonConfig,
  commonConfigError,
+  finalEnv,
 }) => {
  const { t } = useTranslation();
-  const [isDarkMode, setIsDarkMode] = useState(false);
+  const isDarkMode = useDarkMode();
+  const [showPreview, setShowPreview] = useState(false);

+  // 当启用通用配置时，自动显示预览
  useEffect(() => {
-    setIsDarkMode(document.documentElement.classList.contains("dark"));
-
-    const observer = new MutationObserver(() => {
-      setIsDarkMode(document.documentElement.classList.contains("dark"));
-    });
-
-    observer.observe(document.documentElement, {
-      attributes: true,
-      attributeFilter: ["class"],
-    });
-
-    return () => observer.disconnect();
-  }, []);
+    if (useCommonConfig && finalEnv) {
+      setShowPreview(true);
+    }
+  }, [useCommonConfig, finalEnv]);

  const handleChange = (newValue: string) => {
    onChange(newValue);
@@ -74,7 +73,32 @@ export const GeminiEnvSection: React.FC<GeminiEnvSectionProps> = ({
        </label>
      </div>

-      <div className="flex items-center justify-end">
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          {useCommonConfig && finalEnv && (
+            <button
+              type="button"
+              onClick={() => setShowPreview(!showPreview)}
+              className="inline-flex items-center gap-1 text-xs text-blue-400 dark:text-blue-500 hover:text-blue-500 dark:hover:text-blue-400 transition-colors"
+            >
+              {showPreview ? (
+                <>
+                  <EyeOff className="w-3 h-3" />
+                  {t("geminiConfig.hidePreview", {
+                    defaultValue: "隐藏合并预览",
+                  })}
+                </>
+              ) : (
+                <>
+                  <Eye className="w-3 h-3" />
+                  {t("geminiConfig.showPreview", {
+                    defaultValue: "显示合并预览",
+                  })}
+                </>
+              )}
+            </button>
+          )}
+        </div>
        <button
          type="button"
          onClick={onEditCommonConfig}
@@ -92,17 +116,60 @@ export const GeminiEnvSection: React.FC<GeminiEnvSectionProps> = ({
        </p>
      )}

-      <JsonEditor
-        value={value}
-        onChange={handleChange}
-        placeholder={`GOOGLE_GEMINI_BASE_URL=https://your-api-endpoint.com/
+      {/* 自定义配置编辑器 */}
+      <div className="space-y-1">
+        {useCommonConfig && showPreview && (
+          <Label className="text-xs text-muted-foreground">
+            {t("geminiConfig.customConfig", {
+              defaultValue: "自定义配置（覆盖通用配置）",
+            })}
+          </Label>
+        )}
+        <JsonEditor
+          value={value}
+          onChange={handleChange}
+          placeholder={`GOOGLE_GEMINI_BASE_URL=https://your-api-endpoint.com/
 GEMINI_API_KEY=sk-your-api-key-here
 GEMINI_MODEL=gemini-3-pro-preview`}
-        darkMode={isDarkMode}
-        rows={6}
-        showValidation={false}
-        language="javascript"
-      />
+          darkMode={isDarkMode}
+          rows={useCommonConfig && showPreview ? 3 : 6}
+          autoHeight={useCommonConfig && showPreview}
+          showValidation={false}
+          language="javascript"
+        />
+      </div>
+
+      {/* 合并预览（只读）- 放在自定义配置下面 */}
+      {useCommonConfig && showPreview && finalEnv && (
+        <div className="space-y-1">
+          <div className="flex items-center justify-between">
+            <Label className="text-xs text-muted-foreground">
+              {t("geminiConfig.mergedPreview", {
+                defaultValue: "合并预览（只读）",
+              })}
+            </Label>
+            <span className="text-xs text-green-500 dark:text-green-400">
+              {t("geminiConfig.mergedPreviewHint", {
+                defaultValue: "通用配置 + 自定义配置 = 最终配置",
+              })}
+            </span>
+          </div>
+          <div className="relative">
+            <JsonEditor
+              value={finalEnv}
+              onChange={() => {}} // 只读
+              darkMode={isDarkMode}
+              rows={4}
+              showValidation={false}
+              language="javascript"
+              readOnly={true}
+            />
+            <div className="absolute top-2 right-2 px-2 py-0.5 bg-green-500/10 text-green-600 dark:text-green-400 text-xs rounded">
+              {t("common.readonly", { defaultValue: "只读" })}
+            </div>
+          </div>
+        </div>
+      )}

      {error && (
        <p className="text-xs text-red-500 dark:text-red-400">{error}</p>
@@ -134,22 +201,7 @@ export const GeminiConfigSection: React.FC<GeminiConfigSectionProps> = ({
  configError,
 }) => {
  const { t } = useTranslation();
-  const [isDarkMode, setIsDarkMode] = useState(false);
-
-  useEffect(() => {
-    setIsDarkMode(document.documentElement.classList.contains("dark"));
-
-    const observer = new MutationObserver(() => {
-      setIsDarkMode(document.documentElement.classList.contains("dark"));
-    });
-
-    observer.observe(document.documentElement, {
-      attributes: true,
-      attributeFilter: ["class"],
-    });
-
-    return () => observer.disconnect();
-  }, []);
+  const isDarkMode = useDarkMode();

  return (
    <div className="space-y-2">
@@ -1,472 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { useState, useRef, useCallback } from "react";
-import { FormLabel } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { Button } from "@/components/ui/button";
-import { Switch } from "@/components/ui/switch";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import {
-  Collapsible,
-  CollapsibleContent,
-  CollapsibleTrigger,
-} from "@/components/ui/collapsible";
-import { Plus, Trash2, ChevronDown, ChevronRight } from "lucide-react";
-import { ApiKeySection } from "./shared";
-import { openclawApiProtocols } from "@/config/openclawProviderPresets";
-import type { ProviderCategory, OpenClawModel } from "@/types";
-
-interface OpenClawFormFieldsProps {
-  // Base URL
-  baseUrl: string;
-  onBaseUrlChange: (value: string) => void;
-
-  // API Key
-  apiKey: string;
-  onApiKeyChange: (value: string) => void;
-  category?: ProviderCategory;
-  shouldShowApiKeyLink: boolean;
-  websiteUrl: string;
-  isPartner?: boolean;
-  partnerPromotionKey?: string;
-
-  // API Protocol
-  api: string;
-  onApiChange: (value: string) => void;
-
-  // Models
-  models: OpenClawModel[];
-  onModelsChange: (models: OpenClawModel[]) => void;
-}
-
-export function OpenClawFormFields({
-  baseUrl,
-  onBaseUrlChange,
-  apiKey,
-  onApiKeyChange,
-  category,
-  shouldShowApiKeyLink,
-  websiteUrl,
-  isPartner,
-  partnerPromotionKey,
-  api,
-  onApiChange,
-  models,
-  onModelsChange,
-}: OpenClawFormFieldsProps) {
-  const { t } = useTranslation();
-  const [expandedModels, setExpandedModels] = useState<Record<number, boolean>>(
-    {},
-  );
-
-  // Stable key tracking for models list
-  const modelKeysRef = useRef<string[]>([]);
-  const getModelKeys = useCallback(() => {
-    // Grow keys array if models were added externally
-    while (modelKeysRef.current.length < models.length) {
-      modelKeysRef.current.push(crypto.randomUUID());
-    }
-    // Shrink if models were removed externally
-    if (modelKeysRef.current.length > models.length) {
-      modelKeysRef.current.length = models.length;
-    }
-    return modelKeysRef.current;
-  }, [models.length]);
-  const modelKeys = getModelKeys();
-
-  // Toggle advanced section for a model
-  const toggleModelAdvanced = (index: number) => {
-    setExpandedModels((prev) => ({ ...prev, [index]: !prev[index] }));
-  };
-
-  // Add a new model entry
-  const handleAddModel = () => {
-    modelKeysRef.current.push(crypto.randomUUID());
-    onModelsChange([
-      ...models,
-      {
-        id: "",
-        name: "",
-        contextWindow: undefined,
-        maxTokens: undefined,
-        cost: undefined,
-      },
-    ]);
-  };
-
-  // Remove a model entry
-  const handleRemoveModel = (index: number) => {
-    modelKeysRef.current.splice(index, 1);
-    const newModels = [...models];
-    newModels.splice(index, 1);
-    onModelsChange(newModels);
-    // Clean up expanded state
-    setExpandedModels((prev) => {
-      const updated = { ...prev };
-      delete updated[index];
-      return updated;
-    });
-  };
-
-  // Update model field
-  const handleModelChange = (
-    index: number,
-    field: keyof OpenClawModel,
-    value: unknown,
-  ) => {
-    const newModels = [...models];
-    newModels[index] = { ...newModels[index], [field]: value };
-    onModelsChange(newModels);
-  };
-
-  // Update model cost
-  const handleCostChange = (
-    index: number,
-    costField: "input" | "output" | "cacheRead" | "cacheWrite",
-    value: string,
-  ) => {
-    const newModels = [...models];
-    const numValue = parseFloat(value);
-    const currentCost = newModels[index].cost || { input: 0, output: 0 };
-    newModels[index] = {
-      ...newModels[index],
-      cost: {
-        ...currentCost,
-        [costField]: isNaN(numValue) ? undefined : numValue,
-      },
-    };
-    onModelsChange(newModels);
-  };
-
-  return (
-    <>
-      {/* API Protocol Selector */}
-      <div className="space-y-2">
-        <FormLabel htmlFor="openclaw-api">
-          {t("openclaw.apiProtocol", {
-            defaultValue: "API 协议",
-          })}
-        </FormLabel>
-        <Select value={api} onValueChange={onApiChange}>
-          <SelectTrigger id="openclaw-api">
-            <SelectValue
-              placeholder={t("openclaw.selectProtocol", {
-                defaultValue: "选择 API 协议",
-              })}
-            />
-          </SelectTrigger>
-          <SelectContent>
-            {openclawApiProtocols.map((protocol) => (
-              <SelectItem key={protocol.value} value={protocol.value}>
-                {protocol.label}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-        <p className="text-xs text-muted-foreground">
-          {t("openclaw.apiProtocolHint", {
-            defaultValue:
-              "选择与供应商 API 兼容的协议类型。大多数供应商使用 OpenAI Completions 格式。",
-          })}
-        </p>
-      </div>
-
-      {/* Base URL */}
-      <div className="space-y-2">
-        <FormLabel htmlFor="openclaw-baseurl">
-          {t("openclaw.baseUrl", { defaultValue: "API 端点" })}
-        </FormLabel>
-        <Input
-          id="openclaw-baseurl"
-          value={baseUrl}
-          onChange={(e) => onBaseUrlChange(e.target.value)}
-          placeholder="https://api.example.com/v1"
-        />
-        <p className="text-xs text-muted-foreground">
-          {t("openclaw.baseUrlHint", {
-            defaultValue: "供应商的 API 端点地址。",
-          })}
-        </p>
-      </div>
-
-      {/* API Key */}
-      <ApiKeySection
-        value={apiKey}
-        onChange={onApiKeyChange}
-        category={category}
-        shouldShowLink={shouldShowApiKeyLink}
-        websiteUrl={websiteUrl}
-        isPartner={isPartner}
-        partnerPromotionKey={partnerPromotionKey}
-      />
-
-      {/* Models Editor */}
-      <div className="space-y-3">
-        <div className="flex items-center justify-between">
-          <FormLabel>
-            {t("openclaw.models", { defaultValue: "模型列表" })}
-          </FormLabel>
-          <Button
-            type="button"
-            variant="outline"
-            size="sm"
-            onClick={handleAddModel}
-            className="h-7 gap-1"
-          >
-            <Plus className="h-3.5 w-3.5" />
-            {t("openclaw.addModel", { defaultValue: "添加模型" })}
-          </Button>
-        </div>
-
-        {models.length === 0 ? (
-          <p className="text-sm text-muted-foreground py-2">
-            {t("openclaw.noModels", {
-              defaultValue: "暂无模型配置。点击添加模型来配置可用模型。",
-            })}
-          </p>
-        ) : (
-          <div className="space-y-4">
-            {models.map((model, index) => (
-              <div
-                key={modelKeys[index]}
-                className="p-3 border border-border/50 rounded-lg space-y-3"
-              >
-                {/* Model ID and Name row */}
-                <div className="flex items-center gap-2">
-                  <div className="flex-1 space-y-1">
-                    <label className="text-xs text-muted-foreground">
-                      {t("openclaw.modelId", { defaultValue: "模型 ID" })}
-                    </label>
-                    <Input
-                      value={model.id}
-                      onChange={(e) =>
-                        handleModelChange(index, "id", e.target.value)
-                      }
-                      placeholder={t("openclaw.modelIdPlaceholder", {
-                        defaultValue: "claude-3-sonnet",
-                      })}
-                    />
-                  </div>
-                  <div className="flex-1 space-y-1">
-                    <label className="text-xs text-muted-foreground">
-                      {t("openclaw.modelName", { defaultValue: "显示名称" })}
-                    </label>
-                    <Input
-                      value={model.name}
-                      onChange={(e) =>
-                        handleModelChange(index, "name", e.target.value)
-                      }
-                      placeholder={t("openclaw.modelNamePlaceholder", {
-                        defaultValue: "Claude 3 Sonnet",
-                      })}
-                    />
-                  </div>
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    size="icon"
-                    onClick={() => handleRemoveModel(index)}
-                    className="h-9 w-9 mt-5 text-muted-foreground hover:text-destructive"
-                  >
-                    <Trash2 className="h-4 w-4" />
-                  </Button>
-                </div>
-
-                {/* Advanced Options (Collapsible) */}
-                <Collapsible
-                  open={expandedModels[index] ?? false}
-                  onOpenChange={() => toggleModelAdvanced(index)}
-                >
-                  <CollapsibleTrigger asChild>
-                    <Button
-                      type="button"
-                      variant="ghost"
-                      size="sm"
-                      className="h-7 gap-1 text-xs text-muted-foreground hover:text-foreground"
-                    >
-                      {expandedModels[index] ? (
-                        <ChevronDown className="h-3.5 w-3.5" />
-                      ) : (
-                        <ChevronRight className="h-3.5 w-3.5" />
-                      )}
-                      {t("openclaw.advancedOptions", {
-                        defaultValue: "高级选项",
-                      })}
-                    </Button>
-                  </CollapsibleTrigger>
-                  <CollapsibleContent className="space-y-3 pt-2">
-                    {/* Context Window, Max Tokens and Reasoning row */}
-                    <div className="flex items-center gap-2">
-                      <div className="flex-1 space-y-1">
-                        <label className="text-xs text-muted-foreground">
-                          {t("openclaw.contextWindow", {
-                            defaultValue: "上下文窗口",
-                          })}
-                        </label>
-                        <Input
-                          type="number"
-                          value={model.contextWindow ?? ""}
-                          onChange={(e) =>
-                            handleModelChange(
-                              index,
-                              "contextWindow",
-                              e.target.value
-                                ? parseInt(e.target.value)
-                                : undefined,
-                            )
-                          }
-                          placeholder="200000"
-                        />
-                      </div>
-                      <div className="flex-1 space-y-1">
-                        <label className="text-xs text-muted-foreground">
-                          {t("openclaw.maxTokens", {
-                            defaultValue: "最大输出 Tokens",
-                          })}
-                        </label>
-                        <Input
-                          type="number"
-                          value={model.maxTokens ?? ""}
-                          onChange={(e) =>
-                            handleModelChange(
-                              index,
-                              "maxTokens",
-                              e.target.value
-                                ? parseInt(e.target.value)
-                                : undefined,
-                            )
-                          }
-                          placeholder="32000"
-                        />
-                      </div>
-                      <div className="flex-1 space-y-1">
-                        <label className="text-xs text-muted-foreground">
-                          {t("openclaw.reasoning", {
-                            defaultValue: "推理模式",
-                          })}
-                        </label>
-                        <div className="flex items-center h-9 gap-2">
-                          <Switch
-                            checked={model.reasoning ?? false}
-                            onCheckedChange={(checked) =>
-                              handleModelChange(index, "reasoning", checked)
-                            }
-                          />
-                          <span className="text-xs text-muted-foreground">
-                            {model.reasoning
-                              ? t("openclaw.reasoningOn", {
-                                  defaultValue: "启用",
-                                })
-                              : t("openclaw.reasoningOff", {
-                                  defaultValue: "关闭",
-                                })}
-                          </span>
-                        </div>
-                      </div>
-                    </div>
-
-                    {/* Cost row */}
-                    <div className="flex items-center gap-2">
-                      <div className="flex-1 space-y-1">
-                        <label className="text-xs text-muted-foreground">
-                          {t("openclaw.inputCost", {
-                            defaultValue: "输入价格 ($/M tokens)",
-                          })}
-                        </label>
-                        <Input
-                          type="number"
-                          step="0.001"
-                          value={model.cost?.input ?? ""}
-                          onChange={(e) =>
-                            handleCostChange(index, "input", e.target.value)
-                          }
-                          placeholder="3"
-                        />
-                      </div>
-                      <div className="flex-1 space-y-1">
-                        <label className="text-xs text-muted-foreground">
-                          {t("openclaw.outputCost", {
-                            defaultValue: "输出价格 ($/M tokens)",
-                          })}
-                        </label>
-                        <Input
-                          type="number"
-                          step="0.001"
-                          value={model.cost?.output ?? ""}
-                          onChange={(e) =>
-                            handleCostChange(index, "output", e.target.value)
-                          }
-                          placeholder="15"
-                        />
-                      </div>
-                      <div className="flex-1" />
-                    </div>
-
-                    {/* Cache Cost row */}
-                    <div className="flex items-center gap-2">
-                      <div className="flex-1 space-y-1">
-                        <label className="text-xs text-muted-foreground">
-                          {t("openclaw.cacheReadCost", {
-                            defaultValue: "缓存读取价格 ($/M tokens)",
-                          })}
-                        </label>
-                        <Input
-                          type="number"
-                          step="0.001"
-                          value={model.cost?.cacheRead ?? ""}
-                          onChange={(e) =>
-                            handleCostChange(index, "cacheRead", e.target.value)
-                          }
-                          placeholder="0.3"
-                        />
-                      </div>
-                      <div className="flex-1 space-y-1">
-                        <label className="text-xs text-muted-foreground">
-                          {t("openclaw.cacheWriteCost", {
-                            defaultValue: "缓存写入价格 ($/M tokens)",
-                          })}
-                        </label>
-                        <Input
-                          type="number"
-                          step="0.001"
-                          value={model.cost?.cacheWrite ?? ""}
-                          onChange={(e) =>
-                            handleCostChange(
-                              index,
-                              "cacheWrite",
-                              e.target.value,
-                            )
-                          }
-                          placeholder="3.75"
-                        />
-                      </div>
-                      <div className="flex-1" />
-                    </div>
-                    <p className="text-xs text-muted-foreground">
-                      {t("openclaw.cacheCostHint", {
-                        defaultValue:
-                          "缓存价格用于计算 Prompt Caching 的成本。如不使用缓存可留空。",
-                      })}
-                    </p>
-                  </CollapsibleContent>
-                </Collapsible>
-              </div>
-            ))}
-          </div>
-        )}
-
-        <p className="text-xs text-muted-foreground">
-          {t("openclaw.modelsHint", {
-            defaultValue:
-              "配置该供应商支持的模型。模型 ID 用于 API 调用，显示名称用于界面展示。",
-          })}
-        </p>
-      </div>
-    </>
-  );
-}
@@ -7,16 +7,16 @@ import { Button } from "@/components/ui/button";
 import { Form, FormField, FormItem, FormMessage } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { providerSchema, type ProviderFormData } from "@/lib/schemas/provider";
-import { providersApi, type AppId } from "@/lib/api";
+import { providersApi, configApi, type AppId } from "@/lib/api";
 import type {
  ProviderCategory,
  ProviderMeta,
  ProviderTestConfig,
  ProviderProxyConfig,
+  CommonConfigEnabledByApp,
  ClaudeApiFormat,
  OpenCodeModel,
  OpenCodeProviderConfig,
-  OpenClawModel,
 } from "@/types";
 import {
  providerPresets,
@@ -35,16 +35,16 @@ import {
  OPENCODE_PRESET_MODEL_VARIANTS,
  type OpenCodeProviderPreset,
 } from "@/config/opencodeProviderPresets";
-import {
-  openclawProviderPresets,
-  type OpenClawProviderPreset,
-  type OpenClawSuggestedDefaults,
-} from "@/config/openclawProviderPresets";
 import { OpenCodeFormFields } from "./OpenCodeFormFields";
-import { OpenClawFormFields } from "./OpenClawFormFields";
 import type { UniversalProviderPreset } from "@/config/universalProviderPresets";
 import { applyTemplateValues } from "@/utils/providerConfigUtils";
 import { mergeProviderMeta } from "@/utils/providerMetaUtils";
+import { extractDifference, isPlainObject } from "@/utils/configMerge";
+import { extractTomlDifference } from "@/utils/tomlConfigMerge";
+import {
+  parseGeminiCommonConfigSnippet,
+  mapGeminiWarningToI18n,
+} from "@/utils/providerConfigUtils";
 import { getCodexCustomTemplate } from "@/config/codexTemplates";
 import CodexConfigEditor from "./CodexConfigEditor";
 import { CommonConfigEditor } from "./CommonConfigEditor";
@@ -59,7 +59,6 @@ import { GeminiFormFields } from "./GeminiFormFields";
 import { OmoFormFields } from "./OmoFormFields";
 import { type OmoGlobalConfigFieldsRef } from "./OmoGlobalConfigFields";
 import { OmoCommonConfigEditor } from "./OmoCommonConfigEditor";
-import * as configApi from "@/lib/api/config";
 import type { OmoGlobalConfig } from "@/types/omo";
 import { mergeOmoConfigPreview, parseOmoOtherFieldsObject } from "@/types/omo";
 import {
@@ -74,16 +73,49 @@ import {
  useCodexConfigState,
  useApiKeyLink,
  useTemplateValues,
-  useCommonConfigSnippet,
  useCodexCommonConfig,
  useSpeedTestEndpoints,
  useCodexTomlValidation,
  useGeminiConfigState,
-  useGeminiCommonConfig,
 } from "./hooks";
+import { useCommonConfigBase } from "@/hooks/useCommonConfigBase";
+import {
+  claudeAdapter,
+  createGeminiAdapter,
+} from "@/hooks/commonConfigAdapters";
 import { useProvidersQuery } from "@/lib/query/queries";
 import { useOmoGlobalConfig } from "@/lib/query/omo";

+/**
+ * Parse Gemini common config snippet for difference extraction.
+ * Uses shared parser with non-strict forbidden keys (filter instead of reject).
+ *
+ * Supports three formats:
+ * - ENV format: KEY=VALUE lines (one per line)
+ * - Flat JSON: {"KEY": "VALUE", ...}
+ * - Wrapped JSON: {"env": {"KEY": "VALUE", ...}}
+ *
+ * Returns { env, warning } - caller should display warning via toast if present.
+ */
+function parseGeminiCommonConfig(snippet: string): {
+  env: Record<string, string>;
+  warning?: string;
+} {
+  const result = parseGeminiCommonConfigSnippet(snippet, {
+    strictForbiddenKeys: false, // Don't fail, just filter
+  });
+
+  if (result.error) {
+    console.warn(
+      "[ProviderForm] Gemini common config parse error:",
+      result.error,
+    );
+    return { env: {} };
+  }
+
+  return { env: result.env, warning: result.warning };
+}
+
 const CLAUDE_DEFAULT_CONFIG = JSON.stringify({ env: {} }, null, 2);
 const CODEX_DEFAULT_CONFIG = JSON.stringify({ auth: {}, config: "" }, null, 2);
 const GEMINI_DEFAULT_CONFIG = JSON.stringify(
@@ -179,25 +211,13 @@ function toOpencodeExtraOptions(
  return extra;
 }

-const OPENCLAW_DEFAULT_CONFIG = JSON.stringify(
-  {
-    baseUrl: "",
-    apiKey: "",
-    api: "openai-completions",
-    models: [],
-  },
-  null,
-  2,
-);
-
 type PresetEntry = {
  id: string;
  preset:
    | ProviderPreset
    | CodexProviderPreset
    | GeminiProviderPreset
-    | OpenCodeProviderPreset
-    | OpenClawProviderPreset;
+    | OpenCodeProviderPreset;
 };

 interface ProviderFormProps {
@@ -278,7 +298,6 @@ export function ProviderForm({
    category?: ProviderCategory;
    isPartner?: boolean;
    partnerPromotionKey?: string;
-    suggestedDefaults?: OpenClawSuggestedDefaults;
  } | null>(null);
  const [isEndpointModalOpen, setIsEndpointModalOpen] = useState(false);
  const [isCodexEndpointModalOpen, setIsCodexEndpointModalOpen] =
@@ -357,9 +376,7 @@ export function ProviderForm({
            ? GEMINI_DEFAULT_CONFIG
            : appId === "opencode"
              ? OPENCODE_DEFAULT_CONFIG
-              : appId === "openclaw"
-                ? OPENCLAW_DEFAULT_CONFIG
-                : CLAUDE_DEFAULT_CONFIG,
+              : CLAUDE_DEFAULT_CONFIG,
      icon: initialData?.icon ?? "",
      iconColor: initialData?.iconColor ?? "",
    }),
@@ -429,8 +446,12 @@ export function ProviderForm({
    resetCodexConfig,
  } = useCodexConfigState({ initialData });

-  const { configError: codexConfigError, debouncedValidate } =
-    useCodexTomlValidation();
+  // 使用 Codex TOML 校验 hook (仅 Codex 模式)
+  const {
+    configError: codexConfigError,
+    debouncedValidate,
+    validateToml,
+  } = useCodexTomlValidation();

  const handleCodexConfigChange = useCallback(
    (value: string) => {
@@ -486,11 +507,6 @@ export function ProviderForm({
        id: `opencode-${index}`,
        preset,
      }));
-    } else if (appId === "openclaw") {
-      return openclawProviderPresets.map<PresetEntry>((preset, index) => ({
-        id: `openclaw-${index}`,
-        preset,
-      }));
    }
    return providerPresets.map<PresetEntry>((preset, index) => ({
      id: `claude-${index}`,
@@ -511,6 +527,18 @@ export function ProviderForm({
    onConfigChange: (config) => form.setValue("settingsConfig", config),
  });

+  // 使用通用配置片段 hook (仅 Claude 模式)
+  // 直接使用 useCommonConfigBase + claudeAdapter
+  const claudeCommonConfig = useCommonConfigBase({
+    adapter: claudeAdapter,
+    inputValue: form.getValues("settingsConfig"),
+    onInputChange: (config) => form.setValue("settingsConfig", config),
+    initialData: appId === "claude" ? initialData : undefined,
+    selectedPresetId: selectedPresetId ?? undefined,
+    enabled: appId === "claude",
+  });
+
+  // 解构 Claude 通用配置
  const {
    useCommonConfig,
    commonConfigSnippet,
@@ -519,13 +547,11 @@ export function ProviderForm({
    handleCommonConfigSnippetChange,
    isExtracting: isClaudeExtracting,
    handleExtract: handleClaudeExtract,
-  } = useCommonConfigSnippet({
-    settingsConfig: form.getValues("settingsConfig"),
-    onConfigChange: (config) => form.setValue("settingsConfig", config),
-    initialData: appId === "claude" ? initialData : undefined,
-    selectedPresetId: selectedPresetId ?? undefined,
-    enabled: appId === "claude",
-  });
+    isLoading: isClaudeCommonConfigLoading,
+    finalValue: claudeFinalConfig,
+    getPendingCommonConfigSnippet: getPendingClaudeCommonConfigSnippet,
+    markCommonConfigSaved: markClaudeCommonConfigSaved,
+  } = claudeCommonConfig;

  const {
    useCommonConfig: useCodexCommonConfigFlag,
@@ -535,11 +561,16 @@ export function ProviderForm({
    handleCommonConfigSnippetChange: handleCodexCommonConfigSnippetChange,
    isExtracting: isCodexExtracting,
    handleExtract: handleCodexExtract,
+    isLoading: isCodexCommonConfigLoading,
+    finalConfig: codexFinalConfig,
+    getPendingCommonConfigSnippet: getPendingCodexCommonConfigSnippet,
+    markCommonConfigSaved: markCodexCommonConfigSaved,
  } = useCodexCommonConfig({
    codexConfig,
    onConfigChange: handleCodexConfigChange,
    initialData: appId === "codex" ? initialData : undefined,
    selectedPresetId: selectedPresetId ?? undefined,
+    currentProviderId: providerId,
  });

  const {
@@ -562,52 +593,76 @@ export function ProviderForm({
    initialData: appId === "gemini" ? initialData : undefined,
  });

-  const updateGeminiEnvField = useCallback(
-    (
-      key: "GEMINI_API_KEY" | "GOOGLE_GEMINI_BASE_URL" | "GEMINI_MODEL",
-      value: string,
-    ) => {
-      try {
-        const config = JSON.parse(form.getValues("settingsConfig") || "{}") as {
-          env?: Record<string, unknown>;
-        };
-        if (!config.env || typeof config.env !== "object") {
-          config.env = {};
-        }
-        config.env[key] = value;
-        form.setValue("settingsConfig", JSON.stringify(config, null, 2));
-      } catch {}
-    },
-    [form],
-  );
-
  const handleGeminiApiKeyChange = useCallback(
    (key: string) => {
      originalHandleGeminiApiKeyChange(key);
-      updateGeminiEnvField("GEMINI_API_KEY", key.trim());
+      // 同步更新 settingsConfig
+      let config: { env?: Record<string, unknown> };
+      try {
+        config = JSON.parse(form.getValues("settingsConfig") || "{}");
+      } catch {
+        // 解析失败时初始化为有效结构
+        config = { env: {} };
+      }
+      if (!config.env) config.env = {};
+      config.env.GEMINI_API_KEY = key.trim();
+      form.setValue("settingsConfig", JSON.stringify(config, null, 2));
    },
-    [originalHandleGeminiApiKeyChange, updateGeminiEnvField],
+    [originalHandleGeminiApiKeyChange, form],
  );

  const handleGeminiBaseUrlChange = useCallback(
    (url: string) => {
      originalHandleGeminiBaseUrlChange(url);
-      updateGeminiEnvField(
-        "GOOGLE_GEMINI_BASE_URL",
-        url.trim().replace(/\/+$/, ""),
-      );
+      // 同步更新 settingsConfig
+      let config: { env?: Record<string, unknown> };
+      try {
+        config = JSON.parse(form.getValues("settingsConfig") || "{}");
+      } catch {
+        // 解析失败时初始化为有效结构
+        config = { env: {} };
+      }
+      if (!config.env) config.env = {};
+      config.env.GOOGLE_GEMINI_BASE_URL = url.trim().replace(/\/+$/, "");
+      form.setValue("settingsConfig", JSON.stringify(config, null, 2));
    },
-    [originalHandleGeminiBaseUrlChange, updateGeminiEnvField],
+    [originalHandleGeminiBaseUrlChange, form],
  );

  const handleGeminiModelChange = useCallback(
    (model: string) => {
      originalHandleGeminiModelChange(model);
-      updateGeminiEnvField("GEMINI_MODEL", model.trim());
+      // 同步更新 settingsConfig
+      let config: { env?: Record<string, unknown> };
+      try {
+        config = JSON.parse(form.getValues("settingsConfig") || "{}");
+      } catch {
+        // 解析失败时初始化为有效结构
+        config = { env: {} };
+      }
+      if (!config.env) config.env = {};
+      config.env.GEMINI_MODEL = model.trim();
+      form.setValue("settingsConfig", JSON.stringify(config, null, 2));
    },
-    [originalHandleGeminiModelChange, updateGeminiEnvField],
+    [originalHandleGeminiModelChange, form],
  );

+  // 使用 Gemini 通用配置 hook (仅 Gemini 模式)
+  // 直接使用 useCommonConfigBase + createGeminiAdapter
+  const geminiAdapter = useMemo(
+    () => createGeminiAdapter({ envStringToObj, envObjToString }),
+    [envStringToObj, envObjToString],
+  );
+  const geminiCommonConfig = useCommonConfigBase({
+    adapter: geminiAdapter,
+    inputValue: geminiEnv,
+    onInputChange: handleGeminiEnvChange,
+    initialData: appId === "gemini" ? initialData : undefined,
+    selectedPresetId: selectedPresetId ?? undefined,
+    enabled: appId === "gemini",
+  });
+
+  // 解构 Gemini 通用配置
  const {
    useCommonConfig: useGeminiCommonConfigFlag,
    commonConfigSnippet: geminiCommonConfigSnippet,
@@ -616,14 +671,11 @@ export function ProviderForm({
    handleCommonConfigSnippetChange: handleGeminiCommonConfigSnippetChange,
    isExtracting: isGeminiExtracting,
    handleExtract: handleGeminiExtract,
-  } = useGeminiCommonConfig({
-    envValue: geminiEnv,
-    onEnvChange: handleGeminiEnvChange,
-    envStringToObj,
-    envObjToString,
-    initialData: appId === "gemini" ? initialData : undefined,
-    selectedPresetId: selectedPresetId ?? undefined,
-  });
+    isLoading: isGeminiCommonConfigLoading,
+    finalValue: geminiFinalEnv,
+    getPendingCommonConfigSnippet: getPendingGeminiCommonConfigSnippet,
+    markCommonConfigSaved: markGeminiCommonConfigSaved,
+  } = geminiCommonConfig;

  const { data: opencodeProvidersData } = useProvidersQuery("opencode");
  const existingOpencodeKeys = useMemo(() => {
@@ -873,24 +925,6 @@ export function ProviderForm({
    return providerId || "";
  });

-  // OpenClaw: query existing providers for duplicate key checking
-  const { data: openclawProvidersData } = useProvidersQuery("openclaw");
-  const existingOpenclawKeys = useMemo(() => {
-    if (!openclawProvidersData?.providers) return [];
-    // Exclude current provider ID when in edit mode
-    return Object.keys(openclawProvidersData.providers).filter(
-      (k) => k !== providerId,
-    );
-  }, [openclawProvidersData?.providers, providerId]);
-
-  // OpenClaw Provider Key state
-  const [openclawProviderKey, setOpenclawProviderKey] = useState<string>(() => {
-    if (appId !== "openclaw") return "";
-    // In edit mode, use the existing provider ID as the key
-    return providerId || "";
-  });
-
-  // OpenCode 配置状态
  const [opencodeNpm, setOpencodeNpm] = useState<string>(() => {
    if (appId !== "opencode") return OPENCODE_DEFAULT_NPM;
    return initialOpencodeConfig?.npm || OPENCODE_DEFAULT_NPM;
@@ -949,6 +983,13 @@ export function ProviderForm({

  const [isOmoConfigModalOpen, setIsOmoConfigModalOpen] = useState(false);
  const [useOmoCommonConfig, setUseOmoCommonConfig] = useState(() => {
+    const metaByApp = initialData?.meta?.commonConfigEnabledByApp;
+    const fromMeta =
+      metaByApp?.opencode ?? initialData?.meta?.commonConfigEnabled;
+    if (typeof fromMeta === "boolean") {
+      return fromMeta;
+    }
+    // Backward compatibility for old OMO data.
    const raw = initialOmoSettings?.useCommonConfig;
    return typeof raw === "boolean" ? raw : true;
  });
@@ -1032,127 +1073,20 @@ export function ProviderForm({
    setUseOmoCommonConfig(useCommonConfig);
  }, []);

-  // OpenClaw 配置状态
-  const [openclawBaseUrl, setOpenclawBaseUrl] = useState<string>(() => {
-    if (appId !== "openclaw") return "";
-    try {
-      const config = JSON.parse(
-        initialData?.settingsConfig
-          ? JSON.stringify(initialData.settingsConfig)
-          : OPENCLAW_DEFAULT_CONFIG,
-      );
-      return config.baseUrl || "";
-    } catch {
-      return "";
-    }
-  });
-
-  const [openclawApiKey, setOpenclawApiKey] = useState<string>(() => {
-    if (appId !== "openclaw") return "";
-    try {
-      const config = JSON.parse(
-        initialData?.settingsConfig
-          ? JSON.stringify(initialData.settingsConfig)
-          : OPENCLAW_DEFAULT_CONFIG,
-      );
-      return config.apiKey || "";
-    } catch {
-      return "";
-    }
-  });
-
-  const [openclawApi, setOpenclawApi] = useState<string>(() => {
-    if (appId !== "openclaw") return "openai-completions";
-    try {
-      const config = JSON.parse(
-        initialData?.settingsConfig
-          ? JSON.stringify(initialData.settingsConfig)
-          : OPENCLAW_DEFAULT_CONFIG,
-      );
-      return config.api || "openai-completions";
-    } catch {
-      return "openai-completions";
-    }
-  });
-
-  const [openclawModels, setOpenclawModels] = useState<OpenClawModel[]>(() => {
-    if (appId !== "openclaw") return [];
-    try {
-      const config = JSON.parse(
-        initialData?.settingsConfig
-          ? JSON.stringify(initialData.settingsConfig)
-          : OPENCLAW_DEFAULT_CONFIG,
-      );
-      return config.models || [];
-    } catch {
-      return [];
-    }
-  });
-
-  // OpenClaw handlers - sync state to form
-  const handleOpenclawBaseUrlChange = useCallback(
-    (baseUrl: string) => {
-      setOpenclawBaseUrl(baseUrl);
-      try {
-        const config = JSON.parse(
-          form.getValues("settingsConfig") || OPENCLAW_DEFAULT_CONFIG,
-        );
-        config.baseUrl = baseUrl.trim().replace(/\/+$/, "");
-        form.setValue("settingsConfig", JSON.stringify(config, null, 2));
-      } catch {
-        // ignore
-      }
-    },
-    [form],
-  );
-
-  const handleOpenclawApiKeyChange = useCallback(
-    (apiKey: string) => {
-      setOpenclawApiKey(apiKey);
-      try {
-        const config = JSON.parse(
-          form.getValues("settingsConfig") || OPENCLAW_DEFAULT_CONFIG,
-        );
-        config.apiKey = apiKey;
-        form.setValue("settingsConfig", JSON.stringify(config, null, 2));
-      } catch {
-        // ignore
-      }
-    },
-    [form],
-  );
-
-  const handleOpenclawApiChange = useCallback(
-    (api: string) => {
-      setOpenclawApi(api);
-      try {
-        const config = JSON.parse(
-          form.getValues("settingsConfig") || OPENCLAW_DEFAULT_CONFIG,
-        );
-        config.api = api;
-        form.setValue("settingsConfig", JSON.stringify(config, null, 2));
-      } catch {
-        // ignore
-      }
-    },
-    [form],
-  );
-
-  const handleOpenclawModelsChange = useCallback(
-    (models: OpenClawModel[]) => {
-      setOpenclawModels(models);
-      try {
-        const config = JSON.parse(
-          form.getValues("settingsConfig") || OPENCLAW_DEFAULT_CONFIG,
-        );
-        config.models = models;
-        form.setValue("settingsConfig", JSON.stringify(config, null, 2));
-      } catch {
-        // ignore
-      }
-    },
-    [form],
-  );
+  const supportsCommonConfig =
+    appId === "claude" ||
+    appId === "codex" ||
+    appId === "gemini" ||
+    isOmoCategory;
+  const commonConfigEnabled = supportsCommonConfig
+    ? appId === "claude"
+      ? useCommonConfig
+      : appId === "codex"
+        ? useCodexCommonConfigFlag
+        : appId === "gemini"
+          ? useGeminiCommonConfigFlag
+          : useOmoCommonConfig
+    : undefined;

  const updateOpencodeSettings = useCallback(
    (updater: (config: Record<string, any>) => void) => {
@@ -1238,7 +1172,63 @@ export function ProviderForm({

  const [isCommonConfigModalOpen, setIsCommonConfigModalOpen] = useState(false);

-  const handleSubmit = (values: ProviderFormData) => {
+  const handleSubmit = async (values: ProviderFormData) => {
+    // 检查通用配置是否仍在加载中
+    const isCommonConfigLoading =
+      (appId === "claude" && isClaudeCommonConfigLoading) ||
+      (appId === "codex" && isCodexCommonConfigLoading) ||
+      (appId === "gemini" && isGeminiCommonConfigLoading);
+    if (isCommonConfigLoading) {
+      toast.error(t("providerForm.commonConfigLoading"));
+      return;
+    }
+
+    const commonConfigErrorMessage =
+      appId === "claude" && useCommonConfig && commonConfigError
+        ? commonConfigError
+        : appId === "codex" &&
+            useCodexCommonConfigFlag &&
+            codexCommonConfigError
+          ? codexCommonConfigError
+          : appId === "gemini" &&
+              useGeminiCommonConfigFlag &&
+              geminiCommonConfigError
+            ? geminiCommonConfigError
+            : "";
+    if (commonConfigErrorMessage) {
+      toast.error(commonConfigErrorMessage);
+      return;
+    }
+
+    if (appId === "codex") {
+      if (codexAuthError) {
+        toast.error(codexAuthError);
+        return;
+      }
+      const isCodexConfigValid = validateToml(codexConfig);
+      if (!isCodexConfigValid) {
+        toast.error(
+          codexConfigError ||
+            t("mcp.error.tomlInvalid", {
+              defaultValue: "TOML 格式错误，请检查",
+            }),
+        );
+        return;
+      }
+    }
+
+    if (appId === "gemini") {
+      if (envError) {
+        toast.error(envError);
+        return;
+      }
+      if (geminiConfigError) {
+        toast.error(geminiConfigError);
+        return;
+      }
+    }
+
+    // 验证模板变量（仅 Claude 模式）
    if (appId === "claude" && templateValueEntries.length > 0) {
      const validation = validateTemplateValues();
      if (!validation.isValid && validation.missingField) {
@@ -1281,24 +1271,6 @@ export function ProviderForm({
      }
    }

-    // OpenClaw: validate provider key
-    if (appId === "openclaw") {
-      const keyPattern = /^[a-z0-9]+(-[a-z0-9]+)*$/;
-      if (!openclawProviderKey.trim()) {
-        toast.error(t("openclaw.providerKeyRequired"));
-        return;
-      }
-      if (!keyPattern.test(openclawProviderKey)) {
-        toast.error(t("openclaw.providerKeyInvalid"));
-        return;
-      }
-      if (!isEditMode && existingOpenclawKeys.includes(openclawProviderKey)) {
-        toast.error(t("openclaw.providerKeyDuplicate"));
-        return;
-      }
-    }
-
-    // 非官方供应商必填校验：端点和 API Key
    if (category !== "official") {
      if (appId === "claude") {
        if (!baseUrl.trim()) {
@@ -1354,14 +1326,56 @@ export function ProviderForm({
      }
    }

+    // 保存待保存的通用配置（延迟保存模式：在表单提交时统一保存）
+    try {
+      if (appId === "claude") {
+        const pendingSnippet = getPendingClaudeCommonConfigSnippet();
+        if (pendingSnippet !== null) {
+          await configApi.setCommonConfigSnippet("claude", pendingSnippet);
+          markClaudeCommonConfigSaved();
+        }
+      } else if (appId === "codex") {
+        const pendingSnippet = getPendingCodexCommonConfigSnippet();
+        if (pendingSnippet !== null) {
+          await configApi.setCommonConfigSnippet("codex", pendingSnippet);
+          markCodexCommonConfigSaved();
+        }
+      } else if (appId === "gemini") {
+        const pendingSnippet = getPendingGeminiCommonConfigSnippet();
+        if (pendingSnippet !== null) {
+          await configApi.setCommonConfigSnippet("gemini", pendingSnippet);
+          markGeminiCommonConfigSaved();
+        }
+      }
+    } catch (error) {
+      console.error("保存通用配置失败:", error);
+      toast.error(
+        t("providerForm.saveCommonConfigFailed", {
+          defaultValue: "保存通用配置失败",
+        }),
+      );
+      return;
+    }
+
    let settingsConfig: string;

    if (appId === "codex") {
      try {
        const authJson = JSON.parse(codexAuth);
+        // 如果启用了通用配置，只保存与通用配置不同的部分（自定义配置）
+        let configToSave = codexConfig ?? "";
+        if (useCodexCommonConfigFlag && codexCommonConfigSnippet.trim()) {
+          const { customToml, error } = extractTomlDifference(
+            codexConfig ?? "",
+            codexCommonConfigSnippet.trim(),
+          );
+          if (!error) {
+            configToSave = customToml;
+          }
+        }
        const configObj = {
          auth: authJson,
-          config: codexConfig ?? "",
+          config: configToSave,
        };
        settingsConfig = JSON.stringify(configObj);
      } catch (err) {
@@ -1369,8 +1383,29 @@ export function ProviderForm({
      }
    } else if (appId === "gemini") {
      try {
-        const envObj = envStringToObj(geminiEnv);
+        let envObj = envStringToObj(geminiEnv);
        const configObj = geminiConfig.trim() ? JSON.parse(geminiConfig) : {};
+        // 如果启用了通用配置，只保存与通用配置不同的部分（自定义配置）
+        if (useGeminiCommonConfigFlag && geminiCommonConfigSnippet.trim()) {
+          // Parse common config snippet (supports ENV/Flat JSON/Wrapped JSON formats)
+          // Uses parseGeminiCommonConfigSnippet for unified parsing
+          const { env: commonEnvObj, warning } = parseGeminiCommonConfig(
+            geminiCommonConfigSnippet.trim(),
+          );
+          // Show warning toast if keys were filtered
+          if (warning) {
+            toast.warning(mapGeminiWarningToI18n(warning, t));
+          }
+          if (isPlainObject(envObj) && isPlainObject(commonEnvObj)) {
+            const { customConfig } = extractDifference(envObj, commonEnvObj);
+            // Convert to string record with type guard to avoid type assertion issues
+            const stringEnvObj: Record<string, string> = {};
+            for (const [key, value] of Object.entries(customConfig)) {
+              stringEnvObj[key] = String(value);
+            }
+            envObj = stringEnvObj;
+          }
+        }
        const combined = {
          env: envObj,
          config: configObj,
@@ -1381,7 +1416,6 @@ export function ProviderForm({
      }
    } else if (appId === "opencode" && category === "omo") {
      const omoConfig: Record<string, unknown> = {};
-      omoConfig.useCommonConfig = useOmoCommonConfig;
      if (Object.keys(omoAgents).length > 0) {
        omoConfig.agents = omoAgents;
      }
@@ -1414,7 +1448,28 @@ export function ProviderForm({
      }
      settingsConfig = JSON.stringify(omoConfig);
    } else {
-      settingsConfig = values.settingsConfig.trim();
+      // Claude: 使用表单配置
+      // 如果启用了通用配置，只保存与通用配置不同的部分（自定义配置）
+      if (useCommonConfig && commonConfigSnippet.trim()) {
+        try {
+          const currentConfig = JSON.parse(values.settingsConfig.trim());
+          const commonConfig = JSON.parse(commonConfigSnippet.trim());
+          if (isPlainObject(currentConfig) && isPlainObject(commonConfig)) {
+            const { customConfig } = extractDifference(
+              currentConfig,
+              commonConfig,
+            );
+            settingsConfig = JSON.stringify(customConfig, null, 2);
+          } else {
+            settingsConfig = values.settingsConfig.trim();
+          }
+        } catch {
+          // 如果解析失败，使用原始配置
+          settingsConfig = values.settingsConfig.trim();
+        }
+      } else {
+        settingsConfig = values.settingsConfig.trim();
+      }
    }

    const payload: ProviderFormValues = {
@@ -1432,8 +1487,6 @@ export function ProviderForm({
      } else {
        payload.providerKey = opencodeProviderKey;
      }
-    } else if (appId === "openclaw") {
-      payload.providerKey = openclawProviderKey;
    }

    if (category === "omo" && !payload.presetCategory) {
@@ -1448,10 +1501,6 @@ export function ProviderForm({
      if (activePreset.isPartner) {
        payload.isPartner = activePreset.isPartner;
      }
-      // OpenClaw: 传递预设的 suggestedDefaults 到提交数据
-      if (activePreset.suggestedDefaults) {
-        payload.suggestedDefaults = activePreset.suggestedDefaults;
-      }
    }

    if (!isEditMode && draftCustomEndpoints.length > 0) {
@@ -1498,6 +1547,16 @@ export function ProviderForm({

    const baseMeta: ProviderMeta | undefined =
      payload.meta ?? (initialData?.meta ? { ...initialData.meta } : undefined);
+    const existingCommonConfigEnabledByApp = baseMeta?.commonConfigEnabledByApp;
+    const commonConfigEnabledByApp = supportsCommonConfig
+      ? ({
+          ...(existingCommonConfigEnabledByApp ?? {}),
+          [appId]: commonConfigEnabled ?? false,
+        } as CommonConfigEnabledByApp)
+      : existingCommonConfigEnabledByApp;
+    const shouldPersistCommonConfigEnabledByApp =
+      supportsCommonConfig || existingCommonConfigEnabledByApp !== undefined;
+
    payload.meta = {
      ...(baseMeta ?? {}),
      endpointAutoSelect,
@@ -1510,6 +1569,10 @@ export function ProviderForm({
        pricingConfig.enabled && pricingConfig.pricingModelSource !== "inherit"
          ? pricingConfig.pricingModelSource
          : undefined,
+      ...(shouldPersistCommonConfigEnabledByApp
+        ? { commonConfigEnabledByApp }
+        : {}),
+      // Claude API 格式（仅非官方 Claude 供应商使用）
      apiFormat:
        appId === "claude" && category !== "official"
          ? localApiFormat
@@ -1590,21 +1653,6 @@ export function ProviderForm({
    formWebsiteUrl: form.watch("websiteUrl") || "",
  });

-  // 使用 API Key 链接 hook (OpenClaw)
-  const {
-    shouldShowApiKeyLink: shouldShowOpenclawApiKeyLink,
-    websiteUrl: openclawWebsiteUrl,
-    isPartner: isOpenclawPartner,
-    partnerPromotionKey: openclawPartnerPromotionKey,
-  } = useApiKeyLink({
-    appId: "openclaw",
-    category,
-    selectedPresetId,
-    presetEntries,
-    formWebsiteUrl: form.watch("websiteUrl") || "",
-  });
-
-  // 使用端点测速候选 hook
  const speedTestEndpoints = useSpeedTestEndpoints({
    appId,
    selectedPresetId,
@@ -1636,14 +1684,6 @@ export function ProviderForm({
        setOpencodeExtraOptions({});
        resetOmoDraftState();
      }
-      // OpenClaw 自定义模式：重置为空配置
-      if (appId === "openclaw") {
-        setOpenclawProviderKey("");
-        setOpenclawBaseUrl("");
-        setOpenclawApiKey("");
-        setOpenclawApi("openai-completions");
-        setOpenclawModels([]);
-      }
      return;
    }

@@ -1727,40 +1767,6 @@ export function ProviderForm({
      return;
    }

-    // OpenClaw preset handling
-    if (appId === "openclaw") {
-      const preset = entry.preset as OpenClawProviderPreset;
-      const config = preset.settingsConfig;
-
-      // Update activePreset with suggestedDefaults for OpenClaw
-      setActivePreset({
-        id: value,
-        category: preset.category,
-        isPartner: preset.isPartner,
-        partnerPromotionKey: preset.partnerPromotionKey,
-        suggestedDefaults: preset.suggestedDefaults,
-      });
-
-      // Clear provider key (user must enter their own unique key)
-      setOpenclawProviderKey("");
-
-      // Update OpenClaw-specific states
-      setOpenclawBaseUrl(config.baseUrl || "");
-      setOpenclawApiKey(config.apiKey || "");
-      setOpenclawApi(config.api || "openai-completions");
-      setOpenclawModels(config.models || []);
-
-      // Update form fields
-      form.reset({
-        name: preset.name,
-        websiteUrl: preset.websiteUrl ?? "",
-        settingsConfig: JSON.stringify(config, null, 2),
-        icon: preset.icon ?? "",
-        iconColor: preset.iconColor ?? "",
-      });
-      return;
-    }
-
    const preset = entry.preset as ProviderPreset;
    const config = applyTemplateValues(
      preset.settingsConfig,
@@ -1865,54 +1871,6 @@ export function ProviderForm({
                    </p>
                  )}
              </div>
-            ) : appId === "openclaw" ? (
-              <div className="space-y-2">
-                <Label htmlFor="openclaw-key">
-                  {t("openclaw.providerKey")}
-                  <span className="text-destructive ml-1">*</span>
-                </Label>
-                <Input
-                  id="openclaw-key"
-                  value={openclawProviderKey}
-                  onChange={(e) =>
-                    setOpenclawProviderKey(
-                      e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, ""),
-                    )
-                  }
-                  placeholder={t("openclaw.providerKeyPlaceholder")}
-                  disabled={isEditMode}
-                  className={
-                    (existingOpenclawKeys.includes(openclawProviderKey) &&
-                      !isEditMode) ||
-                    (openclawProviderKey.trim() !== "" &&
-                      !/^[a-z0-9]+(-[a-z0-9]+)*$/.test(openclawProviderKey))
-                      ? "border-destructive"
-                      : ""
-                  }
-                />
-                {existingOpenclawKeys.includes(openclawProviderKey) &&
-                  !isEditMode && (
-                    <p className="text-xs text-destructive">
-                      {t("openclaw.providerKeyDuplicate")}
-                    </p>
-                  )}
-                {openclawProviderKey.trim() !== "" &&
-                  !/^[a-z0-9]+(-[a-z0-9]+)*$/.test(openclawProviderKey) && (
-                    <p className="text-xs text-destructive">
-                      {t("openclaw.providerKeyInvalid")}
-                    </p>
-                  )}
-                {!(
-                  existingOpenclawKeys.includes(openclawProviderKey) &&
-                  !isEditMode
-                ) &&
-                  (openclawProviderKey.trim() === "" ||
-                    /^[a-z0-9]+(-[a-z0-9]+)*$/.test(openclawProviderKey)) && (
-                    <p className="text-xs text-muted-foreground">
-                      {t("openclaw.providerKeyHint")}
-                    </p>
-                  )}
-              </div>
            ) : undefined
          }
        />
@@ -2048,26 +2006,6 @@ export function ProviderForm({
          />
        )}

-        {/* OpenClaw 专属字段 */}
-        {appId === "openclaw" && (
-          <OpenClawFormFields
-            baseUrl={openclawBaseUrl}
-            onBaseUrlChange={handleOpenclawBaseUrlChange}
-            apiKey={openclawApiKey}
-            onApiKeyChange={handleOpenclawApiKeyChange}
-            category={category}
-            shouldShowApiKeyLink={shouldShowOpenclawApiKeyLink}
-            websiteUrl={openclawWebsiteUrl}
-            isPartner={isOpenclawPartner}
-            partnerPromotionKey={openclawPartnerPromotionKey}
-            api={openclawApi}
-            onApiChange={handleOpenclawApiChange}
-            models={openclawModels}
-            onModelsChange={handleOpenclawModelsChange}
-          />
-        )}
-
-        {/* 配置编辑器：Codex、Claude、Gemini 分别使用不同的编辑器 */}
        {appId === "codex" ? (
          <>
            <CodexConfigEditor
@@ -2084,6 +2022,7 @@ export function ProviderForm({
              configError={codexConfigError}
              onExtract={handleCodexExtract}
              isExtracting={isCodexExtracting}
+              finalConfig={codexFinalConfig}
            />
            {settingsConfigErrorField}
          </>
@@ -2105,6 +2044,7 @@ export function ProviderForm({
              configError={geminiConfigError}
              onExtract={handleGeminiExtract}
              isExtracting={isGeminiExtracting}
+              finalEnv={envObjToString(geminiFinalEnv)}
            />
            {settingsConfigErrorField}
          </>
@@ -2144,34 +2084,6 @@ export function ProviderForm({
            </div>
            {settingsConfigErrorField}
          </>
-        ) : appId === "openclaw" ? (
-          <>
-            <div className="space-y-2">
-              <Label htmlFor="settingsConfig">{t("provider.configJson")}</Label>
-              <JsonEditor
-                value={form.getValues("settingsConfig")}
-                onChange={(config) => form.setValue("settingsConfig", config)}
-                placeholder={`{
-  "baseUrl": "https://api.example.com/v1",
-  "apiKey": "your-api-key-here",
-  "api": "openai-completions",
-  "models": []
-}`}
-                rows={14}
-                showValidation={true}
-                language="json"
-              />
-            </div>
-            <FormField
-              control={form.control}
-              name="settingsConfig"
-              render={() => (
-                <FormItem className="space-y-0">
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          </>
        ) : (
          <>
            <CommonConfigEditor
@@ -2187,6 +2099,7 @@ export function ProviderForm({
              onModalClose={() => setIsCommonConfigModalOpen(false)}
              onExtract={handleClaudeExtract}
              isExtracting={isClaudeExtracting}
+              finalConfig={claudeFinalConfig}
            />
            {settingsConfigErrorField}
          </>
@@ -2221,6 +2134,5 @@ export type ProviderFormValues = ProviderFormData & {
  presetCategory?: ProviderCategory;
  isPartner?: boolean;
  meta?: ProviderMeta;
-  providerKey?: string; // OpenCode/OpenClaw: user-defined provider key
-  suggestedDefaults?: OpenClawSuggestedDefaults; // OpenClaw: suggested default model configuration
+  providerKey?: string;
 };
@@ -6,9 +6,9 @@ export { useCodexConfigState } from "./useCodexConfigState";
 export { useApiKeyLink } from "./useApiKeyLink";
 export { useCustomEndpoints } from "./useCustomEndpoints";
 export { useTemplateValues } from "./useTemplateValues";
-export { useCommonConfigSnippet } from "./useCommonConfigSnippet";
-export { useCodexCommonConfig } from "./useCodexCommonConfig";
 export { useSpeedTestEndpoints } from "./useSpeedTestEndpoints";
 export { useCodexTomlValidation } from "./useCodexTomlValidation";
 export { useGeminiConfigState } from "./useGeminiConfigState";
-export { useGeminiCommonConfig } from "./useGeminiCommonConfig";
+
+// Common Config Hooks
+export { useCodexCommonConfig } from "./useCodexCommonConfig";
@@ -4,10 +4,9 @@ import {
  setCodexBaseUrl as setCodexBaseUrlInConfig,
 } from "@/utils/providerConfigUtils";
 import type { ProviderCategory } from "@/types";
-import type { AppId } from "@/lib/api";

 interface UseBaseUrlStateProps {
-  appType: AppId;
+  appType: "claude" | "codex" | "gemini" | "opencode";
  category: ProviderCategory | undefined;
  settingsConfig: string;
  codexConfig?: string;
@@ -1,308 +1,195 @@
-import { useState, useEffect, useCallback, useRef } from "react";
+import { useState, useCallback } from "react";
 import { useTranslation } from "react-i18next";
-import {
-  updateTomlCommonConfigSnippet,
-  hasTomlCommonConfigSnippet,
-} from "@/utils/providerConfigUtils";
+import { toast } from "sonner";
 import { configApi } from "@/lib/api";
-
-const LEGACY_STORAGE_KEY = "cc-switch:codex-common-config-snippet";
-const DEFAULT_CODEX_COMMON_CONFIG_SNIPPET = `# Common Codex config
-# Add your common TOML configuration here`;
+import {
+  useCommonConfigBase,
+  type UseCommonConfigBaseReturn,
+} from "@/hooks/useCommonConfigBase";
+import {
+  codexAdapter,
+  preserveCodexConfigFormat,
+} from "@/hooks/commonConfigAdapters";
+import { extractTomlDifference } from "@/utils/tomlConfigMerge";
+import type { ProviderMeta } from "@/types";

 interface UseCodexCommonConfigProps {
+  /**
+   * 当前 Codex 配置（可能是纯 TOML 或 JSON wrapper 格式）
+   */
  codexConfig: string;
+  /**
+   * 配置变化回调
+   */
  onConfigChange: (config: string) => void;
+  /**
+   * 初始数据（编辑模式）
+   */
  initialData?: {
    settingsConfig?: Record<string, unknown>;
+    meta?: ProviderMeta;
  };
+  /**
+   * 当前选中的预设 ID
+   */
  selectedPresetId?: string;
+  /**
+   * 当前正在编辑的供应商 ID
+   */
+  currentProviderId?: string;
+}
+
+export interface UseCodexCommonConfigReturn {
+  /** 是否启用通用配置 */
+  useCommonConfig: boolean;
+  /** 通用配置片段 (TOML 格式) */
+  commonConfigSnippet: string;
+  /** 通用配置错误信息 */
+  commonConfigError: string;
+  /** 是否正在加载 */
+  isLoading: boolean;
+  /** 是否正在提取 */
+  isExtracting: boolean;
+  /** 通用配置开关处理函数 */
+  handleCommonConfigToggle: (checked: boolean) => void;
+  /** 通用配置片段变化处理函数 */
+  handleCommonConfigSnippetChange: (snippet: string) => void;
+  /** 从当前配置提取通用配置 */
+  handleExtract: () => Promise<void>;
+  /** 最终配置（运行时合并结果，只读） */
+  finalConfig: string;
+  /** 是否有待保存的通用配置变更 */
+  hasUnsavedCommonConfig: boolean;
+  /** 获取待保存的通用配置片段（用于 handleSubmit） */
+  getPendingCommonConfigSnippet: () => string | null;
+  /** 标记通用配置已保存 */
+  markCommonConfigSaved: () => void;
 }

 /**
- * 管理 Codex 通用配置片段 (TOML 格式)
- * 从 config.json 读取和保存，支持从 localStorage 平滑迁移
+ * 管理 Codex 通用配置片段
+ *
+ * 基于 useCommonConfigBase 泛型 Hook + Codex TOML 适配器实现。
+ * 额外处理 Codex 双格式（纯 TOML / JSON wrapper）的写回逻辑。
 */
 export function useCodexCommonConfig({
  codexConfig,
  onConfigChange,
  initialData,
  selectedPresetId,
-}: UseCodexCommonConfigProps) {
+}: UseCodexCommonConfigProps): UseCodexCommonConfigReturn {
  const { t } = useTranslation();
-  const [useCommonConfig, setUseCommonConfig] = useState(false);
-  const [commonConfigSnippet, setCommonConfigSnippetState] = useState<string>(
-    DEFAULT_CODEX_COMMON_CONFIG_SNIPPET,
-  );
-  const [commonConfigError, setCommonConfigError] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
-  const [isExtracting, setIsExtracting] = useState(false);

-  // 用于跟踪是否正在通过通用配置更新
-  const isUpdatingFromCommonConfig = useRef(false);
-  // 用于跟踪新建模式是否已初始化默认勾选
-  const hasInitializedNewMode = useRef(false);
+  // 额外的 isExtracting 状态（base hook 的 handleExtract 不适用于 Codex）
+  const [localIsExtracting, setLocalIsExtracting] = useState(false);
+  const [localExtractError, setLocalExtractError] = useState("");

-  // 当预设变化时，重置初始化标记，使新预设能够重新触发初始化逻辑
-  useEffect(() => {
-    hasInitializedNewMode.current = false;
-  }, [selectedPresetId]);
-
-  // 初始化：从 config.json 加载，支持从 localStorage 迁移
-  useEffect(() => {
-    let mounted = true;
-
-    const loadSnippet = async () => {
-      try {
-        // 使用统一 API 加载
-        const snippet = await configApi.getCommonConfigSnippet("codex");
-
-        if (snippet && snippet.trim()) {
-          if (mounted) {
-            setCommonConfigSnippetState(snippet);
-          }
-        } else {
-          // 如果 config.json 中没有，尝试从 localStorage 迁移
-          if (typeof window !== "undefined") {
-            try {
-              const legacySnippet =
-                window.localStorage.getItem(LEGACY_STORAGE_KEY);
-              if (legacySnippet && legacySnippet.trim()) {
-                // 迁移到 config.json
-                await configApi.setCommonConfigSnippet("codex", legacySnippet);
-                if (mounted) {
-                  setCommonConfigSnippetState(legacySnippet);
-                }
-                // 清理 localStorage
-                window.localStorage.removeItem(LEGACY_STORAGE_KEY);
-                console.log(
-                  "[迁移] Codex 通用配置已从 localStorage 迁移到 config.json",
-                );
-              }
-            } catch (e) {
-              console.warn("[迁移] 从 localStorage 迁移失败:", e);
-            }
-          }
-        }
-      } catch (error) {
-        console.error("加载 Codex 通用配置失败:", error);
-      } finally {
-        if (mounted) {
-          setIsLoading(false);
-        }
-      }
-    };
-
-    loadSnippet();
-
-    return () => {
-      mounted = false;
-    };
-  }, []);
-
-  // 初始化时检查通用配置片段（编辑模式）
-  useEffect(() => {
-    if (initialData?.settingsConfig && !isLoading) {
-      const config =
-        typeof initialData.settingsConfig.config === "string"
-          ? initialData.settingsConfig.config
-          : "";
-      const hasCommon = hasTomlCommonConfigSnippet(config, commonConfigSnippet);
-      setUseCommonConfig(hasCommon);
-    }
-  }, [initialData, commonConfigSnippet, isLoading]);
-
-  // 新建模式：如果通用配置片段存在且有效，默认启用
-  useEffect(() => {
-    // 仅新建模式、加载完成、尚未初始化过
-    if (!initialData && !isLoading && !hasInitializedNewMode.current) {
-      hasInitializedNewMode.current = true;
-
-      // 检查 TOML 片段是否有实质内容（不只是注释和空行）
-      const lines = commonConfigSnippet.split("\n");
-      const hasContent = lines.some((line) => {
-        const trimmed = line.trim();
-        return trimmed && !trimmed.startsWith("#");
-      });
-
-      if (hasContent) {
-        setUseCommonConfig(true);
-        // 合并通用配置到当前配置
-        const { updatedConfig, error } = updateTomlCommonConfigSnippet(
-          codexConfig,
-          commonConfigSnippet,
-          true,
-        );
-        if (!error) {
-          isUpdatingFromCommonConfig.current = true;
-          onConfigChange(updatedConfig);
-          setTimeout(() => {
-            isUpdatingFromCommonConfig.current = false;
-          }, 0);
-        }
-      }
-    }
-  }, [
+  const base: UseCommonConfigBaseReturn<string> = useCommonConfigBase({
+    adapter: codexAdapter,
+    inputValue: codexConfig,
+    onInputChange: onConfigChange,
    initialData,
-    commonConfigSnippet,
-    isLoading,
-    codexConfig,
-    onConfigChange,
-  ]);
+    selectedPresetId,
+  });

-  // 处理通用配置开关
-  const handleCommonConfigToggle = useCallback(
-    (checked: boolean) => {
-      const { updatedConfig, error: snippetError } =
-        updateTomlCommonConfigSnippet(
-          codexConfig,
-          commonConfigSnippet,
-          checked,
-        );
-
-      if (snippetError) {
-        setCommonConfigError(snippetError);
-        setUseCommonConfig(false);
-        return;
-      }
-
-      setCommonConfigError("");
-      setUseCommonConfig(checked);
-      // 标记正在通过通用配置更新
-      isUpdatingFromCommonConfig.current = true;
-      onConfigChange(updatedConfig);
-      // 在下一个事件循环中重置标记
-      setTimeout(() => {
-        isUpdatingFromCommonConfig.current = false;
-      }, 0);
-    },
-    [codexConfig, commonConfigSnippet, onConfigChange],
-  );
-
-  // 处理通用配置片段变化
-  const handleCommonConfigSnippetChange = useCallback(
-    (value: string) => {
-      const previousSnippet = commonConfigSnippet;
-      setCommonConfigSnippetState(value);
-
-      if (!value.trim()) {
-        setCommonConfigError("");
-        // 保存到 config.json（清空）
-        configApi.setCommonConfigSnippet("codex", "").catch((error) => {
-          console.error("保存 Codex 通用配置失败:", error);
-          setCommonConfigError(
-            t("codexConfig.saveFailed", { error: String(error) }),
-          );
-        });
-
-        if (useCommonConfig) {
-          const { updatedConfig } = updateTomlCommonConfigSnippet(
-            codexConfig,
-            previousSnippet,
-            false,
-          );
-          onConfigChange(updatedConfig);
-          setUseCommonConfig(false);
-        }
-        return;
-      }
-
-      // TOML 格式校验较为复杂，暂时不做校验，直接清空错误
-      setCommonConfigError("");
-      // 保存到 config.json
-      configApi.setCommonConfigSnippet("codex", value).catch((error) => {
-        console.error("保存 Codex 通用配置失败:", error);
-        setCommonConfigError(
-          t("codexConfig.saveFailed", { error: String(error) }),
-        );
-      });
-
-      // 若当前启用通用配置，需要替换为最新片段
-      if (useCommonConfig) {
-        const removeResult = updateTomlCommonConfigSnippet(
-          codexConfig,
-          previousSnippet,
-          false,
-        );
-        if (removeResult.error) {
-          setCommonConfigError(removeResult.error);
-          return;
-        }
-        const addResult = updateTomlCommonConfigSnippet(
-          removeResult.updatedConfig,
-          value,
-          true,
-        );
-
-        if (addResult.error) {
-          setCommonConfigError(addResult.error);
-          return;
-        }
-
-        // 标记正在通过通用配置更新，避免触发状态检查
-        isUpdatingFromCommonConfig.current = true;
-        onConfigChange(addResult.updatedConfig);
-        // 在下一个事件循环中重置标记
-        setTimeout(() => {
-          isUpdatingFromCommonConfig.current = false;
-        }, 0);
-      }
-    },
-    [commonConfigSnippet, codexConfig, useCommonConfig, onConfigChange],
-  );
-
-  // 当配置变化时检查是否包含通用配置（但避免在通过通用配置更新时检查）
-  useEffect(() => {
-    if (isUpdatingFromCommonConfig.current || isLoading) {
-      return;
-    }
-    const hasCommon = hasTomlCommonConfigSnippet(
-      codexConfig,
-      commonConfigSnippet,
-    );
-    setUseCommonConfig(hasCommon);
-  }, [codexConfig, commonConfigSnippet, isLoading]);
-
-  // 从编辑器当前内容提取通用配置片段
+  // Codex 自定义 handleExtract：处理双格式写回 + 状态管理
  const handleExtract = useCallback(async () => {
-    setIsExtracting(true);
-    setCommonConfigError("");
+    setLocalIsExtracting(true);
+    setLocalExtractError("");

    try {
-      const extracted = await configApi.extractCommonConfigSnippet("codex", {
-        settingsConfig: JSON.stringify({
-          config: codexConfig ?? "",
-        }),
-      });
+      const request = codexAdapter.buildExtractRequest(base.finalValue);
+      const extracted = await configApi.extractCommonConfigSnippet(
+        "codex",
+        request,
+      );

      if (!extracted || !extracted.trim()) {
-        setCommonConfigError(t("codexConfig.extractNoCommonConfig"));
+        setLocalExtractError(t("codexConfig.extractNoCommonConfig"));
        return;
      }

-      // 更新片段状态
-      setCommonConfigSnippetState(extracted);
+      // 验证 TOML 格式
+      const parseResult = codexAdapter.parseSnippet(extracted);
+      if (parseResult.error || parseResult.config === null) {
+        setLocalExtractError(
+          t("codexConfig.extractedTomlInvalid", {
+            defaultValue: "提取的配置 TOML 格式错误",
+          }),
+        );
+        return;
+      }

-      // 保存到后端
-      await configApi.setCommonConfigSnippet("codex", extracted);
+      // 从 config 中移除与 extracted 相同的部分
+      const customToml = codexAdapter.parseInput(codexConfig);
+      const diffResult = extractTomlDifference(customToml, extracted);
+
+      if (diffResult.error) {
+        // 差异提取失败，显示错误而不是静默吞掉
+        setLocalExtractError(
+          t("codexConfig.extractDiffFailed", {
+            error: diffResult.error,
+            defaultValue: `差异提取失败: ${diffResult.error}`,
+          }),
+        );
+        return;
+      }
+
+      // 更新 snippet 状态（在差异提取成功后再更新，避免状态不一致）
+      base.handleCommonConfigSnippetChange(extracted);
+
+      // 使用共享的格式保留函数写回
+      const preserveResult = preserveCodexConfigFormat(
+        codexConfig,
+        diffResult.customToml,
+      );
+
+      if (preserveResult.error) {
+        // 格式保留失败，显示错误
+        setLocalExtractError(
+          t("codexConfig.preserveFormatFailed", {
+            error: preserveResult.error,
+            defaultValue: `配置格式保留失败: ${preserveResult.error}`,
+          }),
+        );
+        return;
+      }
+
+      onConfigChange(preserveResult.config);
+
+      toast.success(
+        t("codexConfig.extractSuccessNeedSave", {
+          defaultValue: "已提取通用配置，点击保存按钮完成保存",
+        }),
+      );
    } catch (error) {
      console.error("提取 Codex 通用配置失败:", error);
-      setCommonConfigError(
-        t("codexConfig.extractFailed", { error: String(error) }),
+      setLocalExtractError(
+        t("codexConfig.extractFailed", {
+          error: String(error),
+          defaultValue: "提取失败",
+        }),
      );
    } finally {
-      setIsExtracting(false);
+      setLocalIsExtracting(false);
    }
-  }, [codexConfig, t]);
+  }, [base, codexConfig, onConfigChange, t]);
+
+  // 合并 error：优先显示 extract 错误，其次是 base 的错误
+  const combinedError = localExtractError || base.commonConfigError;

  return {
-    useCommonConfig,
-    commonConfigSnippet,
-    commonConfigError,
-    isLoading,
-    isExtracting,
-    handleCommonConfigToggle,
-    handleCommonConfigSnippetChange,
+    useCommonConfig: base.useCommonConfig,
+    commonConfigSnippet: base.commonConfigSnippet,
+    commonConfigError: combinedError,
+    isLoading: base.isLoading,
+    isExtracting: localIsExtracting,
+    handleCommonConfigToggle: base.handleCommonConfigToggle,
+    handleCommonConfigSnippetChange: base.handleCommonConfigSnippetChange,
    handleExtract,
+    finalConfig: base.finalValue,
+    hasUnsavedCommonConfig: base.hasUnsavedCommonConfig,
+    getPendingCommonConfigSnippet: base.getPendingCommonConfigSnippet,
+    markCommonConfigSaved: base.markCommonConfigSaved,
  };
 }
@@ -1,4 +1,5 @@
 import { useState, useCallback, useEffect, useRef } from "react";
+import { useTranslation } from "react-i18next";
 import {
  extractCodexBaseUrl,
  setCodexBaseUrl as setCodexBaseUrlInConfig,
@@ -18,6 +19,7 @@ interface UseCodexConfigStateProps {
 * Codex 配置包含两部分：auth.json (JSON) 和 config.toml (TOML 字符串)
 */
 export function useCodexConfigState({ initialData }: UseCodexConfigStateProps) {
+  const { t } = useTranslation();
  const [codexAuth, setCodexAuthState] = useState("");
  const [codexConfig, setCodexConfigState] = useState("");
  const [codexApiKey, setCodexApiKey] = useState("");
@@ -109,18 +111,21 @@ export function useCodexConfigState({ initialData }: UseCodexConfigStateProps) {
  }, [codexAuth, codexApiKey]);

  // 验证 Codex Auth JSON
-  const validateCodexAuth = useCallback((value: string): string => {
-    if (!value.trim()) return "";
-    try {
-      const parsed = JSON.parse(value);
-      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-        return "Auth JSON must be an object";
+  const validateCodexAuth = useCallback(
+    (value: string): string => {
+      if (!value.trim()) return "";
+      try {
+        const parsed = JSON.parse(value);
+        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+          return t("providerForm.authJsonRequired");
+        }
+        return "";
+      } catch {
+        return t("providerForm.authJsonError");
      }
-      return "";
-    } catch {
-      return "Invalid JSON format";
-    }
-  }, []);
+    },
+    [t],
+  );

  // 设置 auth 并验证
  const setCodexAuth = useCallback(
@@ -1,331 +0,0 @@
-import { useState, useEffect, useCallback, useRef } from "react";
-import { useTranslation } from "react-i18next";
-import {
-  updateCommonConfigSnippet,
-  hasCommonConfigSnippet,
-  validateJsonConfig,
-} from "@/utils/providerConfigUtils";
-import { configApi } from "@/lib/api";
-
-const LEGACY_STORAGE_KEY = "cc-switch:common-config-snippet";
-const DEFAULT_COMMON_CONFIG_SNIPPET = `{
-  "includeCoAuthoredBy": false
-}`;
-
-interface UseCommonConfigSnippetProps {
-  settingsConfig: string;
-  onConfigChange: (config: string) => void;
-  initialData?: {
-    settingsConfig?: Record<string, unknown>;
-  };
-  selectedPresetId?: string;
-  /** When false, the hook skips all logic and returns disabled state. Default: true */
-  enabled?: boolean;
-}
-
-/**
- * 管理 Claude 通用配置片段
- * 从 config.json 读取和保存，支持从 localStorage 平滑迁移
- */
-export function useCommonConfigSnippet({
-  settingsConfig,
-  onConfigChange,
-  initialData,
-  selectedPresetId,
-  enabled = true,
-}: UseCommonConfigSnippetProps) {
-  const { t } = useTranslation();
-  const [useCommonConfig, setUseCommonConfig] = useState(false);
-  const [commonConfigSnippet, setCommonConfigSnippetState] = useState<string>(
-    DEFAULT_COMMON_CONFIG_SNIPPET,
-  );
-  const [commonConfigError, setCommonConfigError] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
-  const [isExtracting, setIsExtracting] = useState(false);
-
-  // 用于跟踪是否正在通过通用配置更新
-  const isUpdatingFromCommonConfig = useRef(false);
-  // 用于跟踪新建模式是否已初始化默认勾选
-  const hasInitializedNewMode = useRef(false);
-
-  // 当预设变化时，重置初始化标记，使新预设能够重新触发初始化逻辑
-  useEffect(() => {
-    if (!enabled) return;
-    hasInitializedNewMode.current = false;
-  }, [selectedPresetId, enabled]);
-
-  // 初始化：从 config.json 加载，支持从 localStorage 迁移
-  useEffect(() => {
-    if (!enabled) {
-      setIsLoading(false);
-      return;
-    }
-    let mounted = true;
-
-    const loadSnippet = async () => {
-      try {
-        // 使用统一 API 加载
-        const snippet = await configApi.getCommonConfigSnippet("claude");
-
-        if (snippet && snippet.trim()) {
-          if (mounted) {
-            setCommonConfigSnippetState(snippet);
-          }
-        } else {
-          // 如果 config.json 中没有，尝试从 localStorage 迁移
-          if (typeof window !== "undefined") {
-            try {
-              const legacySnippet =
-                window.localStorage.getItem(LEGACY_STORAGE_KEY);
-              if (legacySnippet && legacySnippet.trim()) {
-                // 迁移到 config.json
-                await configApi.setCommonConfigSnippet("claude", legacySnippet);
-                if (mounted) {
-                  setCommonConfigSnippetState(legacySnippet);
-                }
-                // 清理 localStorage
-                window.localStorage.removeItem(LEGACY_STORAGE_KEY);
-                console.log(
-                  "[迁移] Claude 通用配置已从 localStorage 迁移到 config.json",
-                );
-              }
-            } catch (e) {
-              console.warn("[迁移] 从 localStorage 迁移失败:", e);
-            }
-          }
-        }
-      } catch (error) {
-        console.error("加载通用配置失败:", error);
-      } finally {
-        if (mounted) {
-          setIsLoading(false);
-        }
-      }
-    };
-
-    loadSnippet();
-
-    return () => {
-      mounted = false;
-    };
-  }, [enabled]);
-
-  // 初始化时检查通用配置片段（编辑模式）
-  useEffect(() => {
-    if (!enabled) return;
-    if (initialData && !isLoading) {
-      const configString = JSON.stringify(initialData.settingsConfig, null, 2);
-      const hasCommon = hasCommonConfigSnippet(
-        configString,
-        commonConfigSnippet,
-      );
-      setUseCommonConfig(hasCommon);
-    }
-  }, [enabled, initialData, commonConfigSnippet, isLoading]);
-
-  // 新建模式：如果通用配置片段存在且有效，默认启用
-  useEffect(() => {
-    if (!enabled) return;
-    // 仅新建模式、加载完成、尚未初始化过
-    if (!initialData && !isLoading && !hasInitializedNewMode.current) {
-      hasInitializedNewMode.current = true;
-
-      // 检查片段是否有实质内容
-      try {
-        const snippetObj = JSON.parse(commonConfigSnippet);
-        const hasContent = Object.keys(snippetObj).length > 0;
-        if (hasContent) {
-          setUseCommonConfig(true);
-          // 合并通用配置到当前配置
-          const { updatedConfig, error } = updateCommonConfigSnippet(
-            settingsConfig,
-            commonConfigSnippet,
-            true,
-          );
-          if (!error) {
-            isUpdatingFromCommonConfig.current = true;
-            onConfigChange(updatedConfig);
-            setTimeout(() => {
-              isUpdatingFromCommonConfig.current = false;
-            }, 0);
-          }
-        }
-      } catch {
-        // ignore parse error
-      }
-    }
-  }, [
-    enabled,
-    initialData,
-    commonConfigSnippet,
-    isLoading,
-    settingsConfig,
-    onConfigChange,
-  ]);
-
-  // 处理通用配置开关
-  const handleCommonConfigToggle = useCallback(
-    (checked: boolean) => {
-      const { updatedConfig, error: snippetError } = updateCommonConfigSnippet(
-        settingsConfig,
-        commonConfigSnippet,
-        checked,
-      );
-
-      if (snippetError) {
-        setCommonConfigError(snippetError);
-        setUseCommonConfig(false);
-        return;
-      }
-
-      setCommonConfigError("");
-      setUseCommonConfig(checked);
-      // 标记正在通过通用配置更新
-      isUpdatingFromCommonConfig.current = true;
-      onConfigChange(updatedConfig);
-      // 在下一个事件循环中重置标记
-      setTimeout(() => {
-        isUpdatingFromCommonConfig.current = false;
-      }, 0);
-    },
-    [settingsConfig, commonConfigSnippet, onConfigChange],
-  );
-
-  // 处理通用配置片段变化
-  const handleCommonConfigSnippetChange = useCallback(
-    (value: string) => {
-      const previousSnippet = commonConfigSnippet;
-      setCommonConfigSnippetState(value);
-
-      if (!value.trim()) {
-        setCommonConfigError("");
-        // 保存到 config.json（清空）
-        configApi.setCommonConfigSnippet("claude", "").catch((error) => {
-          console.error("保存通用配置失败:", error);
-          setCommonConfigError(
-            t("claudeConfig.saveFailed", { error: String(error) }),
-          );
-        });
-
-        if (useCommonConfig) {
-          const { updatedConfig } = updateCommonConfigSnippet(
-            settingsConfig,
-            previousSnippet,
-            false,
-          );
-          onConfigChange(updatedConfig);
-          setUseCommonConfig(false);
-        }
-        return;
-      }
-
-      // 验证JSON格式
-      const validationError = validateJsonConfig(value, "通用配置片段");
-      if (validationError) {
-        setCommonConfigError(validationError);
-      } else {
-        setCommonConfigError("");
-        // 保存到 config.json
-        configApi.setCommonConfigSnippet("claude", value).catch((error) => {
-          console.error("保存通用配置失败:", error);
-          setCommonConfigError(
-            t("claudeConfig.saveFailed", { error: String(error) }),
-          );
-        });
-      }
-
-      // 若当前启用通用配置且格式正确，需要替换为最新片段
-      if (useCommonConfig && !validationError) {
-        const removeResult = updateCommonConfigSnippet(
-          settingsConfig,
-          previousSnippet,
-          false,
-        );
-        if (removeResult.error) {
-          setCommonConfigError(removeResult.error);
-          return;
-        }
-        const addResult = updateCommonConfigSnippet(
-          removeResult.updatedConfig,
-          value,
-          true,
-        );
-
-        if (addResult.error) {
-          setCommonConfigError(addResult.error);
-          return;
-        }
-
-        // 标记正在通过通用配置更新，避免触发状态检查
-        isUpdatingFromCommonConfig.current = true;
-        onConfigChange(addResult.updatedConfig);
-        // 在下一个事件循环中重置标记
-        setTimeout(() => {
-          isUpdatingFromCommonConfig.current = false;
-        }, 0);
-      }
-    },
-    [commonConfigSnippet, settingsConfig, useCommonConfig, onConfigChange],
-  );
-
-  // 当配置变化时检查是否包含通用配置（但避免在通过通用配置更新时检查）
-  useEffect(() => {
-    if (!enabled) return;
-    if (isUpdatingFromCommonConfig.current || isLoading) {
-      return;
-    }
-    const hasCommon = hasCommonConfigSnippet(
-      settingsConfig,
-      commonConfigSnippet,
-    );
-    setUseCommonConfig(hasCommon);
-  }, [enabled, settingsConfig, commonConfigSnippet, isLoading]);
-
-  // 从编辑器当前内容提取通用配置片段
-  const handleExtract = useCallback(async () => {
-    setIsExtracting(true);
-    setCommonConfigError("");
-
-    try {
-      const extracted = await configApi.extractCommonConfigSnippet("claude", {
-        settingsConfig,
-      });
-
-      if (!extracted || extracted === "{}") {
-        setCommonConfigError(t("claudeConfig.extractNoCommonConfig"));
-        return;
-      }
-
-      // 验证 JSON 格式
-      const validationError = validateJsonConfig(extracted, "提取的配置");
-      if (validationError) {
-        setCommonConfigError(validationError);
-        return;
-      }
-
-      // 更新片段状态
-      setCommonConfigSnippetState(extracted);
-
-      // 保存到后端
-      await configApi.setCommonConfigSnippet("claude", extracted);
-    } catch (error) {
-      console.error("提取通用配置失败:", error);
-      setCommonConfigError(
-        t("claudeConfig.extractFailed", { error: String(error) }),
-      );
-    } finally {
-      setIsExtracting(false);
-    }
-  }, [settingsConfig, t]);
-
-  return {
-    useCommonConfig,
-    commonConfigSnippet,
-    commonConfigError,
-    isLoading,
-    isExtracting,
-    handleCommonConfigToggle,
-    handleCommonConfigSnippetChange,
-    handleExtract,
-  };
-}
@@ -1,465 +0,0 @@
-import { useState, useEffect, useCallback, useRef } from "react";
-import { useTranslation } from "react-i18next";
-import { configApi } from "@/lib/api";
-
-const LEGACY_STORAGE_KEY = "cc-switch:gemini-common-config-snippet";
-const DEFAULT_GEMINI_COMMON_CONFIG_SNIPPET = "{}";
-
-const GEMINI_COMMON_ENV_FORBIDDEN_KEYS = [
-  "GOOGLE_GEMINI_BASE_URL",
-  "GEMINI_API_KEY",
-] as const;
-type GeminiForbiddenEnvKey = (typeof GEMINI_COMMON_ENV_FORBIDDEN_KEYS)[number];
-
-interface UseGeminiCommonConfigProps {
-  envValue: string;
-  onEnvChange: (env: string) => void;
-  envStringToObj: (envString: string) => Record<string, string>;
-  envObjToString: (envObj: Record<string, unknown>) => string;
-  initialData?: {
-    settingsConfig?: Record<string, unknown>;
-  };
-  selectedPresetId?: string;
-}
-
-function isPlainObject(value: unknown): value is Record<string, unknown> {
-  return (
-    typeof value === "object" &&
-    value !== null &&
-    !Array.isArray(value) &&
-    Object.prototype.toString.call(value) === "[object Object]"
-  );
-}
-
-/**
- * 管理 Gemini 通用配置片段 (JSON 格式)
- * 写入 Gemini 的 .env，但会排除以下敏感字段：
- * - GOOGLE_GEMINI_BASE_URL
- * - GEMINI_API_KEY
- */
-export function useGeminiCommonConfig({
-  envValue,
-  onEnvChange,
-  envStringToObj,
-  envObjToString,
-  initialData,
-  selectedPresetId,
-}: UseGeminiCommonConfigProps) {
-  const { t } = useTranslation();
-  const [useCommonConfig, setUseCommonConfig] = useState(false);
-  const [commonConfigSnippet, setCommonConfigSnippetState] = useState<string>(
-    DEFAULT_GEMINI_COMMON_CONFIG_SNIPPET,
-  );
-  const [commonConfigError, setCommonConfigError] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
-  const [isExtracting, setIsExtracting] = useState(false);
-
-  // 用于跟踪是否正在通过通用配置更新
-  const isUpdatingFromCommonConfig = useRef(false);
-  // 用于跟踪新建模式是否已初始化默认勾选
-  const hasInitializedNewMode = useRef(false);
-
-  // 当预设变化时，重置初始化标记，使新预设能够重新触发初始化逻辑
-  useEffect(() => {
-    hasInitializedNewMode.current = false;
-  }, [selectedPresetId]);
-
-  const parseSnippetEnv = useCallback(
-    (
-      snippetString: string,
-    ): { env: Record<string, string>; error?: string } => {
-      const trimmed = snippetString.trim();
-      if (!trimmed) {
-        return { env: {} };
-      }
-
-      let parsed: unknown;
-      try {
-        parsed = JSON.parse(trimmed);
-      } catch {
-        return { env: {}, error: t("geminiConfig.invalidJsonFormat") };
-      }
-
-      if (!isPlainObject(parsed)) {
-        return { env: {}, error: t("geminiConfig.invalidJsonFormat") };
-      }
-
-      const keys = Object.keys(parsed);
-      const forbiddenKeys = keys.filter((key) =>
-        GEMINI_COMMON_ENV_FORBIDDEN_KEYS.includes(key as GeminiForbiddenEnvKey),
-      );
-      if (forbiddenKeys.length > 0) {
-        return {
-          env: {},
-          error: t("geminiConfig.commonConfigInvalidKeys", {
-            keys: forbiddenKeys.join(", "),
-          }),
-        };
-      }
-
-      const env: Record<string, string> = {};
-      for (const [key, value] of Object.entries(parsed)) {
-        if (typeof value !== "string") {
-          return {
-            env: {},
-            error: t("geminiConfig.commonConfigInvalidValues"),
-          };
-        }
-        const normalized = value.trim();
-        if (!normalized) continue;
-        env[key] = normalized;
-      }
-
-      return { env };
-    },
-    [t],
-  );
-
-  const hasEnvCommonConfigSnippet = useCallback(
-    (envObj: Record<string, string>, snippetEnv: Record<string, string>) => {
-      const entries = Object.entries(snippetEnv);
-      if (entries.length === 0) return false;
-      return entries.every(([key, value]) => envObj[key] === value);
-    },
-    [],
-  );
-
-  const applySnippetToEnv = useCallback(
-    (envObj: Record<string, string>, snippetEnv: Record<string, string>) => {
-      const updated = { ...envObj };
-      for (const [key, value] of Object.entries(snippetEnv)) {
-        if (typeof value === "string") {
-          updated[key] = value;
-        }
-      }
-      return updated;
-    },
-    [],
-  );
-
-  const removeSnippetFromEnv = useCallback(
-    (envObj: Record<string, string>, snippetEnv: Record<string, string>) => {
-      const updated = { ...envObj };
-      for (const [key, value] of Object.entries(snippetEnv)) {
-        if (typeof value === "string" && updated[key] === value) {
-          delete updated[key];
-        }
-      }
-      return updated;
-    },
-    [],
-  );
-
-  // 初始化：从 config.json 加载，支持从 localStorage 迁移
-  useEffect(() => {
-    let mounted = true;
-
-    const loadSnippet = async () => {
-      try {
-        // 使用统一 API 加载
-        const snippet = await configApi.getCommonConfigSnippet("gemini");
-
-        if (snippet && snippet.trim()) {
-          if (mounted) {
-            setCommonConfigSnippetState(snippet);
-          }
-        } else {
-          // 如果 config.json 中没有，尝试从 localStorage 迁移
-          if (typeof window !== "undefined") {
-            try {
-              const legacySnippet =
-                window.localStorage.getItem(LEGACY_STORAGE_KEY);
-              if (legacySnippet && legacySnippet.trim()) {
-                const parsed = parseSnippetEnv(legacySnippet);
-                if (parsed.error) {
-                  console.warn(
-                    "[迁移] legacy Gemini 通用配置片段格式不符合当前规则，跳过迁移",
-                  );
-                  return;
-                }
-                // 迁移到 config.json
-                await configApi.setCommonConfigSnippet("gemini", legacySnippet);
-                if (mounted) {
-                  setCommonConfigSnippetState(legacySnippet);
-                }
-                // 清理 localStorage
-                window.localStorage.removeItem(LEGACY_STORAGE_KEY);
-                console.log(
-                  "[迁移] Gemini 通用配置已从 localStorage 迁移到 config.json",
-                );
-              }
-            } catch (e) {
-              console.warn("[迁移] 从 localStorage 迁移失败:", e);
-            }
-          }
-        }
-      } catch (error) {
-        console.error("加载 Gemini 通用配置失败:", error);
-      } finally {
-        if (mounted) {
-          setIsLoading(false);
-        }
-      }
-    };
-
-    loadSnippet();
-
-    return () => {
-      mounted = false;
-    };
-  }, [parseSnippetEnv]);
-
-  // 初始化时检查通用配置片段（编辑模式）
-  useEffect(() => {
-    if (initialData?.settingsConfig && !isLoading) {
-      try {
-        const env =
-          isPlainObject(initialData.settingsConfig.env) &&
-          Object.keys(initialData.settingsConfig.env).length > 0
-            ? (initialData.settingsConfig.env as Record<string, string>)
-            : {};
-        const parsed = parseSnippetEnv(commonConfigSnippet);
-        if (parsed.error) return;
-        const hasCommon = hasEnvCommonConfigSnippet(
-          env,
-          parsed.env as Record<string, string>,
-        );
-        setUseCommonConfig(hasCommon);
-      } catch {
-        // ignore parse error
-      }
-    }
-  }, [
-    commonConfigSnippet,
-    hasEnvCommonConfigSnippet,
-    initialData,
-    isLoading,
-    parseSnippetEnv,
-  ]);
-
-  // 新建模式：如果通用配置片段存在且有效，默认启用
-  useEffect(() => {
-    // 仅新建模式、加载完成、尚未初始化过
-    if (!initialData && !isLoading && !hasInitializedNewMode.current) {
-      hasInitializedNewMode.current = true;
-
-      const parsed = parseSnippetEnv(commonConfigSnippet);
-      if (parsed.error) return;
-      const hasContent = Object.keys(parsed.env).length > 0;
-      if (!hasContent) return;
-
-      setUseCommonConfig(true);
-      const currentEnv = envStringToObj(envValue);
-      const merged = applySnippetToEnv(currentEnv, parsed.env);
-      const nextEnvString = envObjToString(merged);
-
-      isUpdatingFromCommonConfig.current = true;
-      onEnvChange(nextEnvString);
-      setTimeout(() => {
-        isUpdatingFromCommonConfig.current = false;
-      }, 0);
-    }
-  }, [
-    initialData,
-    isLoading,
-    commonConfigSnippet,
-    envValue,
-    envStringToObj,
-    envObjToString,
-    applySnippetToEnv,
-    onEnvChange,
-    parseSnippetEnv,
-  ]);
-
-  // 处理通用配置开关
-  const handleCommonConfigToggle = useCallback(
-    (checked: boolean) => {
-      const parsed = parseSnippetEnv(commonConfigSnippet);
-      if (parsed.error) {
-        setCommonConfigError(parsed.error);
-        setUseCommonConfig(false);
-        return;
-      }
-      if (Object.keys(parsed.env).length === 0) {
-        setCommonConfigError(t("geminiConfig.noCommonConfigToApply"));
-        setUseCommonConfig(false);
-        return;
-      }
-
-      const currentEnv = envStringToObj(envValue);
-      const updatedEnvObj = checked
-        ? applySnippetToEnv(currentEnv, parsed.env)
-        : removeSnippetFromEnv(currentEnv, parsed.env);
-
-      setCommonConfigError("");
-      setUseCommonConfig(checked);
-
-      isUpdatingFromCommonConfig.current = true;
-      onEnvChange(envObjToString(updatedEnvObj));
-      setTimeout(() => {
-        isUpdatingFromCommonConfig.current = false;
-      }, 0);
-    },
-    [
-      applySnippetToEnv,
-      commonConfigSnippet,
-      envObjToString,
-      envStringToObj,
-      envValue,
-      onEnvChange,
-      parseSnippetEnv,
-      removeSnippetFromEnv,
-      t,
-    ],
-  );
-
-  // 处理通用配置片段变化
-  const handleCommonConfigSnippetChange = useCallback(
-    (value: string) => {
-      const previousSnippet = commonConfigSnippet;
-      setCommonConfigSnippetState(value);
-
-      if (!value.trim()) {
-        setCommonConfigError("");
-        // 保存到 config.json（清空）
-        configApi.setCommonConfigSnippet("gemini", "").catch((error) => {
-          console.error("保存 Gemini 通用配置失败:", error);
-          setCommonConfigError(
-            t("geminiConfig.saveFailed", { error: String(error) }),
-          );
-        });
-
-        if (useCommonConfig) {
-          const parsed = parseSnippetEnv(previousSnippet);
-          if (!parsed.error && Object.keys(parsed.env).length > 0) {
-            const currentEnv = envStringToObj(envValue);
-            const updatedEnv = removeSnippetFromEnv(currentEnv, parsed.env);
-            onEnvChange(envObjToString(updatedEnv));
-          }
-          setUseCommonConfig(false);
-        }
-        return;
-      }
-
-      // 校验 JSON 格式
-      const parsed = parseSnippetEnv(value);
-      if (parsed.error) {
-        setCommonConfigError(parsed.error);
-        return;
-      }
-
-      setCommonConfigError("");
-      configApi.setCommonConfigSnippet("gemini", value).catch((error) => {
-        console.error("保存 Gemini 通用配置失败:", error);
-        setCommonConfigError(
-          t("geminiConfig.saveFailed", { error: String(error) }),
-        );
-      });
-
-      // 若当前启用通用配置，需要替换为最新片段
-      if (useCommonConfig) {
-        const prevParsed = parseSnippetEnv(previousSnippet);
-        const prevEnv = prevParsed.error ? {} : prevParsed.env;
-        const nextEnv = parsed.env;
-        const currentEnv = envStringToObj(envValue);
-
-        const withoutOld =
-          Object.keys(prevEnv).length > 0
-            ? removeSnippetFromEnv(currentEnv, prevEnv)
-            : currentEnv;
-        const withNew =
-          Object.keys(nextEnv).length > 0
-            ? applySnippetToEnv(withoutOld, nextEnv)
-            : withoutOld;
-
-        isUpdatingFromCommonConfig.current = true;
-        onEnvChange(envObjToString(withNew));
-        setTimeout(() => {
-          isUpdatingFromCommonConfig.current = false;
-        }, 0);
-      }
-    },
-    [
-      applySnippetToEnv,
-      commonConfigSnippet,
-      envObjToString,
-      envStringToObj,
-      envValue,
-      onEnvChange,
-      parseSnippetEnv,
-      removeSnippetFromEnv,
-      t,
-      useCommonConfig,
-    ],
-  );
-
-  // 当 env 变化时检查是否包含通用配置（但避免在通过通用配置更新时检查）
-  useEffect(() => {
-    if (isUpdatingFromCommonConfig.current || isLoading) {
-      return;
-    }
-    const parsed = parseSnippetEnv(commonConfigSnippet);
-    if (parsed.error) return;
-    const envObj = envStringToObj(envValue);
-    setUseCommonConfig(
-      hasEnvCommonConfigSnippet(envObj, parsed.env as Record<string, string>),
-    );
-  }, [
-    envValue,
-    commonConfigSnippet,
-    envStringToObj,
-    hasEnvCommonConfigSnippet,
-    isLoading,
-    parseSnippetEnv,
-  ]);
-
-  // 从编辑器当前内容提取通用配置片段
-  const handleExtract = useCallback(async () => {
-    setIsExtracting(true);
-    setCommonConfigError("");
-
-    try {
-      const extracted = await configApi.extractCommonConfigSnippet("gemini", {
-        settingsConfig: JSON.stringify({
-          env: envStringToObj(envValue),
-        }),
-      });
-
-      if (!extracted || extracted === "{}") {
-        setCommonConfigError(t("geminiConfig.extractNoCommonConfig"));
-        return;
-      }
-
-      // 验证 JSON 格式
-      const parsed = parseSnippetEnv(extracted);
-      if (parsed.error) {
-        setCommonConfigError(t("geminiConfig.extractedConfigInvalid"));
-        return;
-      }
-
-      // 更新片段状态
-      setCommonConfigSnippetState(extracted);
-
-      // 保存到后端
-      await configApi.setCommonConfigSnippet("gemini", extracted);
-    } catch (error) {
-      console.error("提取 Gemini 通用配置失败:", error);
-      setCommonConfigError(
-        t("geminiConfig.extractFailed", { error: String(error) }),
-      );
-    } finally {
-      setIsExtracting(false);
-    }
-  }, [envStringToObj, envValue, parseSnippetEnv, t]);
-
-  return {
-    useCommonConfig,
-    commonConfigSnippet,
-    commonConfigError,
-    isLoading,
-    isExtracting,
-    handleCommonConfigToggle,
-    handleCommonConfigSnippetChange,
-    handleExtract,
-  };
-}
@@ -1,4 +1,5 @@
 import { useState, useCallback, useEffect } from "react";
+import { useTranslation } from "react-i18next";

 interface UseGeminiConfigStateProps {
  initialData?: {
@@ -13,6 +14,7 @@ interface UseGeminiConfigStateProps {
 export function useGeminiConfigState({
  initialData,
 }: UseGeminiConfigStateProps) {
+  const { t } = useTranslation();
  const [geminiEnv, setGeminiEnvState] = useState("");
  const [geminiConfig, setGeminiConfigState] = useState("");
  const [geminiApiKey, setGeminiApiKey] = useState("");
@@ -119,18 +121,21 @@ export function useGeminiConfigState({
  }, [geminiEnv, envStringToObj, geminiApiKey, geminiBaseUrl, geminiModel]);

  // 验证 Gemini Config JSON
-  const validateGeminiConfig = useCallback((value: string): string => {
-    if (!value.trim()) return ""; // 空值允许
-    try {
-      const parsed = JSON.parse(value);
-      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-        return "";
+  const validateGeminiConfig = useCallback(
+    (value: string): string => {
+      if (!value.trim()) return ""; // 空值允许
+      try {
+        const parsed = JSON.parse(value);
+        if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+          return "";
+        }
+        return t("providerForm.configJsonError");
+      } catch {
+        return t("providerForm.configJsonError");
      }
-      return "Config must be a JSON object";
-    } catch {
-      return "Invalid JSON format";
-    }
-  }, []);
+    },
+    [t],
+  );

  // 设置 env
  const setGeminiEnv = useCallback((value: string) => {
@@ -20,7 +20,6 @@ const APP_CONFIG: Array<{
  { id: "codex", icon: "openai", nameKey: "apps.codex" },
  { id: "gemini", icon: "gemini", nameKey: "apps.gemini" },
  { id: "opencode", icon: "opencode", nameKey: "apps.opencode" },
-  { id: "openclaw", icon: "openclaw", nameKey: "apps.openclaw" },
 ];

 export function AppVisibilitySettings({
@@ -34,7 +33,6 @@ export function AppVisibilitySettings({
    codex: true,
    gemini: true,
    opencode: true,
-    openclaw: true,
  };

  // Count how many apps are currently visible
@@ -39,7 +39,6 @@ import { SkillSyncMethodSettings } from "@/components/settings/SkillSyncMethodSe
 import { TerminalSettings } from "@/components/settings/TerminalSettings";
 import { DirectorySettings } from "@/components/settings/DirectorySettings";
 import { ImportExportSection } from "@/components/settings/ImportExportSection";
-import { WebdavSyncSection } from "@/components/settings/WebdavSyncSection";
 import { AboutSection } from "@/components/settings/AboutSection";
 import { GlobalProxySettings } from "@/components/settings/GlobalProxySettings";
 import { ProxyPanel } from "@/components/proxy";
@@ -596,11 +595,6 @@ export function SettingsPage({
                            onExport={exportConfig}
                            onClear={clearSelection}
                          />
-                          <div className="pt-6">
-                            <WebdavSyncSection
-                              config={settings?.webdavSync}
-                            />
-                          </div>
                        </AccordionContent>
                      </AccordionItem>

@@ -1,820 +0,0 @@
-import { useCallback, useEffect, useRef, useState } from "react";
-import type { ReactNode } from "react";
-import {
-  Link2,
-  UploadCloud,
-  DownloadCloud,
-  Loader2,
-  Save,
-  Check,
-  Info,
-  AlertTriangle,
-} from "lucide-react";
-import type { LucideIcon } from "lucide-react";
-import { useTranslation } from "react-i18next";
-import { useQueryClient } from "@tanstack/react-query";
-import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Switch } from "@/components/ui/switch";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { settingsApi } from "@/lib/api";
-import type { RemoteSnapshotInfo, WebDavSyncSettings } from "@/types";
-
-// ─── WebDAV service presets ─────────────────────────────────
-
-interface WebDavPreset {
-  id: string;
-  label: string;
-  baseUrl: string;
-  hint: string;
-  matchPattern?: string; // substring match on URL
-}
-
-const WEBDAV_PRESETS: WebDavPreset[] = [
-  {
-    id: "jianguoyun",
-    label: "settings.webdavSync.presets.jianguoyun",
-    baseUrl: "https://dav.jianguoyun.com/dav/",
-    hint: "settings.webdavSync.presets.jianguoyunHint",
-    matchPattern: "jianguoyun.com",
-  },
-  {
-    id: "nextcloud",
-    label: "settings.webdavSync.presets.nextcloud",
-    baseUrl: "https://your-server/remote.php/dav/files/USERNAME/",
-    hint: "settings.webdavSync.presets.nextcloudHint",
-    matchPattern: "remote.php/dav",
-  },
-  {
-    id: "synology",
-    label: "settings.webdavSync.presets.synology",
-    baseUrl: "http://your-nas-ip:5005/",
-    hint: "settings.webdavSync.presets.synologyHint",
-    matchPattern: ":5005",
-  },
-  {
-    id: "custom",
-    label: "settings.webdavSync.presets.custom",
-    baseUrl: "",
-    hint: "",
-  },
-];
-
-/** Match a URL to one of the preset providers, or "custom". */
-function detectPreset(url: string): string {
-  if (!url) return "custom";
-  for (const preset of WEBDAV_PRESETS) {
-    if (preset.matchPattern && url.includes(preset.matchPattern)) {
-      return preset.id;
-    }
-  }
-  return "custom";
-}
-
-/** Format an RFC 3339 date string for display; falls back to raw string. */
-function formatDate(rfc3339: string): string {
-  const d = new Date(rfc3339);
-  return Number.isNaN(d.getTime()) ? rfc3339 : d.toLocaleString();
-}
-
-// ─── Types ──────────────────────────────────────────────────
-
-type ActionState =
-  | "idle"
-  | "testing"
-  | "saving"
-  | "uploading"
-  | "downloading"
-  | "fetching_remote";
-
-type DialogType = "upload" | "download" | null;
-
-interface WebdavSyncSectionProps {
-  config?: WebDavSyncSettings;
-}
-
-// ─── ActionButton ───────────────────────────────────────────
-
-/** Reusable button with loading spinner. */
-function ActionButton({
-  actionState,
-  targetState,
-  alsoActiveFor,
-  icon: Icon,
-  activeLabel,
-  idleLabel,
-  disabled,
-  ...props
-}: {
-  actionState: ActionState;
-  targetState: ActionState;
-  alsoActiveFor?: ActionState[];
-  icon: LucideIcon;
-  activeLabel: ReactNode;
-  idleLabel: ReactNode;
-} & Omit<React.ComponentPropsWithoutRef<typeof Button>, "children">) {
-  const isActive =
-    actionState === targetState ||
-    (alsoActiveFor?.includes(actionState) ?? false);
-  return (
-    <Button {...props} disabled={actionState !== "idle" || disabled}>
-      <span className="inline-flex items-center gap-2">
-        {isActive ? (
-          <Loader2 className="h-3.5 w-3.5 animate-spin" />
-        ) : (
-          <Icon className="h-3.5 w-3.5" />
-        )}
-        {isActive ? activeLabel : idleLabel}
-      </span>
-    </Button>
-  );
-}
-
-// ─── Main component ─────────────────────────────────────────
-
-export function WebdavSyncSection({ config }: WebdavSyncSectionProps) {
-  const { t } = useTranslation();
-  const queryClient = useQueryClient();
-  const [actionState, setActionState] = useState<ActionState>("idle");
-  const [dirty, setDirty] = useState(false);
-  const [passwordTouched, setPasswordTouched] = useState(false);
-  const [justSaved, setJustSaved] = useState(false);
-  const justSavedTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-
-  // Local form state — credentials are only persisted on explicit "Save".
-  const [form, setForm] = useState(() => ({
-    baseUrl: config?.baseUrl ?? "",
-    username: config?.username ?? "",
-    password: config?.password ?? "",
-    remoteRoot: config?.remoteRoot ?? "cc-switch-sync",
-    profile: config?.profile ?? "default",
-    autoSync: config?.autoSync ?? false,
-  }));
-
-  // Preset selector — derived from initial URL, updated on user selection
-  const [presetId, setPresetId] = useState(() =>
-    detectPreset(config?.baseUrl ?? ""),
-  );
-
-  const activePreset = WEBDAV_PRESETS.find((p) => p.id === presetId);
-
-  // Confirmation dialog state
-  const [dialogType, setDialogType] = useState<DialogType>(null);
-  const [remoteInfo, setRemoteInfo] = useState<RemoteSnapshotInfo | null>(null);
-
-  const closeDialog = useCallback(() => {
-    setDialogType(null);
-    setRemoteInfo(null);
-  }, []);
-
-  // Cleanup justSaved timer on unmount
-  useEffect(() => {
-    return () => {
-      if (justSavedTimerRef.current) clearTimeout(justSavedTimerRef.current);
-    };
-  }, []);
-
-  // Sync form when config is loaded/updated from backend, but not while user is editing
-  useEffect(() => {
-    if (!config || dirty) return;
-    setForm({
-      baseUrl: config.baseUrl ?? "",
-      username: config.username ?? "",
-      password: config.password ?? "",
-      remoteRoot: config.remoteRoot ?? "cc-switch-sync",
-      profile: config.profile ?? "default",
-      autoSync: config.autoSync ?? false,
-    });
-    setPasswordTouched(false);
-    setPresetId(detectPreset(config.baseUrl ?? ""));
-  }, [config, dirty]);
-
-  const updateField = useCallback((field: keyof typeof form, value: string) => {
-    setForm((prev) => ({ ...prev, [field]: value }));
-    if (field === "password") {
-      setPasswordTouched(true);
-    }
-    setDirty(true);
-    setJustSaved(false);
-    if (justSavedTimerRef.current) {
-      clearTimeout(justSavedTimerRef.current);
-      justSavedTimerRef.current = null;
-    }
-  }, []);
-
-  const handlePresetChange = useCallback((id: string) => {
-    setPresetId(id);
-    const preset = WEBDAV_PRESETS.find((p) => p.id === id);
-    if (preset?.baseUrl) {
-      setForm((prev) => ({ ...prev, baseUrl: preset.baseUrl }));
-      setDirty(true);
-      setJustSaved(false);
-      if (justSavedTimerRef.current) {
-        clearTimeout(justSavedTimerRef.current);
-        justSavedTimerRef.current = null;
-      }
-    }
-  }, []);
-
-  // When user edits the URL, check if it still matches the current preset on blur
-  const handleBaseUrlBlur = useCallback(() => {
-    if (presetId === "custom") return;
-    const detected = detectPreset(form.baseUrl);
-    if (detected !== presetId) {
-      setPresetId("custom");
-    }
-  }, [form.baseUrl, presetId]);
-
-  const handleAutoSyncChange = useCallback((checked: boolean) => {
-    setForm((prev) => ({ ...prev, autoSync: checked }));
-    setDirty(true);
-    setJustSaved(false);
-    if (justSavedTimerRef.current) {
-      clearTimeout(justSavedTimerRef.current);
-      justSavedTimerRef.current = null;
-    }
-  }, []);
-
-  const buildSettings = useCallback((): WebDavSyncSettings | null => {
-    const baseUrl = form.baseUrl.trim();
-    if (!baseUrl) return null;
-    return {
-      enabled: true,
-      baseUrl,
-      username: form.username.trim(),
-      password: form.password,
-      remoteRoot: form.remoteRoot.trim() || "cc-switch-sync",
-      profile: form.profile.trim() || "default",
-      autoSync: form.autoSync,
-    };
-  }, [form]);
-
-  // ─── Handlers ───────────────────────────────────────────
-
-  const handleTest = useCallback(async () => {
-    const settings = buildSettings();
-    if (!settings) {
-      toast.error(t("settings.webdavSync.missingUrl"));
-      return;
-    }
-    setActionState("testing");
-    try {
-      await settingsApi.webdavTestConnection(settings, !passwordTouched);
-      toast.success(t("settings.webdavSync.testSuccess"));
-    } catch (error) {
-      toast.error(
-        t("settings.webdavSync.testFailed", {
-          error: (error as Error)?.message ?? String(error),
-        }),
-      );
-    } finally {
-      setActionState("idle");
-    }
-  }, [buildSettings, passwordTouched, t]);
-
-  const handleSave = useCallback(async () => {
-    const settings = buildSettings();
-    if (!settings) {
-      toast.error(t("settings.webdavSync.missingUrl"));
-      return;
-    }
-    setActionState("saving");
-    try {
-      await settingsApi.webdavSyncSaveSettings(settings, passwordTouched);
-      setDirty(false);
-      setPasswordTouched(false);
-      // Show "saved" indicator for 2 seconds
-      setJustSaved(true);
-      if (justSavedTimerRef.current) clearTimeout(justSavedTimerRef.current);
-      justSavedTimerRef.current = setTimeout(() => {
-        setJustSaved(false);
-        justSavedTimerRef.current = null;
-      }, 2000);
-      await queryClient.invalidateQueries();
-    } catch (error) {
-      toast.error(
-        t("settings.webdavSync.saveFailed", {
-          error: (error as Error)?.message ?? String(error),
-        }),
-      );
-      setActionState("idle");
-      return;
-    }
-
-    // Auto-test connection after save
-    setActionState("testing");
-    try {
-      await settingsApi.webdavTestConnection(settings, true);
-      toast.success(t("settings.webdavSync.saveAndTestSuccess"));
-    } catch (error) {
-      toast.warning(
-        t("settings.webdavSync.saveAndTestFailed", {
-          error: (error as Error)?.message ?? String(error),
-        }),
-      );
-    } finally {
-      setActionState("idle");
-    }
-  }, [buildSettings, passwordTouched, queryClient, t]);
-
-  /** Fetch remote info, then open upload confirmation dialog. */
-  const handleUploadClick = useCallback(async () => {
-    if (dirty) {
-      toast.error(t("settings.webdavSync.unsavedChanges"));
-      return;
-    }
-    setActionState("fetching_remote");
-    try {
-      const info = await settingsApi.webdavSyncFetchRemoteInfo();
-      if ("empty" in info) {
-        setRemoteInfo(null);
-      } else {
-        setRemoteInfo(info);
-      }
-      setDialogType("upload");
-    } catch {
-      setRemoteInfo(null);
-      toast.error(t("settings.webdavSync.fetchRemoteFailed"));
-      setActionState("idle");
-      return;
-    }
-    setActionState("idle");
-  }, [dirty, t]);
-
-  /** Actually perform the upload after user confirms. */
-  const handleUploadConfirm = useCallback(async () => {
-    if (dirty) {
-      toast.error(t("settings.webdavSync.unsavedChanges"));
-      return;
-    }
-    closeDialog();
-    setActionState("uploading");
-    try {
-      await settingsApi.webdavSyncUpload();
-      toast.success(t("settings.webdavSync.uploadSuccess"));
-      await queryClient.invalidateQueries();
-    } catch (error) {
-      toast.error(
-        t("settings.webdavSync.uploadFailed", {
-          error: (error as Error)?.message ?? String(error),
-        }),
-      );
-    } finally {
-      setActionState("idle");
-    }
-  }, [closeDialog, dirty, queryClient, t]);
-
-  /** Fetch remote info, then open download confirmation dialog. */
-  const handleDownloadClick = useCallback(async () => {
-    if (dirty) {
-      toast.error(t("settings.webdavSync.unsavedChanges"));
-      return;
-    }
-    setActionState("fetching_remote");
-    try {
-      const info = await settingsApi.webdavSyncFetchRemoteInfo();
-      if ("empty" in info) {
-        toast.info(t("settings.webdavSync.noRemoteData"));
-        return;
-      }
-      if (!info.compatible) {
-        toast.error(
-          t("settings.webdavSync.incompatibleVersion", {
-            version: info.version,
-          }),
-        );
-        return;
-      }
-      setRemoteInfo(info);
-      setDialogType("download");
-    } catch (error) {
-      toast.error(
-        t("settings.webdavSync.downloadFailed", {
-          error: (error as Error)?.message ?? String(error),
-        }),
-      );
-    } finally {
-      setActionState("idle");
-    }
-  }, [dirty, t]);
-
-  /** Actually perform the download after user confirms. */
-  const handleDownloadConfirm = useCallback(async () => {
-    if (dirty) {
-      toast.error(t("settings.webdavSync.unsavedChanges"));
-      return;
-    }
-    closeDialog();
-    setActionState("downloading");
-    try {
-      await settingsApi.webdavSyncDownload();
-      toast.success(t("settings.webdavSync.downloadSuccess"));
-      await queryClient.invalidateQueries();
-    } catch (error) {
-      toast.error(
-        t("settings.webdavSync.downloadFailed", {
-          error: (error as Error)?.message ?? String(error),
-        }),
-      );
-    } finally {
-      setActionState("idle");
-    }
-  }, [closeDialog, dirty, queryClient, t]);
-
-  // ─── Derived state ──────────────────────────────────────
-
-  const isLoading = actionState !== "idle";
-  const hasSavedConfig = Boolean(
-    config?.baseUrl?.trim() && config?.username?.trim(),
-  );
-
-  const lastSyncAt = config?.status?.lastSyncAt;
-  const lastSyncDisplay = lastSyncAt
-    ? new Date(lastSyncAt * 1000).toLocaleString()
-    : null;
-  const lastError = config?.status?.lastError?.trim();
-  const showAutoSyncError =
-    !!lastError && config?.status?.lastErrorSource === "auto";
-
-  // ─── Render ─────────────────────────────────────────────
-
-  return (
-    <section className="space-y-4">
-      <header className="space-y-2">
-        <h3 className="text-base font-semibold text-foreground">
-          {t("settings.webdavSync.title")}
-        </h3>
-        <p className="text-sm text-muted-foreground">
-          {t("settings.webdavSync.description")}
-        </p>
-      </header>
-
-      <div className="space-y-4 rounded-lg border border-border bg-muted/40 p-6">
-        {/* Config fields */}
-        <div className="space-y-3">
-          {/* Service preset selector */}
-          <div className="flex items-center gap-4">
-            <label className="w-40 text-xs font-medium text-foreground shrink-0">
-              {t("settings.webdavSync.presets.label")}
-            </label>
-            <Select
-              value={presetId}
-              onValueChange={handlePresetChange}
-              disabled={isLoading}
-            >
-              <SelectTrigger className="text-xs flex-1">
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent>
-                {WEBDAV_PRESETS.map((preset) => (
-                  <SelectItem key={preset.id} value={preset.id}>
-                    {t(preset.label)}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-
-          {/* Server URL */}
-          <div className="flex items-center gap-4">
-            <label className="w-40 text-xs font-medium text-foreground shrink-0">
-              {t("settings.webdavSync.baseUrl")}
-            </label>
-            <Input
-              value={form.baseUrl}
-              onChange={(e) => updateField("baseUrl", e.target.value)}
-              onBlur={handleBaseUrlBlur}
-              placeholder={t("settings.webdavSync.baseUrlPlaceholder")}
-              className="text-xs flex-1"
-              disabled={isLoading}
-            />
-          </div>
-
-          {/* Username */}
-          <div className="flex items-center gap-4">
-            <label className="w-40 text-xs font-medium text-foreground shrink-0">
-              {t("settings.webdavSync.username")}
-            </label>
-            <Input
-              value={form.username}
-              onChange={(e) => updateField("username", e.target.value)}
-              placeholder={t("settings.webdavSync.usernamePlaceholder")}
-              className="text-xs flex-1"
-              disabled={isLoading}
-            />
-          </div>
-
-          {/* Password */}
-          <div className="flex items-center gap-4">
-            <label className="w-40 text-xs font-medium text-foreground shrink-0">
-              {t("settings.webdavSync.password")}
-            </label>
-            <Input
-              type="password"
-              value={form.password}
-              onChange={(e) => updateField("password", e.target.value)}
-              placeholder={t("settings.webdavSync.passwordPlaceholder")}
-              className="text-xs flex-1"
-              autoComplete="off"
-              disabled={isLoading}
-            />
-          </div>
-
-          {/* Preset hint */}
-          {activePreset?.hint && (
-            <div className="flex items-start gap-2 pl-44 text-xs text-muted-foreground">
-              <Info className="h-3.5 w-3.5 shrink-0 mt-0.5" />
-              <span>{t(activePreset.hint)}</span>
-            </div>
-          )}
-
-          {/* Remote Root */}
-          <div className="flex items-center gap-4">
-            <label className="w-40 text-xs font-medium text-foreground shrink-0">
-              {t("settings.webdavSync.remoteRoot")}
-              <span className="block text-[10px] font-normal text-muted-foreground">
-                {t("settings.webdavSync.remoteRootDefault")}
-              </span>
-            </label>
-            <Input
-              value={form.remoteRoot}
-              onChange={(e) => updateField("remoteRoot", e.target.value)}
-              placeholder="cc-switch-sync"
-              className="text-xs flex-1"
-              disabled={isLoading}
-            />
-          </div>
-
-          {/* Profile */}
-          <div className="flex items-center gap-4">
-            <label className="w-40 text-xs font-medium text-foreground shrink-0">
-              {t("settings.webdavSync.profile")}
-              <span className="block text-[10px] font-normal text-muted-foreground">
-                {t("settings.webdavSync.profileDefault")}
-              </span>
-            </label>
-            <Input
-              value={form.profile}
-              onChange={(e) => updateField("profile", e.target.value)}
-              placeholder="default"
-              className="text-xs flex-1"
-              disabled={isLoading}
-            />
-          </div>
-
-          <div className="flex items-start gap-4">
-            <label className="w-40 text-xs font-medium text-foreground shrink-0">
-              {t("settings.webdavSync.autoSync")}
-              <span className="block text-[10px] font-normal text-muted-foreground">
-                {t("settings.webdavSync.autoSyncHint")}
-              </span>
-            </label>
-            <div className="pt-1">
-              <Switch
-                checked={form.autoSync}
-                onCheckedChange={handleAutoSyncChange}
-                aria-label={t("settings.webdavSync.autoSync")}
-                disabled={isLoading}
-              />
-            </div>
-          </div>
-        </div>
-
-        {/* Last sync time */}
-        {lastSyncDisplay && (
-          <p className="text-xs text-muted-foreground">
-            {t("settings.webdavSync.lastSync", { time: lastSyncDisplay })}
-          </p>
-        )}
-        {showAutoSyncError && (
-          <div className="rounded-lg border border-red-300/70 bg-red-50/80 px-3 py-2 text-xs text-red-900 dark:border-red-500/50 dark:bg-red-950/30 dark:text-red-200">
-            <p className="font-medium">
-              {t("settings.webdavSync.autoSyncLastErrorTitle")}
-            </p>
-            <p className="mt-1 break-all whitespace-pre-wrap">{lastError}</p>
-            <p className="mt-1 text-[11px] text-red-700/90 dark:text-red-300/80">
-              {t("settings.webdavSync.autoSyncLastErrorHint")}
-            </p>
-          </div>
-        )}
-
-        {/* Config buttons + save status */}
-        <div className="flex flex-wrap items-center gap-3 pt-2">
-          <ActionButton
-            type="button"
-            variant="outline"
-            size="sm"
-            onClick={handleTest}
-            actionState={actionState}
-            targetState="testing"
-            icon={Link2}
-            activeLabel={t("settings.webdavSync.testing")}
-            idleLabel={t("settings.webdavSync.test")}
-          />
-          <ActionButton
-            type="button"
-            variant="outline"
-            size="sm"
-            onClick={handleSave}
-            actionState={actionState}
-            targetState="saving"
-            icon={Save}
-            activeLabel={t("settings.webdavSync.saving")}
-            idleLabel={t("settings.webdavSync.save")}
-          />
-
-          {/* Save status indicator */}
-          {dirty && (
-            <span className="inline-flex items-center gap-1.5 text-xs text-amber-500 dark:text-amber-400 animate-in fade-in duration-200">
-              <span className="h-1.5 w-1.5 rounded-full bg-amber-500 dark:bg-amber-400" />
-              {t("settings.webdavSync.unsaved")}
-            </span>
-          )}
-          {!dirty && justSaved && (
-            <span className="inline-flex items-center gap-1.5 text-xs text-emerald-600 dark:text-emerald-400 animate-in fade-in duration-200">
-              <Check className="h-3 w-3" />
-              {t("settings.webdavSync.saved")}
-            </span>
-          )}
-        </div>
-
-        {/* Sync buttons */}
-        <div className="flex flex-wrap items-center gap-3 border-t border-border pt-4">
-          <ActionButton
-            type="button"
-            size="sm"
-            onClick={handleUploadClick}
-            disabled={!hasSavedConfig}
-            actionState={actionState}
-            targetState="uploading"
-            alsoActiveFor={["fetching_remote"]}
-            icon={UploadCloud}
-            activeLabel={
-              actionState === "fetching_remote"
-                ? t("settings.webdavSync.fetchingRemote")
-                : t("settings.webdavSync.uploading")
-            }
-            idleLabel={t("settings.webdavSync.upload")}
-          />
-          <ActionButton
-            type="button"
-            variant="secondary"
-            size="sm"
-            onClick={handleDownloadClick}
-            disabled={!hasSavedConfig}
-            actionState={actionState}
-            targetState="downloading"
-            alsoActiveFor={["fetching_remote"]}
-            icon={DownloadCloud}
-            activeLabel={
-              actionState === "fetching_remote"
-                ? t("settings.webdavSync.fetchingRemote")
-                : t("settings.webdavSync.downloading")
-            }
-            idleLabel={t("settings.webdavSync.download")}
-          />
-        </div>
-        {!hasSavedConfig && (
-          <p className="text-xs text-muted-foreground">
-            {t("settings.webdavSync.saveBeforeSync")}
-          </p>
-        )}
-      </div>
-
-      {/* ─── Upload confirmation dialog ──────────────────── */}
-      <Dialog
-        open={dialogType === "upload"}
-        onOpenChange={(open) => {
-          if (!open) closeDialog();
-        }}
-      >
-        <DialogContent className="max-w-sm" zIndex="alert">
-          <DialogHeader className="space-y-3 border-b-0 bg-transparent pb-0">
-            <DialogTitle className="flex items-center gap-2 text-lg font-semibold">
-              <AlertTriangle className="h-5 w-5 text-destructive" />
-              {t("settings.webdavSync.confirmUpload.title")}
-            </DialogTitle>
-            <DialogDescription asChild>
-              <div className="space-y-3 text-sm leading-relaxed">
-                <p>{t("settings.webdavSync.confirmUpload.content")}</p>
-                <ul className="list-disc pl-5 space-y-1 text-muted-foreground">
-                  <li>{t("settings.webdavSync.confirmUpload.dbItem")}</li>
-                  <li>{t("settings.webdavSync.confirmUpload.skillsItem")}</li>
-                </ul>
-                <p className="text-muted-foreground">
-                  {t("settings.webdavSync.confirmUpload.targetPath")}
-                  {": "}
-                  <code className="ml-1 text-xs bg-muted px-1.5 py-0.5 rounded">
-                    /{form.remoteRoot.trim() || "cc-switch-sync"}/v2/
-                    {form.profile.trim() || "default"}
-                  </code>
-                </p>
-                {remoteInfo && (
-                  <div className="rounded-lg border border-border bg-muted/50 p-3 space-y-2">
-                    <p className="text-xs font-medium text-foreground">
-                      {t("settings.webdavSync.confirmUpload.existingData")}
-                    </p>
-                    <dl className="grid grid-cols-[auto_1fr] gap-x-3 gap-y-1.5 text-xs text-muted-foreground">
-                      <dt className="font-medium text-foreground">
-                        {t("settings.webdavSync.confirmUpload.deviceName")}
-                      </dt>
-                      <dd>
-                        <code className="bg-muted px-1.5 py-0.5 rounded">
-                          {remoteInfo.deviceName}
-                        </code>
-                      </dd>
-                      <dt className="font-medium text-foreground">
-                        {t("settings.webdavSync.confirmUpload.createdAt")}
-                      </dt>
-                      <dd>{formatDate(remoteInfo.createdAt)}</dd>
-                    </dl>
-                  </div>
-                )}
-                {remoteInfo && (
-                  <p className="text-destructive font-medium">
-                    {t("settings.webdavSync.confirmUpload.warning")}
-                  </p>
-                )}
-              </div>
-            </DialogDescription>
-          </DialogHeader>
-          <DialogFooter className="flex gap-2 border-t-0 bg-transparent pt-2 sm:justify-end">
-            <Button variant="outline" onClick={closeDialog}>
-              {t("common.cancel")}
-            </Button>
-            <Button variant="destructive" onClick={handleUploadConfirm}>
-              {t("settings.webdavSync.confirmUpload.confirm")}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-
-      {/* ─── Download confirmation dialog ────────────────── */}
-      <Dialog
-        open={dialogType === "download"}
-        onOpenChange={(open) => {
-          if (!open) closeDialog();
-        }}
-      >
-        <DialogContent className="max-w-sm" zIndex="alert">
-          <DialogHeader className="space-y-3 border-b-0 bg-transparent pb-0">
-            <DialogTitle className="flex items-center gap-2 text-lg font-semibold">
-              <AlertTriangle className="h-5 w-5 text-destructive" />
-              {t("settings.webdavSync.confirmDownload.title")}
-            </DialogTitle>
-            <DialogDescription asChild>
-              <div className="space-y-3 text-sm leading-relaxed">
-                {remoteInfo && (
-                  <dl className="grid grid-cols-[auto_1fr] gap-x-3 gap-y-1.5 text-muted-foreground">
-                    <dt className="font-medium text-foreground">
-                      {t("settings.webdavSync.confirmDownload.deviceName")}
-                    </dt>
-                    <dd>
-                      <code className="text-xs bg-muted px-1.5 py-0.5 rounded">
-                        {remoteInfo.deviceName}
-                      </code>
-                    </dd>
-                    <dt className="font-medium text-foreground">
-                      {t("settings.webdavSync.confirmDownload.createdAt")}
-                    </dt>
-                    <dd>{formatDate(remoteInfo.createdAt)}</dd>
-                    <dt className="font-medium text-foreground">
-                      {t("settings.webdavSync.confirmDownload.artifacts")}
-                    </dt>
-                    <dd>{remoteInfo.artifacts.join(", ")}</dd>
-                  </dl>
-                )}
-                <p className="text-destructive font-medium">
-                  {t("settings.webdavSync.confirmDownload.warning")}
-                </p>
-              </div>
-            </DialogDescription>
-          </DialogHeader>
-          <DialogFooter className="flex gap-2 border-t-0 bg-transparent pt-2 sm:justify-end">
-            <Button variant="outline" onClick={closeDialog}>
-              {t("common.cancel")}
-            </Button>
-            <Button variant="destructive" onClick={handleDownloadConfirm}>
-              {t("settings.webdavSync.confirmDownload.confirm")}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </section>
-  );
-}
@@ -53,7 +53,7 @@ const UnifiedSkillsPanel = React.forwardRef<
  const installFromZipMutation = useInstallSkillsFromZip();

  const enabledCounts = useMemo(() => {
-    const counts = { claude: 0, codex: 0, gemini: 0, opencode: 0, openclaw: 0 };
+    const counts = { claude: 0, codex: 0, gemini: 0, opencode: 0 };
    if (!skills) return counts;
    skills.forEach((skill) => {
      for (const app of APP_IDS) {
@@ -1,9 +0,0 @@
-import * as CollapsiblePrimitive from "@radix-ui/react-collapsible";
-
-const Collapsible = CollapsiblePrimitive.Root;
-
-const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger;
-
-const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent;
-
-export { Collapsible, CollapsibleTrigger, CollapsibleContent };
@@ -1,95 +0,0 @@
-import React, { useState, useEffect, useCallback } from "react";
-import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
-import MarkdownEditor from "@/components/MarkdownEditor";
-import { FullScreenPanel } from "@/components/common/FullScreenPanel";
-import { workspaceApi } from "@/lib/api/workspace";
-
-interface WorkspaceFileEditorProps {
-  filename: string;
-  isOpen: boolean;
-  onClose: () => void;
-}
-
-const WorkspaceFileEditor: React.FC<WorkspaceFileEditorProps> = ({
-  filename,
-  isOpen,
-  onClose,
-}) => {
-  const { t } = useTranslation();
-  const [content, setContent] = useState("");
-  const [loading, setLoading] = useState(true);
-  const [saving, setSaving] = useState(false);
-  const [isDarkMode, setIsDarkMode] = useState(false);
-
-  useEffect(() => {
-    setIsDarkMode(document.documentElement.classList.contains("dark"));
-    const observer = new MutationObserver(() => {
-      setIsDarkMode(document.documentElement.classList.contains("dark"));
-    });
-    observer.observe(document.documentElement, {
-      attributes: true,
-      attributeFilter: ["class"],
-    });
-    return () => observer.disconnect();
-  }, []);
-
-  useEffect(() => {
-    if (!isOpen || !filename) return;
-
-    setLoading(true);
-    workspaceApi
-      .readFile(filename)
-      .then((data) => {
-        setContent(data ?? "");
-      })
-      .catch((err) => {
-        console.error("Failed to read workspace file:", err);
-        toast.error(t("workspace.loadFailed"));
-      })
-      .finally(() => setLoading(false));
-  }, [isOpen, filename, t]);
-
-  const handleSave = useCallback(async () => {
-    setSaving(true);
-    try {
-      await workspaceApi.writeFile(filename, content);
-      toast.success(t("workspace.saveSuccess"));
-    } catch (err) {
-      console.error("Failed to save workspace file:", err);
-      toast.error(t("workspace.saveFailed"));
-    } finally {
-      setSaving(false);
-    }
-  }, [filename, content, t]);
-
-  return (
-    <FullScreenPanel
-      isOpen={isOpen}
-      title={t("workspace.editing", { filename })}
-      onClose={onClose}
-      footer={
-        <Button onClick={handleSave} disabled={saving || loading}>
-          {saving ? t("common.saving") : t("common.save")}
-        </Button>
-      }
-    >
-      {loading ? (
-        <div className="flex items-center justify-center h-64 text-muted-foreground">
-          {t("prompts.loading")}
-        </div>
-      ) : (
-        <MarkdownEditor
-          value={content}
-          onChange={setContent}
-          darkMode={isDarkMode}
-          placeholder={`# ${filename}\n\n...`}
-          minHeight="calc(100vh - 240px)"
-        />
-      )}
-    </FullScreenPanel>
-  );
-};
-
-export default WorkspaceFileEditor;
@@ -1,129 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import {
-  FileCode,
-  Heart,
-  User,
-  IdCard,
-  Wrench,
-  Brain,
-  Activity,
-  Rocket,
-  Power,
-  CheckCircle2,
-  Circle,
-} from "lucide-react";
-import type { LucideIcon } from "lucide-react";
-import { workspaceApi } from "@/lib/api/workspace";
-import WorkspaceFileEditor from "./WorkspaceFileEditor";
-
-interface WorkspaceFile {
-  filename: string;
-  icon: LucideIcon;
-  descKey: string;
-}
-
-const WORKSPACE_FILES: WorkspaceFile[] = [
-  { filename: "AGENTS.md", icon: FileCode, descKey: "workspace.files.agents" },
-  { filename: "SOUL.md", icon: Heart, descKey: "workspace.files.soul" },
-  { filename: "USER.md", icon: User, descKey: "workspace.files.user" },
-  {
-    filename: "IDENTITY.md",
-    icon: IdCard,
-    descKey: "workspace.files.identity",
-  },
-  { filename: "TOOLS.md", icon: Wrench, descKey: "workspace.files.tools" },
-  { filename: "MEMORY.md", icon: Brain, descKey: "workspace.files.memory" },
-  {
-    filename: "HEARTBEAT.md",
-    icon: Activity,
-    descKey: "workspace.files.heartbeat",
-  },
-  {
-    filename: "BOOTSTRAP.md",
-    icon: Rocket,
-    descKey: "workspace.files.bootstrap",
-  },
-  { filename: "BOOT.md", icon: Power, descKey: "workspace.files.boot" },
-];
-
-const WorkspaceFilesPanel: React.FC = () => {
-  const { t } = useTranslation();
-  const [editingFile, setEditingFile] = useState<string | null>(null);
-  const [fileExists, setFileExists] = useState<Record<string, boolean>>({});
-
-  const checkFileExistence = async () => {
-    const results: Record<string, boolean> = {};
-    await Promise.all(
-      WORKSPACE_FILES.map(async (f) => {
-        try {
-          const content = await workspaceApi.readFile(f.filename);
-          results[f.filename] = content !== null;
-        } catch {
-          results[f.filename] = false;
-        }
-      }),
-    );
-    setFileExists(results);
-  };
-
-  useEffect(() => {
-    void checkFileExistence();
-  }, []);
-
-  const handleEditorClose = () => {
-    setEditingFile(null);
-    // Re-check file existence after closing editor (file may have been created)
-    void checkFileExistence();
-  };
-
-  return (
-    <div className="px-6 pt-4 pb-8">
-      <p className="text-sm text-muted-foreground mb-6">
-        ~/.openclaw/workspace/
-      </p>
-
-      <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
-        {WORKSPACE_FILES.map((file) => {
-          const Icon = file.icon;
-          const exists = fileExists[file.filename];
-
-          return (
-            <button
-              key={file.filename}
-              onClick={() => setEditingFile(file.filename)}
-              className="flex items-start gap-3 p-4 rounded-xl border border-border bg-card hover:bg-accent/50 transition-colors text-left group"
-            >
-              <div className="mt-0.5 text-muted-foreground group-hover:text-foreground transition-colors">
-                <Icon className="w-5 h-5" />
-              </div>
-              <div className="flex-1 min-w-0">
-                <div className="flex items-center gap-2">
-                  <span className="font-medium text-sm text-foreground">
-                    {file.filename}
-                  </span>
-                  {exists ? (
-                    <CheckCircle2 className="w-3.5 h-3.5 text-emerald-500 flex-shrink-0" />
-                  ) : (
-                    <Circle className="w-3.5 h-3.5 text-muted-foreground/40 flex-shrink-0" />
-                  )}
-                </div>
-                <p className="text-xs text-muted-foreground mt-0.5">
-                  {t(file.descKey)}
-                </p>
-              </div>
-            </button>
-          );
-        })}
-      </div>
-
-      <WorkspaceFileEditor
-        filename={editingFile ?? ""}
-        isOpen={!!editingFile}
-        onClose={handleEditorClose}
-      />
-    </div>
-  );
-};
-
-export default WorkspaceFilesPanel;
@@ -1,11 +1,6 @@
 import React from "react";
 import type { AppId } from "@/lib/api/types";
-import {
-  ClaudeIcon,
-  CodexIcon,
-  GeminiIcon,
-  OpenClawIcon,
-} from "@/components/BrandIcons";
+import { ClaudeIcon, CodexIcon, GeminiIcon } from "@/components/BrandIcons";
 import { ProviderIcon } from "@/components/ProviderIcon";

 export interface AppConfig {
@@ -15,13 +10,7 @@ export interface AppConfig {
  badgeClass: string;
 }

-export const APP_IDS: AppId[] = [
-  "claude",
-  "codex",
-  "gemini",
-  "opencode",
-  "openclaw",
-];
+export const APP_IDS: AppId[] = ["claude", "codex", "gemini", "opencode"];

 export const APP_ICON_MAP: Record<AppId, AppConfig> = {
  claude: {
@@ -63,12 +52,4 @@ export const APP_ICON_MAP: Record<AppId, AppConfig> = {
    badgeClass:
      "bg-indigo-500/10 text-indigo-700 dark:text-indigo-300 hover:bg-indigo-500/20 border-0 gap-1.5",
  },
-  openclaw: {
-    label: "OpenClaw",
-    icon: <OpenClawIcon size={14} />,
-    activeClass:
-      "bg-rose-500/10 ring-1 ring-rose-500/20 hover:bg-rose-500/20 text-rose-600 dark:text-rose-400",
-    badgeClass:
-      "bg-rose-500/10 text-rose-700 dark:text-rose-300 hover:bg-rose-500/20 border-0 gap-1.5",
-  },
 };
@@ -99,6 +99,8 @@ export const providerPresets: ProviderPreset[] = [
      },
    },
    category: "cn_official",
+    isPartner: true, // 合作伙伴
+    partnerPromotionKey: "zhipu", // 促销信息 i18n key
    icon: "zhipu",
    iconColor: "#0F62FE",
  },
@@ -117,6 +119,8 @@ export const providerPresets: ProviderPreset[] = [
      },
    },
    category: "cn_official",
+    isPartner: true, // 合作伙伴
+    partnerPromotionKey: "zhipu", // 促销信息 i18n key
    icon: "zhipu",
    iconColor: "#0F62FE",
  },
@@ -445,6 +445,8 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
      },
    },
    category: "cn_official",
+    isPartner: true,
+    partnerPromotionKey: "zhipu",
    icon: "zhipu",
    iconColor: "#0F62FE",
    templateValues: {
@@ -477,6 +479,8 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
      },
    },
    category: "cn_official",
+    isPartner: true,
+    partnerPromotionKey: "zhipu",
    icon: "zhipu",
    iconColor: "#0F62FE",
    templateValues: {
@@ -844,7 +848,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
      },
      models: {
        "claude-sonnet-4-5-20250929": { name: "Claude Sonnet 4.5" },
-        "claude-opus-4-6": { name: "Claude Opus 4.6" },
+        "claude-opus-4-5-20251101": { name: "Claude Opus 4.5" },
      },
    },
    category: "aggregator",
@@ -871,7 +875,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
      },
      models: {
        "claude-sonnet-4-5-20250929": { name: "Claude Sonnet 4.5" },
-        "claude-opus-4-6": { name: "Claude Opus 4.6" },
+        "claude-opus-4-5-20251101": { name: "Claude Opus 4.5" },
      },
    },
    category: "aggregator",
@@ -898,7 +902,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
      },
      models: {
        "anthropic/claude-sonnet-4.5": { name: "Claude Sonnet 4.5" },
-        "anthropic/claude-opus-4.6": { name: "Claude Opus 4.6" },
+        "anthropic/claude-opus-4.5": { name: "Claude Opus 4.5" },
      },
    },
    category: "aggregator",
@@ -952,7 +956,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
      },
      models: {
        "claude-sonnet-4-5-20250929": { name: "Claude Sonnet 4.5" },
-        "claude-opus-4-6": { name: "Claude Opus 4.6" },
+        "claude-opus-4-5-20251101": { name: "Claude Opus 4.5" },
      },
    },
    category: "third_party",
@@ -980,7 +984,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
      },
      models: {
        "claude-sonnet-4-5-20250929": { name: "Claude Sonnet 4.5" },
-        "claude-opus-4-6": { name: "Claude Opus 4.6" },
+        "claude-opus-4-5-20251101": { name: "Claude Opus 4.5" },
      },
    },
    category: "third_party",
@@ -1009,7 +1013,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
      },
      models: {
        "claude-sonnet-4-5-20250929": { name: "Claude Sonnet 4.5" },
-        "claude-opus-4-6": { name: "Claude Opus 4.6" },
+        "claude-opus-4-5-20251101": { name: "Claude Opus 4.5" },
      },
    },
    category: "third_party",
@@ -1070,7 +1074,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
      },
      models: {
        "claude-sonnet-4.5": { name: "Claude Sonnet 4.5" },
-        "claude-opus-4.6": { name: "Claude Opus 4.6" },
+        "claude-opus-4.5": { name: "Claude Opus 4.5" },
      },
    },
    category: "third_party",
@@ -0,0 +1,504 @@
+/**
+ * 通用配置格式适配器
+ *
+ * 提供 Claude (JSON), Codex (TOML), Gemini (ENV/JSON) 三种格式的适配器实现。
+ */
+
+import {
+  computeFinalConfig,
+  extractDifference,
+  isPlainObject,
+  isSubset,
+} from "@/utils/configMerge";
+import {
+  computeFinalTomlConfig,
+  extractTomlDifference,
+  safeParseToml,
+} from "@/utils/tomlConfigMerge";
+import {
+  parseGeminiCommonConfigSnippet,
+  GEMINI_CONFIG_ERROR_CODES,
+} from "@/utils/providerConfigUtils";
+import type {
+  CommonConfigAdapter,
+  ParseResult,
+  ExtractResult,
+} from "./useCommonConfigBase";
+
+// Re-export from utils for backward compatibility
+export { hasContentByAppType } from "@/utils/commonConfigDetection";
+import { hasGeminiContent } from "@/utils/commonConfigDetection";
+
+// ============================================================================
+// Claude Adapter (JSON)
+// ============================================================================
+
+const CLAUDE_LEGACY_STORAGE_KEY = "cc-switch:common-config-snippet";
+const CLAUDE_DEFAULT_SNIPPET = `{
+  "includeCoAuthoredBy": false
+}`;
+
+export const claudeAdapter: CommonConfigAdapter<
+  Record<string, unknown>,
+  string
+> = {
+  appKey: "claude",
+  defaultSnippet: CLAUDE_DEFAULT_SNIPPET,
+  legacyStorageKey: CLAUDE_LEGACY_STORAGE_KEY,
+
+  parseSnippet: (snippet: string): ParseResult<Record<string, unknown>> => {
+    const trimmed = snippet.trim();
+    if (!trimmed) {
+      return { config: {}, error: null };
+    }
+
+    try {
+      const parsed = JSON.parse(trimmed);
+      if (!isPlainObject(parsed)) {
+        return { config: null, error: "JSON 格式错误：不是对象" };
+      }
+      return { config: parsed, error: null };
+    } catch {
+      return { config: null, error: "JSON 格式错误" };
+    }
+  },
+
+  hasValidContent: (snippet: string): boolean => {
+    const result = claudeAdapter.parseSnippet(snippet);
+    return (
+      !result.error &&
+      result.config !== null &&
+      Object.keys(result.config).length > 0
+    );
+  },
+
+  hasContent: (configStr: string, snippetStr: string): boolean => {
+    try {
+      if (!snippetStr.trim()) return false;
+      const config = configStr ? JSON.parse(configStr) : {};
+      const snippet = JSON.parse(snippetStr);
+      if (!isPlainObject(snippet)) return false;
+      return isSubset(config, snippet);
+    } catch {
+      return false;
+    }
+  },
+
+  getApplyError: (snippet: string, t): string => {
+    const result = claudeAdapter.parseSnippet(snippet);
+    if (result.error) {
+      return result.error;
+    }
+    if (result.config === null || Object.keys(result.config).length === 0) {
+      return t("claudeConfig.noCommonConfigToApply");
+    }
+    return "";
+  },
+
+  parseInput: (input: string): Record<string, unknown> => {
+    try {
+      const parsed = JSON.parse(input || "{}");
+      return isPlainObject(parsed) ? parsed : {};
+    } catch {
+      return {};
+    }
+  },
+
+  computeFinal: (
+    custom: Record<string, unknown>,
+    common: Record<string, unknown>,
+    enabled: boolean,
+  ): string => {
+    if (!enabled || Object.keys(common).length === 0) {
+      return JSON.stringify(custom, null, 2);
+    }
+    const merged = computeFinalConfig(custom, common, true);
+    return JSON.stringify(merged, null, 2);
+  },
+
+  extractDiff: (
+    custom: Record<string, unknown>,
+    common: Record<string, unknown>,
+  ): ExtractResult<Record<string, unknown>> => {
+    const result = extractDifference(custom, common);
+    return {
+      custom: result.customConfig,
+      hasCommonKeys: result.hasCommonKeys,
+    };
+  },
+
+  serializeOutput: (config: Record<string, unknown>): string => {
+    return JSON.stringify(config, null, 2);
+  },
+
+  buildExtractRequest: (finalValue: string): { settingsConfig: string } => {
+    return { settingsConfig: finalValue };
+  },
+};
+
+// ============================================================================
+// Codex Adapter (TOML)
+// ============================================================================
+
+const CODEX_LEGACY_STORAGE_KEY = "cc-switch:codex-common-config-snippet";
+const CODEX_DEFAULT_SNIPPET = `# Common Codex config
+# Add your common TOML configuration here`;
+
+/** 检查 TOML 是否有实质内容（非空、非纯注释） */
+function hasTomlContent(toml: string): boolean {
+  const lines = toml.split("\n");
+  return lines.some((line) => {
+    const trimmed = line.trim();
+    return trimmed && !trimmed.startsWith("#");
+  });
+}
+
+/** 校验 TOML 格式 */
+function validateTomlFormat(tomlText: string): string | null {
+  if (!hasTomlContent(tomlText)) {
+    return null; // 空或纯注释是合法的
+  }
+  const result = safeParseToml(tomlText);
+  return result.error;
+}
+
+/**
+ * 从 codexConfig 提取 config 字段（TOML 格式）
+ * 支持两种格式：
+ * 1. 直接的 TOML 字符串
+ * 2. JSON 字符串 { auth: {...}, config: "TOML" }
+ *
+ * 注意：如果 config 字段存在但不是 string，这表示 schema 异常
+ * 此时返回空字符串并打印警告，避免静默处理错误数据
+ */
+function extractConfigToml(configInput: string): string {
+  if (!configInput || !configInput.trim()) {
+    return "";
+  }
+
+  // 尝试解析为 JSON（wrapper 格式）
+  try {
+    const parsed = JSON.parse(configInput);
+    if (typeof parsed?.config === "string") {
+      return parsed.config;
+    }
+    // 如果是 JSON 对象
+    if (typeof parsed === "object" && parsed !== null) {
+      // config 字段存在但不是 string，这是 schema 异常
+      if ("config" in parsed && typeof parsed.config !== "string") {
+        console.warn(
+          `[extractConfigToml] config field is ${typeof parsed.config}, expected string`,
+        );
+      }
+      // JSON 对象没有有效的 config 字段，返回空（无 TOML 可提取）
+      return "";
+    }
+  } catch {
+    // JSON 解析失败，说明是直接的 TOML 字符串
+  }
+
+  return configInput;
+}
+
+/**
+ * 检测 Codex 配置是否是 JSON wrapper 格式
+ * @returns 如果是 JSON wrapper 返回解析后的对象，否则返回 null
+ */
+function detectJsonWrapperFormat(
+  codexConfig: string,
+): { auth?: unknown; config?: unknown; [key: string]: unknown } | null {
+  try {
+    const parsed = JSON.parse(codexConfig);
+    // 只有当解析结果是对象时才认为是 JSON wrapper
+    if (
+      typeof parsed === "object" &&
+      parsed !== null &&
+      !Array.isArray(parsed)
+    ) {
+      return parsed;
+    }
+  } catch {
+    // 不是 JSON
+  }
+  return null;
+}
+
+/**
+ * Codex 配置格式保留结果
+ */
+export interface PreserveCodexConfigResult {
+  /** 格式化后的配置字符串 */
+  config: string;
+  /** 错误信息（如果有） */
+  error?: string;
+}
+
+/**
+ * 保留原始格式写回 Codex 配置
+ *
+ * 如果原始配置是 JSON wrapper 格式，则更新 config 字段并返回 JSON
+ * 如果原始配置是纯 TOML 格式，则直接返回 TOML
+ *
+ * @param originalConfig - 原始配置字符串
+ * @param updatedToml - 更新后的 TOML 内容
+ * @returns 格式化后的配置字符串和可能的错误
+ */
+export function preserveCodexConfigFormat(
+  originalConfig: string,
+  updatedToml: string,
+): PreserveCodexConfigResult {
+  const jsonWrapper = detectJsonWrapperFormat(originalConfig);
+
+  if (jsonWrapper) {
+    // 是 JSON wrapper 格式
+    if ("config" in jsonWrapper) {
+      // 存在 config 字段
+      if (typeof jsonWrapper.config !== "string") {
+        // config 字段不是 string，这是意外的 schema
+        // 返回原配置并报错，避免数据丢失
+        return {
+          config: originalConfig,
+          error: `Codex config field is ${typeof jsonWrapper.config}, expected string. Cannot update safely.`,
+        };
+      }
+      // 正常更新 config 字段
+      jsonWrapper.config = updatedToml;
+      return { config: JSON.stringify(jsonWrapper, null, 2) };
+    } else {
+      // 没有 config 字段，但是是 JSON 对象（可能包含 auth 等其他字段）
+      // 添加 config 字段
+      jsonWrapper.config = updatedToml;
+      return { config: JSON.stringify(jsonWrapper, null, 2) };
+    }
+  }
+
+  // 纯 TOML 格式
+  return { config: updatedToml };
+}
+
+export const codexAdapter: CommonConfigAdapter<string, string> = {
+  appKey: "codex",
+  defaultSnippet: CODEX_DEFAULT_SNIPPET,
+  legacyStorageKey: CODEX_LEGACY_STORAGE_KEY,
+
+  parseSnippet: (snippet: string): ParseResult<string> => {
+    const error = validateTomlFormat(snippet);
+    if (error) {
+      return { config: null, error };
+    }
+    return { config: snippet, error: null };
+  },
+
+  hasValidContent: (snippet: string): boolean => {
+    return hasTomlContent(snippet) && !validateTomlFormat(snippet);
+  },
+
+  hasContent: (configStr: string, snippetStr: string): boolean => {
+    if (!snippetStr.trim()) return false;
+    // 解析配置（可能是纯 TOML 或 JSON wrapper 格式）
+    const configToml = extractConfigToml(configStr);
+    const configParsed = safeParseToml(configToml);
+    const snippetParsed = safeParseToml(snippetStr);
+    if (configParsed.error || !configParsed.config) return false;
+    if (snippetParsed.error || !snippetParsed.config) return false;
+    // 使用 isSubset 检查 snippet 是否是 config 的子集
+    return isSubset(configParsed.config, snippetParsed.config);
+  },
+
+  getApplyError: (snippet: string, t): string => {
+    if (!hasTomlContent(snippet)) {
+      return t("codexConfig.noCommonConfigToApply");
+    }
+    const error = validateTomlFormat(snippet);
+    if (error) {
+      return t("codexConfig.tomlFormatError", {
+        defaultValue: "TOML 格式错误",
+      });
+    }
+    return "";
+  },
+
+  parseInput: (input: string): string => {
+    return extractConfigToml(input);
+  },
+
+  computeFinal: (custom: string, common: string, enabled: boolean): string => {
+    if (!enabled || !hasTomlContent(common)) {
+      return custom;
+    }
+    const result = computeFinalTomlConfig(custom, common, true);
+    return result.error ? custom : result.finalConfig;
+  },
+
+  extractDiff: (custom: string, common: string): ExtractResult<string> => {
+    const result = extractTomlDifference(custom, common);
+    return {
+      custom: result.customToml,
+      hasCommonKeys: result.hasCommonKeys,
+      error: result.error,
+    };
+  },
+
+  serializeOutput: (config: string): string => {
+    return config;
+  },
+
+  buildExtractRequest: (finalValue: string): { settingsConfig: string } => {
+    return {
+      settingsConfig: JSON.stringify({ config: finalValue ?? "" }),
+    };
+  },
+};
+
+// ============================================================================
+// Gemini Adapter (ENV/JSON)
+// ============================================================================
+
+const GEMINI_LEGACY_STORAGE_KEY = "cc-switch:gemini-common-config-snippet";
+const GEMINI_DEFAULT_SNIPPET = "";
+
+export interface GeminiAdapterOptions {
+  /** 字符串转对象 */
+  envStringToObj: (envString: string) => Record<string, string>;
+  /** 对象转字符串 */
+  envObjToString: (envObj: Record<string, unknown>) => string;
+}
+
+/**
+ * 创建 Gemini 适配器
+ * 需要传入 env 转换函数，因为这些函数依赖于外部实现
+ */
+export function createGeminiAdapter(
+  options: GeminiAdapterOptions,
+): CommonConfigAdapter<Record<string, string>, Record<string, string>> {
+  const { envStringToObj, envObjToString } = options;
+
+  return {
+    appKey: "gemini",
+    defaultSnippet: GEMINI_DEFAULT_SNIPPET,
+    legacyStorageKey: GEMINI_LEGACY_STORAGE_KEY,
+
+    parseSnippet: (snippet: string): ParseResult<Record<string, string>> => {
+      const result = parseGeminiCommonConfigSnippet(snippet, {
+        strictForbiddenKeys: true,
+      });
+
+      if (result.error) {
+        return { config: null, error: result.error };
+      }
+
+      return { config: result.env, error: null };
+    },
+
+    hasValidContent: (snippet: string): boolean => {
+      const result = parseGeminiCommonConfigSnippet(snippet, {
+        strictForbiddenKeys: true,
+      });
+      return !result.error && Object.keys(result.env).length > 0;
+    },
+
+    hasContent: (configStr: string, snippetStr: string): boolean => {
+      return hasGeminiContent(configStr, snippetStr).hasContent;
+    },
+
+    getApplyError: (snippet: string, t): string => {
+      const result = parseGeminiCommonConfigSnippet(snippet, {
+        strictForbiddenKeys: true,
+      });
+
+      if (result.errorInfo) {
+        // Use structured error info for type-safe handling
+        switch (result.errorInfo.code) {
+          case GEMINI_CONFIG_ERROR_CODES.FORBIDDEN_KEYS:
+            return t("geminiConfig.commonConfigInvalidKeys", {
+              keys: result.errorInfo.keys?.join(", ") ?? "",
+            });
+          case GEMINI_CONFIG_ERROR_CODES.VALUE_NOT_STRING:
+            return t("geminiConfig.commonConfigInvalidValues");
+          default:
+            return t("geminiConfig.invalidEnvFormat", {
+              defaultValue: "配置格式错误",
+            });
+        }
+      }
+
+      // Fallback for legacy error string (backward compatibility)
+      if (result.error) {
+        return t("geminiConfig.invalidEnvFormat", {
+          defaultValue: "配置格式错误",
+        });
+      }
+
+      if (Object.keys(result.env).length === 0) {
+        return t("geminiConfig.noCommonConfigToApply");
+      }
+
+      return "";
+    },
+
+    parseInput: (input: string): Record<string, string> => {
+      return envStringToObj(input);
+    },
+
+    computeFinal: (
+      custom: Record<string, string>,
+      common: Record<string, string>,
+      enabled: boolean,
+    ): Record<string, string> => {
+      if (!enabled || Object.keys(common).length === 0) {
+        return custom;
+      }
+
+      // 通用配置作为 base，自定义 env 覆盖
+      const merged = computeFinalConfig(
+        custom as Record<string, unknown>,
+        common as Record<string, unknown>,
+        true,
+      );
+
+      // 转换回 Record<string, string>
+      const result: Record<string, string> = {};
+      for (const [key, value] of Object.entries(merged)) {
+        if (typeof value === "string") {
+          result[key] = value;
+        }
+      }
+      return result;
+    },
+
+    extractDiff: (
+      custom: Record<string, string>,
+      common: Record<string, string>,
+    ): ExtractResult<Record<string, string>> => {
+      const result = extractDifference(
+        custom as Record<string, unknown>,
+        common as Record<string, unknown>,
+      );
+
+      // 转换回 Record<string, string>
+      const customResult: Record<string, string> = {};
+      for (const [key, value] of Object.entries(result.customConfig)) {
+        if (typeof value === "string") {
+          customResult[key] = value;
+        }
+      }
+
+      return {
+        custom: customResult,
+        hasCommonKeys: result.hasCommonKeys,
+      };
+    },
+
+    serializeOutput: (config: Record<string, string>): string => {
+      return envObjToString(config);
+    },
+
+    buildExtractRequest: (
+      finalValue: Record<string, string>,
+    ): { settingsConfig: string } => {
+      return {
+        settingsConfig: JSON.stringify({ env: finalValue }),
+      };
+    },
+  };
+}
@@ -0,0 +1,494 @@
+/**
+ * 通用配置管理基础 Hook
+ *
+ * 提供加载、切换、保存、提取等通用逻辑，通过 Adapter 注入格式特定处理。
+ * 支持 Claude (JSON), Codex (TOML), Gemini (ENV/JSON) 三种格式。
+ */
+
+import { useState, useEffect, useCallback, useRef, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { toast } from "sonner";
+import { configApi } from "@/lib/api";
+import type { ProviderMeta } from "@/types";
+
+// ============================================================================
+// 类型定义
+// ============================================================================
+
+/** 应用类型 */
+export type CommonConfigAppKey = "claude" | "codex" | "gemini";
+
+/** 解析结果 */
+export interface ParseResult<T> {
+  config: T | null;
+  error: string | null;
+}
+
+/** 合并结果 */
+export interface MergeResult<T> {
+  merged: T;
+  error?: string;
+}
+
+/** 差异提取结果 */
+export interface ExtractResult<T> {
+  custom: T;
+  hasCommonKeys: boolean;
+  error?: string;
+}
+
+/**
+ * 格式适配器接口
+ *
+ * 每种格式（JSON/TOML/ENV）需要实现此接口
+ */
+export interface CommonConfigAdapter<TConfig, TFinal> {
+  /** 应用标识 */
+  appKey: CommonConfigAppKey;
+
+  /** 默认片段内容 */
+  defaultSnippet: string;
+
+  /** localStorage 迁移 key (可选) */
+  legacyStorageKey?: string;
+
+  /**
+   * 解析片段字符串为配置对象
+   * @param snippet - 原始片段字符串
+   * @returns 解析结果
+   */
+  parseSnippet: (snippet: string) => ParseResult<TConfig>;
+
+  /**
+   * 验证片段是否有有效内容（非空、非纯注释）
+   * @param snippet - 片段字符串
+   * @returns 是否有有效内容
+   */
+  hasValidContent: (snippet: string) => boolean;
+
+  /**
+   * 检查配置是否包含指定的片段内容
+   * 用于检测供应商配置是否已应用通用配置
+   * @param configStr - 供应商的配置字符串 (settingsConfig)
+   * @param snippetStr - 通用配置片段字符串
+   * @returns 是否包含片段内容
+   */
+  hasContent: (configStr: string, snippetStr: string) => boolean;
+
+  /**
+   * 获取片段应用错误（用于 toggle 时验证）
+   * @param snippet - 片段字符串
+   * @param t - i18n 翻译函数
+   * @returns 错误信息，无错误返回空字符串
+   */
+  getApplyError: (
+    snippet: string,
+    t: (key: string, options?: Record<string, unknown>) => string,
+  ) => string;
+
+  /**
+   * 从表单输入解析当前配置
+   * @param input - 表单输入值
+   * @returns 解析后的配置对象
+   */
+  parseInput: (input: string) => TConfig;
+
+  /**
+   * 计算最终合并配置
+   * @param custom - 自定义配置
+   * @param common - 通用配置
+   * @param enabled - 是否启用
+   * @returns 合并后的最终配置
+   */
+  computeFinal: (custom: TConfig, common: TConfig, enabled: boolean) => TFinal;
+
+  /**
+   * 提取差异（从自定义配置中移除与通用配置相同的部分）
+   * @param custom - 自定义配置
+   * @param common - 通用配置
+   * @returns 差异结果
+   */
+  extractDiff: (custom: TConfig, common: TConfig) => ExtractResult<TConfig>;
+
+  /**
+   * 将配置对象序列化为表单输出
+   * @param config - 配置对象
+   * @returns 序列化后的字符串
+   */
+  serializeOutput: (config: TConfig) => string;
+
+  /**
+   * 构建提取 API 的请求参数
+   * @param finalValue - 最终合并后的值
+   * @returns API 请求参数
+   */
+  buildExtractRequest: (finalValue: TFinal) => { settingsConfig: string };
+}
+
+// ============================================================================
+// Props 和 Return 类型
+// ============================================================================
+
+export interface UseCommonConfigBaseProps<TConfig, TFinal> {
+  /** 格式适配器 */
+  adapter: CommonConfigAdapter<TConfig, TFinal>;
+  /** 当前表单输入值 */
+  inputValue: string;
+  /** 输入变化回调 */
+  onInputChange: (value: string) => void;
+  /** 初始数据（编辑模式） */
+  initialData?: {
+    settingsConfig?: Record<string, unknown>;
+    meta?: ProviderMeta;
+  };
+  /** 当前选中的预设 ID */
+  selectedPresetId?: string;
+  /** 是否启用此 hook（默认 true） */
+  enabled?: boolean;
+}
+
+export interface UseCommonConfigBaseReturn<TFinal> {
+  /** 是否启用通用配置 */
+  useCommonConfig: boolean;
+  /** 通用配置片段 */
+  commonConfigSnippet: string;
+  /** 通用配置错误信息 */
+  commonConfigError: string;
+  /** 是否正在加载 */
+  isLoading: boolean;
+  /** 是否正在提取 */
+  isExtracting: boolean;
+  /** 通用配置开关处理函数 */
+  handleCommonConfigToggle: (checked: boolean) => void;
+  /** 通用配置片段变化处理函数 */
+  handleCommonConfigSnippetChange: (snippet: string) => void;
+  /** 从当前配置提取通用配置 */
+  handleExtract: () => Promise<void>;
+  /** 最终配置（运行时合并结果，只读） */
+  finalValue: TFinal;
+  /** 是否有待保存的通用配置变更 */
+  hasUnsavedCommonConfig: boolean;
+  /** 获取待保存的通用配置片段（用于 handleSubmit） */
+  getPendingCommonConfigSnippet: () => string | null;
+  /** 标记通用配置已保存 */
+  markCommonConfigSaved: () => void;
+}
+
+// ============================================================================
+// 基础 Hook 实现
+// ============================================================================
+
+export function useCommonConfigBase<TConfig, TFinal>({
+  adapter,
+  inputValue,
+  onInputChange,
+  initialData,
+  selectedPresetId,
+  enabled = true,
+}: UseCommonConfigBaseProps<
+  TConfig,
+  TFinal
+>): UseCommonConfigBaseReturn<TFinal> {
+  const { t } = useTranslation();
+
+  // ============================================================================
+  // 状态
+  // ============================================================================
+  const [useCommonConfig, setUseCommonConfig] = useState(false);
+  const [commonConfigSnippet, setCommonConfigSnippetState] = useState<string>(
+    adapter.defaultSnippet,
+  );
+  const [commonConfigError, setCommonConfigError] = useState("");
+  const [isLoading, setIsLoading] = useState(true);
+  const [isExtracting, setIsExtracting] = useState(false);
+  const [hasUnsavedCommonConfig, setHasUnsavedCommonConfig] = useState(false);
+
+  // 初始化跟踪
+  const hasInitializedEditMode = useRef(false);
+  const hasInitializedNewMode = useRef(false);
+
+  // ============================================================================
+  // 预设变化时重置初始化标记
+  // ============================================================================
+  useEffect(() => {
+    if (!enabled) return;
+    hasInitializedNewMode.current = false;
+    hasInitializedEditMode.current = false;
+  }, [selectedPresetId, enabled]);
+
+  // ============================================================================
+  // 加载通用配置片段（从数据库，支持 localStorage 迁移）
+  // ============================================================================
+  useEffect(() => {
+    if (!enabled) {
+      setIsLoading(false);
+      return;
+    }
+
+    let mounted = true;
+
+    const loadSnippet = async () => {
+      try {
+        const snippet = await configApi.getCommonConfigSnippet(adapter.appKey);
+
+        if (snippet && snippet.trim()) {
+          if (mounted) {
+            setCommonConfigSnippetState(snippet);
+          }
+        } else if (adapter.legacyStorageKey && typeof window !== "undefined") {
+          // 尝试从 localStorage 迁移
+          try {
+            const legacySnippet = window.localStorage.getItem(
+              adapter.legacyStorageKey,
+            );
+            if (legacySnippet && legacySnippet.trim()) {
+              const parsed = adapter.parseSnippet(legacySnippet);
+              // 只有在解析成功且有有效内容时才迁移
+              // 这避免了将 "{}" 这样的空 JSON 迁移为"有效配置"
+              if (!parsed.error && adapter.hasValidContent(legacySnippet)) {
+                await configApi.setCommonConfigSnippet(
+                  adapter.appKey,
+                  legacySnippet,
+                );
+                if (mounted) {
+                  setCommonConfigSnippetState(legacySnippet);
+                }
+                window.localStorage.removeItem(adapter.legacyStorageKey);
+                console.log(
+                  `[迁移] ${adapter.appKey} 通用配置已从 localStorage 迁移到数据库`,
+                );
+              } else {
+                // 解析失败或无有效内容，清理 localStorage 不迁移
+                window.localStorage.removeItem(adapter.legacyStorageKey);
+              }
+            }
+          } catch (e) {
+            console.warn("[迁移] 从 localStorage 迁移失败:", e);
+          }
+        }
+      } catch (error) {
+        console.error(`加载 ${adapter.appKey} 通用配置失败:`, error);
+      } finally {
+        if (mounted) {
+          setIsLoading(false);
+        }
+      }
+    };
+
+    loadSnippet();
+
+    return () => {
+      mounted = false;
+    };
+  }, [enabled, adapter]);
+
+  // ============================================================================
+  // 编辑模式初始化：从 meta 读取启用状态
+  // ============================================================================
+  useEffect(() => {
+    if (!enabled) return;
+    if (initialData && !isLoading && !hasInitializedEditMode.current) {
+      hasInitializedEditMode.current = true;
+
+      const metaByApp = initialData.meta?.commonConfigEnabledByApp;
+      const resolvedMetaEnabled =
+        metaByApp?.[adapter.appKey] ?? initialData.meta?.commonConfigEnabled;
+
+      if (resolvedMetaEnabled !== undefined) {
+        if (!resolvedMetaEnabled) {
+          setUseCommonConfig(false);
+          return;
+        }
+        const applyError = adapter.getApplyError(commonConfigSnippet, t);
+        if (applyError) {
+          setCommonConfigError(applyError);
+          setUseCommonConfig(false);
+          return;
+        }
+        setCommonConfigError("");
+        setUseCommonConfig(true);
+      } else {
+        setUseCommonConfig(false);
+      }
+    }
+  }, [enabled, initialData, isLoading, commonConfigSnippet, adapter, t]);
+
+  // ============================================================================
+  // 新建模式初始化：如果通用配置有效，默认启用
+  // ============================================================================
+  useEffect(() => {
+    if (!enabled) return;
+    if (!initialData && !isLoading && !hasInitializedNewMode.current) {
+      hasInitializedNewMode.current = true;
+
+      if (adapter.hasValidContent(commonConfigSnippet)) {
+        const parsed = adapter.parseSnippet(commonConfigSnippet);
+        if (!parsed.error && parsed.config !== null) {
+          setUseCommonConfig(true);
+        }
+      }
+    }
+  }, [enabled, initialData, commonConfigSnippet, isLoading, adapter]);
+
+  // ============================================================================
+  // 计算最终配置（运行时合并）
+  // ============================================================================
+  const finalValue = useMemo((): TFinal => {
+    const customConfig = adapter.parseInput(inputValue);
+
+    if (!enabled || !useCommonConfig) {
+      return adapter.computeFinal(customConfig, customConfig, false);
+    }
+
+    const snippetParsed = adapter.parseSnippet(commonConfigSnippet);
+    if (snippetParsed.error || snippetParsed.config === null) {
+      return adapter.computeFinal(customConfig, customConfig, false);
+    }
+
+    return adapter.computeFinal(customConfig, snippetParsed.config, true);
+  }, [enabled, inputValue, commonConfigSnippet, useCommonConfig, adapter]);
+
+  // ============================================================================
+  // 处理通用配置开关
+  // ============================================================================
+  const handleCommonConfigToggle = useCallback(
+    (checked: boolean) => {
+      if (checked) {
+        const applyError = adapter.getApplyError(commonConfigSnippet, t);
+        if (applyError) {
+          setCommonConfigError(applyError);
+          setUseCommonConfig(false);
+          return;
+        }
+      }
+      setCommonConfigError("");
+      setUseCommonConfig(checked);
+    },
+    [commonConfigSnippet, adapter, t],
+  );
+
+  // ============================================================================
+  // 处理通用配置片段变化（延迟保存模式）
+  // ============================================================================
+  const handleCommonConfigSnippetChange = useCallback(
+    (value: string) => {
+      setCommonConfigSnippetState(value);
+
+      if (!value.trim()) {
+        setCommonConfigError("");
+        setHasUnsavedCommonConfig(true);
+        return;
+      }
+
+      // 格式校验
+      const parsed = adapter.parseSnippet(value);
+      if (parsed.error) {
+        setCommonConfigError(parsed.error);
+        return;
+      }
+
+      setCommonConfigError("");
+      setHasUnsavedCommonConfig(true);
+    },
+    [adapter],
+  );
+
+  // ============================================================================
+  // 从当前最终配置提取通用配置片段
+  // ============================================================================
+  const handleExtract = useCallback(async () => {
+    setIsExtracting(true);
+    setCommonConfigError("");
+
+    try {
+      const request = adapter.buildExtractRequest(finalValue);
+      const extracted = await configApi.extractCommonConfigSnippet(
+        adapter.appKey,
+        request,
+      );
+
+      if (
+        !extracted ||
+        !extracted.trim() ||
+        !adapter.hasValidContent(extracted)
+      ) {
+        setCommonConfigError(
+          t(`${adapter.appKey}Config.extractNoCommonConfig`, {
+            defaultValue: "无法提取通用配置",
+          }),
+        );
+        return;
+      }
+
+      // 验证提取结果格式
+      const extractedParsed = adapter.parseSnippet(extracted);
+      if (extractedParsed.error || extractedParsed.config === null) {
+        setCommonConfigError(
+          t(`${adapter.appKey}Config.extractedConfigInvalid`, {
+            defaultValue: "提取的配置格式错误",
+          }),
+        );
+        return;
+      }
+
+      // 更新片段状态
+      setCommonConfigSnippetState(extracted);
+      setHasUnsavedCommonConfig(true);
+
+      // 从自定义配置中移除与提取内容相同的部分
+      const customConfig = adapter.parseInput(inputValue);
+      const diffResult = adapter.extractDiff(
+        customConfig,
+        extractedParsed.config,
+      );
+
+      if (!diffResult.error) {
+        onInputChange(adapter.serializeOutput(diffResult.custom));
+        toast.success(
+          t(`${adapter.appKey}Config.extractSuccessNeedSave`, {
+            defaultValue: "已提取通用配置，点击保存按钮完成保存",
+          }),
+        );
+      }
+    } catch (error) {
+      console.error(`提取 ${adapter.appKey} 通用配置失败:`, error);
+      setCommonConfigError(
+        t(`${adapter.appKey}Config.extractFailed`, {
+          error: String(error),
+          defaultValue: "提取失败",
+        }),
+      );
+    } finally {
+      setIsExtracting(false);
+    }
+  }, [adapter, finalValue, inputValue, onInputChange, t]);
+
+  // ============================================================================
+  // 获取待保存的通用配置片段
+  // ============================================================================
+  const getPendingCommonConfigSnippet = useCallback(() => {
+    return hasUnsavedCommonConfig ? commonConfigSnippet : null;
+  }, [hasUnsavedCommonConfig, commonConfigSnippet]);
+
+  // ============================================================================
+  // 标记通用配置已保存
+  // ============================================================================
+  const markCommonConfigSaved = useCallback(() => {
+    setHasUnsavedCommonConfig(false);
+  }, []);
+
+  return {
+    useCommonConfig,
+    commonConfigSnippet,
+    commonConfigError,
+    isLoading,
+    isExtracting,
+    handleCommonConfigToggle,
+    handleCommonConfigSnippetChange,
+    handleExtract,
+    finalValue,
+    hasUnsavedCommonConfig,
+    getPendingCommonConfigSnippet,
+    markCommonConfigSaved,
+  };
+}
@@ -0,0 +1,27 @@
+import { useState, useEffect } from "react";
+
+/**
+ * Hook to track dark mode state by observing document.documentElement class changes.
+ *
+ * @returns boolean indicating if dark mode is currently active
+ */
+export function useDarkMode(): boolean {
+  const [isDarkMode, setIsDarkMode] = useState(false);
+
+  useEffect(() => {
+    setIsDarkMode(document.documentElement.classList.contains("dark"));
+
+    const observer = new MutationObserver(() => {
+      setIsDarkMode(document.documentElement.classList.contains("dark"));
+    });
+
+    observer.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ["class"],
+    });
+
+    return () => observer.disconnect();
+  }, []);
+
+  return isDarkMode;
+}
@@ -1,131 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { openclawApi } from "@/lib/api/openclaw";
-import { providersApi } from "@/lib/api/providers";
-import type {
-  OpenClawEnvConfig,
-  OpenClawToolsConfig,
-  OpenClawAgentsDefaults,
-} from "@/types";
-
-/**
- * Centralized query keys for all OpenClaw-related queries.
- * Import this from any file that needs to invalidate OpenClaw caches.
- */
-export const openclawKeys = {
-  all: ["openclaw"] as const,
-  liveProviderIds: ["openclaw", "liveProviderIds"] as const,
-  defaultModel: ["openclaw", "defaultModel"] as const,
-  env: ["openclaw", "env"] as const,
-  tools: ["openclaw", "tools"] as const,
-  agentsDefaults: ["openclaw", "agentsDefaults"] as const,
-};
-
-// ============================================================
-// Query hooks
-// ============================================================
-
-/**
- * Query live provider IDs from openclaw.json config.
- * Used by ProviderList to show "In Config" badge.
- */
-export function useOpenClawLiveProviderIds(enabled: boolean) {
-  return useQuery({
-    queryKey: openclawKeys.liveProviderIds,
-    queryFn: () => providersApi.getOpenClawLiveProviderIds(),
-    enabled,
-  });
-}
-
-/**
- * Query the default model from agents.defaults.model.
- * Used by ProviderList to show which provider is the default.
- */
-export function useOpenClawDefaultModel(enabled: boolean) {
-  return useQuery({
-    queryKey: openclawKeys.defaultModel,
-    queryFn: () => openclawApi.getDefaultModel(),
-    enabled,
-  });
-}
-
-/**
- * Query env section of openclaw.json.
- */
-export function useOpenClawEnv() {
-  return useQuery({
-    queryKey: openclawKeys.env,
-    queryFn: () => openclawApi.getEnv(),
-    staleTime: 30_000,
-  });
-}
-
-/**
- * Query tools section of openclaw.json.
- */
-export function useOpenClawTools() {
-  return useQuery({
-    queryKey: openclawKeys.tools,
-    queryFn: () => openclawApi.getTools(),
-    staleTime: 30_000,
-  });
-}
-
-/**
- * Query agents.defaults section of openclaw.json.
- */
-export function useOpenClawAgentsDefaults() {
-  return useQuery({
-    queryKey: openclawKeys.agentsDefaults,
-    queryFn: () => openclawApi.getAgentsDefaults(),
-    staleTime: 30_000,
-  });
-}
-
-// ============================================================
-// Mutation hooks
-// ============================================================
-
-/**
- * Save env config. Invalidates env query on success.
- * Toast notifications are handled by the component.
- */
-export function useSaveOpenClawEnv() {
-  const queryClient = useQueryClient();
-  return useMutation({
-    mutationFn: (env: OpenClawEnvConfig) => openclawApi.setEnv(env),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: openclawKeys.env });
-    },
-  });
-}
-
-/**
- * Save tools config. Invalidates tools query on success.
- * Toast notifications are handled by the component.
- */
-export function useSaveOpenClawTools() {
-  const queryClient = useQueryClient();
-  return useMutation({
-    mutationFn: (tools: OpenClawToolsConfig) => openclawApi.setTools(tools),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: openclawKeys.tools });
-    },
-  });
-}
-
-/**
- * Save agents.defaults config. Invalidates both agentsDefaults and defaultModel
- * queries on success (since changing agents.defaults may affect the default model).
- * Toast notifications are handled by the component.
- */
-export function useSaveOpenClawAgentsDefaults() {
-  const queryClient = useQueryClient();
-  return useMutation({
-    mutationFn: (defaults: OpenClawAgentsDefaults) =>
-      openclawApi.setAgentsDefaults(defaults),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: openclawKeys.agentsDefaults });
-      queryClient.invalidateQueries({ queryKey: openclawKeys.defaultModel });
-    },
-  });
-}
@@ -2,14 +2,8 @@ import { useCallback } from "react";
 import { useQueryClient } from "@tanstack/react-query";
 import { toast } from "sonner";
 import { useTranslation } from "react-i18next";
-import { providersApi, settingsApi, openclawApi, type AppId } from "@/lib/api";
-import type {
-  Provider,
-  UsageScript,
-  OpenClawProviderConfig,
-  OpenClawDefaultModel,
-} from "@/types";
-import type { OpenClawSuggestedDefaults } from "@/config/openclawProviderPresets";
+import { providersApi, settingsApi, type AppId } from "@/lib/api";
+import type { Provider, UsageScript } from "@/types";
 import {
  useAddProviderMutation,
  useUpdateProviderMutation,
@@ -17,7 +11,6 @@ import {
  useSwitchProviderMutation,
 } from "@/lib/query";
 import { extractErrorMessage } from "@/utils/errorUtils";
-import { openclawKeys } from "@/hooks/useOpenClaw";

 /**
 * Hook for managing provider actions (add, update, delete, switch)
@@ -61,55 +54,10 @@ export function useProviderActions(activeApp: AppId) {

  // 添加供应商
  const addProvider = useCallback(
-    async (
-      provider: Omit<Provider, "id"> & {
-        providerKey?: string;
-        suggestedDefaults?: OpenClawSuggestedDefaults;
-      },
-    ) => {
+    async (provider: Omit<Provider, "id"> & { providerKey?: string }) => {
      await addProviderMutation.mutateAsync(provider);
-
-      // OpenClaw: register models to allowlist after adding provider
-      if (activeApp === "openclaw" && provider.suggestedDefaults) {
-        const { model, modelCatalog } = provider.suggestedDefaults;
-        let modelsRegistered = false;
-
-        try {
-          // 1. Merge model catalog (allowlist)
-          if (modelCatalog && Object.keys(modelCatalog).length > 0) {
-            const existingCatalog = (await openclawApi.getModelCatalog()) || {};
-            const mergedCatalog = { ...existingCatalog, ...modelCatalog };
-            await openclawApi.setModelCatalog(mergedCatalog);
-            modelsRegistered = true;
-          }
-
-          // 2. Set default model (only if not already set)
-          if (model) {
-            const existingDefault = await openclawApi.getDefaultModel();
-            if (!existingDefault?.primary) {
-              await openclawApi.setDefaultModel(model);
-            }
-          }
-
-          // Show success toast if models were registered
-          if (modelsRegistered) {
-            toast.success(
-              t("notifications.openclawModelsRegistered", {
-                defaultValue: "模型已注册到 /model 列表",
-              }),
-              { closeButton: true },
-            );
-          }
-        } catch (error) {
-          // Log warning but don't block main flow - provider config is already saved
-          console.warn(
-            "[OpenClaw] Failed to register models to allowlist:",
-            error,
-          );
-        }
-      }
    },
-    [addProviderMutation, activeApp, t],
+    [addProviderMutation],
  );

  // 更新供应商
@@ -156,15 +104,13 @@ export function useProviderActions(activeApp: AppId) {
          );
        } else {
          // 普通供应商：显示切换成功
-          // OpenCode/OpenClaw: show "added to config" message instead of "switched"
-          const isMultiProviderApp =
-            activeApp === "opencode" || activeApp === "openclaw";
-          const messageKey = isMultiProviderApp
-            ? "notifications.addToConfigSuccess"
-            : "notifications.switchSuccess";
-          const defaultMessage = isMultiProviderApp
-            ? "已添加到配置"
-            : "切换成功！";
+          // OpenCode: show "added to config" message instead of "switched"
+          const messageKey =
+            activeApp === "opencode"
+              ? "notifications.addToConfigSuccess"
+              : "notifications.switchSuccess";
+          const defaultMessage =
+            activeApp === "opencode" ? "已添加到配置" : "切换成功！";

          toast.success(t(messageKey, { defaultValue: defaultMessage }), {
            closeButton: true,
@@ -224,54 +170,12 @@ export function useProviderActions(activeApp: AppId) {
    [activeApp, queryClient, t],
  );

-  // Set provider as default model (OpenClaw only)
-  const setAsDefaultModel = useCallback(
-    async (provider: Provider) => {
-      const config = provider.settingsConfig as OpenClawProviderConfig;
-      if (!config.models || config.models.length === 0) {
-        toast.error(
-          t("notifications.openclawNoModels", {
-            defaultValue: "该供应商没有配置模型",
-          }),
-        );
-        return;
-      }
-
-      const model: OpenClawDefaultModel = {
-        primary: `${provider.id}/${config.models[0].id}`,
-        fallbacks: config.models.slice(1).map((m) => `${provider.id}/${m.id}`),
-      };
-
-      try {
-        await openclawApi.setDefaultModel(model);
-        await queryClient.invalidateQueries({
-          queryKey: openclawKeys.defaultModel,
-        });
-        toast.success(
-          t("notifications.openclawDefaultModelSet", {
-            defaultValue: "已设为默认模型",
-          }),
-          { closeButton: true },
-        );
-      } catch (error) {
-        const detail =
-          extractErrorMessage(error) ||
-          t("notifications.openclawDefaultModelSetFailed", {
-            defaultValue: "设置默认模型失败",
-          });
-        toast.error(detail);
-      }
-    },
-    [queryClient, t],
-  );
-
  return {
    addProvider,
    updateProvider,
    switchProvider,
    deleteProvider,
    saveUsageScript,
-    setAsDefaultModel,
    isLoading:
      addProviderMutation.isPending ||
      updateProviderMutation.isPending ||
@@ -135,10 +135,9 @@ export function useSettings(): UseSettingsResult {
        const sanitizedOpencodeDir = sanitizeDir(
          mergedSettings.opencodeConfigDir,
        );
-        const { webdavSync: _ignoredWebdavSync, ...restSettings } = mergedSettings;

        const payload: Settings = {
-          ...restSettings,
+          ...mergedSettings,
          claudeConfigDir: sanitizedClaudeDir,
          codexConfigDir: sanitizedCodexDir,
          geminiConfigDir: sanitizedGeminiDir,
@@ -252,10 +251,9 @@ export function useSettings(): UseSettingsResult {
        const previousCodexDir = sanitizeDir(data?.codexConfigDir);
        const previousGeminiDir = sanitizeDir(data?.geminiConfigDir);
        const previousOpencodeDir = sanitizeDir(data?.opencodeConfigDir);
-        const { webdavSync: _ignoredWebdavSync, ...restSettings } = mergedSettings;

        const payload: Settings = {
-          ...restSettings,
+          ...mergedSettings,
          claudeConfigDir: sanitizedClaudeDir,
          codexConfigDir: sanitizedCodexDir,
          geminiConfigDir: sanitizedGeminiDir,
@@ -37,7 +37,8 @@
    "search": "Search",
    "reset": "Reset",
    "actions": "Actions",
-    "deleting": "Deleting..."
+    "deleting": "Deleting...",
+    "readonly": "Read-only"
  },
  "apiKeyInput": {
    "placeholder": "Enter API Key",
@@ -54,11 +55,18 @@
    "editCommonConfig": "Edit Common Config",
    "editCommonConfigTitle": "Edit Common Config Snippet",
    "commonConfigHint": "This snippet will be merged into settings.json when 'Write Common Config' is checked",
+    "noCommonConfigToApply": "Common config snippet is empty or has no applicable entries",
    "fullSettingsHint": "Full Claude Code settings.json content",
    "extractFromCurrent": "Extract from Editor",
    "extractNoCommonConfig": "No common config available to extract from editor",
    "extractFailed": "Extract failed: {{error}}",
-    "saveFailed": "Save failed: {{error}}"
+    "extractSuccessNeedSave": "Common config extracted, click Save to complete",
+    "saveFailed": "Save failed: {{error}}",
+    "hidePreview": "Hide merged preview",
+    "showPreview": "Show merged preview",
+    "customConfig": "Custom config (overrides common)",
+    "mergedPreview": "Merged preview (read-only)",
+    "mergedPreviewHint": "Common config + Custom config = Final config"
  },
  "header": {
    "viewOnGithub": "View on GitHub",
@@ -88,8 +96,6 @@
    "addOpenCodeProvider": "Add OpenCode Provider",
    "addToConfig": "Add",
    "removeFromConfig": "Remove",
-    "setAsDefault": "Enable",
-    "isDefault": "Default",
    "inConfig": "Added",
    "addProviderHint": "Fill in the information to quickly switch providers in the list.",
    "editClaudeProvider": "Edit Claude Code Provider",
@@ -164,11 +170,7 @@
    "settingsSaved": "Settings saved",
    "settingsSaveFailed": "Failed to save settings: {{error}}",
    "openAIChatFormatHint": "This provider uses OpenAI Chat format and requires the proxy service to be enabled",
-    "openLinkFailed": "Failed to open link",
-    "openclawModelsRegistered": "Models have been registered to /model list",
-    "openclawDefaultModelSet": "Set as default model",
-    "openclawDefaultModelSetFailed": "Failed to set default model",
-    "openclawNoModels": "No models configured"
+    "openLinkFailed": "Failed to open link"
  },
  "confirm": {
    "deleteProvider": "Delete Provider",
@@ -272,82 +274,6 @@
    "selectFileFailed": "Please choose a valid SQL backup file",
    "configCorrupted": "SQL file may be corrupted or invalid",
    "backupId": "Backup ID",
-    "webdavSync": {
-      "title": "WebDAV Cloud Sync",
-      "description": "Sync database and skill configurations across devices via WebDAV.",
-      "baseUrl": "WebDAV Server URL",
-      "baseUrlPlaceholder": "https://dav.example.com/dav/",
-      "username": "WebDAV Account",
-      "usernamePlaceholder": "Email or username",
-      "password": "WebDAV Password",
-      "passwordPlaceholder": "App password",
-      "remoteRoot": "Remote Root Directory",
-      "profile": "Sync Profile Name",
-      "autoSync": "Auto Sync",
-      "autoSyncHint": "When enabled, each database change triggers an automatic WebDAV upload.",
-      "test": "Test Connection",
-      "testing": "Testing...",
-      "testSuccess": "Connection successful",
-      "testFailed": "Connection failed: {{error}}",
-      "save": "Save Config",
-      "saving": "Saving...",
-      "saveFailed": "Failed to save config: {{error}}",
-      "upload": "Upload to Cloud",
-      "uploading": "Uploading...",
-      "uploadSuccess": "Uploaded to WebDAV",
-      "uploadFailed": "Upload failed: {{error}}",
-      "autoSyncFailedToast": "Auto sync failed: {{error}}",
-      "download": "Download from Cloud",
-      "downloading": "Downloading...",
-      "downloadSuccess": "Downloaded and restored from WebDAV",
-      "downloadFailed": "Download failed: {{error}}",
-      "lastSync": "Last sync: {{time}}",
-      "autoSyncLastErrorTitle": "Last auto sync failed",
-      "autoSyncLastErrorHint": "Please check network or WebDAV settings. Auto sync will retry on future changes.",
-      "missingUrl": "Please enter the WebDAV server URL",
-      "presets": {
-        "label": "Provider",
-        "jianguoyun": "Jianguoyun",
-        "jianguoyunHint": "Generate an \"App Password\" in Jianguoyun security settings. Do not use your login password.",
-        "nextcloud": "Nextcloud",
-        "nextcloudHint": "Replace your-server with your Nextcloud domain and USERNAME with your username.",
-        "synology": "Synology NAS",
-        "synologyHint": "Install and enable the WebDAV Server package in Synology Package Center first.",
-        "custom": "Custom"
-      },
-      "remoteRootDefault": "Default: cc-switch-sync",
-      "profileDefault": "Default: default",
-      "saveAndTestSuccess": "Config saved, connection OK",
-      "saveAndTestFailed": "Config saved, but connection test failed: {{error}}",
-      "noRemoteData": "No sync data found on the remote server",
-      "incompatibleVersion": "Remote data version incompatible (v{{version}}), current supports v2",
-      "unsaved": "Unsaved",
-      "saved": "Saved",
-      "unsavedChanges": "Please save config first",
-      "saveBeforeSync": "Save configuration first to enable upload/download.",
-      "fetchingRemote": "Fetching remote info...",
-      "fetchRemoteFailed": "Failed to fetch remote info. Please check configuration and network.",
-      "confirmDownload": {
-        "title": "Restore from Cloud",
-        "deviceName": "Uploaded by",
-        "createdAt": "Uploaded at",
-        "artifacts": "Contents",
-        "warning": "This will overwrite all local data and skill configurations",
-        "confirm": "Confirm Restore"
-      },
-      "confirmUpload": {
-        "title": "Upload to Cloud",
-        "content": "The following will be synced to the WebDAV server:",
-        "dbItem": "Database (all provider configs and data)",
-        "skillsItem": "Skills (all custom skills)",
-        "targetPath": "Target path",
-        "existingData": "Existing cloud data",
-        "deviceName": "Uploaded by",
-        "createdAt": "Uploaded at",
-        "warning": "This will overwrite existing sync data on the remote server",
-        "confirm": "Confirm Upload"
-      }
-    },
    "autoReload": "Data refreshed",
    "languageOptionChinese": "中文",
    "languageOptionEnglish": "English",
@@ -489,8 +415,7 @@
    "claude": "Claude",
    "codex": "Codex",
    "gemini": "Gemini",
-    "opencode": "OpenCode",
-    "openclaw": "OpenClaw"
+    "opencode": "OpenCode"
  },
  "sessionManager": {
    "title": "Session Manager",
@@ -573,6 +498,7 @@
    "officialHint": "💡 Official provider uses browser login, no API Key needed",
    "getApiKey": "Get API Key",
    "partnerPromotion": {
+      "zhipu": "Zhipu GLM is an official partner of CC Switch. Use this link to top up and get a 10% discount",
      "packycode": "PackyCode is an official partner of CC Switch. Register using this link and enter \"cc-switch\" promo code during recharge to get 10% off",
      "minimax_cn": "MiniMax Coding Plan Special Offer, Starter from ¥9.9",
      "minimax_en": "MiniMax Coding Plan Black Friday, Starter is now $2/mo (80% OFF!)",
@@ -620,7 +546,10 @@
    "categoryOfficial": "Official",
    "categoryCnOfficial": "Opensource Official",
    "categoryAggregation": "Aggregation",
-    "categoryThirdParty": "Third Party"
+    "categoryThirdParty": "Third Party",
+    "commonConfigLoading": "Common config is still loading, please wait before saving",
+    "commonConfigSyncFailed": "Common config sync failed for some providers. Please retry.",
+    "saveCommonConfigFailed": "Failed to save common config"
  },
  "endpointTest": {
    "title": "API Endpoint Management",
@@ -685,10 +614,12 @@
    "editCommonConfig": "Edit Common Config",
    "editCommonConfigTitle": "Edit Codex Common Config Snippet",
    "commonConfigHint": "This snippet will be appended to the end of config.toml when 'Write Common Config' is checked",
+    "noCommonConfigToApply": "Common config snippet is empty or has no applicable entries",
    "apiUrlLabel": "API Request URL",
    "extractFromCurrent": "Extract from Editor",
    "extractNoCommonConfig": "No common config available to extract from editor",
    "extractFailed": "Extract failed: {{error}}",
+    "extractSuccessNeedSave": "Common config extracted, click Save to complete",
    "saveFailed": "Save failed: {{error}}"
  },
  "geminiConfig": {
@@ -703,14 +634,17 @@
    "extractFromCurrent": "Extract from Editor",
    "extractNoCommonConfig": "No common config available to extract from editor",
    "extractFailed": "Extract failed: {{error}}",
+    "extractSuccessNeedSave": "Common config extracted, click Save to complete",
    "saveFailed": "Save failed: {{error}}",
    "extractedConfigInvalid": "Extracted config format is invalid",
    "invalidJsonFormat": "Common config snippet format error (must be valid JSON)",
+    "invalidEnvFormat": "Config format error (use KEY=VALUE format, one per line)",
    "commonConfigInvalidKeys": "Common config snippet must not include GOOGLE_GEMINI_BASE_URL or GEMINI_API_KEY (found: {{keys}})",
    "commonConfigInvalidValues": "Common config snippet values must be strings",
    "noCommonConfigToApply": "Common config snippet is empty or has no applicable entries",
    "configMergeFailed": "Config merge failed: {{error}}",
-    "configReplaceFailed": "Config replace failed: {{error}}"
+    "configReplaceFailed": "Config replace failed: {{error}}",
+    "forbiddenKeysWarning": "The following keys were filtered (not allowed in common config): {{keys}}"
  },
  "opencode": {
    "npmPackage": "API Format",
@@ -743,38 +677,6 @@
    "modelOptionKeyPlaceholder": "provider",
    "modelOptionValuePlaceholder": "{\"order\": [\"baseten\"]}"
  },
-  "openclaw": {
-    "providerKey": "Provider Key",
-    "providerKeyPlaceholder": "my-provider",
-    "providerKeyHint": "Unique identifier in config file. Cannot be changed after creation. Use lowercase letters, numbers, and hyphens only.",
-    "providerKeyRequired": "Provider key is required",
-    "providerKeyDuplicate": "This key is already in use",
-    "providerKeyInvalid": "Invalid format. Use lowercase letters, numbers, and hyphens only.",
-    "apiProtocol": "API Protocol",
-    "selectProtocol": "Select API Protocol",
-    "apiProtocolHint": "Select the protocol type compatible with the provider's API. Most providers use OpenAI Completions format.",
-    "baseUrl": "API Endpoint",
-    "baseUrlHint": "The provider's API endpoint address.",
-    "models": "Models",
-    "addModel": "Add Model",
-    "noModels": "No models configured. Click Add Model to configure available models.",
-    "modelId": "Model ID",
-    "modelIdPlaceholder": "claude-3-sonnet",
-    "modelName": "Display Name",
-    "modelNamePlaceholder": "Claude 3 Sonnet",
-    "contextWindow": "Context Window",
-    "maxTokens": "Max Output Tokens",
-    "reasoning": "Reasoning Mode",
-    "reasoningOn": "Enabled",
-    "reasoningOff": "Disabled",
-    "inputCost": "Input Cost ($/M tokens)",
-    "outputCost": "Output Cost ($/M tokens)",
-    "advancedOptions": "Advanced Options",
-    "cacheReadCost": "Cache Read Cost ($/M tokens)",
-    "cacheWriteCost": "Cache Write Cost ($/M tokens)",
-    "cacheCostHint": "Cache costs are used to calculate Prompt Caching costs. Leave empty if not using caching.",
-    "modelsHint": "Configure the models supported by this provider. Model ID is used for API calls, Display Name for the interface."
-  },
  "providerPreset": {
    "label": "Provider Preset",
    "custom": "Custom Configuration",
@@ -970,8 +872,7 @@
        "claude": "Claude",
        "codex": "Codex",
        "gemini": "Gemini",
-        "opencode": "OpenCode",
-        "openclaw": "OpenClaw"
+        "opencode": "OpenCode"
      }
    },
    "userLevelPath": "User-level MCP path",
@@ -1144,74 +1045,6 @@
      "deleteMessage": "Are you sure you want to delete prompt \"{{name}}\"?"
    }
  },
-  "workspace": {
-    "title": "Workspace Files",
-    "manage": "Workspace",
-    "files": {
-      "agents": "Agent instructions and rules",
-      "soul": "Agent personality and communication style",
-      "user": "User profile and preferences",
-      "identity": "Agent name and avatar",
-      "tools": "Local tool documentation",
-      "memory": "Long-term memory and decisions",
-      "heartbeat": "Heartbeat run checklist",
-      "bootstrap": "First-run bootstrap ritual",
-      "boot": "Gateway reboot checklist"
-    },
-    "editing": "Edit {{filename}}",
-    "saveSuccess": "Saved successfully",
-    "saveFailed": "Failed to save",
-    "loadFailed": "Failed to load"
-  },
-  "openclaw": {
-    "env": {
-      "title": "Environment Variables",
-      "description": "Manage environment variables in openclaw.json (API keys, custom variables, etc.)",
-      "keyPlaceholder": "Variable name",
-      "valuePlaceholder": "Value",
-      "add": "Add Variable",
-      "saveSuccess": "Environment variables saved",
-      "saveFailed": "Failed to save environment variables",
-      "loadFailed": "Failed to load environment variables",
-      "duplicateKey": "Duplicate variable name detected: {{key}}"
-    },
-    "tools": {
-      "title": "Tool Permissions",
-      "description": "Manage tool permissions in openclaw.json (allow/deny lists)",
-      "profile": "Permission Profile",
-      "profiles": {
-        "default": "Default",
-        "strict": "Strict",
-        "permissive": "Permissive",
-        "custom": "Custom"
-      },
-      "allowList": "Allow List",
-      "denyList": "Deny List",
-      "patternPlaceholder": "Tool name or pattern",
-      "addAllow": "Add Allow",
-      "addDeny": "Add Deny",
-      "saveSuccess": "Tool permissions saved",
-      "saveFailed": "Failed to save tool permissions",
-      "loadFailed": "Failed to load tool permissions"
-    },
-    "agents": {
-      "title": "Agents Config",
-      "description": "Manage agents.defaults in openclaw.json (default model, runtime parameters, etc.)",
-      "modelSection": "Model Configuration",
-      "primaryModel": "Primary Model",
-      "primaryModelHint": "Format: provider/model-id",
-      "fallbackModels": "Fallback Models",
-      "fallbackModelsHint": "Comma-separated, ordered by priority",
-      "runtimeSection": "Runtime Parameters",
-      "workspace": "Workspace Path",
-      "timeout": "Timeout (seconds)",
-      "contextTokens": "Context Tokens",
-      "maxConcurrent": "Max Concurrent",
-      "saveSuccess": "Agents config saved",
-      "saveFailed": "Failed to save agents config",
-      "loadFailed": "Failed to load agents config"
-    }
-  },
  "env": {
    "warning": {
      "title": "Environment Variable Conflicts Detected",
@@ -1354,8 +1187,7 @@
      "claude": "Claude",
      "codex": "Codex",
      "gemini": "Gemini",
-      "opencode": "OpenCode",
-      "openclaw": "OpenClaw"
+      "opencode": "OpenCode"
    },
    "installFromZip": {
      "button": "Install from ZIP",
@@ -1856,34 +1688,5 @@
      "unspecifiedHigh": "Uncategorized high-effort task category for tasks that don't fit other categories with large workload. Defaults to Claude Opus 4.6 max variant.",
      "writing": "Writing category for documentation, prose and technical writing. Defaults to Gemini 3 Flash fast generation model."
    }
-  },
-  "openclawConfig": {
-    "defaultModel": {
-      "title": "Default Model",
-      "description": "Configure the default primary model and fallback models for OpenClaw",
-      "primary": "Primary Model",
-      "primaryPlaceholder": "e.g., deepseek/deepseek-chat",
-      "fallbacks": "Fallback Models",
-      "fallbacksPlaceholder": "e.g., openrouter/anthropic/claude-sonnet-4.5",
-      "addFallback": "Add Fallback Model",
-      "saved": "Default model configuration saved",
-      "saveFailed": "Failed to save default model"
-    },
-    "modelCatalog": {
-      "title": "Model Catalog",
-      "description": "Configure model aliases and allowlist",
-      "modelId": "Model ID",
-      "modelIdPlaceholder": "e.g., deepseek/deepseek-chat",
-      "alias": "Alias",
-      "aliasPlaceholder": "e.g., DeepSeek",
-      "addEntry": "Add Model",
-      "removeEntry": "Remove",
-      "saved": "Model catalog saved",
-      "saveFailed": "Failed to save model catalog",
-      "empty": "No model catalog entries",
-      "emptyHint": "Add models to the catalog to configure aliases"
-    },
-    "suggestedDefaults": "Apply Suggested Defaults",
-    "suggestedDefaultsHint": "Use this preset's recommended default model configuration"
  }
 }
@@ -37,7 +37,8 @@
    "search": "検索",
    "reset": "リセット",
    "actions": "操作",
-    "deleting": "削除中..."
+    "deleting": "削除中...",
+    "readonly": "読み取り専用"
  },
  "apiKeyInput": {
    "placeholder": "API Key を入力",
@@ -54,11 +55,18 @@
    "editCommonConfig": "共通設定を編集",
    "editCommonConfigTitle": "共通設定スニペットを編集",
    "commonConfigHint": "「共通設定を書き込む」がオンのとき settings.json にマージされます",
+    "noCommonConfigToApply": "共通設定スニペットが空、または適用できる項目がありません",
    "fullSettingsHint": "Claude Code の settings.json 全文",
    "extractFromCurrent": "編集内容から抽出",
    "extractNoCommonConfig": "編集内容から抽出できる共通設定がありません",
    "extractFailed": "抽出に失敗しました: {{error}}",
-    "saveFailed": "保存に失敗しました: {{error}}"
+    "extractSuccessNeedSave": "共通設定を抽出しました。保存ボタンをクリックして完了してください",
+    "saveFailed": "保存に失敗しました: {{error}}",
+    "hidePreview": "マージプレビューを非表示",
+    "showPreview": "マージプレビューを表示",
+    "customConfig": "カスタム設定（共通設定を上書き）",
+    "mergedPreview": "マージプレビュー（読み取り専用）",
+    "mergedPreviewHint": "共通設定 + カスタム設定 = 最終設定"
  },
  "header": {
    "viewOnGithub": "GitHub で見る",
@@ -88,8 +96,6 @@
    "addOpenCodeProvider": "OpenCode プロバイダーを追加",
    "addToConfig": "追加",
    "removeFromConfig": "削除",
-    "setAsDefault": "有効化",
-    "isDefault": "デフォルト",
    "inConfig": "追加済み",
    "addProviderHint": "一覧にすばやく切り替えられるよう、ここに情報を入力してください。",
    "editClaudeProvider": "Claude Code プロバイダーを編集",
@@ -164,11 +170,7 @@
    "settingsSaved": "設定を保存しました",
    "settingsSaveFailed": "設定の保存に失敗しました: {{error}}",
    "openAIChatFormatHint": "このプロバイダーは OpenAI Chat フォーマットを使用しており、プロキシサービスの有効化が必要です",
-    "openLinkFailed": "リンクを開けませんでした",
-    "openclawModelsRegistered": "モデルが /model リストに登録されました",
-    "openclawDefaultModelSet": "デフォルトモデルに設定しました",
-    "openclawDefaultModelSetFailed": "デフォルトモデルの設定に失敗しました",
-    "openclawNoModels": "モデルが設定されていません"
+    "openLinkFailed": "リンクを開けませんでした"
  },
  "confirm": {
    "deleteProvider": "プロバイダーを削除",
@@ -272,82 +274,6 @@
    "selectFileFailed": "有効な SQL バックアップファイルを選択してください",
    "configCorrupted": "SQL ファイルが壊れているか形式が無効な可能性があります",
    "backupId": "バックアップ ID",
-    "webdavSync": {
-      "title": "WebDAV クラウド同期",
-      "description": "WebDAV を使ってデバイス間でデータベースとスキル設定を同期します。",
-      "baseUrl": "WebDAV サーバー URL",
-      "baseUrlPlaceholder": "https://example.com/remote.php/dav/files/user",
-      "username": "ユーザー名",
-      "usernamePlaceholder": "メールアドレスまたはユーザー名",
-      "password": "パスワード",
-      "passwordPlaceholder": "アプリパスワード",
-      "remoteRoot": "リモートルートディレクトリ",
-      "profile": "同期プロファイル名",
-      "autoSync": "自動同期",
-      "autoSyncHint": "有効にすると、データベース変更のたびに WebDAV へ自動アップロードします。",
-      "test": "接続テスト",
-      "testing": "テスト中...",
-      "testSuccess": "接続成功",
-      "testFailed": "接続失敗：{{error}}",
-      "save": "設定を保存",
-      "saving": "保存中...",
-      "saveFailed": "設定の保存に失敗しました：{{error}}",
-      "upload": "クラウドにアップロード",
-      "uploading": "アップロード中...",
-      "uploadSuccess": "WebDAV にアップロードしました",
-      "uploadFailed": "アップロードに失敗しました：{{error}}",
-      "autoSyncFailedToast": "自動同期に失敗しました：{{error}}",
-      "download": "クラウドからダウンロード",
-      "downloading": "ダウンロード中...",
-      "downloadSuccess": "WebDAV からダウンロード・復元しました",
-      "downloadFailed": "ダウンロードに失敗しました：{{error}}",
-      "lastSync": "前回の同期：{{time}}",
-      "autoSyncLastErrorTitle": "前回の自動同期に失敗しました",
-      "autoSyncLastErrorHint": "ネットワークまたは WebDAV 設定を確認してください。次回の変更時に自動再試行されます。",
-      "missingUrl": "WebDAV サーバー URL を入力してください",
-      "presets": {
-        "label": "サービス",
-        "jianguoyun": "坚果云",
-        "jianguoyunHint": "坚果云の「セキュリティ設定」で「サードパーティアプリパスワード」を生成してください。ログインパスワードは使用しないでください。",
-        "nextcloud": "Nextcloud",
-        "nextcloudHint": "your-server を Nextcloud サーバーのアドレスに、USERNAME をユーザー名に置き換えてください。",
-        "synology": "Synology NAS",
-        "synologyHint": "Synology の「パッケージセンター」で WebDAV Server パッケージをインストール・有効化してください。",
-        "custom": "カスタム"
-      },
-      "remoteRootDefault": "デフォルト: cc-switch-sync",
-      "profileDefault": "デフォルト: default",
-      "saveAndTestSuccess": "設定を保存しました。接続正常です",
-      "saveAndTestFailed": "設定を保存しましたが、接続テストに失敗しました：{{error}}",
-      "noRemoteData": "クラウドに同期データが見つかりません",
-      "incompatibleVersion": "リモートデータのバージョンに互換性がありません（v{{version}}）。現在 v2 をサポートしています",
-      "unsaved": "未保存",
-      "saved": "保存済み",
-      "unsavedChanges": "先に設定を保存してください",
-      "saveBeforeSync": "アップロード/ダウンロードを有効にするには、先に設定を保存してください。",
-      "fetchingRemote": "リモート情報を取得中...",
-      "fetchRemoteFailed": "リモート情報の取得に失敗しました。設定とネットワークを確認してください。",
-      "confirmDownload": {
-        "title": "クラウドから復元",
-        "deviceName": "アップロード元",
-        "createdAt": "アップロード日時",
-        "artifacts": "内容",
-        "warning": "ローカルのすべてのデータとスキル設定が上書きされます",
-        "confirm": "復元を実行"
-      },
-      "confirmUpload": {
-        "title": "クラウドにアップロード",
-        "content": "以下の内容を WebDAV サーバーに同期します：",
-        "dbItem": "データベース（すべてのプロバイダー設定とデータ）",
-        "skillsItem": "スキル（すべてのカスタムスキル）",
-        "targetPath": "保存先パス",
-        "existingData": "クラウドの既存データ",
-        "deviceName": "アップロード元",
-        "createdAt": "アップロード日時",
-        "warning": "リモートの既存同期データが上書きされます",
-        "confirm": "アップロードを実行"
-      }
-    },
    "autoReload": "データを更新しました",
    "languageOptionChinese": "中文",
    "languageOptionEnglish": "English",
@@ -489,8 +415,7 @@
    "claude": "Claude",
    "codex": "Codex",
    "gemini": "Gemini",
-    "opencode": "OpenCode",
-    "openclaw": "OpenClaw"
+    "opencode": "OpenCode"
  },
  "sessionManager": {
    "title": "セッション管理",
@@ -573,6 +498,7 @@
    "officialHint": "💡 公式プロバイダーはブラウザログインで、API Key は不要です",
    "getApiKey": "API Key を取得",
    "partnerPromotion": {
+      "zhipu": "Zhipu GLM は CC Switch の公式パートナーです。リンク経由でチャージすると 10% 割引",
      "packycode": "PackyCode は CC Switch の公式パートナーです。登録後チャージ時に \"cc-switch\" を入力すると 10% オフ",
      "minimax_cn": "MiniMax Coding Plan 特別価格、Starter ¥9.9 から",
      "minimax_en": "MiniMax Coding Plan Black Friday、Starter が月額 $2（80% OFF）",
@@ -620,7 +546,10 @@
    "categoryOfficial": "公式",
    "categoryCnOfficial": "オープンソース公式",
    "categoryAggregation": "アグリゲーター",
-    "categoryThirdParty": "サードパーティ"
+    "categoryThirdParty": "サードパーティ",
+    "commonConfigLoading": "共通設定を読み込み中です。保存する前にお待ちください",
+    "commonConfigSyncFailed": "共通設定の同期に失敗しました。再試行してください",
+    "saveCommonConfigFailed": "共通設定の保存に失敗しました"
  },
  "endpointTest": {
    "title": "API エンドポイント管理",
@@ -685,10 +614,12 @@
    "editCommonConfig": "共通設定を編集",
    "editCommonConfigTitle": "Codex 共通設定スニペットを編集",
    "commonConfigHint": "「共通設定を書き込む」がオンの場合、config.toml の末尾に追記されます",
+    "noCommonConfigToApply": "共通設定スニペットが空、または適用できる項目がありません",
    "apiUrlLabel": "API リクエスト URL",
    "extractFromCurrent": "編集内容から抽出",
    "extractNoCommonConfig": "編集内容から抽出できる共通設定がありません",
    "extractFailed": "抽出に失敗しました: {{error}}",
+    "extractSuccessNeedSave": "共通設定を抽出しました。保存ボタンをクリックして完了してください",
    "saveFailed": "保存に失敗しました: {{error}}"
  },
  "geminiConfig": {
@@ -703,14 +634,17 @@
    "extractFromCurrent": "編集内容から抽出",
    "extractNoCommonConfig": "編集内容から抽出できる共通設定がありません",
    "extractFailed": "抽出に失敗しました: {{error}}",
+    "extractSuccessNeedSave": "共通設定を抽出しました。保存ボタンをクリックして完了してください",
    "saveFailed": "保存に失敗しました: {{error}}",
    "extractedConfigInvalid": "抽出した設定のフォーマットが不正です",
    "invalidJsonFormat": "共通設定スニペットの形式が不正です（有効な JSON でなければなりません）",
+    "invalidEnvFormat": "設定フォーマットエラー（KEY=VALUE 形式を使用してください、各行に1つ）",
    "commonConfigInvalidKeys": "共通設定スニペットに GOOGLE_GEMINI_BASE_URL または GEMINI_API_KEY を含めることはできません（検出: {{keys}}）",
    "commonConfigInvalidValues": "共通設定スニペットの値は文字列である必要があります",
    "noCommonConfigToApply": "共通設定スニペットが空、または適用できる項目がありません",
    "configMergeFailed": "設定のマージに失敗しました: {{error}}",
-    "configReplaceFailed": "設定の置換に失敗しました: {{error}}"
+    "configReplaceFailed": "設定の置換に失敗しました: {{error}}",
+    "forbiddenKeysWarning": "以下のキーはフィルタされました（共通設定では許可されていません）：{{keys}}"
  },
  "opencode": {
    "npmPackage": "API フォーマット",
@@ -743,38 +677,6 @@
    "modelOptionKeyPlaceholder": "provider",
    "modelOptionValuePlaceholder": "{\"order\": [\"baseten\"]}"
  },
-  "openclaw": {
-    "providerKey": "プロバイダーキー",
-    "providerKeyPlaceholder": "my-provider",
-    "providerKeyHint": "設定ファイル内のユニーク識別子。作成後は変更できません。小文字、数字、ハイフンのみ使用可能。",
-    "providerKeyRequired": "プロバイダーキーを入力してください",
-    "providerKeyDuplicate": "このキーは既に使用されています",
-    "providerKeyInvalid": "無効な形式です。小文字、数字、ハイフンのみ使用可能。",
-    "apiProtocol": "API プロトコル",
-    "selectProtocol": "API プロトコルを選択",
-    "apiProtocolHint": "プロバイダーの API と互換性のあるプロトコルタイプを選択してください。ほとんどのプロバイダーは OpenAI Completions 形式を使用します。",
-    "baseUrl": "API エンドポイント",
-    "baseUrlHint": "プロバイダーの API エンドポイントアドレス。",
-    "models": "モデル一覧",
-    "addModel": "モデルを追加",
-    "noModels": "モデルが設定されていません。「モデルを追加」をクリックして利用可能なモデルを設定してください。",
-    "modelId": "モデル ID",
-    "modelIdPlaceholder": "claude-3-sonnet",
-    "modelName": "表示名",
-    "modelNamePlaceholder": "Claude 3 Sonnet",
-    "contextWindow": "コンテキストウィンドウ",
-    "maxTokens": "最大出力トークン数",
-    "reasoning": "推論モード",
-    "reasoningOn": "有効",
-    "reasoningOff": "無効",
-    "inputCost": "入力コスト ($/M トークン)",
-    "outputCost": "出力コスト ($/M トークン)",
-    "advancedOptions": "詳細オプション",
-    "cacheReadCost": "キャッシュ読取コスト ($/M トークン)",
-    "cacheWriteCost": "キャッシュ書込コスト ($/M トークン)",
-    "cacheCostHint": "キャッシュコストは Prompt Caching のコスト計算に使用されます。キャッシュを使用しない場合は空欄のままにしてください。",
-    "modelsHint": "このプロバイダーがサポートするモデルを設定します。モデル ID は API 呼び出しに、表示名はインターフェースに使用されます。"
-  },
  "providerPreset": {
    "label": "プロバイダータイプ",
    "custom": "カスタム設定",
@@ -970,8 +872,7 @@
        "claude": "Claude",
        "codex": "Codex",
        "gemini": "Gemini",
-        "opencode": "OpenCode",
-        "openclaw": "OpenClaw"
+        "opencode": "OpenCode"
      }
    },
    "userLevelPath": "ユーザーレベルの MCP パス",
@@ -1144,74 +1045,6 @@
      "deleteMessage": "プロンプト「{{name}}」を削除してもよろしいですか？"
    }
  },
-  "workspace": {
-    "title": "ワークスペースファイル",
-    "manage": "ワークスペース",
-    "files": {
-      "agents": "エージェントの操作指示とルール",
-      "soul": "エージェントの人格とコミュニケーションスタイル",
-      "user": "ユーザープロファイルと設定",
-      "identity": "エージェントの名前とアバター",
-      "tools": "ローカルツールドキュメント",
-      "memory": "長期記憶と意思決定記録",
-      "heartbeat": "ハートビート実行チェックリスト",
-      "bootstrap": "初回実行ブートストラップ",
-      "boot": "ゲートウェイ再起動チェックリスト"
-    },
-    "editing": "{{filename}} を編集",
-    "saveSuccess": "保存しました",
-    "saveFailed": "保存に失敗しました",
-    "loadFailed": "読み込みに失敗しました"
-  },
-  "openclaw": {
-    "env": {
-      "title": "環境変数",
-      "description": "openclaw.json の環境変数設定を管理（APIキー、カスタム変数など）",
-      "keyPlaceholder": "変数名",
-      "valuePlaceholder": "値",
-      "add": "変数を追加",
-      "saveSuccess": "環境変数を保存しました",
-      "saveFailed": "環境変数の保存に失敗しました",
-      "loadFailed": "環境変数の読み込みに失敗しました",
-      "duplicateKey": "重複する変数名が検出されました: {{key}}"
-    },
-    "tools": {
-      "title": "ツール権限",
-      "description": "openclaw.json のツール権限設定を管理（許可/拒否リスト）",
-      "profile": "権限プロファイル",
-      "profiles": {
-        "default": "デフォルト",
-        "strict": "厳格",
-        "permissive": "寛容",
-        "custom": "カスタム"
-      },
-      "allowList": "許可リスト",
-      "denyList": "拒否リスト",
-      "patternPlaceholder": "ツール名またはパターン",
-      "addAllow": "許可を追加",
-      "addDeny": "拒否を追加",
-      "saveSuccess": "ツール権限を保存しました",
-      "saveFailed": "ツール権限の保存に失敗しました",
-      "loadFailed": "ツール権限の読み込みに失敗しました"
-    },
-    "agents": {
-      "title": "Agents 設定",
-      "description": "openclaw.json の agents.defaults 設定を管理（デフォルトモデル、ランタイムパラメータなど）",
-      "modelSection": "モデル設定",
-      "primaryModel": "プライマリモデル",
-      "primaryModelHint": "形式: provider/model-id",
-      "fallbackModels": "フォールバックモデル",
-      "fallbackModelsHint": "カンマ区切り、優先度順",
-      "runtimeSection": "ランタイムパラメータ",
-      "workspace": "ワークスペースパス",
-      "timeout": "タイムアウト（秒）",
-      "contextTokens": "コンテキストトークン数",
-      "maxConcurrent": "最大同時実行数",
-      "saveSuccess": "Agents 設定を保存しました",
-      "saveFailed": "Agents 設定の保存に失敗しました",
-      "loadFailed": "Agents 設定の読み込みに失敗しました"
-    }
-  },
  "env": {
    "warning": {
      "title": "競合する環境変数を検出しました",
@@ -1352,8 +1185,7 @@
      "claude": "Claude",
      "codex": "Codex",
      "gemini": "Gemini",
-      "opencode": "OpenCode",
-      "openclaw": "OpenClaw"
+      "opencode": "OpenCode"
    },
    "installFromZip": {
      "button": "ZIP からインストール",
@@ -1837,34 +1669,5 @@
      "unspecifiedHigh": "未分類の高作業量タスクカテゴリ。他のカテゴリに該当せず作業量が大きいタスクに適用。デフォルトで Claude Opus 4.6 の max バリアントを使用。",
      "writing": "ライティングカテゴリ。ドキュメント、散文、技術文書に特化。デフォルトで Gemini 3 Flash 高速生成モデルを使用。"
    }
-  },
-  "openclawConfig": {
-    "defaultModel": {
-      "title": "デフォルトモデル",
-      "description": "OpenClaw のデフォルトのプライマリモデルとフォールバックモデルを設定します",
-      "primary": "プライマリモデル",
-      "primaryPlaceholder": "例: deepseek/deepseek-chat",
-      "fallbacks": "フォールバックモデル",
-      "fallbacksPlaceholder": "例: openrouter/anthropic/claude-sonnet-4.5",
-      "addFallback": "フォールバックモデルを追加",
-      "saved": "デフォルトモデル設定を保存しました",
-      "saveFailed": "デフォルトモデルの保存に失敗しました"
-    },
-    "modelCatalog": {
-      "title": "モデルカタログ",
-      "description": "モデルのエイリアスと許可リストを設定します",
-      "modelId": "モデル ID",
-      "modelIdPlaceholder": "例: deepseek/deepseek-chat",
-      "alias": "エイリアス",
-      "aliasPlaceholder": "例: DeepSeek",
-      "addEntry": "モデルを追加",
-      "removeEntry": "削除",
-      "saved": "モデルカタログを保存しました",
-      "saveFailed": "モデルカタログの保存に失敗しました",
-      "empty": "モデルカタログエントリがありません",
-      "emptyHint": "エイリアスを設定するにはカタログにモデルを追加してください"
-    },
-    "suggestedDefaults": "推奨デフォルト設定を適用",
-    "suggestedDefaultsHint": "このプリセットの推奨デフォルトモデル設定を使用します"
  }
 }
--- a/Show More
+++ b/Show More